Skip to content

[SYCL] Construct context from first device in unit tests #4142

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.

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

Merged
merged 1 commit into from
Jul 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion sycl/unittests/kernel-and-program/DeviceInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ TEST_F(DeviceInfoTest, GetDeviceUUID) {
return;
}

context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
TestContext.reset(new TestCtx(Ctx));

device Dev = Ctx.get_devices()[0];
Expand Down
2 changes: 1 addition & 1 deletion sycl/unittests/kernel-and-program/KernelInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ TEST_F(KernelInfoTest, GetPrivateMemUsage) {
return;
}

context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
program Prg{Ctx};
TestContext.reset(new TestCtx(Ctx));

Expand Down
2 changes: 1 addition & 1 deletion sycl/unittests/kernel-and-program/KernelRelease.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ TEST(KernelReleaseTest, GetKernelRelease) {
Mock.redefine<detail::PiApiKind::piKernelSetExecInfo>(
redefinedKernelSetExecInfo);

context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
TestContext.reset(new TestCtx(Ctx));

program Prg{Ctx};
Expand Down
4 changes: 2 additions & 2 deletions sycl/unittests/queue/EventClear.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ TEST(QueueEventClear, ClearOnQueueWait) {
if (!preparePiMock(Plt))
return;

context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
TestContext.reset(new TestCtx(Ctx));
queue Q{Ctx, default_selector()};

Expand All @@ -129,7 +129,7 @@ TEST(QueueEventClear, CleanupOnThreshold) {
if (!preparePiMock(Plt))
return;

context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
TestContext.reset(new TestCtx(Ctx));
queue Q{Ctx, default_selector()};

Expand Down
2 changes: 1 addition & 1 deletion sycl/unittests/queue/Wait.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ TEST(QueueWait, QueueWaitTest) {
platform Plt{default_selector()};
if (!preparePiMock(Plt))
return;
context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
queue Q{Ctx, default_selector()};

unsigned char *HostAlloc = (unsigned char *)malloc_host(1, Ctx);
Expand Down
4 changes: 2 additions & 2 deletions sycl/unittests/scheduler/CommandsWaitForEvents.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ TEST_F(SchedulerTest, CommandsWaitForEvents) {
Mock.redefine<detail::PiApiKind::piEventRelease>(retainReleaseFunc);
Mock.redefine<detail::PiApiKind::piEventGetInfo>(getEventInfoFunc);

context Ctx1{Plt};
context Ctx1{Plt.get_devices()[0]};
queue Q1{Ctx1, Selector};
context Ctx2{Plt};
context Ctx2{Plt.get_devices()[0]};
queue Q2{Ctx2, Selector};

TestContext.reset(new TestCtx(Q1, Q2));
Expand Down
2 changes: 1 addition & 1 deletion sycl/unittests/scheduler/InOrderQueueDeps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ TEST_F(SchedulerTest, InOrderQueueDeps) {
Mock.redefine<detail::PiApiKind::piEventsWait>(redefinedEventsWait);
Mock.redefine<detail::PiApiKind::piEventRelease>(redefinedEventRelease);

context Ctx{Plt};
context Ctx{Plt.get_devices()[0]};
queue InOrderQueue{Ctx, Selector, property::queue::in_order()};
cl::sycl::detail::QueueImplPtr InOrderQueueImpl =
detail::getSyclObjImpl(InOrderQueue);
Expand Down