Skip to content

Commit d0fd267

Browse files
authored
[NFC] Rename hlsltest->offloadtest (#23)
Rename hlsltest to offloadtest, and scrub HLSL from most of the codebase.
1 parent 74ccf79 commit d0fd267

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+239
-240
lines changed

.github/workflows/macos-clang-mtl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
SKU: macOS
2222
Test-Clang: On
2323
TestTarget: check-hlsl-clang-mtl
24-
HLSLTest-branch: ${{ github.ref }}
24+
OffloadTest-branch: ${{ github.ref }}

.github/workflows/macos-dxc-mtl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
SKU: macOS
2222
Test-Clang: Off
2323
TestTarget: check-hlsl-mtl
24-
HLSLTest-branch: ${{ github.ref }}
24+
OffloadTest-branch: ${{ github.ref }}

.github/workflows/test-all.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
on:
88
workflow_dispatch:
99
inputs:
10-
HLSLTest-branch:
10+
OffloadTest-branch:
1111
description: 'Test Suite Branch'
1212
required: false
1313
default: 'main'
@@ -66,7 +66,7 @@ on:
6666
type: string
6767
workflow_call:
6868
inputs:
69-
HLSLTest-branch:
69+
OffloadTest-branch:
7070
description: 'Test Suite Branch'
7171
required: false
7272
default: 'main'
@@ -130,12 +130,12 @@ jobs:
130130
ref: ${{ inputs.LLVM-branch }}
131131
path: llvm-project
132132
fetch-depth: 1
133-
- name: Checkout HLSLTest
133+
- name: Checkout OffloadTest
134134
uses: actions/checkout@v4
135135
with:
136136
repository: llvm-beanz/HLSLTest
137-
ref: ${{ inputs.HLSLTest-branch }}
138-
path: HLSLTest
137+
ref: ${{ inputs.OffloadTest-branch }}
138+
path: OffloadTest
139139
fetch-depth: 1
140140
- name: Checkout Golden Images
141141
uses: actions/checkout@v4
@@ -154,14 +154,14 @@ jobs:
154154
cd DXC
155155
mkdir build
156156
cd build
157-
cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/DXC/cmake/caches/PredefinedParams.cmake -C ${{ github.workspace }}/HLSLTest/cmake/caches/sccache.cmake -DHLSL_DISABLE_SOURCE_GENERATION=On ${{ github.workspace }}/DXC/
157+
cmake -G Ninja -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/DXC/cmake/caches/PredefinedParams.cmake -C ${{ github.workspace }}/OffloadTest/cmake/caches/sccache.cmake -DHLSL_DISABLE_SOURCE_GENERATION=On ${{ github.workspace }}/DXC/
158158
ninja
159159
- name: Build LLVM
160160
run: |
161161
cd llvm-project
162162
mkdir build
163163
cd build
164-
cmake -G Ninja ${{ inputs.LLVM-ExtraCMakeArgs }} -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/llvm-project/clang/cmake/caches/HLSL.cmake -C ${{ github.workspace }}/HLSLTest/cmake/caches/sccache.cmake -DDXC_DIR=${{ github.workspace }}/DXC/build/bin -DLLVM_EXTERNAL_HLSLTEST_SOURCE_DIR=${{ github.workspace }}/HLSLTest -DLLVM_EXTERNAL_PROJECTS="HLSLTest" -DLLVM_LIT_ARGS="--xunit-xml-output=testresults.xunit.xml -v" -DHLSLTEST_TEST_CLANG=${{ inputs.Test-Clang }} -DGOLDENIMAGE_DIR=${{ github.workspace }}/golden-images ${{ github.workspace }}/llvm-project/llvm/
164+
cmake -G Ninja ${{ inputs.LLVM-ExtraCMakeArgs }} -DCMAKE_BUILD_TYPE=${{ inputs.BuildType }} -C ${{ github.workspace }}/llvm-project/clang/cmake/caches/HLSL.cmake -C ${{ github.workspace }}/OffloadTest/cmake/caches/sccache.cmake -DDXC_DIR=${{ github.workspace }}/DXC/build/bin -DLLVM_EXTERNAL_OFFLOADTEST_SOURCE_DIR=${{ github.workspace }}/OffloadTest -DLLVM_EXTERNAL_PROJECTS="OffloadTest" -DLLVM_LIT_ARGS="--xunit-xml-output=testresults.xunit.xml -v" -DOFFLOADTEST_TEST_CLANG=${{ inputs.Test-Clang }} -DGOLDENIMAGE_DIR=${{ github.workspace }}/golden-images ${{ github.workspace }}/llvm-project/llvm/
165165
ninja hlsl-test-depends
166166
- name: Run HLSL Tests
167167
run: |

.github/workflows/windows-intel-clang-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ jobs:
2121
SKU: GPU-Intel
2222
Test-Clang: On
2323
TestTarget: check-hlsl-clang-d3d12
24-
HLSLTest-branch: ${{ github.ref }}
24+
OffloadTest-branch: ${{ github.ref }}
2525
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

.github/workflows/windows-intel-clang-warp-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ jobs:
2121
SKU: GPU-Intel
2222
Test-Clang: On
2323
TestTarget: check-hlsl-clang-warp-d3d12
24-
HLSLTest-branch: ${{ github.ref }}
24+
OffloadTest-branch: ${{ github.ref }}
2525
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

.github/workflows/windows-intel-dxc-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
Test-Clang: Off
2323
BuildType: Debug
2424
TestTarget: check-hlsl-d3d12
25-
HLSLTest-branch: ${{ github.ref }}
25+
OffloadTest-branch: ${{ github.ref }}
2626
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

.github/workflows/windows-intel-dxc-vk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
Test-Clang: Off
2323
BuildType: Debug
2424
TestTarget: check-hlsl-vk
25-
HLSLTest-branch: ${{ github.ref }}
25+
OffloadTest-branch: ${{ github.ref }}
2626
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

.github/workflows/windows-intel-dxc-warp-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
Test-Clang: Off
2323
BuildType: Debug
2424
TestTarget: check-hlsl-warp-d3d12
25-
HLSLTest-branch: ${{ github.ref }}
25+
OffloadTest-branch: ${{ github.ref }}
2626
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

.github/workflows/windows-nv-clang-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ jobs:
1818
SKU: GPU-NV
1919
Test-Clang: On
2020
TestTarget: check-hlsl-clang-d3d12
21-
HLSLTest-branch: ${{ github.ref }}
21+
OffloadTest-branch: ${{ github.ref }}
2222
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

.github/workflows/windows-nv-clang-vk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ jobs:
1818
SKU: GPU-NV
1919
Test-Clang: On
2020
TestTarget: check-hlsl-clang-vk
21-
HLSLTest-branch: ${{ github.ref }}
21+
OffloadTest-branch: ${{ github.ref }}
2222
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

0 commit comments

Comments
 (0)