Merge branch 'intel' into cperkins-update-device-selectors-in-tests

cperkinsintel · cperkinsintel · commit aa4f1857e88e · 2022-09-08T16:15:26.000-07:00
diff --git a/SYCL/AtomicRef/add_local.cpp b/SYCL/AtomicRef/add_local.cpp
@@ -3,9 +3,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// HIP does not support floating point atomics.
-// XFAIL: hip
-
 #include "add.h"
 
 int main() { add_test_all<access::address_space::local_space>(); }
diff --git a/SYCL/AtomicRef/device_has_aspect_atomic64_level_zero.cpp b/SYCL/AtomicRef/device_has_aspect_atomic64_level_zero.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit
+// REQUIRES: level_zero, level_zero_dev_kit, TEMPORARY_DISABLED
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
diff --git a/SYCL/AtomicRef/min_local.cpp b/SYCL/AtomicRef/min_local.cpp
@@ -3,9 +3,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// HIP does not support floating point atomics.
-// XFAIL: hip
-
 #include "min.h"
 
 int main() { min_test_all<access::address_space::local_space>(); }
diff --git a/SYCL/AtomicRef/sub_local.cpp b/SYCL/AtomicRef/sub_local.cpp
@@ -3,9 +3,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 
-// HIP does not support floating point atomics.
-// XFAIL: hip
-
 #include "sub.h"
 
 int main() { sub_test_all<access::address_space::local_space>(); }
diff --git a/SYCL/DeviceGlobal/device_global_arrow.cpp b/SYCL/DeviceGlobal/device_global_arrow.cpp
@@ -11,9 +11,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t_dev_img_scope.out
 // RUN: %ACC_RUN_PLACEHOLDER %t_dev_img_scope.out
 //
-// Currently fails for CPUs due to missing support for the SPIR-V extension.
-// Currently crashes on accelerators.
-// XFAIL: cpu, accelerator
+// CPU and accelerators are not currently guaranteed to support the required
+// extensions they are disabled until they are.
+// UNSUPPORTED: cpu, accelerator
 //
 // Tests operator-> on device_global.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so
diff --git a/SYCL/DeviceGlobal/device_global_device_only.cpp b/SYCL/DeviceGlobal/device_global_device_only.cpp
@@ -11,9 +11,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t_dev_img_scope.out
 // RUN: %ACC_RUN_PLACEHOLDER %t_dev_img_scope.out
 //
-// Currently fails for CPUs due to missing support for the SPIR-V extension.
-// Currently crashes on accelerators.
-// XFAIL: cpu, accelerator
+// CPU and accelerators are not currently guaranteed to support the required
+// extensions they are disabled until they are.
+// UNSUPPORTED: cpu, accelerator
 //
 // Tests basic device_global access through device kernels.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so
diff --git a/SYCL/DeviceGlobal/device_global_operator_passthrough.cpp b/SYCL/DeviceGlobal/device_global_operator_passthrough.cpp
@@ -11,9 +11,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t_dev_img_scope.out
 // RUN: %ACC_RUN_PLACEHOLDER %t_dev_img_scope.out
 //
-// Currently fails for CPUs due to missing support for the SPIR-V extension.
-// Currently crashes on accelerators.
-// XFAIL: cpu, accelerator
+// CPU and accelerators are not currently guaranteed to support the required
+// extensions they are disabled until they are.
+// UNSUPPORTED: cpu, accelerator
 //
 // Tests the passthrough of operators on device_global.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so
diff --git a/SYCL/DeviceGlobal/device_global_subscript.cpp b/SYCL/DeviceGlobal/device_global_subscript.cpp
@@ -11,9 +11,9 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t_dev_img_scope.out
 // RUN: %ACC_RUN_PLACEHOLDER %t_dev_img_scope.out
 //
-// Currently fails for CPUs due to missing support for the SPIR-V extension.
-// Currently crashes on accelerators.
-// XFAIL: cpu, accelerator
+// CPU and accelerators are not currently guaranteed to support the required
+// extensions they are disabled until they are.
+// UNSUPPORTED: cpu, accelerator
 //
 // Tests operator[] on device_global.
 // NOTE: USE_DEVICE_IMAGE_SCOPE needs both kernels to be in the same image so
