Skip to content

Commit d5c468e

Browse files
smaslov-intelsmaslov-intel
committed
allow custom L0 and UR
Signed-off-by: Sergey V Maslov <[email protected]>
1 parent 413f366 commit d5c468e

File tree

2 files changed

+41
-44
lines changed

2 files changed

+41
-44
lines changed

‎sycl/plugins/level_zero/CMakeLists.txt

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
# PI Level Zero plugin library
22

3-
if(MSVC)
4-
set(LEVEL_ZERO_LOADER
5-
"${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}ze_loader${CMAKE_STATIC_LIBRARY_SUFFIX}")
6-
else()
7-
set(LEVEL_ZERO_LOADER
8-
"${LLVM_LIBRARY_OUTPUT_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}ze_loader${CMAKE_SHARED_LIBRARY_SUFFIX}")
9-
endif()
3+
if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
4+
message(STATUS "Download Level Zero loader and headers from github.com")
105

11-
set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
12-
set(LEVEL_ZERO_LOADER_TAG v1.8.8)
6+
set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
7+
set(LEVEL_ZERO_LOADER_TAG v1.8.8)
138

14-
# Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
15-
set(CMAKE_INCLUDE_CURRENT_DIR OFF)
9+
# Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
10+
set(CMAKE_INCLUDE_CURRENT_DIR OFF)
1611

17-
message(STATUS "Will fetch Level Zero Loader from ${LEVEL_ZERO_LOADER_REPO}")
18-
include(FetchContent)
19-
FetchContent_Declare(level-zero-loader
20-
GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
21-
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
22-
)
12+
message(STATUS "Will fetch Level Zero Loader from ${LEVEL_ZERO_LOADER_REPO}")
13+
include(FetchContent)
14+
FetchContent_Declare(level-zero-loader
15+
GIT_REPOSITORY ${LEVEL_ZERO_LOADER_REPO}
16+
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
17+
)
2318

24-
# Suppress some pedantic warnings for Level Zero build
25-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
26-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
27-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
28-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
19+
# Suppress some pedantic warnings for Level Zero build
20+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
21+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
22+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
23+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
2924

30-
FetchContent_MakeAvailable(level-zero-loader)
31-
FetchContent_GetProperties(level-zero-loader)
25+
FetchContent_MakeAvailable(level-zero-loader)
26+
FetchContent_GetProperties(level-zero-loader)
3227

33-
set(LEVEL_ZERO_INCLUDE_DIR
34-
${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
28+
set(LEVEL_ZERO_LIBRARY CACHE ze_loader)
29+
set(LEVEL_ZERO_INCLUDE_DIR
30+
${level-zero-loader_SOURCE_DIR}/include CACHE PATH "Path to Level Zero Headers")
31+
endif()
3532

3633
add_library (LevelZeroLoader-Headers INTERFACE)
3734
target_include_directories(LevelZeroLoader-Headers
@@ -41,7 +38,7 @@ target_include_directories(LevelZeroLoader-Headers
4138
if (SYCL_ENABLE_XPTI_TRACING)
4239
set(XPTI_PROXY_SRC "${CMAKE_SOURCE_DIR}/../xpti/src/xpti_proxy.cpp")
4340
set(XPTI_INCLUDE "${CMAKE_SOURCE_DIR}/../xpti/include")
44-
set(XPIT_LIBS "${CMAKE_DL_LIBS}")
41+
set(XPTI_LIBS "${CMAKE_DL_LIBS}")
4542
endif()
4643

4744
find_package(Python3 REQUIRED)
@@ -85,7 +82,7 @@ add_sycl_plugin(level_zero
8582
LIBRARIES
8683
LevelZeroLoader-Headers
8784
UnifiedRuntime-Headers
88-
ze_loader
85+
${LEVEL_ZERO_LIBRARY}
8986
Threads::Threads
9087
${XPTI_LIBS}
9188
)

‎sycl/plugins/unified_runtime/CMakeLists.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# PI Unified Runtime plugin library
22
#
3+
if (NOT DEFINED UNIFIED_RUNTIME_INCLUDE_DIR)
4+
include(FetchContent)
35

4-
include(FetchContent)
6+
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
7+
set(UNIFIED_RUNTIME_TAG fd711c920acc4434cb52ff18b078c082d9d7f44d)
58

6-
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
7-
set(UNIFIED_RUNTIME_TAG fd711c920acc4434cb52ff18b078c082d9d7f44d)
9+
message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
10+
FetchContent_Declare(unified-runtime
11+
GIT_REPOSITORY ${UNIFIED_RUNTIME_REPO}
12+
GIT_TAG ${UNIFIED_RUNTIME_TAG}
13+
)
814

9-
message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
10-
FetchContent_Declare(unified-runtime
11-
GIT_REPOSITORY ${UNIFIED_RUNTIME_REPO}
12-
GIT_TAG ${UNIFIED_RUNTIME_TAG}
13-
)
14-
15-
FetchContent_MakeAvailable(unified-runtime)
16-
FetchContent_GetProperties(unified-runtime)
17-
18-
set(UNIFIED_RUNTIME_SOURCE_DIR
19-
${unified-runtime_SOURCE_DIR} CACHE PATH "Path to Unified Runtime Headers")
20-
set(UNIFIED_RUNTIME_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/include")
15+
FetchContent_MakeAvailable(unified-runtime)
16+
FetchContent_GetProperties(unified-runtime)
2117

18+
set(UNIFIED_RUNTIME_SOURCE_DIR
19+
${unified-runtime_SOURCE_DIR} CACHE PATH "Path to Unified Runtime Headers")
20+
set(UNIFIED_RUNTIME_INCLUDE_DIR "${UNIFIED_RUNTIME_SOURCE_DIR}/include")
21+
endif()
2222

2323
add_library (UnifiedRuntime-Headers INTERFACE)
2424
target_include_directories(UnifiedRuntime-Headers
@@ -54,5 +54,5 @@ add_sycl_plugin(unified_runtime
5454
Threads::Threads
5555
UnifiedRuntime-Headers
5656
LevelZeroLoader-Headers
57-
ze_loader
57+
${LEVEL_ZERO_LIBRARY}
5858
)

0 commit comments

Comments
 (0)