Use single var to enable both adapters

Author: igchor

devops/scripts/benchmarks/README.md

@@ -43,7 +43,7 @@ To install Unified Runtime in the predefined location, use the `-DCMAKE_INSTALL_
 
 UR build example:
 ```
-$ cmake -DCMAKE_BUILD_TYPE=Release -S~/llvm/unified-runtime -B~/ur_build -DCMAKE_INSTALL_PREFIX=~/ur_install -DUR_BUILD_ADAPTER_L0=ON -DUR_BUILD_ADAPTER_L0_V2=ON
+$ cmake -DCMAKE_BUILD_TYPE=Release -S~/llvm/unified-runtime -B~/ur_build -DCMAKE_INSTALL_PREFIX=~/ur_install -DUR_BUILD_ADAPTER_L0=ON
 ```
 
 ### Rebuild

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -40,7 +40,7 @@ if("level_zero" IN_LIST SYCL_ENABLE_BACKENDS)
   set(UR_BUILD_ADAPTER_L0 ON)
 endif()
 if("level_zero_v2" IN_LIST SYCL_ENABLE_BACKENDS)
-  set(UR_BUILD_ADAPTER_L0_V2 ON)
+  set(UR_BUILD_ADAPTER_L0 ON)
 endif()
 if("cuda" IN_LIST SYCL_ENABLE_BACKENDS)
   set(UR_BUILD_ADAPTER_CUDA ON)
@@ -349,7 +349,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
       -DUR_ENABLE_TRACING:BOOL=${UR_ENABLE_TRACING}
       -DUR_ENABLE_COMGR:BOOL=${UR_ENABLE_COMGR}
       -DUR_BUILD_ADAPTER_L0:BOOL=${UR_BUILD_ADAPTER_L0}
-      -DUR_BUILD_ADAPTER_L0_V2:BOOL=${UR_BUILD_ADAPTER_L0_V2}
       -DUR_BUILD_ADAPTER_OPENCL:BOOL=${UR_BUILD_ADAPTER_OPENCL}
       -DUR_BUILD_ADAPTER_CUDA:BOOL=${UR_BUILD_ADAPTER_CUDA}
       -DUR_BUILD_ADAPTER_HIP:BOOL=${UR_BUILD_ADAPTER_HIP}

sycl/test-e2e/format.py

@@ -333,6 +333,8 @@ def get_extra_env(sycl_devices):
                 dev_features = test.config.sycl_dev_features[full_dev_name]
                 if "level_zero_v2_adapter" in dev_features:
                     expanded += " env UR_LOADER_USE_LEVEL_ZERO_V2=1"
+                else:
+                    expanded += " env UR_LOADER_USE_LEVEL_ZERO_V2=0"
 
                 expanded += " ONEAPI_DEVICE_SELECTOR={} {}".format(
                     parsed_dev_name, test.config.run_launcher

sycl/test-e2e/lit.cfg.py

@@ -962,6 +962,8 @@ def get_sycl_ls_verbose(sycl_device, env):
 
     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:"):

unified-runtime/CMakeLists.txt

@@ -271,10 +271,15 @@ if(UR_USE_MSAN)
     add_sanitizer_flag(memory)
 endif()
 
+if (UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2)
+    set(UR_BUILD_ADAPTER_L0_ALL 1)
+else()
+    set(UR_BUILD_ADAPTER_L0_ALL 0)
+endif()
+
 if(NOT (UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_HIP
-    OR UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_OPENCL
-    OR UR_BUILD_ADAPTER_NATIVE_CPU OR UR_BUILD_ADAPTER_L0_V2
-    OR UR_BUILD_ADAPTER_ALL))
+    OR UR_BUILD_ADAPTER_L0_ALL OR UR_BUILD_ADAPTER_OPENCL
+    OR UR_BUILD_ADAPTER_NATIVE_CPU OR UR_BUILD_ADAPTER_ALL))
     message(WARNING "No adapters have been enabled; conformance tests will not be ran")
     message(STATUS "Consider setting UR_BUILD_ADAPTER_*")
 endif()

unified-runtime/source/adapters/CMakeLists.txt

@@ -57,7 +57,7 @@ endfunction()
 
 list(APPEND TEMP_LIST "mock")
 
-if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2 OR UR_BUILD_ADAPTER_ALL)
+if(UR_BUILD_ADAPTER_L0_ALL OR UR_BUILD_ADAPTER_ALL)
     add_ur_adapter_subdirectory(level_zero)
     list(APPEND TEMP_LIST "level_zero")
 endif()

unified-runtime/source/adapters/level_zero/CMakeLists.txt

@@ -3,7 +3,7 @@
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-if(UR_BUILD_ADAPTER_L0)
+if(UR_BUILD_ADAPTER_L0_ALL)
     set(ADAPTER_LIB_TYPE SHARED)
     if(UR_STATIC_ADAPTER_L0)
         set(ADAPTER_LIB_TYPE STATIC)
@@ -115,7 +115,7 @@ if(UR_BUILD_ADAPTER_L0)
     )
 endif()
 
-if(UR_BUILD_ADAPTER_L0_V2)
+if(UR_BUILD_ADAPTER_L0_ALL)
     add_ur_adapter(ur_adapter_level_zero_v2
         SHARED
         # sources shared with legacy adapter

unified-runtime/source/common/CMakeLists.txt

@@ -3,7 +3,7 @@
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-if (UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2)
+if (UR_BUILD_ADAPTER_L0_ALL)
     include(FetchLevelZero)
     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")

unified-runtime/test/adapters/CMakeLists.txt

@@ -13,6 +13,6 @@ if(UR_BUILD_ADAPTER_HIP OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(hip)
 endif()
 
-if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2 OR UR_BUILD_ADAPTER_ALL)
+if(UR_BUILD_ADAPTER_L0_ALL OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(level_zero)
 endif()

unified-runtime/test/adapters/level_zero/CMakeLists.txt

@@ -60,6 +60,4 @@ add_conformance_devices_test(device_select_binary urDeviceSelectBinary.cpp)
 
 add_l0_loader_devices_test(mem_buffer_create_with_native_handle urMemBufferCreateWithNativeHandleShared.cpp)
 
-if(UR_BUILD_ADAPTER_L0_V2)
-    add_subdirectory(v2)
-endif()
+add_subdirectory(v2)