[SYCL] Remove host run and dependencies from SYCL/FilterSelector tests

SYCL/FilterSelector/filter_list_cpu_gpu_acc.cpp

@@ -6,71 +6,39 @@
 //
 //===---------------------------------------------------------------------===//
 
-// REQUIRES: cpu, gpu, accelerator, host
+// REQUIRES: cpu, gpu, accelerator
 
 // RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out
 
 // 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

@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out

SYCL/FilterSelector/select.cpp

@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out

SYCL/FilterSelector/select_device.cpp

@@ -1,6 +1,6 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: env SYCL_DEVICE_FILTER="*" %t.out
-// RUN: env SYCL_DEVICE_FILTER=cpu,host %t.out
+// RUN: env SYCL_DEVICE_FILTER=cpu %t.out
 // 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
@@ -11,7 +11,7 @@
 // Checks that no device is selected when no device of desired type is
 // available.
 //
-// REQUIRES: cpu,gpu,accelerator,host
+// REQUIRES: cpu,gpu,accelerator
 
 #include <iostream>
 #include <sycl/sycl.hpp>
@@ -50,12 +50,6 @@ int main() {
     device d = cs.select_device();
     std::cout << "CPU device is found: " << d.is_cpu() << std::endl;
   }
-  if (!envVal || forcedPIs == "*" ||
-      forcedPIs.find("host") != std::string::npos) {
-    host_selector hs;
-    device d = hs.select_device();
-    std::cout << "HOST device is found: " << d.is_host() << std::endl;
-  }
   if (!envVal || forcedPIs == "*" ||
       forcedPIs.find("acc") != std::string::npos) {
     accelerator_selector as;

SYCL/FilterSelector/select_device_acc.cpp

@@ -51,20 +51,6 @@ int main() {
       std::cout << "Expectedly, CPU device is not found." << std::endl;
     }
   }
-  /*
-  // TODO: enable this test after SYCL_DEVICE_FILTER is merged.
-  {
-    host_selector hs;
-    try {
-      device d = hs.select_device();
-      std::cerr << "HOST Device is found in error: " << std::boolalpha
-                << d.is_cpu() << std::endl;
-      return -1;
-    } catch (...) {
-      std::cout << "Expectedly, HOST device is not found." << std::endl;
-    }
-  }
-  */
   {
     accelerator_selector as;
     device d = as.select_device();

SYCL/FilterSelector/select_device_cpu.cpp

@@ -45,19 +45,6 @@ int main() {
     device d = cs.select_device();
     std::cout << "CPU device is found: " << d.is_cpu() << std::endl;
   }
-  /*
-  // TODO: enable this once SYCL_DEVICE_FILTER PR is merged.
-  {
-    host_selector hs;
-    try {
-      device d = hs.select_device();
-      std::cerr << "HOST device is found: " << d.is_host() << std::endl;
-      return -1;
-    } catch (...) {
-      std::cout << "Expectedly, HOST device is not found";
-    }
-  }
-  */
   {
     accelerator_selector as;
     try {

SYCL/FilterSelector/select_device_cuda.cpp

@@ -47,16 +47,6 @@ int main() {
       cout << "Expectedly, cpu device is not found." << std::endl;
     }
   }
-  {
-    host_selector hs;
-    try {
-      device d = hs.select_device();
-      cerr << "HOST device is found in error: " << d.is_host() << std::endl;
-      return -1;
-    } catch (...) {
-      cout << "Expectedly, HOST device is not found." << std::endl;
-    }
-  }
   {
     accelerator_selector as;
     try {

SYCL/FilterSelector/select_device_level_zero.cpp

@@ -1,12 +1,12 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env SYCL_DEVICE_FILTER=level_zero:gpu,host %t.out
+// RUN: env SYCL_DEVICE_FILTER=level_zero:gpu %t.out
 //
 // Checks if only specified device types can be acquired from select_device
 // when SYCL_DEVICE_FILTER is set
 // Checks that no device is selected when no device of desired type is
 // available.
 //
-// REQUIRES: level_zero,gpu,host
+// REQUIRES: level_zero,gpu
 
 #include <iostream>
 #include <sycl/sycl.hpp>
@@ -47,12 +47,6 @@ int main() {
       cout << "Expectedly, cpu device is not found." << std::endl;
     }
   }
-  // HOST device is always available regardless of SYCL_DEVICE_FILTER
-  {
-    host_selector hs;
-    device d = hs.select_device();
-    cout << "HOST device is found: " << d.is_host() << std::endl;
-  }
   {
     accelerator_selector as;
     try {

SYCL/FilterSelector/select_device_opencl.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: env SYCL_DEVICE_FILTER=opencl,host %t.out
+// RUN: env SYCL_DEVICE_FILTER=opencl %t.out
 //
 // Checks if only specified device types can be acquired from select_device
 // when SYCL_DEVICE_FILTER is set
@@ -42,11 +42,6 @@ int main() {
     device d = cs.select_device();
     cout << "CPU device is found : " << d.is_cpu() << std::endl;
   }
-  {
-    host_selector hs;
-    device d = hs.select_device();
-    cout << "HOST device is found: " << d.is_host() << std::endl;
-  }
   {
     accelerator_selector as;
     device d = as.select_device();