diff --git a/SYCL/Scheduler/HostAccDestruction.cpp b/SYCL/Scheduler/HostAccDestruction.cpp
@@ -1,8 +1,8 @@
-// RUN: %clangxx -fsycl -fsycl-dead-args-optimization %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-dead-args-optimization -fsycl-targets=%sycl_triple %s -o %t.out
 // RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
 // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
 // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: hip
 //==---------------------- HostAccDestruction.cpp --------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
diff --git a/SYCL/USM/alloc_functions.cpp b/SYCL/USM/alloc_functions.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
diff --git a/SYCL/USM/allocator_container.cpp b/SYCL/USM/allocator_container.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
diff --git a/SYCL/USM/allocator_equal.cpp b/SYCL/USM/allocator_equal.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
diff --git a/SYCL/USM/allocator_rebind.cpp b/SYCL/USM/allocator_rebind.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
diff --git a/SYCL/USM/allocator_shared.cpp b/SYCL/USM/allocator_shared.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
diff --git a/SYCL/USM/allocator_vector.cpp b/SYCL/USM/allocator_vector.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
diff --git a/SYCL/USM/badmalloc.cpp b/SYCL/USM/badmalloc.cpp
@@ -1,7 +1,6 @@
 // UNSUPPORTED: windows
 //
 // 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
diff --git a/SYCL/USM/buffer_location.cpp b/SYCL/USM/buffer_location.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: %ACC_RUN_PLACEHOLDER %t1.out
 
diff --git a/SYCL/USM/copy.cpp b/SYCL/USM/copy.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
diff --git a/SYCL/USM/dep_events.cpp b/SYCL/USM/dep_events.cpp
@@ -11,7 +11,6 @@
 // UNSUPPORTED: cuda && windows
 //
 // 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
diff --git a/SYCL/USM/depends_on.cpp b/SYCL/USM/depends_on.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
diff --git a/SYCL/USM/dmem_varied.cpp b/SYCL/USM/dmem_varied.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
diff --git a/SYCL/USM/dmemll.cpp b/SYCL/USM/dmemll.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
diff --git a/SYCL/USM/dmemllaligned.cpp b/SYCL/USM/dmemllaligned.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
diff --git a/SYCL/USM/fill.cpp b/SYCL/USM/fill.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
diff --git a/SYCL/USM/free_during_kernel_execution.cpp b/SYCL/USM/free_during_kernel_execution.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
diff --git a/SYCL/USM/hmemll.cpp b/SYCL/USM/hmemll.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
diff --git a/SYCL/USM/hmemllaligned.cpp b/SYCL/USM/hmemllaligned.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
diff --git a/SYCL/USM/math.cpp b/SYCL/USM/math.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 
 // REQUIRES: cpu
diff --git a/SYCL/USM/memadvise.cpp b/SYCL/USM/memadvise.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
diff --git a/SYCL/USM/memadvise_cuda.cpp b/SYCL/USM/memadvise_cuda.cpp
@@ -1,6 +1,5 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out
 // REQUIRES: cuda
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/memcpy.cpp b/SYCL/USM/memcpy.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 //
 // 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
diff --git a/SYCL/USM/memset.cpp b/SYCL/USM/memset.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
diff --git a/SYCL/USM/mixed.cpp b/SYCL/USM/mixed.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
diff --git a/SYCL/USM/mixed2.cpp b/SYCL/USM/mixed2.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
diff --git a/SYCL/USM/mixed2template.cpp b/SYCL/USM/mixed2template.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
diff --git a/SYCL/USM/mixed_queue.cpp b/SYCL/USM/mixed_queue.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
diff --git a/SYCL/USM/pfor_flatten.cpp b/SYCL/USM/pfor_flatten.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-unnamed-lambda -fsycl-dead-args-optimization %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
diff --git a/SYCL/USM/pfor_flatten_range_shortcut.cpp b/SYCL/USM/pfor_flatten_range_shortcut.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple  -fsycl-unnamed-lambda %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
diff --git a/SYCL/USM/pointer_query.cpp b/SYCL/USM/pointer_query.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl %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
@@ -36,16 +35,8 @@ int main() {
     return 1;
   }
   Kind = get_pointer_type(array, ctxt);
