[SYCL] Use default L0 adapter in tests when level_zero:gpu is specified

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

@@ -123,7 +123,7 @@ jobs:
           - name: Intel Battlemage Graphics
             runner: '["Linux", "bmg"]'
             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;level_zero_v2:gpu
+            target_devices: level_zero_v1:gpu;level_zero_v2:gpu
           - name: SPIR-V Backend / Intel Battlemage Graphics
             runner: '["Linux", "bmg"]'
             image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN

sycl/test-e2e/Basic/fill_accessor.cpp

@@ -4,7 +4,7 @@
 // UNSUPPORTED: run-mode && arch-intel_gpu_pvc && !igc-dev
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19585
 
-// UNSUPPORTED: run-mode && linux && arch-intel_gpu_bmg_g21 && !spirv-backend
+// UNSUPPORTED: run-mode && linux && arch-intel_gpu_bmg_g21
 // UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/19586
 
 #include <sycl/detail/core.hpp>

sycl/test-e2e/format.py

@@ -13,7 +13,7 @@
 
 
 def remove_level_zero_suffix(devices):
-    return [device.replace("_v2", "") for device in devices]
+    return [device.replace("_v2", "").replace("_v1", "") for device in devices]
 
 
 def parse_min_intel_driver_req(line_number, line, output):
@@ -331,10 +331,9 @@ def get_extra_env(sycl_devices):
                 if extra_env:
                     expanded += " {}".format(" ".join(extra_env))
 
-                dev_features = test.config.sycl_dev_features[full_dev_name]
-                if "level_zero_v2_adapter" in dev_features:
+                if "level_zero_v2" in full_dev_name:
                     expanded += " env UR_LOADER_USE_LEVEL_ZERO_V2=1"
-                else:
+                elif "level_zero_v1" in full_dev_name:
                     expanded += " env UR_LOADER_USE_LEVEL_ZERO_V2=0"
 
                 expanded += " ONEAPI_DEVICE_SELECTOR={} {}".format(

sycl/test-e2e/lit.cfg.py

@@ -694,7 +694,7 @@ def open_check_file(file_name):
 
 
 def remove_level_zero_suffix(devices):
-    return [device.replace("_v2", "") for device in devices]
+    return [device.replace("_v2", "").replace("_v1", "") for device in devices]
 
 
 available_devices = {
@@ -981,15 +981,11 @@ def get_sycl_ls_verbose(sycl_device, env):
 ):
     env = copy.copy(llvm_config.config.environment)
 
-    if "v2" in full_name:
-        env["UR_LOADER_ENABLE_LEVEL_ZERO_V2"] = "1"
-    else:
-        env["UR_LOADER_ENABLE_LEVEL_ZERO_V2"] = "0"
-
     env["ONEAPI_DEVICE_SELECTOR"] = sycl_device
     if sycl_device.startswith("cuda:"):
         env["SYCL_UR_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
 
+    features = set()
     dev_aspects = []
     dev_sg_sizes = []
     architectures = set()
@@ -1030,6 +1026,8 @@ def get_sycl_ls_verbose(sycl_device, env):
         if re.match(r" *Architecture:", line):
             _, architecture = line.strip().split(":", 1)
             architectures.add(architecture.strip())
+        if re.match(r" *Name *:", line) and "Level-Zero V2" in line:
+            features.add("level_zero_v2_adapter")
 
     if dev_aspects == []:
         lit_config.error(
@@ -1093,16 +1091,21 @@ def get_sycl_ls_verbose(sycl_device, env):
             )
         )
 
-    features = set()
     features.update(aspect_features)
     features.update(sg_size_features)
     features.update(architecture_feature)
     features.update(device_family)
 
     be, dev = sycl_device.split(":")
     features.add(dev.replace("fpga", "accelerator"))
-    if "v2" in full_name:
+    if "level_zero_v2" in full_name:
         features.add("level_zero_v2_adapter")
+    elif "level_zero_v1" in full_name:
+        features.discard("level_zero_v2_adapter")
+
+    if "level_zero_v2_adapter" in features:
+        lit_config.note("Using Level Zero V2 adapter for {}".format(sycl_device))
+
     # Use short names for LIT rules.
     features.add(be)
     # Add corresponding target feature