[SYCL] Change pattern to reflect the change in sycl-ls

SYCL/Basic/host_platform_avail.cpp

@@ -2,7 +2,7 @@
 // RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
-// RUN: %ACC_RUN_PLACEHOLDER %t1.out
+// RUN: env SYCL_DEVICE_FILTER=acc,host %t1.out
 
 //==------ host_platform_avail.cpp - Host Platform Availability test -------==//
 //

SYCL/FilterSelector/filter_list_cpu_gpu_acc.cpp

@@ -6,22 +6,71 @@
 //
 //===---------------------------------------------------------------------===//
 
-// REQUIRES: opencl, cpu, gpu, accelerator
+// REQUIRES: cpu, gpu, accelerator, host
 
 // RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out
 
-// RUN: env SYCL_DEVICE_FILTER="*" %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU,CHECK-ACC,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=opencl,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU,CHECK-ACC,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=cpu,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=acc,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU-NOT,CHECK-ACC,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=gpu,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU,CHECK-ACC-NOT,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=cpu,acc,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=cpu:0,acc:1,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
-// RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 SYCL_DEVICE_FILTER=cpu:0,acc:1,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU,CHECK-GPU-NOT,CHECK-ACC,CHECK-HOST
-// RUN: env SYCL_DEVICE_FILTER=cuda:cpu,opencl:gpu:0,level_zero:acc:1,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-NOT,CHECK-GPU-NOT,CHECK-ACC-NOT,CHECK-HOST
-//
-// CHECK-ACC: Device: acc
-// CHECK-CPU: Device: cpu
-// CHECK-GPU: Device: gpu
-// CHECK-HOST: Device: host
+// RUN: env SYCL_DEVICE_FILTER=acc %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY
+// RUN: env SYCL_DEVICE_FILTER=gpu %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY
+// RUN: env SYCL_DEVICE_FILTER=cpu %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY
+// RUN: env SYCL_DEVICE_FILTER=host %t.out | FileCheck %s --check-prefixes=CHECK-HOST-ONLY
+//
+// RUN: env SYCL_DEVICE_FILTER=acc,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU
+// RUN: env SYCL_DEVICE_FILTER=cpu,host %t.out | FileCheck %s --check-prefixes=CHECK-CPU-HOST
+// RUN: env SYCL_DEVICE_FILTER=acc,cpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU
+// RUN: env SYCL_DEVICE_FILTER=gpu,host %t.out | FileCheck %s --check-prefixes=CHECK-GPU-HOST
+//
+// RUN: env SYCL_DEVICE_FILTER=cpu,acc,host %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU-HOST
+// RUN: env SYCL_DEVICE_FILTER=cpu,acc,gpu %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU
+// RUN: env CL_CONFIG_CPU_EMULATE_DEVICES=2 SYCL_DEVICE_FILTER=cpu,acc,host %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU-HOST
+// RUN: env SYCL_DEVICE_FILTER=cuda:cpu,opencl:gpu,level_zero:acc,host %t.out | FileCheck %s --check-prefixes=CHECK-GPU-HOST
+//
+// CHECK-ACC-ONLY: Device: acc
+// CHECK-ACC-ONLY-NOT: Device: cpu
+// CHECK-ACC-ONLY-NOT: Device: gpu
+// CHECK-ACC-ONLY-NOT: Device: host
+//
+// CHECK-GPU-ONLY-NOT: Device: acc
+// CHECK-GPU-ONLY: Device: gpu
+// CHECK-GPU-ONLY-NOT: Device: cpu
+// CHECK-GPU-ONLY-NOT: Device: host
+//
+// CHECK-CPU-ONLY-NOT: Device: acc
+// CHECK-CPU-ONLY: Device: cpu
+// CHECK-CPU-ONLY-NOT: Device: gpu
+// CHECK-CPU-ONLY-NOT: Device: host
+//
+// CHECK-HOST-ONLY-NOT: Device: acc
+// CHECK-HOST-ONLY-NOT: Device: gpu
+// CHECK-HOST-ONLY-NOT: Device: cpu
+// CHECK-HOST-ONLY: Device: host
+//
+// CHECK-ACC-GPU: Device: acc
+// CHECK-ACC-GPU-NEXT: Device: gpu
+// CHECK-ACC-GPU-NOT: Device: cpu
+// CHECK-ACC-GPU-NOT: Device: host
+//
+// CHECK-CPU-HOST-NOT: Device: acc
+// CHECK-CPU-HOST-NOT: Device: gpu
+// CHECK-CPU-HOST: Device: cpu
+// CHECK-CPU-HOST: Device: host
+//
+// CHECK-ACC-CPU: Device: acc
+// CHECK-ACC-CPU-NEXT: Device: cpu
+// CHECK-ACC-CPU-NOT: Device: gpu
+// CHECK-ACC-CPU-NOT: Device: host
+//
+// CHECK-GPU-HOST-NOT: Device: acc
+// CHECK-GPU-HOST: Device: gpu
+// CHECK-GPU-HOST-NOT: Device: cpu
+// CHECK-GPU-HOST: Device: host
+//
+// CHECK-ACC-CPU-HOST: Device: acc
+// CHECK-ACC-CPU-HOST: Device: cpu
+// CHECK-ACC-CPU-HOST-NOT: Device: gpu
+// CHECK-ACC-CPU-HOST: Device: host
+//
+// CHECK-ACC-GPU-CPU: Device: acc
+// CHECK-ACC-GPU-CPU-DAG: Device: gpu
+// CHECK-ACC-GPU-CPU-DAG: Device: cpu
+// CHECK-ACC-GPU-CPU-NOT: Device: host

