Skip to content

Commit d239fb0

Browse files
author
Pavel Chupin
authored
[SYCL] Fix post-commit issues after #7521 (#7825)
1 parent 74af442 commit d239fb0

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

sycl/plugins/level_zero/CMakeLists.txt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,19 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
1616
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
1717
)
1818

19-
# Suppress some pedantic warnings for Level Zero build
19+
# Workaround warnings/errors for Level Zero build
2020
set(CMAKE_CXX_FLAGS_BAK "${CMAKE_CXX_FLAGS}")
21-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
22-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
23-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-truncation")
24-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
21+
if (WIN32)
22+
#FIXME: Level Zero build fails with /DUNICODE
23+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /UUNICODE")
24+
else()
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-unused-parameter")
29+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++98-compat-extra-semi")
30+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
31+
endif()
2532

2633
FetchContent_MakeAvailable(level-zero-loader)
2734
FetchContent_GetProperties(level-zero-loader)

sycl/plugins/unified_runtime/pi2ur.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ inline pi_result piPlatformGetInfo(pi_platform platform,
6969
pi_platform_info param_name,
7070
size_t param_value_size, void *param_value,
7171
size_t *param_value_size_ret) {
72+
(void)platform;
73+
(void)param_name;
74+
(void)param_value_size;
75+
(void)param_value;
76+
(void)param_value_size_ret;
7277
die("Unified Runtime: piPlatformGetInfo is not implemented");
7378
}
7479
} // namespace pi2ur

sycl/plugins/unified_runtime/ur/ur.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <iostream>
1212
#include <mutex>
1313
#include <shared_mutex>
14+
#include <string>
1415
#include <thread>
1516
#include <vector>
1617

0 commit comments

Comments
 (0)