-  if (ctxt.is_host()) {
-    // for now, host device treats all allocations
-    // as host allocations
-    if (Kind != usm::alloc::host) {
-      return 2;
-    }
-  } else {
-    if (Kind != usm::alloc::device) {
-      return 3;
-    }
+  if (Kind != usm::alloc::device) {
+    return 3;
   }
   device D = get_pointer_device(array, ctxt);
   if (D != dev) {
@@ -59,16 +50,8 @@ int main() {
     return 5;
   }
   Kind = get_pointer_type(array, ctxt);
-  if (ctxt.is_host()) {
-    // for now, host device treats all allocations
-    // as host allocations
-    if (Kind != usm::alloc::host) {
-      return 6;
-    }
-  } else {
-    if (Kind != usm::alloc::shared) {
-      return 7;
-    }
+  if (Kind != usm::alloc::shared) {
+    return 7;
   }
   D = get_pointer_device(array, ctxt);
   if (D != dev) {
@@ -103,22 +86,15 @@ int main() {
   // next checks only valid for non-host contexts
   array = (int *)malloc(N * sizeof(int));
   Kind = get_pointer_type(array, ctxt);
-  if (!ctxt.is_host()) {
-    if (Kind != usm::alloc::unknown) {
-      return 12;
-    }
-    try {
-      D = get_pointer_device(array, ctxt);
-    } catch (runtime_error) {
-      return 0;
-    }
-    return 13;
-  } else {
-    // host ctxts always report host
-    if (Kind != usm::alloc::host) {
-      return 14;
-    }
+  if (Kind != usm::alloc::unknown) {
+    return 12;
+  }
+  try {
+    D = get_pointer_device(array, ctxt);
+  } catch (runtime_error) {
+    return 0;
   }
+  return 13;
   free(array);
 
   return 0;
diff --git a/SYCL/USM/prefetch.cpp b/SYCL/USM/prefetch.cpp
@@ -11,7 +11,6 @@
 // UNSUPPORTED: cuda && windows
 //
 // 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
diff --git a/SYCL/USM/queue_wait.cpp b/SYCL/USM/queue_wait.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
-// RUN: %HOST_RUN_PLACEHOLDER %t.out
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
diff --git a/SYCL/USM/smem_concurrent.cpp b/SYCL/USM/smem_concurrent.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
diff --git a/SYCL/USM/smem_varied.cpp b/SYCL/USM/smem_varied.cpp
@@ -1,5 +1,4 @@
 // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out -DTEST_SHARED
-// RUN: %HOST_RUN_PLACEHOLDER %t1.out
 // RUN: %CPU_RUN_PLACEHOLDER %t1.out
 // RUN: %GPU_RUN_PLACEHOLDER  %t1.out
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
diff --git a/SYCL/USM/smemll.cpp b/SYCL/USM/smemll.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
diff --git a/SYCL/USM/smemllaligned.cpp b/SYCL/USM/smemllaligned.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
diff --git a/SYCL/USM/usm_pooling.cpp b/SYCL/USM/usm_pooling.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// REQUIRES: level_zero, level_zero_dev_kit`
	`1`	`+// REQUIRES: level_zero, level_zero_dev_kit, TEMPORARY_DISABLED`
`2`	`2`	`// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %level_zero_options`
`3`	`3`	`// RUN: %GPU_RUN_PLACEHOLDER %t.out`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out`
`2`		`-// RUN: %HOST_RUN_PLACEHOLDER %t1.out`
`3`	`2`	`// RUN: %CPU_RUN_PLACEHOLDER %t1.out`
`4`	`3`	`// RUN: %GPU_RUN_PLACEHOLDER %t1.out`
`5`	`4`	`// RUN: %ACC_RUN_PLACEHOLDER %t1.out`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out`
`2`		`-// RUN: %HOST_RUN_PLACEHOLDER %t.out`
`3`	`2`	`// RUN: %CPU_RUN_PLACEHOLDER %t.out`
`4`	`3`
`5`	`4`	`// REQUIRES: cpu`