Skip to content
Merged
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
11 changes: 10 additions & 1 deletion .github/workflows/build-and-test-callable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -441,9 +441,18 @@ jobs:
# bare name elsewhere.
dxc_path="$GITHUB_WORKSPACE/dxc-dist/bin/dxc"
if [ -x "${dxc_path}.exe" ]; then dxc_path="${dxc_path}.exe"; fi
warp_arch_args=()
if [ '${{ inputs.OS }}' = 'windows' ]; then

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to check windows. If the user wants to pick warp windows should be assumed no?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the workflow we don't actually know that we're configuring for warp. It probably wouldn't harm anything to set this always (I just didn't trace through all the places where WARP_ARCHITECTURE might impact something). It also might be better to just have a more generalized way of feeding lit the host architecture, but I think that would be a bigger change.

if [ '${{ runner.arch }}' = 'ARM64' ]; then
warp_arch_args=(--warp-arch arm64)
else
warp_arch_args=(--warp-arch x64)
fi
fi
python configure-test-suite.py \
--suite "${{ steps.suite.outputs.suite }}" \
--dxc-path "$dxc_path"
--dxc-path "$dxc_path" \
"${warp_arch_args[@]}"
- name: Run HLSL Tests
shell: bash
run: |
Expand Down
Loading