Skip to content

Commit 6c0a911

Browse files
committed
[SYCL][ESIMD] Move vc-intrinsics dependency build to llvm/lib/SYCLLowerIR.
SYCLLowerIR is the only user of vc-intrinsics. Signed-off-by: Konstantin S Bobrovsky <[email protected]>
1 parent f22c5cd commit 6c0a911

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

llvm/lib/SYCLLowerIR/CMakeLists.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# Lowering of SYCL ESIMD kernels depends on vc-intrinsics
2+
# NOTE: could have been added earlier from llvm/projects
3+
if (NOT TARGET LLVMGenXIntrinsics)
4+
if (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
5+
message(STATUS "vc-intrinsics are missing. Will try to download them from github.com")
6+
7+
include(FetchContent)
8+
FetchContent_Declare(vc-intrinsics
9+
GIT_REPOSITORY https://github.com/intel/vc-intrinsics.git
10+
GIT_TAG cce6e48c28eb850d7dadd30841c0d95f009bbca1
11+
)
12+
FetchContent_MakeAvailable(vc-intrinsics)
13+
FetchContent_GetProperties(vc-intrinsics)
14+
15+
set(LLVMGenXIntrinsics_SOURCE_DIR ${vc-intrinsics_SOURCE_DIR})
16+
set(LLVMGenXIntrinsics_BINARY_DIR ${vc-intrinsics_BINARY_DIR})
17+
else()
18+
# -DLLVMGenXIntrinsics_SOURCE_DIR is provided
19+
message(STATUS "vc-intrinsics are added manually ${LLVMGenXIntrinsics_SOURCE_DIR}")
20+
21+
set(LLVMGenXIntrinsics_BINARY_DIR ${CMAKE_BINARY_DIR}/vc-intrinsics-build)
22+
add_subdirectory(${LLVMGenXIntrinsics_SOURCE_DIR} ${LLVMGenXIntrinsics_BINARY_DIR})
23+
endif()
24+
25+
target_include_directories(LLVMGenXIntrinsics
26+
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include>
27+
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include>
28+
)
29+
endif()
30+
131
add_llvm_component_library(LLVMSYCLLowerIR
232
LowerWGScope.cpp
333
LowerESIMD.cpp

sycl/CMakeLists.txt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -184,35 +184,6 @@ install(DIRECTORY ${OPENCL_INCLUDE}/CL
184184
COMPONENT opencl-headers
185185
)
186186

187-
# vc-intrinsics could have been added earlier from llvm/projects
188-
if (NOT TARGET LLVMGenXIntrinsics)
189-
if (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
190-
message(STATUS "vc-intrinsics are missing. Will try to download them from github.com")
191-
192-
include(FetchContent)
193-
FetchContent_Declare(vc-intrinsics
194-
GIT_REPOSITORY https://github.com/intel/vc-intrinsics.git
195-
GIT_TAG cce6e48c28eb850d7dadd30841c0d95f009bbca1
196-
)
197-
FetchContent_MakeAvailable(vc-intrinsics)
198-
FetchContent_GetProperties(vc-intrinsics)
199-
200-
set(LLVMGenXIntrinsics_SOURCE_DIR ${vc-intrinsics_SOURCE_DIR})
201-
set(LLVMGenXIntrinsics_BINARY_DIR ${vc-intrinsics_BINARY_DIR})
202-
else()
203-
# -DLLVMGenXIntrinsics_SOURCE_DIR is provided
204-
message(STATUS "vc-intrinsics are added manually ${LLVMGenXIntrinsics_SOURCE_DIR}")
205-
206-
set(LLVMGenXIntrinsics_BINARY_DIR ${CMAKE_BINARY_DIR}/vc-intrinsics-build)
207-
add_subdirectory(${LLVMGenXIntrinsics_SOURCE_DIR} ${LLVMGenXIntrinsics_BINARY_DIR})
208-
endif()
209-
210-
target_include_directories(LLVMGenXIntrinsics
211-
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include>
212-
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include>
213-
)
214-
endif()
215-
216187
option(SYCL_BUILD_PI_CUDA
217188
"Enables the CUDA backend for the Plugin Interface" OFF)
218189

0 commit comments

Comments
 (0)