SYCL/FilterSelector/reuse.cpp

@@ -15,8 +15,6 @@
 #include <CL/sycl.hpp>
 
 using namespace cl::sycl;
-// TODO: change to 'using namespace cl::sycl::oneapi' after PR intel/llvm:4014
-// is merged
 using namespace cl::sycl::ext::oneapi;
 
 int main() {
@@ -27,17 +25,15 @@ int main() {
   std::cout << "# Devices found: " << Devs.size() << std::endl;
 
   if (Devs.size() > 1) {
-    // TODO: change all occurrences of filter_selector to 'filter_selector' or
-    // 'oneapi::filter_selector' after PR intel/llvm:4014 is merged
-    ext::oneapi::filter_selector filter("1");
+    filter_selector filter("1");
 
     device d1(filter);
     device d2(filter);
 
     assert(d1 == d2);
 
-    ext::oneapi::filter_selector f1("0");
-    ext::oneapi::filter_selector f2("1");
+    filter_selector f1("0");
+    filter_selector f2("1");
     device d3(f1);
     device d4(f2);
 

SYCL/FilterSelector/select.cpp

@@ -15,8 +15,6 @@
 #include <CL/sycl.hpp>
 
 using namespace cl::sycl;
-// TODO: change to 'using namespace cl::sycl::oneapi' after PR intel/llvm:4014
-// is merged
 using namespace cl::sycl::ext::oneapi;
 
 int main() {
@@ -73,62 +71,60 @@ int main() {
 
   if (!CPUs.empty()) {
     std::cout << "Test 'cpu'";
-    // TODO: change all occurrences of filter_selector to 'filter_selector' or
-    // 'oneapi::filter_selector' after PR intel/llvm:4014 is merged
-    device d1(ext::oneapi::filter_selector("cpu"));
+    device d1(filter_selector("cpu"));
     assert(d1.is_cpu());
     std::cout << "...PASS" << std::endl;
   }
 
   if (!GPUs.empty()) {
     std::cout << "Test 'gpu'";
-    device d2(ext::oneapi::filter_selector("gpu"));
+    device d2(filter_selector("gpu"));
     assert(d2.is_gpu());
     std::cout << "...PASS" << std::endl;
   }
 
   if (!CPUs.empty() || !GPUs.empty()) {
     std::cout << "Test 'cpu,gpu'";
-    device d3(ext::oneapi::filter_selector("cpu,gpu"));
+    device d3(filter_selector("cpu,gpu"));
     assert((d3.is_gpu() || d3.is_cpu()));
     std::cout << "...PASS" << std::endl;
   }
 
   if (HasOpenCLDevices) {
     std::cout << "Test 'opencl'";
-    device d4(ext::oneapi::filter_selector("opencl"));
+    device d4(filter_selector("opencl"));
     assert(d4.get_platform().get_backend() == backend::opencl);
     std::cout << "...PASS" << std::endl;
 
     if (!CPUs.empty()) {
       std::cout << "Test 'opencl:cpu'";
-      device d5(ext::oneapi::filter_selector("opencl:cpu"));
+      device d5(filter_selector("opencl:cpu"));
       assert(d5.is_cpu() && d5.get_platform().get_backend() == backend::opencl);
       std::cout << "...PASS" << std::endl;
 
       std::cout << "Test 'opencl:cpu:0'";
-      device d6(ext::oneapi::filter_selector("opencl:cpu:0"));
+      device d6(filter_selector("opencl:cpu:0"));
       assert(d6.is_cpu() && d6.get_platform().get_backend() == backend::opencl);
       std::cout << "...PASS" << std::endl;
     }
 
     if (HasOpenCLGPU) {
       std::cout << "Test 'opencl:gpu'" << std::endl;
-      device d7(ext::oneapi::filter_selector("opencl:gpu"));
+      device d7(filter_selector("opencl:gpu"));
       assert(d7.is_gpu() && d7.get_platform().get_backend() == backend::opencl);
     }
   }
 
   std::cout << "Test '0'";
-  device d8(ext::oneapi::filter_selector("0"));
+  device d8(filter_selector("0"));
   std::cout << "...PASS" << std::endl;
 
   std::string ErrorMesg(
       "Could not find a device that matches the specified filter(s)!");
 
   try {
     // pick something crazy
-    device d9(ext::oneapi::filter_selector("gpu:999"));
+    device d9(filter_selector("gpu:999"));
     std::cout << "d9 = " << d9.get_info<info::device::name>() << std::endl;
   } catch (const sycl::runtime_error &e) {
     assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -137,7 +133,7 @@ int main() {
 
   try {
     // pick something crazy
-    device d10(ext::oneapi::filter_selector("bob:gpu"));
+    device d10(filter_selector("bob:gpu"));
     std::cout << "d10 = " << d10.get_info<info::device::name>() << std::endl;
   } catch (const sycl::runtime_error &e) {
     assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -146,7 +142,7 @@ int main() {
 
   try {
     // pick something crazy
-    device d11(ext::oneapi::filter_selector("opencl:bob"));
+    device d11(filter_selector("opencl:bob"));
     std::cout << "d11 = " << d11.get_info<info::device::name>() << std::endl;
   } catch (const sycl::runtime_error &e) {
     assert(ErrorMesg.find_first_of(e.what()) == 0);
@@ -155,19 +151,19 @@ int main() {
 
   if (HasLevelZeroDevices && HasLevelZeroGPU) {
     std::cout << "Test 'level_zero'";
-    device d12(ext::oneapi::filter_selector("level_zero"));
+    device d12(filter_selector("level_zero"));
     assert(d12.get_platform().get_backend() == backend::level_zero);
     std::cout << "...PASS" << std::endl;
 
     std::cout << "Test 'level_zero:gpu'";
-    device d13(ext::oneapi::filter_selector("level_zero:gpu"));
+    device d13(filter_selector("level_zero:gpu"));
     assert(d13.is_gpu() &&
            d13.get_platform().get_backend() == backend::level_zero);
     std::cout << "...PASS" << std::endl;
 
     if (HasOpenCLDevices && !CPUs.empty()) {
       std::cout << "Test 'level_zero:gpu,cpu'";
-      device d14(ext::oneapi::filter_selector("level_zero:gpu,cpu"));
+      device d14(filter_selector("level_zero:gpu,cpu"));
       assert((d14.is_gpu() || d14.is_cpu()));
       std::cout << "...PASS 1/2" << std::endl;
       if (d14.is_gpu()) {
@@ -179,25 +175,25 @@ int main() {
 
   if (Devs.size() > 1) {
     std::cout << "Test '1'";
-    device d15(ext::oneapi::filter_selector("1"));
+    device d15(filter_selector("1"));
     std::cout << "...PASS" << std::endl;
   }
 
   if (HasCUDADevices) {
     std::cout << "Test 'cuda'";
-    device d16(ext::oneapi::filter_selector("cuda"));
+    device d16(filter_selector("cuda"));
     assert(d16.get_platform().get_backend() == backend::cuda);
     std::cout << "...PASS" << std::endl;
 
     std::cout << "Test 'cuda:gpu'";
-    device d17(ext::oneapi::filter_selector("cuda:gpu"));
+    device d17(filter_selector("cuda:gpu"));
     assert(d17.is_gpu() && d17.get_platform().get_backend() == backend::cuda);
     std::cout << "...PASS" << std::endl;
   }
 
   if (!Accels.empty()) {
     std::cout << "Test 'accelerator'";
-    device d18(ext::oneapi::filter_selector("accelerator"));
+    device d18(filter_selector("accelerator"));
     assert(d18.is_accelerator());
     std::cout << "...PASS" << std::endl;
   }

SYCL/FilterSelector/select_device.cpp

@@ -4,7 +4,7 @@
 // RUN: env SYCL_DEVICE_FILTER=level_zero:gpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=opencl:gpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=cpu,level_zero:gpu %t.out
-// RUN: env SYCL_DEVICE_FILTER=opencl:acc:0 %t.out
+// RUN: env SYCL_DEVICE_FILTER=opencl:acc %t.out
 //
 // Checks if only specified device types can be acquired from select_device
 // when SYCL_DEVICE_FILTER is set

SYCL/Plugin/sycl-ls-gpu-cuda.cpp

@@ -3,8 +3,8 @@
 // RUN: env SYCL_DEVICE_FILTER=cuda sycl-ls --verbose >%t.cuda.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
 
-// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU :{{.*}}CUDA
-// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU :{{.*}}CUDA
+// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}gpu, {{.*}}CUDA
+// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}gpu, {{.*}}CUDA
 
 //==---- sycl-ls-gpu-cuda.cpp - SYCL test for discovered/selected devices --==//
 //

SYCL/Plugin/sycl-ls-gpu-default-any.cpp

@@ -3,9 +3,9 @@
 // RUN: env --unset=SYCL_DEVICE_FILTER sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
 
-// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}{{Level-Zero|CUDA|OpenCL}}
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}Level-Zero
 // clang-format off
-// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}{{Level-Zero|CUDA|OpenCL}}
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}Level-Zero
 // clang-format on
 
 //==--------------------- sycl-ls-gpu-default-any.cpp ----------------------==//

SYCL/Plugin/sycl-ls-gpu-default-level-zero.cpp

@@ -3,8 +3,8 @@
 // RUN: env --unset=SYCL_DEVICE_FILTER sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
 
-// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
-// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}Level-Zero
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}Level-Zero
 
 //==------------------ sycl-ls-gpu-default-level-zero.cpp ------------------==//
 //

SYCL/Plugin/sycl-ls-gpu-hip.cpp

@@ -3,8 +3,8 @@
 // RUN: env SYCL_DEVICE_FILTER=hip sycl-ls --verbose >%t.hip.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
 
-// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}GPU :{{.*}}HIP
-// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}GPU :{{.*}}HIP
+// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}gpu, {{.*}}HIP
+// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}gpu, {{.*}}HIP
 
 //==---- sycl-ls-gpu-hip.cpp - SYCL test for discovered/selected devices --==//
 //

SYCL/Plugin/sycl-ls-gpu-level-zero.cpp

@@ -3,8 +3,8 @@
 // RUN: sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
 
-// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
-// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}Level-Zero
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}Level-Zero
 
 //==-- sycl-ls-gpu-level-zero.cpp - Test Level-Zero selected gpu device ----==//
 //

SYCL/Plugin/sycl-ls-gpu-opencl.cpp

@@ -3,8 +3,8 @@
 // RUN: env SYCL_DEVICE_FILTER=opencl sycl-ls --verbose >%t.opencl.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out
 
-// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}OpenCL
-// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}OpenCL
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}gpu, {{.*}}OpenCL
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}gpu, {{.*}}OpenCL
 
 //==-- sycl-ls-gpu-opencl.cpp - SYCL test for selected OpenCL GPU device --===//
 //

SYCL/Plugin/sycl-ls-gpu-sycl-be.cpp

@@ -6,20 +6,20 @@
 // RUN: env SYCL_DEVICE_FILTER=opencl sycl-ls --verbose >%t.opencl.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.opencl.out
 
-// CHECK-BUILTIN-GPU-OPENCL: gpu_selector(){{.*}}GPU : OpenCL
-// CHECK-CUSTOM-GPU-OPENCL: custom_selector(gpu){{.*}}GPU : OpenCL
+// CHECK-BUILTIN-GPU-OPENCL: gpu_selector(){{.*}}gpu, {{.*}}OpenCL
+// CHECK-CUSTOM-GPU-OPENCL: custom_selector(gpu){{.*}}gpu, {{.*}}OpenCL
 
 // RUN: env SYCL_DEVICE_FILTER=cuda sycl-ls --verbose >%t.cuda.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out
 
-// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU : CUDA
-// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}GPU : CUDA
+// CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}gpu, {{.*}}CUDA
+// CHECK-CUSTOM-GPU-CUDA: custom_selector(gpu){{.*}}gpu, {{.*}}CUDA
 
 // RUN: env SYCL_DEVICE_FILTER=hip sycl-ls --verbose >%t.hip.out
 // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-HIP,CHECK-CUSTOM-GPU-HIP --input-file %t.hip.out
 
-// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}GPU : HIP
-// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}GPU : HIP
+// CHECK-BUILTIN-GPU-HIP: gpu_selector(){{.*}}gpu, {{.*}}HIP
+// CHECK-CUSTOM-GPU-HIP: custom_selector(gpu){{.*}}gpu, {{.*}}HIP
 
 //==---- sycl-ls-gpu-sycl-be.cpp - SYCL test for discovered/selected devices
 //--==//

SYCL/Regression/device_num.cpp

@@ -82,14 +82,12 @@ int main() {
       printDeviceType(d);
       assert(targetDevice == d &&
              "The selected device is not the target device specified.");
-    }
-    // HOST device is always available regardless of SYCL_DEVICE_FILTER
-    {
+    } else if (targetDevice.is_host()) {
       host_selector hs;
       device d = hs.select_device();
       std::cout << "host_selector selected ";
       printDeviceType(d);
-      assert(d.is_host() && "The selected device is not a host device.");
+      assert(targetDevice == d && "The selected device is not a host device.");
     }
   }
   return 0;