Skip to content

Commit e41e34f

Browse files
committed
Fix Intel native CPU cache and Windows SYCL sources
1 parent abff6a6 commit e41e34f

3 files changed

Lines changed: 27 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,31 @@ if(ITLABAI_ENABLE_SYCL)
8282
message(FATAL_ERROR "itlabai_add_sycl_to_target requires TARGET")
8383
endif()
8484

85-
target_compile_options(${ITLABAI_SYCL_TARGET} PRIVATE
86-
$<$<COMPILE_LANGUAGE:CXX>:-fsycl>
87-
)
8885
target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE -fsycl)
8986

90-
if(ITLABAI_SYCL_TARGETS)
87+
if(ITLABAI_SYCL_SOURCES)
88+
foreach(ITLABAI_SYCL_SOURCE IN LISTS ITLABAI_SYCL_SOURCES)
89+
set_property(SOURCE ${ITLABAI_SYCL_SOURCE} APPEND PROPERTY
90+
COMPILE_OPTIONS -fsycl
91+
)
92+
if(ITLABAI_SYCL_TARGETS)
93+
set_property(SOURCE ${ITLABAI_SYCL_SOURCE} APPEND PROPERTY
94+
COMPILE_OPTIONS -fsycl-targets=${ITLABAI_SYCL_TARGETS}
95+
)
96+
endif()
97+
endforeach()
98+
else()
9199
target_compile_options(${ITLABAI_SYCL_TARGET} PRIVATE
92-
$<$<COMPILE_LANGUAGE:CXX>:-fsycl-targets=${ITLABAI_SYCL_TARGETS}>
100+
$<$<COMPILE_LANGUAGE:CXX>:-fsycl>
93101
)
102+
if(ITLABAI_SYCL_TARGETS)
103+
target_compile_options(${ITLABAI_SYCL_TARGET} PRIVATE
104+
$<$<COMPILE_LANGUAGE:CXX>:-fsycl-targets=${ITLABAI_SYCL_TARGETS}>
105+
)
106+
endif()
107+
endif()
108+
109+
if(ITLABAI_SYCL_TARGETS)
94110
target_link_options(${ITLABAI_SYCL_TARGET} PRIVATE
95111
-fsycl-targets=${ITLABAI_SYCL_TARGETS}
96112
)

app/SYCL/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ add_executable(SYCL_Example
44
)
55
target_link_libraries(SYCL_Example PRIVATE layers_lib)
66
itlabai_add_sycl_to_target(TARGET SYCL_Example SOURCES
7-
sycl_example.cpp
87
sycl_kernel.cpp
98
)
109

scripts/ci/sycl_x86_setup.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ def linux_native_cpu_toolchain_ready(toolchain_root: Path) -> bool:
3333
toolchain_root / "bin" / "compiler" / "clang++",
3434
]
3535
has_compiler = any(path.exists() for path in compiler_candidates)
36-
has_runtime = find_file([toolchain_root], "libsycl.so") is not None
36+
has_runtime = (
37+
find_file([toolchain_root], "libsycl.so") is not None
38+
or find_file([toolchain_root], "libsycl.so.9") is not None
39+
)
3740
has_native_cpu_libspirv = (
38-
find_file([toolchain_root], "remangled-l64-signed_char.libspirv-native_cpu.bc")
41+
find_file([toolchain_root], "remangled-l64-signed_char.libspirv.bc")
3942
is not None
4043
)
4144
return has_compiler and has_runtime and has_native_cpu_libspirv
@@ -148,6 +151,7 @@ def build_linux_native_cpu_toolchain() -> Path:
148151
)
149152

150153
run(["cmake", "--build", str(build_dir), "--target", "sycl-toolchain", "--parallel"])
154+
run(["cmake", "--install", str(build_dir)])
151155

152156
if not linux_native_cpu_toolchain_ready(toolchain_root):
153157
main_error(

0 commit comments

Comments
 (0)