Skip to content

Commit 69cb210

Browse files
author
Pavel Chupin
authored
[SYCL] Return level_zero loader and header back to install (#7867)
We need to update at least 2 environements before we can remove that: * Jenkins testing on llvm-test-suite * Windows testing on llvm-test-suite. See related #7477 that currently fails.
1 parent 9673e05 commit 69cb210

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

sycl/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,6 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
362362
clang-offload-deps
363363
clang-offload-extract
364364
file-table-tform
365-
level-zero-loader
366-
level-zero-headers
367365
llc
368366
llvm-ar
369367
llvm-foreach
@@ -381,6 +379,7 @@ set( SYCL_TOOLCHAIN_DEPLOY_COMPONENTS
381379
sycl-headers-extras
382380
sycl
383381
libsycldevice
382+
level-zero-sycl-dev
384383
${XPTIFW_LIBS}
385384
${SYCL_TOOLCHAIN_DEPS}
386385
)

sycl/plugins/level_zero/CMakeLists.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,25 @@ add_sycl_plugin(level_zero
105105
${XPTI_LIBS}
106106
)
107107

108+
#FIXME: We should stop shipping level zero loader and headers as part of the
109+
# toolchain installation. Instead these should be avaialble in the system.
110+
# We keep shipping it until all environments are updated.
111+
install(TARGETS ze_loader
112+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
113+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
114+
LIBRARY
115+
DESTINATION ${CMAKE_INSTALL_LIBDIR}
116+
COMPONENT level-zero-sycl-dev
117+
NAMELINK_SKIP
118+
)
119+
120+
file(GLOB LEVEL_ZERO_API_HEADERS "${LEVEL_ZERO_INCLUDE_DIR}/*.h")
121+
install(FILES ${LEVEL_ZERO_API_HEADERS}
122+
DESTINATION ${CMAKE_INSTALL_PREFIX}/include/sycl/level_zero/
123+
COMPONENT level-zero-sycl-dev
124+
)
125+
# end of FIXME
126+
108127
add_dependencies(pi_level_zero ze-api)
109128

110129
if (SYCL_ENABLE_XPTI_TRACING)

0 commit comments

Comments
 (0)