Skip to content

[SYCL-Unit]Fix segfault in DeviceGlobalProgramHandle test due to static initialization order #21921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsji wants to merge 1 commit into
base: sycl
Choose a base branch
from
Open

[SYCL-Unit]Fix segfault in DeviceGlobalProgramHandle test due to static initialization order #21921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sycl/unittests/thread_safety/DeviceGlobalProgramHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ struct KernelInfo<DevGlobHandleTestKernel>
static sycl::unittest::MockDeviceImage generateHandleTestImage() {
using namespace sycl::unittest;

sycl::detail::device_global_map::add(&g_TestDevGlobal,
DevGlobHandleTestGlobalName);

MockPropertySet PropSet;
MockProperty DevGlobInfo =
makeDeviceGlobalInfo(DevGlobHandleTestGlobalName, sizeof(DevGlobElem),
Expand Down Expand Up @@ -159,6 +156,11 @@ static ur_result_t blocking_urProgramBuildExp(void *) {
class DeviceGlobalProgramHandleTest : public ::testing::Test {
protected:
void SetUp() override {
// Register the device_global here rather than during static initialization
// to avoid static initialization order fiasco with GlobalHandler
sycl::detail::device_global_map::add(&g_TestDevGlobal,
DevGlobHandleTestGlobalName);

{
std::lock_guard<std::mutex> HLock(g_HandlesMtx);
g_CapturedHandles.clear();
Expand Down
Loading