do it in the testing infra instead

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

.github/workflows/sycl-linux-precommit.yml

@@ -162,7 +162,6 @@ jobs:
             runner: '["Linux", "amdgpu"]'
             image: ghcr.io/intel/llvm/ubuntu2204_build:latest
             image_extra_opts: --device=/dev/dri --device=/dev/kfd
-            extra_cmake_args: -DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1031"
           - name: CUDA system
             runner: '["Linux", "cuda"]'
             image: ghcr.io/intel/llvm/ubuntu2204_build:latest

.github/workflows/sycl-linux-run-tests.yml

@@ -21,9 +21,6 @@ on:
         type: string
         required: True
       extra_cmake_args:
-        description: |
-          If empty, then HIP_PLATFORM and AMD_ARCH would be automatically added
-          if inputs.target_devices contains 'ext_oneapi_hip'
         type: string
         required: False
       tests_selector:
@@ -282,13 +279,6 @@ jobs:
       run: |
         if [ -n "$CMAKE_EXTRA_ARGS" ]; then
           echo "opts=$CMAKE_EXTRA_ARGS" >> $GITHUB_OUTPUT
-        else
-          if [ "${{ contains(inputs.target_devices, 'ext_oneapi_hip')  }}" == "true" ]; then
-            amd_arch="$( env ONEAPI_DEVICE_SELECTOR=hip:gpu sycl-ls --verbose 2>&1 | grep 'Architecture:' | sed 's|\s*Architecture: amd_gpu_||g' )"
-            echo 'opts=-DHIP_PLATFORM="AMD" -DAMD_ARCH='$amd_arch'' >> $GITHUB_OUTPUT
-          else
-            echo 'opts=' >> $GITHUB_OUTPUT
-          fi
         fi
     - name: Configure E2E tests
       if: inputs.tests_selector == 'e2e'

sycl/test-e2e/Matrix/joint_matrix_hip_gfx90a.cpp

@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: %{build} -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
 // RUN: %{run} %t.out
 
-// REQUIRES: gpu-amd-gfx90a
+// REQUIRES: arch-amd_gpu_gfx90a
 
 #include "joint_matrix_hip_apply.hpp"
 #include "joint_matrix_hip_copy.hpp"

sycl/test-e2e/Matrix/joint_matrix_hip_half_gfx90a.cpp

@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-// RUN: %{build} -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=amd_gpu_gfx90a %s -o %t.out
 // RUN: %{run} %t.out
 
-// REQUIRES: gpu-amd-gfx90a
+// REQUIRES: arch-amd_gpu_gfx90a
 // REQUIRES: aspect-fp16
 
 #include "joint_matrix_hip_apply.hpp"

sycl/test-e2e/Matrix/runtime_query_hip_gfx90a.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// REQUIRES: gpu-amd-gfx90a
-// RUN: %{build} -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx90a -o %t.out
+// REQUIRES: arch-amd_gpu_gfx90a
+// RUN: %clangxx -Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=gfx90a -o %t.out
 // RUN: %{run} %t.out
 
 #include <sycl/detail/core.hpp>

sycl/test-e2e/lit.cfg.py

@@ -442,8 +442,6 @@ def open_check_file(file_name):
     )
     sp = subprocess.check_output(cmd, text=True, shell=True)
     for line in sp.splitlines():
-        if "gfx90a" in line:
-            config.available_features.add("gpu-amd-gfx90a")
         if not line.startswith("["):
             continue
         (backend, device) = line[1:].split("]")[0].split(":")
@@ -540,42 +538,6 @@ def open_check_file(file_name):
         config.cuda_libs_dir = os.path.join(os.environ["CUDA_PATH"], r"lib64")
         config.cuda_include = os.path.join(os.environ["CUDA_PATH"], "include")
 
-# FIXME: This needs to be made per-device as well, possibly with a helper.
-if "hip:gpu" in config.sycl_devices and config.hip_platform == "AMD":
-    if not config.amd_arch:
-        lit_config.error(
-            "Cannot run tests for HIP without an offload-arch. Please "
-            + "specify one via the 'amd_arch' parameter or 'AMD_ARCH' CMake "
-            + "variable."
-        )
-    llvm_config.with_system_environment("ROCM_PATH")
-    config.available_features.add("hip_amd")
-    arch_flag = (
-        "-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=" + config.amd_arch
-    )
-    config.substitutions.append(
-        ("%rocm_path", os.environ.get("ROCM_PATH", "/opt/rocm"))
-    )
-elif "hip:gpu" in config.sycl_devices and config.hip_platform == "NVIDIA":
-    config.available_features.add("hip_nvidia")
-    arch_flag = ""
-else:
-    arch_flag = ""
-
-if lit_config.params.get("compatibility_testing", False):
-    config.substitutions.append(("%clangxx", " true "))
-    config.substitutions.append(("%clang", " true "))
-else:
-    config.substitutions.append(
-        (
-            "%clangxx",
-            " " + config.dpcpp_compiler + " " + config.cxx_flags + " " + arch_flag,
-        )
-    )
-    config.substitutions.append(
-        ("%clang", " " + config.dpcpp_compiler + " " + config.c_flags)
-    )
-
 config.substitutions.append(("%threads_lib", config.sycl_threads_lib))
 
 if lit_config.params.get("ze_debug"):
@@ -805,6 +767,44 @@ def open_check_file(file_name):
     else:
         config.intel_driver_ver[sycl_device] = {}
 
+if "hip:gpu" in config.sycl_devices and config.hip_platform == "AMD":
+    if not config.amd_arch:
+        amd_arch_prefix = "arch-amd_gpu_"
+        amd_device_arch = [i for i in config.sycl_dev_features["hip:gpu"] if amd_arch_prefix in i]
+        if len(amd_device_arch) == 0:
+            lit_config.error(
+                "Cannot detect architecture for AMD HIP device, specify it explicitly"
+            )
+        if len(amd_device_arch) > 1:
+            lit_config.warning("Multiple AMD HIP devices, using the architecture from the first one")
+        config.amd_arch = amd_device_arch[0].replace(amd_arch_prefix, "")
+    llvm_config.with_system_environment("ROCM_PATH")
+    config.available_features.add("hip_amd")
+    arch_flag = (
+        "-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch=" + config.amd_arch
+    )
+    config.substitutions.append(
+        ("%rocm_path", os.environ.get("ROCM_PATH", "/opt/rocm"))
+    )
+elif "hip:gpu" in config.sycl_devices and config.hip_platform == "NVIDIA":
+    config.available_features.add("hip_nvidia")
+    arch_flag = ""
+else:
+    arch_flag = ""
+
+if lit_config.params.get("compatibility_testing", False):
+    config.substitutions.append(("%clangxx", " true "))
+    config.substitutions.append(("%clang", " true "))
+else:
+    config.substitutions.append(
+        (
+            "%clangxx",
+            " " + config.dpcpp_compiler + " " + config.cxx_flags + " " + arch_flag,
+        )
+    )
+    config.substitutions.append(
+        ("%clang", " " + config.dpcpp_compiler + " " + config.c_flags)
+    )
 # Set timeout for a single test
 try:
     import psutil