[SYCL] Remove host run and dependencies from SYCL/USM tests (#1221)

steffenlarsen · AlexeySachkov · web-flow · commit bfd61bb175f3 · 2022-09-08T11:07:57.000+01:00
This commit removes the host run and any assumptions and operations
related to the host device from the tests in SYCL/USM.

Co-authored-by: Sachkov, Alexey &lt;alexey.sachkov@intel.com&gt;
Signed-off-by: Larsen, Steffen &lt;steffen.larsen@intel.com&gt;
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
@@ -80,7 +80,7 @@ int main(int argc, char *argv[]) {
   device D = Q.get_device();
   context C = Q.get_context();
 
-  const char *devType = D.is_host() ? "Host" : D.is_cpu() ? "CPU" : "GPU";
+  const char *devType = D.is_cpu() ? "CPU" : "GPU";
   std::string pluginName =
       D.get_platform().get_info<sycl::info::platform::name>();
   std::cout << "Running on device " << devType << " ("

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`