From 92c7f50b74e3faa80bf0b559ea8d9d89708f404b Mon Sep 17 00:00:00 2001 From: Sergey Semenov Date: Mon, 8 Jun 2020 13:26:23 +0300 Subject: [PATCH 1/2] [SYCL][NFC] Fix kernel release test when only host device is available PIMock should only be constructed from a non-host platform, make the test check for a non-host platform prior to constructing PIMock. Signed-off-by: Sergey Semenov --- sycl/unittests/program/KernelRelease.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/unittests/program/KernelRelease.cpp b/sycl/unittests/program/KernelRelease.cpp index a90ada3a686c5..ff472062d58d5 100644 --- a/sycl/unittests/program/KernelRelease.cpp +++ b/sycl/unittests/program/KernelRelease.cpp @@ -69,8 +69,7 @@ pi_result redefinedKernelGetInfo(pi_kernel kernel, pi_kernel_info param_name, } TEST(KernelReleaseTest, GetKernelRelease) { - unittest::PiMock Mock; - platform Plt = Mock.getPlatform(); + platform Plt{default_selector()}; if (Plt.is_host()) { std::cerr << "The program/kernel methods are mostly no-op on the host " "device, the test is not run." @@ -78,6 +77,7 @@ TEST(KernelReleaseTest, GetKernelRelease) { return; } + unittest::PiMock Mock{Plt}; Mock.redefine( redefinedProgramCreateWithSource); Mock.redefine(redefinedProgramBuild); From d5c1e7eb104409348c951c6d9f48b9037a35059e Mon Sep 17 00:00:00 2001 From: Sergey Semenov <43845535+sergey-semenov@users.noreply.github.com> Date: Mon, 8 Jun 2020 16:39:38 +0300 Subject: [PATCH 2/2] Apply suggestion Co-authored-by: Alexey Bader --- sycl/unittests/program/KernelRelease.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/unittests/program/KernelRelease.cpp b/sycl/unittests/program/KernelRelease.cpp index ff472062d58d5..5b94dedbb3970 100644 --- a/sycl/unittests/program/KernelRelease.cpp +++ b/sycl/unittests/program/KernelRelease.cpp @@ -71,7 +71,7 @@ pi_result redefinedKernelGetInfo(pi_kernel kernel, pi_kernel_info param_name, TEST(KernelReleaseTest, GetKernelRelease) { platform Plt{default_selector()}; if (Plt.is_host()) { - std::cerr << "The program/kernel methods are mostly no-op on the host " + std::cout << "The program/kernel methods are mostly no-op on the host " "device, the test is not run." << std::endl; return;