[SYCL][UR][L0] Fetch Level Zero adapter source from the Unified Runtime repo (#11252)

This is the second part of moving the Level Zero adapter to the Unified
Runtime repo, after
oneapi-src/unified-runtime#879

Author: callumfare

sycl/plugins/CMakeLists.txt

@@ -2,12 +2,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|IntelLLVM" )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-covered-switch-default")
 endif()
 
-foreach(plugin ${SYCL_ENABLE_PLUGINS})
-  add_subdirectory(${plugin})
-endforeach()
-
 # level_zero plugin depends today on unified_runtime plugin
 # and unified_runtime plugin is not an independent plugin, adding it explicitly
 if ("level_zero" IN_LIST SYCL_ENABLE_PLUGINS)
   add_subdirectory(unified_runtime)
 endif()
+
+foreach(plugin ${SYCL_ENABLE_PLUGINS})
+  add_subdirectory(${plugin})
+endforeach()

sycl/plugins/level_zero/CMakeLists.txt

@@ -44,24 +44,6 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
     ${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
 endif()
 
-add_library (LevelZeroLoader INTERFACE)
-# The MSVC linker does not like / at the start of a path, so to work around this
-# we split it into a link library and a library path, where the path is allowed
-# to have leading /.
-get_filename_component(LEVEL_ZERO_LIBRARY_SRC "${LEVEL_ZERO_LIBRARY}" DIRECTORY)
-get_filename_component(LEVEL_ZERO_LIB_NAME "${LEVEL_ZERO_LIBRARY}" NAME)
-target_link_directories(LevelZeroLoader
-  INTERFACE "${LEVEL_ZERO_LIBRARY_SRC}"
-)
-target_link_libraries(LevelZeroLoader
-  INTERFACE "${LEVEL_ZERO_LIB_NAME}"
-)
-
-add_library (LevelZeroLoader-Headers INTERFACE)
-target_include_directories(LevelZeroLoader-Headers
-  INTERFACE "${LEVEL_ZERO_INCLUDE_DIR}"
-)
-
 if (SYCL_ENABLE_XPTI_TRACING)
   set(XPTI_PROXY_SRC "${CMAKE_SOURCE_DIR}/../xpti/src/xpti_proxy.cpp")
   set(XPTI_INCLUDE "${CMAKE_SOURCE_DIR}/../xpti/include")
@@ -83,6 +65,9 @@ add_custom_command(
 
 find_package(Threads REQUIRED)
 
+# Get the L0 adapter sources so they can be shared with the L0 PI plugin
+get_target_property(UR_L0_ADAPTER_SOURCES ur_adapter_level_zero SOURCES)
+
 add_sycl_plugin(level_zero
   SOURCES
     # These are short-term shared with Unified Runtime
@@ -93,39 +78,7 @@ add_sycl_plugin(level_zero
     "ur_bindings.hpp"
     "../unified_runtime/pi2ur.hpp"
     "../unified_runtime/pi2ur.cpp"
-    "../unified_runtime/ur/ur.hpp"
-    "../unified_runtime/ur/ur.cpp"
-    "../unified_runtime/ur/adapters/level_zero/ur_level_zero.hpp"
-    "../unified_runtime/ur/adapters/level_zero/command_buffer.hpp"
-    "../unified_runtime/ur/adapters/level_zero/adapter.hpp"
-    "../unified_runtime/ur/adapters/level_zero/common.hpp"
-    "../unified_runtime/ur/adapters/level_zero/context.hpp"
-    "../unified_runtime/ur/adapters/level_zero/device.hpp"
-    "../unified_runtime/ur/adapters/level_zero/event.hpp"
-    "../unified_runtime/ur/adapters/level_zero/image.hpp"
-    "../unified_runtime/ur/adapters/level_zero/kernel.hpp"
-    "../unified_runtime/ur/adapters/level_zero/memory.hpp"
-    "../unified_runtime/ur/adapters/level_zero/platform.hpp"
-    "../unified_runtime/ur/adapters/level_zero/program.hpp"
-    "../unified_runtime/ur/adapters/level_zero/queue.hpp"
-    "../unified_runtime/ur/adapters/level_zero/sampler.hpp"
-    "../unified_runtime/ur/adapters/level_zero/usm.hpp"
-    "../unified_runtime/ur/adapters/level_zero/ur_level_zero.cpp"
-    "../unified_runtime/ur/adapters/level_zero/adapter.cpp"
-    "../unified_runtime/ur/adapters/level_zero/command_buffer.cpp"
-    "../unified_runtime/ur/adapters/level_zero/common.cpp"
-    "../unified_runtime/ur/adapters/level_zero/context.cpp"
-    "../unified_runtime/ur/adapters/level_zero/device.cpp"
-    "../unified_runtime/ur/adapters/level_zero/event.cpp"
-    "../unified_runtime/ur/adapters/level_zero/image.cpp"
-    "../unified_runtime/ur/adapters/level_zero/kernel.cpp"
-    "../unified_runtime/ur/adapters/level_zero/memory.cpp"
-    "../unified_runtime/ur/adapters/level_zero/platform.cpp"
-    "../unified_runtime/ur/adapters/level_zero/program.cpp"
-    "../unified_runtime/ur/adapters/level_zero/queue.cpp"
-    "../unified_runtime/ur/adapters/level_zero/sampler.cpp"
-    "../unified_runtime/ur/adapters/level_zero/usm.cpp"
-    "../unified_runtime/ur/adapters/level_zero/usm_p2p.cpp"
+    ${UR_L0_ADAPTER_SOURCES}
     # Following are the PI Level-Zero Plugin only codes.
     "pi_level_zero.cpp"
     "pi_level_zero.hpp"
@@ -135,6 +88,7 @@ add_sycl_plugin(level_zero
     ${CMAKE_CURRENT_BINARY_DIR} # for ze_api.def
     ${CMAKE_CURRENT_SOURCE_DIR} # for Level-Zero Plugin "ur_bindings.hpp"
     ${CMAKE_CURRENT_SOURCE_DIR}/../unified_runtime # for Unified Runtime
+    ${UNIFIED_RUNTIME_SOURCE_DIR}/source/ # for adapters/level_zero
     ${XPTI_INCLUDE}
   LIBRARIES
     LevelZeroLoader-Headers

sycl/plugins/level_zero/pi_level_zero.hpp

@@ -26,7 +26,7 @@
   _PI_PLUGIN_VERSION_STRING(_PI_LEVEL_ZERO_PLUGIN_VERSION)
 
 // Share code between this PI L0 Plugin and UR L0 Adapter
+#include <adapters/level_zero/ur_level_zero.hpp>
 #include <pi2ur.hpp>
-#include <ur/adapters/level_zero/ur_level_zero.hpp>
 
 #endif // PI_LEVEL_ZERO_HPP

sycl/plugins/unified_runtime/CMakeLists.txt

@@ -3,9 +3,11 @@
 if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_DIR)
   include(FetchContent)
 
+  # The UR tag should be from the 'adapters' branch
   set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-  set(UNIFIED_RUNTIME_TAG b3cc9ae3f99ca7faff1ba765dd36652fef2cfddd)
+  set(UNIFIED_RUNTIME_TAG c791b8bba63af1c1880ae278e9d6df90021636dd)
 
+  set(UR_BUILD_ADAPTER_L0 ON)
   set(UMF_ENABLE_POOL_TRACKING ON)
   message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
   FetchContent_Declare(unified-runtime
@@ -76,58 +78,7 @@ add_sycl_plugin(unified_runtime
     LevelZeroLoader-Headers # we need for #include <ze_api.h> in common.h
 )
 
-# Build level zero adapter
-add_sycl_library("ur_adapter_level_zero" SHARED
-  SOURCES
-    "ur/ur.hpp"
-    "ur/ur.cpp"
-    "ur/adapters/level_zero/ur_level_zero.hpp"
-    "ur/adapters/level_zero/ur_level_zero.cpp"
-    "ur/adapters/level_zero/ur_interface_loader.cpp"
-    "ur/adapters/level_zero/adapter.hpp"
-    "ur/adapters/level_zero/command_buffer.hpp"
-    "ur/adapters/level_zero/common.hpp"
-    "ur/adapters/level_zero/context.hpp"
-    "ur/adapters/level_zero/device.hpp"
-    "ur/adapters/level_zero/event.hpp"
-    "ur/adapters/level_zero/image.cpp"
-    "ur/adapters/level_zero/image.hpp"
-    "ur/adapters/level_zero/memory.hpp"
-    "ur/adapters/level_zero/kernel.hpp"
-    "ur/adapters/level_zero/platform.hpp"
-    "ur/adapters/level_zero/program.hpp"
-    "ur/adapters/level_zero/queue.hpp"
-    "ur/adapters/level_zero/sampler.hpp"
-    "ur/adapters/level_zero/usm.hpp"
-    "ur/adapters/level_zero/adapter.cpp"
-    "ur/adapters/level_zero/command_buffer.cpp"
-    "ur/adapters/level_zero/common.cpp"
-    "ur/adapters/level_zero/context.cpp"
-    "ur/adapters/level_zero/device.cpp"
-    "ur/adapters/level_zero/event.cpp"
-    "ur/adapters/level_zero/memory.cpp"
-    "ur/adapters/level_zero/kernel.cpp"
-    "ur/adapters/level_zero/platform.cpp"
-    "ur/adapters/level_zero/program.cpp"
-    "ur/adapters/level_zero/queue.cpp"
-    "ur/adapters/level_zero/sampler.cpp"
-    "ur/adapters/level_zero/usm.cpp"
-    "ur/adapters/level_zero/usm_p2p.cpp"
-  INCLUDE_DIRS
-    ${sycl_inc_dir}
-  LIBRARIES
-    UnifiedRuntime-Headers
-    UnifiedRuntimeCommon
-    UnifiedMallocFramework
-    LevelZeroLoader-Headers
-    LevelZeroLoader
-    Threads::Threads
-)
-
-set_target_properties("ur_adapter_level_zero" PROPERTIES
-    VERSION "0.0.0"
-    SOVERSION "0"
-)
+add_dependencies(sycl-runtime-libraries ur_adapter_level_zero)
 
 if ("cuda" IN_LIST SYCL_ENABLE_PLUGINS)
   # Build CUDA adapter

sycl/plugins/unified_runtime/ur/adapters/level_zero/README.md

@@ -0,0 +1,7 @@
+# Level Zero adapter
+The source for the Level Zero adapter has been moved to the
+[adapters](https://github.com/oneapi-src/unified-runtime/tree/adapters) branch
+of the [Unified Runtime](https://github.com/oneapi-src/unified-runtime/) repo. 
+Changes can be made by opening pull requests against that branch, and updating
+the Unified Runtime commit in the parent
+[CMakeLists.txt](../../../CMakeLists.txt).