Skip to content

[SYCL] Use the system installed vc-intrinsics if available #18206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2025
Merged

[SYCL] Use the system installed vc-intrinsics if available #18206

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7adb7d
[SYCL] Use the sysinstalled vc-intrinsics if available
sarnex Apr 25, 2025
ead39e1
whitespace
sarnex Apr 28, 2025
27c597b
address feedback
sarnex Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 39 additions & 25 deletions llvm/lib/SYCLLowerIR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,50 @@
# Lowering of SYCL ESIMD kernels depends on vc-intrinsics
# NOTE: could have been added earlier from llvm/projects
if (NOT TARGET LLVMGenXIntrinsics)
if (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
set(LLVMGenXIntrinsics_GIT_REPO https://github.com/intel/vc-intrinsics.git)
if(NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR AND NOT LLVMGenXIntrinsics_INCLUDE_DIR)
find_package(LLVMGenXIntrinsics QUIET)
endif()

# Date: Mar 7, 2025
# Update Triple usage after 979c275097
Copy link
Contributor Author

@sarnex sarnex Apr 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff kinda sucks, all I did is wrap all the existing code in

find_package(LLVMGenXIntrinsics QUIET)
if (NOT LLVMGenXIntrinsics_FOUND)

endif()

set(LLVMGenXIntrinsics_GIT_TAG 9e1935aedc2101deaab45b2f69f4b43ccf6f2b52)
if (NOT LLVMGenXIntrinsics_FOUND)
if (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
find_path(LLVMGenXIntrinsics_INCLUDE_DIR GenXIntrinsics/include PATHS ${CMAKE_PREFIX_PATH})

message(STATUS "vc-intrinsics repo is missing. Will try to download it from ${LLVMGenXIntrinsics_GIT_REPO}")
include(FetchContent)
FetchContent_Declare(vc-intrinsics
GIT_REPOSITORY ${LLVMGenXIntrinsics_GIT_REPO}
GIT_TAG ${LLVMGenXIntrinsics_GIT_TAG}
)
FetchContent_MakeAvailable(vc-intrinsics)
FetchContent_GetProperties(vc-intrinsics)
if (NOT LLVMGenXIntrinsics_INCLUDE_DIR)
set(LLVMGenXIntrinsics_GIT_REPO https://github.com/intel/vc-intrinsics.git)

set(LLVMGenXIntrinsics_SOURCE_DIR ${vc-intrinsics_SOURCE_DIR})
set(LLVMGenXIntrinsics_BINARY_DIR ${vc-intrinsics_BINARY_DIR})
else (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
# -DLLVMGenXIntrinsics_SOURCE_DIR is provided
message(STATUS "vc-intrinsics are added manually ${LLVMGenXIntrinsics_SOURCE_DIR}")
# Date: Mar 7, 2025
# Update Triple usage after 979c275097
set(LLVMGenXIntrinsics_GIT_TAG 9e1935aedc2101deaab45b2f69f4b43ccf6f2b52)

set(LLVMGenXIntrinsics_BINARY_DIR ${CMAKE_BINARY_DIR}/vc-intrinsics-build)
add_subdirectory(${LLVMGenXIntrinsics_SOURCE_DIR} ${LLVMGenXIntrinsics_BINARY_DIR})
endif (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
message(STATUS "vc-intrinsics repo is missing. Will try to download it from ${LLVMGenXIntrinsics_GIT_REPO}")
include(FetchContent)
FetchContent_Declare(vc-intrinsics
GIT_REPOSITORY ${LLVMGenXIntrinsics_GIT_REPO}
GIT_TAG ${LLVMGenXIntrinsics_GIT_TAG}
)
FetchContent_MakeAvailable(vc-intrinsics)
FetchContent_GetProperties(vc-intrinsics)

target_include_directories(LLVMGenXIntrinsics
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include>
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include>
)
set(LLVMGenXIntrinsics_SOURCE_DIR ${vc-intrinsics_SOURCE_DIR})
set(LLVMGenXIntrinsics_BINARY_DIR ${vc-intrinsics_BINARY_DIR})
else()
message(STATUS "vc-intrinsics found in system at ${LLVMGenXIntrinsics_INCLUDE_DIR}")
set(LLVMGenXIntrinsics_SOURCE_DIR ${LLVMGenXIntrinsics_INCLUDE_DIR}/..)
set(LLVMGenXIntrinsics_BINARY_DIR ${CMAKE_BINARY_DIR}/vc-intrinsics-build)
add_subdirectory(${LLVMGenXIntrinsics_SOURCE_DIR} ${LLVMGenXIntrinsics_BINARY_DIR})
endif()
else (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
# -DLLVMGenXIntrinsics_SOURCE_DIR is provided
message(STATUS "vc-intrinsics are added manually ${LLVMGenXIntrinsics_SOURCE_DIR}")

set(LLVMGenXIntrinsics_BINARY_DIR ${CMAKE_BINARY_DIR}/vc-intrinsics-build)
add_subdirectory(${LLVMGenXIntrinsics_SOURCE_DIR} ${LLVMGenXIntrinsics_BINARY_DIR})
endif (NOT DEFINED LLVMGenXIntrinsics_SOURCE_DIR)
target_include_directories(LLVMGenXIntrinsics
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include>
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include>
)
endif()
endif (NOT TARGET LLVMGenXIntrinsics)

set_property(GLOBAL PROPERTY LLVMGenXIntrinsics_SOURCE_PROP ${LLVMGenXIntrinsics_SOURCE_DIR})
Expand Down