[E2E][CI] Automatically add device family feature from architecture reported by sycl-ls

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

@@ -92,22 +92,21 @@ jobs:
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: level_zero:gpu;opencl:gpu;opencl:cpu
             reset_intel_gpu: true
-            extra_lit_opts: --param gpu-intel-gen12=True
           - name: E2E tests on Intel Arc A-Series Graphics
             runner: '["Linux", "arc"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: level_zero:gpu;opencl:gpu
             reset_intel_gpu: true
-            extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
+            extra_lit_opts: --param matrix-xmx8=True
             env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
           - name: E2E tests with dev igc on Intel Arc A-Series Graphics
             runner: '["Linux", "arc"]'
             image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:devigc
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
             target_devices: level_zero:gpu;opencl:gpu
             reset_intel_gpu: true
-            extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
+            extra_lit_opts: --param matrix-xmx8=True
             env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
             use_igc_dev: true
 

.github/workflows/sycl-nightly.yml

@@ -57,7 +57,6 @@ jobs:
             target_devices: level_zero:gpu
             reset_intel_gpu: true
             tests_selector: e2e
-            extra_lit_opts: --param gpu-intel-gen12=True
 
           - name: Intel OCL GPU
             runner: '["Linux", "gen12"]'
@@ -66,7 +65,6 @@ jobs:
             target_devices: opencl:gpu
             reset_intel_gpu: true
             tests_selector: e2e
-            extra_lit_opts: --param gpu-intel-gen12=True
 
           - name: OCL CPU (AMD)
             runner: '["Linux", "amdgpu"]'
@@ -139,7 +137,6 @@ jobs:
       name: Intel GEN12 Graphics with Level Zero
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
-      extra_lit_opts: --param gpu-intel-gen12=True
 
   cuda-aws-start:
     needs: [ubuntu2204_build]

.github/workflows/sycl-post-commit.yml

@@ -51,12 +51,11 @@ jobs:
         include:
           - name: Intel GEN12 Graphics with Level Zero
             runner: '["Linux", "gen12"]'
-            extra_lit_opts: --param gpu-intel-gen12=True
             target_devices: level_zero:gpu;opencl:fpga
             reset_intel_gpu: true
           - name: Intel Arc A-Series Graphics with Level Zero
             runner: '["Linux", "arc"]'
-            extra_lit_opts: --param matrix-xmx8=True --param gpu-intel-dg2=True
+            extra_lit_opts: --param matrix-xmx8=True
             reset_intel_gpu: true
           - name: AMD/HIP
             runner: '["Linux", "amdgpu"]'
@@ -73,7 +72,7 @@ jobs:
           - name: Perf tests on Intel GEN12 Graphics system
             runner: '["Linux", "gen12"]'
             env: '{"LIT_FILTER":"PerformanceTests/"}'
-            extra_lit_opts: -a -j 1 --param enable-perf-tests=True --param gpu-intel-gen12=True
+            extra_lit_opts: -a -j 1 --param enable-perf-tests=True
             target_devices: all
             reset_intel_gpu: true
           - name: Perf tests on Intel Arc A-Series Graphics system
@@ -120,7 +119,6 @@ jobs:
       name: Intel GEN12 Graphics with Level Zero
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
-      extra_lit_opts: --param gpu-intel-gen12=True
 
   macos_default:
     name: macOS

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

@@ -55,4 +55,3 @@ jobs:
       name: Intel GEN12 Graphics with Level Zero
       runner: '["Windows","gen12"]'
       sycl_toolchain_archive: ${{ needs.build.outputs.artifact_archive_name }}
-      extra_lit_opts: --param gpu-intel-gen12=True

sycl/test-e2e/lit.cfg.py

@@ -173,6 +173,33 @@
 if lit_config.params.get("igc-dev", False):
     config.available_features.add("igc-dev")
 
+# Map between architecture types and device name.
+device_name_arch_map = {
+    # <Device name> : Set of architectures types (and aliases)
+    # DG1
+    "gpu-intel-dg1": {"intel_gpu_dg1"},
+    # DG2
+    "gpu-intel-dg2": {
+        "intel_gpu_acm_g12",
+        "intel_gpu_dg2_g12",
+        "intel_gpu_acm_g11",
+        "intel_gpu_dg2_g11",
+        "intel_gpu_acm_g10",
+        "intel_gpu_dg2_g10",
+    },
+    # Gen12
+    "gpu-intel-gen12": {"intel_gpu_tgllp", "intel_gpu_tgl"},
+    # Gen11
+    "gpu-intel-gen11": {"intel_gpu_icllp", "intel_gpu_icl"},
+}
+
+
+def get_device_name_from_arch(arch):
+    for device_name, arch_set in device_name_arch_map.items():
+        if arch in arch_set:
+            return device_name
+    return None
+
 def check_igc_tag_and_add_feature():
     if os.path.isfile(config.igc_tag_file):
         with open(config.igc_tag_file, "r") as tag_file:
@@ -768,10 +795,27 @@ def open_check_file(file_name):
     aspect_features = set("aspect-" + a for a in aspects)
     sg_size_features = set("sg-" + s for s in sg_sizes)
     architecture_feature = set("arch-" + s for s in architectures)
+    # Add device name features like intel-gpu-gen12, intel-gpu-dg2 based on
+    # the architecture reported by sycl-ls.
+    device_names = set(
+        get_device_name_from_arch(arch)
+        for arch in architectures
+        if get_device_name_from_arch(arch) is not None
+    )
+
+    # Print the detected GPU family name.
+    if len(device_names) > 0:
+        lit_config.note(
+            "Detected GPU family for {}: {}".format(
+                sycl_device, ", ".join(device_names)
+            )
+        )
+
     features = set()
     features.update(aspect_features)
     features.update(sg_size_features)
     features.update(architecture_feature)
+    features.update(device_names)
 
     be, dev = sycl_device.split(":")
     features.add(dev.replace("fpga", "accelerator"))