Skip to content

Commit

Permalink
Revert "[CI] Temporarily disable tests requiring spirv-tools in CI" (
Browse files Browse the repository at this point in the history
…intel#16801)

Reverts intel#16743. After installing `pkg-config` in CI,
`llvm-spirv` can correctly find `spriv-tools` so this workaround is no
longer needed.
Example run:
https://github.com/intel/llvm/actions/runs/12996166493/job/36244369469?pr=16801#step:14:16
  • Loading branch information
uditagarwal97 authored Jan 28, 2025
1 parent fee4449 commit cf1df78
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/sycl-linux-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,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
11 changes: 4 additions & 7 deletions llvm-spirv/test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,27 +60,24 @@

using_spirv_tools = False

# Explicitly disable using spirv tools, if requested.
disable_spirv_tools = lit_config.params.get("disable-spirv-tools", False)

if config.spirv_tools_have_spirv_as and not disable_spirv_tools:
if config.spirv_tools_have_spirv_as:
llvm_config.add_tool_substitutions(['spirv-as'], [config.spirv_tools_bin_dir])
config.available_features.add('spirv-as')
using_spirv_tools = True

if config.spirv_tools_have_spirv_dis and not disable_spirv_tools:
if config.spirv_tools_have_spirv_dis:
llvm_config.add_tool_substitutions(['spirv-dis'], [config.spirv_tools_bin_dir])
config.available_features.add('spirv-dis')
using_spirv_tools = True

if config.spirv_tools_have_spirv_link and not disable_spirv_tools:
if config.spirv_tools_have_spirv_link:
llvm_config.add_tool_substitutions(['spirv-link'], [config.spirv_tools_bin_dir])
config.available_features.add('spirv-link')
using_spirv_tools = True

# Unlike spirv-{as,dis,link} above, running spirv-val is optional: if spirv-val is
# not available, the test must still run and just skip any spirv-val commands.
if config.spirv_tools_have_spirv_val and not disable_spirv_tools:
if config.spirv_tools_have_spirv_val:
llvm_config.add_tool_substitutions(['spirv-val'], [config.spirv_tools_bin_dir])
using_spirv_tools = True
else:
Expand Down

0 comments on commit cf1df78

Please sign in to comment.