allow custom L0 and UR

Signed-off-by: Sergey V Maslov <[email protected]>
intel · Dec 7, 2022 · d5c468e · d5c468e
1 parent 413f366
commit d5c468e
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 44 deletions.
diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
@@ -1,37 +1,34 @@
 # PI Level Zero plugin library
 
-if(MSVC)
-  set(LEVEL_ZERO_LOADER
-      "${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}ze_loader${CMAKE_STATIC_LIBRARY_SUFFIX}")
-else()
-  set(LEVEL_ZERO_LOADER
-      "${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}ze_loader${CMAKE_SHARED_LIBRARY_SUFFIX}")
-endif()
+if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
+  message(STATUS "Download Level Zero loader and headers from github.com")
 
-set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
-set(LEVEL_ZERO_LOADER_TAG v1.8.8)
+  set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
+  set(LEVEL_ZERO_LOADER_TAG v1.8.8)
 
-# Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
-set(CMAKE_INCLUDE_CURRENT_DIR OFF)
+  # Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
+  set(CMAKE_INCLUDE_CURRENT_DIR OFF)
 
-message(STATUS "Will fetch Level Zero Loader from ${LEVEL_ZERO_LOADER_REPO}")
-include(FetchContent)
-FetchContent_Declare(level-zero-loader
-  GIT_REPOSITORY    ${LEVEL_ZERO_LOADER_REPO}
-  GIT_TAG           ${LEVEL_ZERO_LOADER_TAG}
-)
+  message(STATUS "Will fetch Level Zero Loader from ${LEVEL_ZERO_LOADER_REPO}")
+  include(FetchContent)
+  FetchContent_Declare(level-zero-loader
+    GIT_REPOSITORY    ${LEVEL_ZERO_LOADER_REPO}
+    GIT_TAG           ${LEVEL_ZERO_LOADER_TAG}
+  )
 
-# Suppress some pedantic warnings for Level Zero build
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
+  # Suppress some pedantic warnings for Level Zero build
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
 
-FetchContent_MakeAvailable(level-zero-loader)
-FetchContent_GetProperties(level-zero-loader)
+  FetchContent_MakeAvailable(level-zero-loader)
+  FetchContent_GetProperties(level-zero-loader)
 
-set(LEVEL_ZERO_INCLUDE_DIR
-  ${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
+  set(LEVEL_ZERO_LIBRARY CACHE ze_loader)
+  set(LEVEL_ZERO_INCLUDE_DIR
+    ${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
+endif()
 
 add_library (LevelZeroLoader-Headers INTERFACE)
 target_include_directories(LevelZeroLoader-Headers
@@ -41,7 +38,7 @@ target_include_directories(LevelZeroLoader-Headers
 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")
-  set(XPIT_LIBS "${CMAKE_DL_LIBS}")
+  set(XPTI_LIBS "${CMAKE_DL_LIBS}")
 endif()
 
 find_package(Python3 REQUIRED)
@@ -85,7 +82,7 @@ add_sycl_plugin(level_zero
   LIBRARIES
     LevelZeroLoader-Headers
     UnifiedRuntime-Headers
-    ze_loader
+    ${LEVEL_ZERO_LIBRARY}
     Threads::Threads
     ${XPTI_LIBS}
 )

diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -1,24 +1,24 @@
 # PI Unified Runtime plugin library
 #
+if (NOT DEFINED UNIFIED_RUNTIME_INCLUDE_DIR)
+  include(FetchContent)
 
-include(FetchContent)
+  set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
+  set(UNIFIED_RUNTIME_TAG fd711c920acc4434cb52ff18b078c082d9d7f44d)
 
-set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
-set(UNIFIED_RUNTIME_TAG fd711c920acc4434cb52ff18b078c082d9d7f44d)
+  message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
+  FetchContent_Declare(unified-runtime
+    GIT_REPOSITORY    ${UNIFIED_RUNTIME_REPO}
+    GIT_TAG           ${UNIFIED_RUNTIME_TAG}
+  )
 
-message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
-FetchContent_Declare(unified-runtime
-  GIT_REPOSITORY    ${UNIFIED_RUNTIME_REPO}
-  GIT_TAG           ${UNIFIED_RUNTIME_TAG}
-)
-
-FetchContent_MakeAvailable(unified-runtime)
-FetchContent_GetProperties(unified-runtime)
-
-set(UNIFIED_RUNTIME_SOURCE_DIR
-  ${unified-runtime_SOURCE_DIR} CACHE PATH "Path to Unified Runtime Headers")
-set(UNIFIED_RUNTIME_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/include")
+  FetchContent_MakeAvailable(unified-runtime)
+  FetchContent_GetProperties(unified-runtime)
 
+  set(UNIFIED_RUNTIME_SOURCE_DIR
+    ${unified-runtime_SOURCE_DIR} CACHE PATH "Path to Unified Runtime Headers")
+  set(UNIFIED_RUNTIME_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/include")
+endif()
 
 add_library (UnifiedRuntime-Headers INTERFACE)
 target_include_directories(UnifiedRuntime-Headers
@@ -54,5 +54,5 @@ add_sycl_plugin(unified_runtime
     Threads::Threads
     UnifiedRuntime-Headers
     LevelZeroLoader-Headers
-    ze_loader
+    ${LEVEL_ZERO_LIBRARY}
 )