intel · ayylol · Feb 10, 2025 · Feb 10, 2025 · Feb 11, 2025 · Feb 11, 2025
@@ -279,7 +279,7 @@ jobs:
         target_devices: all
         binaries_artifact: ${{ inputs.e2e_binaries_artifact }}
         cxx_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
-        extra_lit_opts: --param sycl_build_targets="spir;nvidia"
+        extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd"
 
     - name: Remove E2E tests before spirv-backend run
       if: ${{ inputs.e2e_binaries_artifact && always() && !cancelled() && steps.build.conclusion == 'success' }}

@@ -90,6 +90,11 @@ jobs:
             runner: '["Linux", "cuda"]'
             image_options: -u 1001 --gpus all --cap-add SYS_ADMIN
             target_devices: cuda:gpu
+          - name: AMD/HIP
+            runner: '["Linux", "amdgpu"]'
+            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
+            target_devices: hip:gpu
+            reset_intel_gpu: false
           - name: Intel Arc A-Series Graphics
             runner: '["Linux", "arc"]'
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
@@ -147,11 +152,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: AMD/HIP
-            runner: '["Linux", "amdgpu"]'
-            image_options: -u 1001 --device=/dev/dri --device=/dev/kfd
-            target_devices: hip:gpu
-            reset_intel_gpu: false
           - name: E2E tests with dev igc on Intel Arc A-Series Graphics
             runner: '["Linux", "arc"]'
             image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // spir-v gen for legacy images at O0 not working
 // UNSUPPORTED: O0

@@ -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
 

@@ -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.

@@ -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
 

@@ -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>

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: cuda || target-amd
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %{build} -o %t.out

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: cuda || target-amd
 // CUDA cannot support SYCL 1.2.1 images.
 //
 // RUN: %{build} -o %t.out

@@ -1,6 +1,6 @@
 // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image
 
-// UNSUPPORTED: cuda, hip
+// UNSUPPORTED: cuda, target-amd
 // CUDA cannot support SYCL 1.2.1 images.
 
 // RUN: %{build} -o %t.out

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// UNSUPPORTED: cuda || hip
+// UNSUPPORTED: cuda || target-amd
 // CUDA does not support info::device::image3d_max_width query.
 
 // The test checks that 'image' with max allowed sizes is handled correctly.

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // Temporarily add explicit '-O2' to avoid GPU hang issue with O0 optimization.
 // RUN: %{build} -O2 -o %t.out
 // RUN: %{run} %t.out

@@ -1,6 +1,6 @@
 // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // Temporarily add explicit '-O2' to avoid GPU hang issue with O0 optimization.
 // RUN: %{build} -O2 -o %t.out

@@ -1,7 +1,7 @@
 // REQUIRES: aspect-ext_intel_legacy_image
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 #include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>

@@ -2,7 +2,7 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // TODO: re-enable on cuda device.
 // See https://github.com/intel/llvm/issues/1542#issuecomment-707877817 for more
 // details.

@@ -1,6 +1,6 @@
 // REQUIRES: aspect-fp16, aspect-ext_intel_legacy_image
 
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out

@@ -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>

@@ -1,4 +1,4 @@
-// REQUIRES: accelerator
+// REQUIRES: target-spir, accelerator
 // RUN: %{build} -Wno-error=deprecated-declarations -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out
 // RUN: %{run} %t.out
 // RUN: %{build} -Wno-error=deprecated-declarations -D__ENABLE_USM_ADDR_SPACE__ -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl-dead-args-optimization -o %t1.out

@@ -1,4 +1,4 @@
-// REQUIRES: accelerator
+// REQUIRES: target-spir, accelerator
 // RUN: %{build} -D__ENABLE_USM_ADDR_SPACE__ -fsycl-dead-args-optimization -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,6 @@
 // End-to-End test for testing device image compression.
 // REQUIRES: zstd
+// UNSUPPORTED: true
 
 // RUN: %{build} %O0 -g %S/Inputs/single_kernel.cpp -o %t_not_compress.out
 // RUN: %{build} %O0 -g --offload-compress --offload-compression-level=3 %S/Inputs/single_kernel.cpp -o %t_compress.out

@@ -1,4 +1,4 @@
-// REQUIRES: opencl, opencl_icd, aspect-usm_shared_allocations
+// REQUIRES: target-spir, opencl, opencl_icd, aspect-usm_shared_allocations
 // RUN: %{build} %opencl_lib -fno-sycl-dead-args-optimization -o %t.out
 // RUN: %{run} %t.out
 // XFAIL: accelerator

@@ -1,4 +1,4 @@
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // REQUIRES: aspect-ext_intel_legacy_image
 //
 // RUN: %{build} -o %t.out

@@ -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
 

@@ -5,7 +5,7 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
 // AMD
 

@@ -5,7 +5,7 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
 // AMD
 

@@ -5,7 +5,7 @@
 // Extra run to check for immediate-command-list in Level Zero
 // RUN: %if level_zero %{env SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS=1 %{l0_leak_check} %{run} %t.out 2>&1 | FileCheck %s --implicit-check-not=LEAK %}
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // UNSUPPORTED-INTENDED: sycl_ext_oneapi_work_group_static is not supported on
 // AMD
 

@@ -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
 

@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s

@@ -5,7 +5,7 @@
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
 // REQUIRES: aspect-fp64
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s

@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 //
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out | FileCheck %s

@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // FIXME: The 'short' type gets overflown with sporadic values on CUDA.
 // XFAIL: cuda
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14734

@@ -1,7 +1,7 @@
 // This test is written with an aim to check that experimental::printf versions
 // for constant and generic address space can be used in the same module.
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // XFAIL: cuda && windows
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
 // FIXME: Drop the test once generic AS support is considered stable and the

@@ -4,7 +4,7 @@
 // The test is written using conversion specifiers table from cppreference [1]
 // [1]: https://en.cppreference.com/w/cpp/io/c/fprintf
 //
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // XFAIL: cuda && windows
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14733
 // RUN: %{build} -o %t.out

@@ -3,7 +3,7 @@
 //
 // XFAIL: target-nvidia
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/16417
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 
 // Windows doesn't yet have full shutdown().
 // UNSUPPORTED: ze_debug && windows

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -2,7 +2,7 @@
 // UNSUPPORTED: cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
-// XFAIL: hip
+// XFAIL: target-amd
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14732
 
 // CUDA works with image_channel_type::fp32, but not with any 8-bit per channel

@@ -4,7 +4,7 @@
 //
 // Missing __spirv_ImageWrite, __spirv_SampledImage,
 // __spirv_ImageSampleExplicitLod on AMD
-// XFAIL: hip
+// XFAIL: target-amd
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/14732
 
 /*

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip
+// UNSUPPORTED: target-amd
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

@@ -1,5 +1,5 @@
 // REQUIRES: aspect-ext_intel_legacy_image
-// UNSUPPORTED: hip, cuda
+// UNSUPPORTED: target-amd, cuda
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out