From f2e0cb1f6e86a60345dfc73a94081c08678e1645 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 24 Jan 2025 14:09:03 -0800 Subject: [PATCH 1/2] Fix detection of spriv-tools in CI --- .github/workflows/sycl-linux-build.yml | 3 --- .github/workflows/sycl-windows-build.yml | 3 --- llvm-spirv/test/CMakeLists.txt | 8 ++++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index d528aa6ce7ce3..4777a7a32f467 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -199,9 +199,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 diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml index 9a19cf677e07e..e6bf38b8f4d8c 100644 --- a/.github/workflows/sycl-windows-build.yml +++ b/.github/workflows/sycl-windows-build.yml @@ -152,9 +152,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 diff --git a/llvm-spirv/test/CMakeLists.txt b/llvm-spirv/test/CMakeLists.txt index 1e51c50590ed4..2bd46ea0f01c8 100644 --- a/llvm-spirv/test/CMakeLists.txt +++ b/llvm-spirv/test/CMakeLists.txt @@ -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) From 20d632a558285efd80dec4d8bd12beb23f0e30bc Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Fri, 24 Jan 2025 15:38:33 -0800 Subject: [PATCH 2/2] Turn on cmake debug mode --- llvm-spirv/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/llvm-spirv/CMakeLists.txt b/llvm-spirv/CMakeLists.txt index e8eae24849d76..0b74b73484ff9 100644 --- a/llvm-spirv/CMakeLists.txt +++ b/llvm-spirv/CMakeLists.txt @@ -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)