apply comments

Signed-off-by: Mateusz P. Nowak <mateusz.p.nowak@intel.com>

Author: mateuszpn

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

@@ -31,7 +31,5 @@ unsupported_san_flags = [
 if any(flag in config.cxx_flags for flag in unsupported_san_flags):
     config.unsupported=True
 
-if hasattr(config, 'ze_affinity_mask') and config.ze_affinity_mask is not None:
+if config.ze_affinity_mask is not None:
     config.environment["ZE_AFFINITY_MASK"] = config.ze_affinity_mask
-else:
-    config.environment["ZE_AFFINITY_MASK"] = "0"

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

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

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

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

sycl/test-e2e/format.py

@@ -351,9 +351,9 @@ 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, it filters devices so we should use :0
+                # If ZE_AFFINITY_MASK is set in local config, it filters devices so we should use :0
                 device_selector = parsed_dev_name
-                if "ZE_AFFINITY_MASK" in test.config.environment:
+                if test.config.ze_affinity_mask is not None:
                     backend, _ = parsed_dev_name.split(":", 1)
                     device_selector = f"{backend}:0"
 

sycl/test-e2e/lit.cfg.py

@@ -9,6 +9,9 @@
 import shlex
 import shutil
 
+import lit.formats
+import lit.util
+
 from lit.llvm import llvm_config
 from lit.llvm.subst import ToolSubst, FindTool
 
@@ -93,6 +96,7 @@
     "LIBCLANG_NOTHREADS",
     "LIBCLANG_RESOURCE_USAGE",
     "LIBCLANG_CODE_COMPLETION_LOGGING",
+    "ZE_AFFINITY_MASK",
 ]
 
 # Names of the Release and Debug versions of the XPTIFW library
@@ -953,9 +957,8 @@ def get_sycl_ls_verbose(sycl_device, env):
 for sycl_device in remove_level_zero_suffix(config.sycl_devices):
     be, dev = sycl_device.split(":")
     if be == "level_zero" and dev.isdigit():
-        if config.ze_affinity_mask is None:
-            config.ze_affinity_mask = dev
-            break
+        config.ze_affinity_mask = dev
+        break
 
 for sycl_device in remove_level_zero_suffix(config.sycl_devices):
     be, dev = sycl_device.split(":")
@@ -1066,6 +1069,10 @@ def get_sycl_ls_verbose(sycl_device, env):
     # Compute intersection of aspects.
     aspects = set(dev_aspects[0]).intersection(*dev_aspects)
     lit_config.note("Aspects for {}: {}".format(sycl_device, ", ".join(aspects)))
+    lit_config.note("Len of dev_aspects for {}: {}".format(sycl_device, len(dev_aspects)))
+    
+    for i in range(len(dev_aspects)):
+        lit_config.note("DevAsp{} for {}: {}".format(i, sycl_device, ", ".join(dev_aspects[i])))
 
     if dev_sg_sizes == []:
         lit_config.error(
@@ -1121,9 +1128,15 @@ 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():
+        backend_devices = available_devices.get(be, "gpu")
+        if isinstance(backend_devices, tuple):
+            # arch-selection is typically used to select gpu device
+            dev = "gpu"
+        else:
+            dev = backend_devices
     features.add(dev.replace("fpga", "accelerator"))
     if "level_zero_v2" in full_name:
         features.add("level_zero_v2_adapter")