Revert "Use single var to enable both adapters"

This reverts commit 586d0da.

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
+$ 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
 ```
 
 ### 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 ON)
+  set(UR_BUILD_ADAPTER_L0_V2 ON)
 endif()
 if("cuda" IN_LIST SYCL_ENABLE_BACKENDS)
   set(UR_BUILD_ADAPTER_CUDA ON)
@@ -349,6 +349,7 @@ 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}

unified-runtime/CMakeLists.txt

@@ -271,15 +271,10 @@ 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_ALL OR UR_BUILD_ADAPTER_OPENCL
-    OR UR_BUILD_ADAPTER_NATIVE_CPU OR UR_BUILD_ADAPTER_ALL))
+    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))
     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_ALL OR UR_BUILD_ADAPTER_ALL)
+if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2 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_ALL)
+if(UR_BUILD_ADAPTER_L0)
     set(ADAPTER_LIB_TYPE SHARED)
     if(UR_STATIC_ADAPTER_L0)
         set(ADAPTER_LIB_TYPE STATIC)
@@ -115,7 +115,7 @@ if(UR_BUILD_ADAPTER_L0_ALL)
     )
 endif()
 
-if(UR_BUILD_ADAPTER_L0_ALL)
+if(UR_BUILD_ADAPTER_L0_V2)
     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_ALL)
+if (UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2)
     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_ALL OR UR_BUILD_ADAPTER_ALL)
+if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2 OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(level_zero)
 endif()

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

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

unified-runtime/test/conformance/CMakeLists.txt

@@ -92,7 +92,7 @@ if(UR_FOUND_DPCXX)
     file(MAKE_DIRECTORY ${UR_CONFORMANCE_DEVICE_BINARIES_DIR})
 
     if("${UR_CONFORMANCE_TARGET_TRIPLES}" STREQUAL "")
-        if(UR_BUILD_ADAPTER_L0_ALL OR UR_BUILD_ADAPTER_OFFLOAD OR UR_BUILD_ADAPTER_OPENCL OR UR_BUILD_ADAPTER_ALL)
+        if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_OFFLOAD OR UR_BUILD_ADAPTER_L0_V2 OR UR_BUILD_ADAPTER_OPENCL OR UR_BUILD_ADAPTER_ALL)
             list(APPEND TARGET_TRIPLES "spir64")
         endif()
         if(UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_OFFLOAD OR UR_BUILD_ADAPTER_ALL)

unified-runtime/test/conformance/exp_command_buffer/native-command/CMakeLists.txt

@@ -13,7 +13,7 @@ if (UR_BUILD_ADAPTER_HIP)
     target_link_libraries(exp_command_buffer-test PRIVATE rocmdrv)
 endif()
 
-if (UR_BUILD_ADAPTER_L0_ALL)
+if (UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_v2)
     target_sources(exp_command_buffer-test PRIVATE "append_native_L0.cpp")
     target_link_libraries(exp_command_buffer-test PRIVATE LevelZeroLoader LevelZeroLoader-Headers)
 endif()