Skip to content

[SYCL] Fix unittest crashes after PR #6128 #6206

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

Merged
merged 1 commit into from
May 26, 2022
Merged

[SYCL] Fix unittest crashes after PR #6128 #6206

Show file tree
Hide file tree
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
6 changes: 2 additions & 4 deletions sycl/unittests/SYCL2020/KernelBundle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,8 @@ TEST(KernelBundle, GetKernelBundleFromKernel) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];

sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle<sycl::bundle_state::executable> KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down
18 changes: 6 additions & 12 deletions sycl/unittests/SYCL2020/KernelID.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,8 @@ TEST(KernelID, FreeKernelIDEqualsKernelBundleId) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];

sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle<sycl::bundle_state::executable> KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down Expand Up @@ -200,10 +198,8 @@ TEST(KernelID, KernelBundleKernelIDsIntersectAll) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];

sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle<sycl::bundle_state::executable> KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down Expand Up @@ -239,10 +235,8 @@ TEST(KernelID, KernelIDHasKernel) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];

sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle<sycl::bundle_state::executable> KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down
14 changes: 6 additions & 8 deletions sycl/unittests/SYCL2020/SpecializationConstant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,8 @@ TEST(SpecializationConstant, SetSpecConstAfterUseKernelBundle) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];

sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down Expand Up @@ -252,8 +250,8 @@ TEST(SpecializationConstant, GetSpecConstAfterUseKernelBundle) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];
sycl::queue Queue{Dev};
const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down Expand Up @@ -312,8 +310,8 @@ TEST(SpecializationConstant, UseKernelBundleAfterSetSpecConst) {
setupDefaultMockAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];
sycl::queue Queue{Dev};
const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx, {Dev});
Expand Down
5 changes: 2 additions & 3 deletions sycl/unittests/assert/assert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,8 @@ TEST(Assert, TestInteropKernelFromProgramNegative) {
sycl::unittest::PiMock Mock{Plt};

const sycl::device Dev = Plt.get_devices()[0];
sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

setupMockForInterop(Mock, Ctx, Dev);

Expand Down
10 changes: 4 additions & 6 deletions sycl/unittests/program_manager/BuildLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,9 @@ TEST(BuildLog, OutputNothingOnLevel1) {
setupCommonTestAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::queue Queue{Dev};

sycl::context Ctx = Queue.get_context();
auto ContextImpl = getSyclObjImpl(Ctx);
// Make sure no kernels are cached
ContextImpl->getKernelProgramCache().reset();
Expand Down Expand Up @@ -133,10 +132,9 @@ TEST(BuildLog, OutputLogOnLevel2) {
setupCommonTestAPIs(Mock);

const sycl::device Dev = Plt.get_devices()[0];
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::queue Queue{Dev};

const sycl::context Ctx = Queue.get_context();
auto ContextImpl = getSyclObjImpl(Ctx);
// Make sure no kernels are cached
ContextImpl->getKernelProgramCache().reset();
Expand Down
6 changes: 3 additions & 3 deletions sycl/unittests/program_manager/passing_link_and_compile_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,12 @@ TEST(Link_Compile_Options, check_sycl_build) {
expected_link_options);
static sycl::unittest::PiImageArray<1> DevImageArray{&DevImage};
auto KernelID = sycl::get_kernel_id<EAMTestKernel1>();
sycl::queue Queue{Dev};
const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};
sycl::kernel_bundle KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev},
{KernelID});
sycl::build(KernelBundle);
EXPECT_EQ(expected_compile_options + " " + expected_link_options,
current_build_opts);
}
}
4 changes: 2 additions & 2 deletions sycl/unittests/stream/stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ TEST(Stream, TestStreamConstructorExceptionNoAllocation) {
redefinedMemBufferCreate);

const sycl::device Dev = Plt.get_devices()[0];
sycl::queue Queue{Dev};
const sycl::context Ctx = Queue.get_context();
sycl::context Ctx{Dev};
sycl::queue Queue{Ctx, Dev};

sycl::kernel_bundle KernelBundle =
sycl::get_kernel_bundle<sycl::bundle_state::input>(Ctx, {Dev});
Expand Down