Merge branch 'adapters' into steffen/virtual_mem_adapters

Author: steffenlarsen

CMakeLists.txt

@@ -36,11 +36,12 @@ option(UR_USE_TSAN "enable ThreadSanitizer" OFF)
 option(UR_ENABLE_TRACING "enable api tracing through xpti" OFF)
 option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" OFF)
 option(UMF_ENABLE_POOL_TRACKING "Build UMF with pool tracking" OFF)
-option(UR_BUILD_ADAPTER_L0 "build level 0 adapter from SYCL" OFF)
-option(UR_BUILD_ADAPTER_OPENCL "build opencl adapter from SYCL" OFF)
-option(UR_BUILD_ADAPTER_CUDA "build cuda adapter from SYCL" OFF)
-option(UR_BUILD_ADAPTER_HIP "build hip adapter from SYCL" OFF)
-option(UR_BUILD_ADAPTER_NATIVE_CPU "build native_cpu adapter from SYCL" OFF)
+option(UR_BUILD_ADAPTER_L0 "Build the Level-Zero adapter" OFF)
+option(UR_BUILD_ADAPTER_OPENCL "Build the OpenCL adapter" OFF)
+option(UR_BUILD_ADAPTER_CUDA "Build the CUDA adapter" OFF)
+option(UR_BUILD_ADAPTER_HIP "Build the HIP adapter" OFF)
+option(UR_BUILD_ADAPTER_NATIVE_CPU "Build the Native-CPU adapter" OFF)
+option(UR_BUILD_ADAPTER_ALL "Build all currently supported adapters" OFF)
 option(UR_BUILD_EXAMPLE_CODEGEN "Build the codegen example." OFF)
 option(VAL_USE_LIBBACKTRACE_BACKTRACE "enable libbacktrace validation backtrace for linux" OFF)
 set(UR_DPCXX "" CACHE FILEPATH "Path of the DPC++ compiler executable")

README.md

@@ -131,12 +131,13 @@ List of options provided by CMake:
 | UR_USE_MSAN | Enable MemorySanitizer (clang only) | ON/OFF | OFF |
 | UR_ENABLE_TRACING | Enable XPTI-based tracing layer | ON/OFF | OFF |
 | UR_CONFORMANCE_TARGET_TRIPLES | SYCL triples to build CTS device binaries for | Comma-separated list | spir64 |
-| UR_BUILD_ADAPTER_L0     | Fetch and use level-zero adapter from SYCL             | ON/OFF     | OFF     |
-| UR_BUILD_ADAPTER_OPENCL | Fetch and use opencl adapter from SYCL                 | ON/OFF     | OFF     |
-| UR_BUILD_ADAPTER_CUDA   | Fetch and use cuda adapter from SYCL                   | ON/OFF     | OFF     |
-| UR_BUILD_ADAPTER_HIP    | Fetch and use hip adapter from SYCL                    | ON/OFF     | OFF     |
-| UR_BUILD_ADAPTER_NATIVE_CPU | Fetch and use native-cpu adapter from SYCL         | ON/OFF     | OFF     |
-| UR_HIP_PLATFORM         | Build hip adapter for AMD or NVIDIA platform           | AMD/NVIDIA | AMD     |
+| UR_BUILD_ADAPTER_L0     | Build the Level-Zero adapter            | ON/OFF     | OFF     |
+| UR_BUILD_ADAPTER_OPENCL | Build the OpenCL adapter                | ON/OFF     | OFF     |
+| UR_BUILD_ADAPTER_CUDA   | Build the CUDA adapter                  | ON/OFF     | OFF     |
+| UR_BUILD_ADAPTER_HIP    | Build the HIP adapter                   | ON/OFF     | OFF     |
+| UR_BUILD_ADAPTER_NATIVE_CPU | Build the Native-CPU adapter        | ON/OFF     | OFF     |
+| UR_BUILD_ADAPTER_ALL    | Build all currently supported adapters  | ON/OFF     | OFF     |
+| UR_HIP_PLATFORM         | Build HIP adapter for AMD or NVIDIA platform           | AMD/NVIDIA | AMD     |
 | UR_ENABLE_COMGR         | Enable comgr lib usage           | AMD/NVIDIA | AMD     |
 | UR_DPCXX | Path of the DPC++ compiler executable to build CTS device binaries | File path | `""` |
 | UR_SYCL_LIBRARY_DIR | Path of the SYCL runtime library directory to build CTS device binaries | Directory path | `""` |

