Skip to content

Commit 266bdd7

Browse files
IcohedronIcohedron
authored
Add windows-amd and windows-nvidia GitHub workflows for the two new machines (#313)
This PR duplicates the existing windows-intel github workflows to support the new windows-amd and windows-nvidia machines. windows-amd and windows-nvidia have also been added to the pr-matrix workflow SKUs for the Exec-Tests-Windows job. The WARP workflow has been changed to run solely on the AMD machine only.
1 parent 5f0f73d commit 266bdd7

14 files changed

+210
-7
lines changed

‎.github/workflows/build-and-test-callable.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ on:
5050
required: true
5151
type: choice
5252
options:
53-
- macOS
54-
- GPU-Intel
55-
- GPU-NV
53+
- macos
54+
- windows-amd
55+
- windows-intel
56+
- windows-nvidia
5657
LLVM-ExtraCMakeArgs:
5758
description: 'Extra CMake Args for LLVM'
5859
required: false

‎.github/workflows/pr-matrix.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,22 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
SKU: [windows-intel]
22-
TestTarget: [check-hlsl-d3d12, check-hlsl-warp-d3d12, check-hlsl-vk, check-hlsl-clang-d3d12, check-hlsl-clang-warp-d3d12, check-hlsl-clang-vk]
22+
TestTarget: [check-hlsl-d3d12, check-hlsl-vk, check-hlsl-clang-d3d12, check-hlsl-clang-vk]
23+
24+
uses: ./.github/workflows/build-and-test-callable.yaml
25+
with:
26+
OS: windows
27+
SKU: ${{ matrix.SKU }}
28+
TestTarget: ${{ matrix.TestTarget }}
29+
OffloadTest-branch: ${{ github.event.pull_request.head.sha }}
30+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On
31+
32+
Exec-Tests-Windows-Warp:
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
SKU: [windows-amd]
37+
TestTarget: [check-hlsl-warp-d3d12, check-hlsl-clang-warp-d3d12]
2338

2439
uses: ./.github/workflows/build-and-test-callable.yaml
2540
with:

‎.github/workflows/windows-amd-clang-d3d12.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Windows D3D12 AMD Clang
2+
3+
permissions:
4+
contents: read
5+
checks: write
6+
7+
on:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 */2 * * *' # run every 2 hours
11+
12+
jobs:
13+
Windows-D3D12-AMD-Clang:
14+
uses: ./.github/workflows/build-and-test-callable.yaml
15+
with:
16+
OS: windows
17+
SKU: windows-amd
18+
TestTarget: check-hlsl-clang-d3d12
19+
OffloadTest-branch: ${{ github.ref }}
20+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

‎.github/workflows/windows-amd-clang-vk.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Windows Vulkan AMD Clang
2+
3+
permissions:
4+
contents: read
5+
checks: write
6+
7+
on:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 */2 * * *' # run every 2 hours
11+
12+
jobs:
13+
Windows-VK-AMD-Clang:
14+
uses: ./.github/workflows/build-and-test-callable.yaml
15+
with:
16+
OS: windows
17+
SKU: windows-amd
18+
TestTarget: check-hlsl-clang-vk
19+
OffloadTest-branch: ${{ github.ref }}
20+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

‎.github/workflows/windows-intel-clang-warp-d3d12.yaml renamed to ‎.github/workflows/windows-amd-clang-warp-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: ./.github/workflows/build-and-test-callable.yaml
1515
with:
1616
OS: windows
17-
SKU: windows-intel
17+
SKU: windows-amd
1818
TestTarget: check-hlsl-clang-warp-d3d12
1919
OffloadTest-branch: ${{ github.ref }}
2020
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

‎.github/workflows/windows-amd-dxc-d3d12.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Windows D3D12 AMD DXC
2+
3+
permissions:
4+
contents: read
5+
checks: write
6+
7+
on:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 * * * *' # run every 30 minutes
11+
12+
jobs:
13+
Windows-D3D12-AMD-DXC:
14+
uses: ./.github/workflows/build-and-test-callable.yaml
15+
with:
16+
OS: windows
17+
SKU: windows-amd
18+
BuildType: Debug
19+
TestTarget: check-hlsl-d3d12
20+
OffloadTest-branch: ${{ github.ref }}
21+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

‎.github/workflows/windows-amd-dxc-vk.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Windows Vulkan AMD DXC
2+
3+
permissions:
4+
contents: read
5+
checks: write
6+
7+
on:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 */2 * * *' # run every 2 hours
11+
12+
jobs:
13+
Windows-VK-AMD-DXC:
14+
uses: ./.github/workflows/build-and-test-callable.yaml
15+
with:
16+
OS: windows
17+
SKU: windows-amd
18+
BuildType: Debug
19+
TestTarget: check-hlsl-vk
20+
OffloadTest-branch: ${{ github.ref }}
21+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl

‎.github/workflows/windows-intel-dxc-warp-d3d12.yaml renamed to ‎.github/workflows/windows-amd-dxc-warp-d3d12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: ./.github/workflows/build-and-test-callable.yaml
1515
with:
1616
OS: windows
17-
SKU: windows-intel
17+
SKU: windows-amd
1818
BuildType: Debug
1919
TestTarget: check-hlsl-warp-d3d12
2020
OffloadTest-branch: ${{ github.ref }}

‎.github/workflows/windows-nvidia-clang-d3d12.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Windows D3D12 NVIDIA Clang
2+
3+
permissions:
4+
contents: read
5+
checks: write
6+
7+
on:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 */2 * * *' # run every 2 hours
11+
12+
jobs:
13+
Windows-D3D12-NVIDIA-Clang:
14+
uses: ./.github/workflows/build-and-test-callable.yaml
15+
with:
16+
OS: windows
17+
SKU: windows-nvidia
18+
TestTarget: check-hlsl-clang-d3d12
19+
OffloadTest-branch: ${{ github.ref }}
20+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

‎.github/workflows/windows-nvidia-clang-vk.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Windows Vulkan NVIDIA Clang
2+
3+
permissions:
4+
contents: read
5+
checks: write
6+
7+
on:
8+
workflow_dispatch:
9+
schedule:
10+
- cron: '0 */2 * * *' # run every 2 hours
11+
12+
jobs:
13+
Windows-VK-NVIDIA-Clang:
14+
uses: ./.github/workflows/build-and-test-callable.yaml
15+
with:
16+
OS: windows
17+
SKU: windows-nvidia
18+
TestTarget: check-hlsl-clang-vk
19+
OffloadTest-branch: ${{ github.ref }}
20+
LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On

0 commit comments

Comments
 (0)