fix affinity mask in python scripts

Author: mateuszpn

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

@@ -78,8 +78,8 @@ 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: -j 12 -v --param "sycl_devices=level_zero_v2:arch-intel_gpu_mtl_u" sycl/test-e2e/ 
+      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"
       ninja -C build-e2e check-sycl-e2e > e2e.log 2>&1

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

@@ -33,3 +33,6 @@ if any(flag in config.cxx_flags for flag in unsupported_san_flags):
 
 if config.ze_affinity_mask is not None:
     config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
+    # When ZE_AFFINITY_MASK is set, it filters devices so the selected device becomes :0
+    config.sycl_devices = [dev.replace(":"+config.ze_affinity_mask, ":0") if dev.startswith("level_zero") else dev 
+                           for dev in config.sycl_devices]

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

@@ -41,3 +41,6 @@ if any(flag in config.cxx_flags for flag in unsupported_san_flags):
 
 if config.ze_affinity_mask is not None:
     config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
+    # When ZE_AFFINITY_MASK is set, it filters devices so the selected device becomes :0
+    config.sycl_devices = [dev.replace(":"+config.ze_affinity_mask, ":0") if dev.startswith("level_zero") else dev 
+                           for dev in config.sycl_devices]

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

@@ -36,3 +36,6 @@ if any(flag in config.cxx_flags for flag in unsupported_san_flags):
 
 if config.ze_affinity_mask is not None:
     config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
+    # When ZE_AFFINITY_MASK is set, it filters devices so the selected device becomes :0
+    config.sycl_devices = [dev.replace(":"+config.ze_affinity_mask, ":0") if dev.startswith("level_zero") else dev 
+                           for dev in config.sycl_devices]

sycl/test-e2e/format.py

@@ -293,6 +293,10 @@ def get_extra_env(sycl_devices):
                     "UR_L0_LEAKS_DEBUG={}".format(test.config.ur_l0_leaks_debug)
                 )
 
+            # Add ZE_AFFINITY_MASK if it's set in config.environment (e.g., by sanitizer tests)
+            if "ZE_AFFINITY_MASK" in test.config.environment:
+                extra_env.append("ZE_AFFINITY_MASK={}".format(test.config.environment["ZE_AFFINITY_MASK"]))
+
             if "cuda:gpu" in sycl_devices:
                 extra_env.append("SYCL_UR_CUDA_ENABLE_IMAGE_SUPPORT=1")
 
@@ -334,12 +338,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))
 
@@ -348,8 +346,14 @@ def get_extra_env(sycl_devices):
                 elif "level_zero_v1" in full_dev_name:
                     expanded += " env UR_LOADER_USE_LEVEL_ZERO_V2=0"
 
+                # If ZE_AFFINITY_MASK is set in local config, it filters devices so we should use :0
+                device_selector = parsed_dev_name
+                if test.config.ze_affinity_mask is not None:
+                    backend, _ = parsed_dev_name.split(":", 1)
+                    device_selector = f"{backend}:0"
+
                 expanded += " ONEAPI_DEVICE_SELECTOR={} {}".format(
-                    parsed_dev_name, test.config.run_launcher
+                    device_selector, test.config.run_launcher
                 )
                 cmd = directive.command.replace("%{run}", expanded)
                 # Expand device-specific condtions (%if ... %{ ... %}).
@@ -359,6 +363,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

@@ -707,7 +707,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 +951,25 @@ 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
+# Determine ZE_AFFINITY_MASK value for Level Zero devices.
+# Sanitizer tests (via their lit.local.cfg) can use this to set ZE_AFFINITY_MASK
+# environment variable when needed. The main config does NOT set it in the environment.
 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
 
+# If ze_affinity_mask wasn't determined from config.sycl_devices, check if
+# ONEAPI_DEVICE_SELECTOR is set in the environment and extract from there
+if config.ze_affinity_mask is None:
+    oneapi_selector = os.environ.get("ONEAPI_DEVICE_SELECTOR", "")
+    if oneapi_selector.startswith("level_zero:"):
+        dev = oneapi_selector.split(":", 1)[1]
+        if dev.isdigit():
+            config.ze_affinity_mask = dev
+
 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 +1134,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():