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.

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

Revert "[CI] Temporarily disable tests requiring spirv-tools in CI" #16801

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Revert "[CI] Temporarily disable tests requiring spirv-tools in CI" #16801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading