fix affinity mask in python scripts

Author: mateuszpn

devops/actions/run-tests/e2e/action.yml

@@ -78,7 +78,7 @@ runs:
     continue-on-error: true
     shell: bash
     env:
-      LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=${{ inputs.target_devices }} ${{ inputs.extra_lit_opts }}
+      LIT_OPTS: -v --no-progress-bar --show-unsupported --show-pass --show-xfail --max-time 3600 --time-tests --param print_features=True --param test-mode=${{ inputs.testing_mode }} --param sycl_devices=level_zero_v2:arch-intel_gpu_mtl_u ${{ inputs.extra_lit_opts }}
       # LIT_OPTS: -j 12 -v --param "sycl_devices=level_zero_v2:arch-intel_gpu_mtl_u" sycl/test-e2e/ 
     run: |
       echo "LIT_OPTS: $LIT_OPTS"

sycl/test-e2e/AddressSanitizer/lit.local.cfg

@@ -20,6 +20,8 @@ config.unsupported_features += ['spirv-backend']
 
 # https://github.com/intel/llvm/issues/16920
 config.unsupported_features += ['arch-intel_gpu_bmg_g21']
+config.unsupported_features += ['arch-intel_gpu_mtl_u']
+
 
 # https://github.com/intel/llvm/issues/20142
 config.unsupported_features += ['target-native_cpu']
@@ -31,5 +33,4 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-if config.ze_affinity_mask is not None:
-    config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
+config.environment["ZE_AFFINITY_MASK"] = "0"

sycl/test-e2e/MemorySanitizer/lit.local.cfg

@@ -39,5 +39,4 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-if config.ze_affinity_mask is not None:
-    config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
+config.environment["ZE_AFFINITY_MASK"] = "0"

sycl/test-e2e/ThreadSanitizer/lit.local.cfg

@@ -34,5 +34,4 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-if config.ze_affinity_mask is not None:
-    config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
+config.environment["ZE_AFFINITY_MASK"] = "0"

sycl/test-e2e/format.py

@@ -334,12 +334,6 @@ def get_extra_env(sycl_devices):
                 expanded = "env"
 
                 extra_env = get_extra_env([parsed_dev_name])
-                backend, device = parsed_dev_name.split(":", 1)
-                device_selector = parsed_dev_name
-                if backend == "level_zero" and device.isdigit():
-                    extra_env.append(f"ZE_AFFINITY_MASK={device}")
-                    device_selector = f"{backend}:0"
-
                 if extra_env:
                     expanded += " {}".format(" ".join(extra_env))
 
@@ -359,6 +353,11 @@ def get_extra_env(sycl_devices):
                     "linux",
                     "windows",
                     "preview-breaking-changes-supported",
+                    # the following entries are used by architecture-based filtering
+                    # (:arch- device, not :gpu or :cpu)
+                    "cpu",
+                    "gpu",
+                    "accelerator",
                 ]:
                     if cond_features in test.config.available_features:
                         conditions[cond_features] = True

sycl/test-e2e/lit.cfg.py

@@ -96,7 +96,6 @@
     "LIBCLANG_NOTHREADS",
     "LIBCLANG_RESOURCE_USAGE",
     "LIBCLANG_CODE_COMPLETION_LOGGING",
-    "ZE_AFFINITY_MASK",
 ]
 
 # Names of the Release and Debug versions of the XPTIFW library
@@ -707,7 +706,7 @@ def remove_level_zero_suffix(devices):
 available_devices = {
     "opencl": ("cpu", "gpu", "fpga"),
     "cuda": "gpu",
-    "level_zero": ("gpu", "0", "1"),
+    "level_zero": "gpu",
     "hip": "gpu",
     "native_cpu": "cpu",
     "offload": "gpu",
@@ -951,15 +950,6 @@ def get_sycl_ls_verbose(sycl_device, env):
 
 config.sycl_devices = filtered_sycl_devices
 
-# Determine ZE_AFFINITY_MASK for Level Zero devices.
-# Sanitizer tests need to set ZE_AFFINITY_MASK to a single device index
-config.ze_affinity_mask = None
-for sycl_device in remove_level_zero_suffix(config.sycl_devices):
-    be, dev = sycl_device.split(":")
-    if be == "level_zero" and dev.isdigit():
-        config.ze_affinity_mask = dev
-        break
-
 for sycl_device in remove_level_zero_suffix(config.sycl_devices):
     be, dev = sycl_device.split(":")
     config.available_features.add("any-device-is-" + dev)
@@ -1124,7 +1114,6 @@ def get_sycl_ls_verbose(sycl_device, env):
     features.update(sg_size_features)
     features.update(architecture_feature)
     features.update(device_family)
-    features.update(aspects)
 
     be, dev = sycl_device.split(":")
     if dev.isdigit():