Fix detection of spriv-tools in CI

intel · Jan 24, 2025 · f2e0cb1 · f2e0cb1
1 parent 8a27954
commit f2e0cb1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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)