Skip to content
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.

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

[CI] Fix detection of spriv-tools in CI #16773

Draft
wants to merge 3 commits into
base: sycl
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/workflows/sycl-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ jobs:
cmake --build $GITHUB_WORKSPACE/build --target check-sycl-unittests
- name: check-llvm-spirv
if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
# Temporary workaround to disable running tests requiring spirv-tools.
env:
LIT_OPTS: "--param disable-spirv-tools=True"
run: |
cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
- name: check-xptifw
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/sycl-windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,6 @@ jobs:
cmake --build build --target check-sycl-unittests
- name: check-llvm-spirv
if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
# Temporary workaround to disable running tests requiring spirv-tools.
env:
LIT_OPTS: "--param disable-spirv-tools=True"
run: |
cmake --build build --target check-llvm-spirv
- name: check-xptifw
Expand Down
1 change: 1 addition & 0 deletions llvm-spirv/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ set(LLVM_SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
pkg_search_module(SPIRV_TOOLS SPIRV-Tools)
if (NOT SPIRV_TOOLS_FOUND)
# then try locating SPIRV-Tools via cmake (the new way)
set(CMAKE_FIND_DEBUG_MODE 1)
find_package(SPIRV-Tools)
find_package(SPIRV-Tools-tools)
if (SPIRV-Tools_FOUND AND SPIRV-Tools-tools_FOUND)
Expand Down
8 changes: 4 additions & 4 deletions llvm-spirv/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ elseif(SPIRV-Tools-tools_FOUND)
set(SPIRV_TOOLS_SPIRV_VAL_FOUND True)
endif()

get_target_property(SPIRV_AS_PATH spirv-as IMPORTED_LOCATION_RELEASE)
if(NOT SPIRV_AS_PATH)
get_target_property(SPIRV_AS_PATH spirv-as IMPORTED_LOCATION_DEBUG)
endif()
get_target_property(SPIRV_AS_PATH spirv-as LOCATION)
#if(NOT SPIRV_AS_PATH)
# get_target_property(SPIRV_AS_PATH spirv-as IMPORTED_LOCATION_DEBUG)
#endif()

if(SPIRV_AS_PATH)
cmake_path(GET SPIRV_AS_PATH PARENT_PATH SPIRV_AS_PATH)
Expand Down
Loading