Make tests unsupported on target-amd

ayylol · ayylol · commit 94362c4d58b5 · 2025-02-11T13:34:51.000-08:00
diff --git a/sycl/test-e2e/Adapters/interop-level-zero-image-get-native-mem.cpp b/sycl/test-e2e/Adapters/interop-level-zero-image-get-native-mem.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 // RUN: %{build} %level_zero_options -o %t.out
 // RUN: %{run} %t.out 2>&1 | FileCheck %s
 
diff --git a/sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp b/sycl/test-e2e/Adapters/interop-level-zero-image-ownership.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 
 // the ze_debug=4 memory check will fail on this test, since it itentionally
 // makes an 'unbalanced' create/destroy situation for the test.
diff --git a/sycl/test-e2e/Adapters/interop-level-zero-image.cpp b/sycl/test-e2e/Adapters/interop-level-zero-image.cpp
@@ -1,4 +1,4 @@
-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image
 // RUN: %{build} %level_zero_options -o %t.out
 // RUN: %{run} %t.out
 
diff --git a/sycl/test-e2e/Basic/built-ins.cpp b/sycl/test-e2e/Basic/built-ins.cpp
@@ -5,7 +5,7 @@
 // RUN: %{run} %t_var.out | FileCheck %s
 
 // Hits an assertion and kernel page fault with AMD:
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/14404
 
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/Basic/image/srgba-read.cpp b/sycl/test-e2e/Basic/image/srgba-read.cpp
@@ -3,6 +3,8 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14387
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
+//
+// UNSUPPORTED: target-amd
 
 #include <iostream>
 #include <sycl/accessor_image.hpp>
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
@@ -1,6 +1,6 @@
 // FIXME: the rocm include path and link path are highly platform dependent,
 // we should set this with some variable instead.
-// RUN: %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
+// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
 // REQUIRES: target-amd
 
diff --git a/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp b/sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
@@ -1,6 +1,6 @@
 // FIXME: the rocm include path and link path are highly platform dependent,
 // we should set this with some variable instead.
-// RUN: %{build} -Wno-error=deprecated-pragma -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
+// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
 // RUN: %{run} %t.out
 // REQUIRES: target-amd
 
diff --git a/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp b/sycl/test-e2e/bindless_images/array/fetch_sampled_array.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_image_array
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/examples/example_3_1D_mipmap_anisotropic_filtering_and_levels.cpp b/sycl/test-e2e/bindless_images/examples/example_3_1D_mipmap_anisotropic_filtering_and_levels.cpp
@@ -1,5 +1,6 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
 // REQUIRES: aspect-ext_oneapi_mipmap_anisotropy
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_1D.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_2D.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp b/sycl/test-e2e/bindless_images/mipmap/mipmap_read_3D.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_1D_USM.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_1d_usm
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_2d
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_2D_USM.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_2d_usm
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp b/sycl/test-e2e/bindless_images/sampled_fetch/fetch_3D.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_3d
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
diff --git a/sycl/test-e2e/bindless_images/user_types/mipmap_read_user_type_2D.cpp b/sycl/test-e2e/bindless_images/user_types/mipmap_read_user_type_2D.cpp
@@ -1,4 +1,5 @@
 // REQUIRES: aspect-ext_oneapi_mipmap
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// REQUIRES: level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image`
	`1`	`+// REQUIRES: target-spir, level_zero, level_zero_dev_kit, aspect-ext_intel_legacy_image`
`2`	`2`	`// RUN: %{build} %level_zero_options -o %t.out`
`3`	`3`	`// RUN: %{run} %t.out 2>&1 \| FileCheck %s`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// REQUIRES: aspect-ext_oneapi_image_array`
	`2`	`+// UNSUPPORTED: target-amd`
`2`	`3`
`3`	`4`	`// RUN: %{build} -o %t.out`
`4`	`5`	`// RUN: %{run} %t.out`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// REQUIRES: aspect-ext_oneapi_mipmap`
	`2`	`+// UNSUPPORTED: target-amd`
`2`	`3`
`3`	`4`	`// RUN: %{build} -o %t.out`
`4`	`5`	`// RUN: %{run-unfiltered-devices} %t.out`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`// REQUIRES: aspect-ext_oneapi_bindless_sampled_image_fetch_1d_usm`
	`2`	`+// UNSUPPORTED: target-amd`
`2`	`3`
`3`	`4`	`// RUN: %{build} -o %t.out`
`4`	`5`	`// RUN: %{run} %t.out`