Skip to content

Commit 068c324

Browse files
author
Jaime Arteaga
committed
[UR][L0] Upgrade L0 loader to v1.15.1
This to use latest features present in L0 spec. Signed-off-by: Jaime Arteaga <[email protected]>
1 parent 192e940 commit 068c324

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

source/adapters/level_zero/CMakeLists.txt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,25 @@ endif()
2222
if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
2323
message(STATUS "Download Level Zero loader and headers from github.com")
2424

25+
# Workaround warnings/errors for Level Zero build
26+
set(CMAKE_CXX_FLAGS_BAK "${CMAKE_CXX_FLAGS}")
27+
if (WIN32)
28+
# FIXME: Level Zero build fails with /DUNICODE
29+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /UUNICODE")
30+
# USE_Z7 forces use of /Z7 instead of /Zi which is broken with sccache
31+
set(USE_Z7 ON)
32+
else()
33+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
34+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
35+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
36+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
37+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat-extra-semi")
38+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
39+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
40+
endif()
41+
2542
set(LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
26-
set(LEVEL_ZERO_LOADER_TAG v1.11.0)
43+
set(LEVEL_ZERO_LOADER_TAG v1.15.1)
2744

2845
# Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
2946
set(CMAKE_INCLUDE_CURRENT_DIR OFF)
@@ -42,6 +59,9 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
4259
FetchContent_MakeAvailable(level-zero-loader)
4360
FetchContent_GetProperties(level-zero-loader)
4461

62+
# Restore original flags
63+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}")
64+
4565
target_compile_options(ze_loader PRIVATE
4666
$<$<IN_LIST:$<CXX_COMPILER_ID>,GNU;Clang;Intel;IntelLLVM>:-Wno-error>
4767
$<$<CXX_COMPILER_ID:MSVC>:/WX- /UUNICODE>

0 commit comments

Comments
 (0)