[Benchmark] use UR_ADAPTERS_FORCE_LOAD in benchmarks

to enable testing L0 v2 adapter which cannot be selected
by ONEAPI_SELECTOR

Author: igchor

.github/workflows/benchmarks_compute.yml

@@ -151,9 +151,17 @@ jobs:
     - name: Build SYCL
       run: cmake --build ${{github.workspace}}/sycl_build -j
 
-    - name: Set oneAPI Device Selector
-      run: |
-        echo "ONEAPI_DEVICE_SELECTOR=${{ matrix.adapter.str_name }}:${{ matrix.adapter.unit }}" >> $GITHUB_ENV
+    - name: Configure UR
+      working-directory: ${{github.workspace}}/ur-repo
+      run: >
+        cmake -DCMAKE_BUILD_TYPE=Release
+        -B${{github.workspace}}/ur-repo/build
+        -DUR_BUILD_TESTS=OFF
+        -DUR_BUILD_ADAPTER_L0=ON
+        -DUR_BUILD_ADAPTER_L0_V2=ON
+
+    - name: Build UR
+      run: cmake --build ${{github.workspace}}/ur-repo/build -j $(nproc)
 
     - name: Run benchmarks
       id: benchmarks

scripts/benchmarks/benches/compute.py

@@ -60,7 +60,7 @@ def bin_args(self) -> list[str]:
         return []
 
     def extra_env_vars(self) -> dict:
-        return {}
+        return {"UR_ADAPTERS_FORCE_LOAD" : os.path.join(self.bench.libs, f"libur_adapter_{options.ur_adapter_name}.so")}
 
     def unit(self):
         return "μs"
@@ -130,9 +130,6 @@ def name(self):
         order = "in order" if self.ioq else "out of order"
         return f"api_overhead_benchmark_ur SubmitKernel {order}"
 
-    def extra_env_vars(self) -> dict:
-        return {"UR_ADAPTERS_FORCE_LOAD" : os.path.join(self.bench.libs, f"libur_adapter_{options.ur_adapter_name}.so")}
-
     def bin_args(self) -> list[str]:
         return [
             f"--Ioq={self.ioq}",

scripts/benchmarks/benches/velocity.py

@@ -9,6 +9,7 @@
 from utils.utils import run, create_build_path
 import os
 import re
+from .options import options
 
 class VelocityBench:
     def __init__(self, directory):
@@ -22,6 +23,7 @@ def __init__(self, name: str, bin_name: str, vb: VelocityBench):
         self.bench_name = name
         self.bin_name = bin_name
         self.code_path = os.path.join(self.vb.repo_path, self.bench_name, 'SYCL')
+        self.adapter_path = os.path.join(options.ur_dir, 'build', 'lib', f"libur_adapter_{options.ur_adapter_name}.so")
 
     def download_deps(self):
         return
@@ -46,7 +48,7 @@ def bin_args(self) -> list[str]:
         return []
 
     def extra_env_vars(self) -> dict:
-        return {}
+        return {"UR_ADAPTERS_FORCE_LOAD" : self.adapter_path}
 
     def parse_output(self, stdout: str) -> float:
         raise NotImplementedError()

source/common/CMakeLists.txt

@@ -5,14 +5,8 @@
 
 if (UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2)
     include(FetchLevelZero)
-endif()
-
-if (UR_BUILD_ADAPTER_L0_V2)
-    # For now, only v2 adapter uses L0 provider from UMF
     set(UMF_BUILD_LEVEL_ZERO_PROVIDER ON CACHE INTERNAL "Build Level Zero Provider")
     set(UMF_LEVEL_ZERO_INCLUDE_DIR "${LEVEL_ZERO_INCLUDE_DIR}" CACHE INTERNAL "Level Zero headers")
-else()
-    set(UMF_BUILD_LEVEL_ZERO_PROVIDER OFF CACHE INTERNAL "Build Level Zero Provider")
 endif()
 
 add_ur_library(ur_common STATIC