source/adapters/CMakeLists.txt

@@ -32,21 +32,21 @@ add_subdirectory(null)
 
 set(INTEL_LLVM_TAG nightly-2023-09-20)
 
-if(UR_BUILD_ADAPTER_L0)
+if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(level_zero)
 endif()
 
-if(UR_BUILD_ADAPTER_CUDA)
+if(UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(cuda)
 endif()
 
-if(UR_BUILD_ADAPTER_HIP)
+if(UR_BUILD_ADAPTER_HIP OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(hip)
 endif()
 
-if(UR_BUILD_ADAPTER_OPENCL)
+if(UR_BUILD_ADAPTER_OPENCL OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(opencl)
 endif()
-if(UR_BUILD_ADAPTER_NATIVE_CPU)
+if(UR_BUILD_ADAPTER_NATIVE_CPU OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(native_cpu)
 endif()

test/adapters/CMakeLists.txt

@@ -37,10 +37,10 @@ function(add_adapter_test name)
         ENVIRONMENT "${args_ENVIRONMENT}")
 endfunction()
 
-if(UR_BUILD_ADAPTER_CUDA)
+if(UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(cuda)
 endif()
 
-if(UR_BUILD_ADAPTER_HIP)
+if(UR_BUILD_ADAPTER_HIP OR UR_BUILD_ADAPTER_ALL)
     add_subdirectory(hip)
 endif()

test/conformance/CMakeLists.txt

@@ -39,25 +39,25 @@ function(add_conformance_test name)
         ${PROJECT_NAME}::common
         GTest::gtest_main)
 
-    if(UR_BUILD_ADAPTER_CUDA)
+    if(UR_BUILD_ADAPTER_CUDA OR UR_BUILD_ADAPTER_ALL)
         add_test_adapter(${name} adapter_cuda)
     endif()
-    if(UR_BUILD_ADAPTER_HIP)
+    if(UR_BUILD_ADAPTER_HIP OR UR_BUILD_ADAPTER_ALL)
         add_test_adapter(${name} adapter_hip)
     endif()
-    if(UR_BUILD_ADAPTER_L0)
+    if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_ALL)
         add_test_adapter(${name} adapter_level_zero)
     endif()
-    if(UR_BUILD_ADAPTER_OPENCL)
+    if(UR_BUILD_ADAPTER_OPENCL OR UR_BUILD_ADAPTER_ALL)
         add_test_adapter(${name} adapter_opencl)
     endif()
-    if(UR_BUILD_ADAPTER_NATIVE_CPU)
+    if(UR_BUILD_ADAPTER_NATIVE_CPU OR UR_BUILD_ADAPTER_ALL)
         add_test_adapter(${name} adapter_native_cpu)
     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_NATIVE_CPU OR UR_BUILD_ADAPTER_ALL))
         add_test_adapter(${name} adapter_null)
     endif()
 endfunction()

test/fuzz/CMakeLists.txt

@@ -18,7 +18,7 @@ function(add_fuzz_test name label)
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
     set(ENV_VARS UR_ENABLE_LAYERS=UR_LAYER_FULL_VALIDATION)
-    if(UR_BUILD_ADAPTER_L0)
+    if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_ALL)
         list(APPEND ENV_VARS
                 UR_ADAPTERS_FORCE_LOAD=\"$<TARGET_FILE:ur_adapter_level_zero>\"
                 NEOReadDebugKeys=1