Rework PR jobs to use a matrix (#231)

llvm-beanz · web-flow · commit e4e6f0f5521a · 2025-06-11T11:07:06.000-05:00
This moves the PR workflows into a single matrix configuration which
allows for completely separate workflows from the scheduled jobs. This
fixes two problems with the PR workflows.

First it fixes the README files badges to only be based on scheduled
jobs. This will allow the red/green status badges to reflect the actual
state of main instead of the state of the last PR build.

Second, it uses concurrency groups to cancel in-progress runs for a pull
request if the PR is updated. This should reduce the load on the
builders when they are processing PRs with lots of updates.
diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
@@ -40,12 +40,6 @@ on:
         required: false
         default: 'check-hlsl'
         type: string
-      Test-Clang:
-        required: true
-        type: choice
-        options:
-        - On
-        - Off
       OS:
         required: true
         type: choice
@@ -97,10 +91,6 @@ on:
         required: false
         default: 'Release'
         type: string
-      Test-Clang:
-        required: false
-        default: 'On'
-        type: string
       TestTarget:
         required: false
         default: 'check-hlsl'
@@ -149,6 +139,11 @@ jobs:
         uses: llvm/actions/setup-windows@main
         with:
           arch: amd64
+      - name: Detect Clang
+        id: Test-Clang
+        shell: bash
+        if: contains(inputs.TestTarget, 'clang')
+        run: echo TEST_CLANG=On >> $GITHUB_OUTPUT
       - name: Build DXC
         run: |
             cd DXC
@@ -161,7 +156,7 @@ jobs:
             cd llvm-project
             mkdir build
             cd build
-            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/
+            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=${{steps.Test-Clang.outputs.TEST_CLANG || 'Off' }} -DGOLDENIMAGE_DIR=${{ github.workspace }}/golden-images ${{ github.workspace }}/llvm-project/llvm/
             ninja hlsl-test-depends
       - name: Run HLSL Tests
         run: |
diff --git a/.github/workflows/macos-clang-mtl.yaml b/.github/workflows/macos-clang-mtl.yaml
@@ -9,16 +9,11 @@ on:
   schedule:
     - cron: '*/30 * * * *' # run every 30 minutes
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   macOS-Metal-Clang:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: macOS
       SKU: macos
-      Test-Clang: On
       TestTarget: check-hlsl-clang-mtl
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
diff --git a/.github/workflows/macos-dxc-mtl.yaml b/.github/workflows/macos-dxc-mtl.yaml
@@ -9,16 +9,11 @@ on:
   schedule:
     - cron: '*/30 * * * *' # run every 30 minutes
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   macOS-Metal-DXC:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: macOS
       SKU: macos
-      Test-Clang: Off
       TestTarget: check-hlsl-mtl
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
diff --git a/.github/workflows/pr-matrix.yaml b/.github/workflows/pr-matrix.yaml
@@ -0,0 +1,44 @@
+name: Execution Testing
+
+permissions:
+  contents: read
+  checks: write
+
+on:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  Exec-Tests-Windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        SKU: [windows-intel]
+        TestTarget: [check-hlsl-d3d12, check-hlsl-warp-d3d12, check-hlsl-vk, check-hlsl-clang-d3d12, check-hlsl-clang-warp-d3d12, check-hlsl-clang-vk]
+
+    uses: ./.github/workflows/build-and-test-callable.yaml
+    with:
+      OS: windows
+      SKU: ${{ matrix.SKU }}
+      TestTarget: ${{ matrix.TestTarget }}
+      OffloadTest-branch: ${{ github.event.pull_request.head.sha }}
+      LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On
+
+  Exec-Tests-MacOS:
+    strategy:
+      fail-fast: false
+      matrix:
+        SKU: [macos]
+        TestTarget: [check-hlsl-mtl, check-hlsl-clang-mtl]
+
+    uses: ./.github/workflows/build-and-test-callable.yaml
+    with:
+      OS: macOS
+      SKU: ${{ matrix.SKU }}
+      TestTarget: ${{ matrix.TestTarget }}
+      OffloadTest-branch: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/windows-intel-clang-d3d12.yaml b/.github/workflows/windows-intel-clang-d3d12.yaml
@@ -9,17 +9,12 @@ on:
   schedule:
     - cron: '0 */2 * * *' # run every 2 hours
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   Windows-D3D12-Intel-Clang:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: On
       TestTarget: check-hlsl-clang-d3d12
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On
diff --git a/.github/workflows/windows-intel-clang-vk.yaml b/.github/workflows/windows-intel-clang-vk.yaml
@@ -9,17 +9,12 @@ on:
   schedule:
     - cron: '0 */2 * * *' # run every 2 hours
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   Windows-VK-Intel-Clang:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: On
       TestTarget: check-hlsl-clang-vk
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On
diff --git a/.github/workflows/windows-intel-clang-warp-d3d12.yaml b/.github/workflows/windows-intel-clang-warp-d3d12.yaml
@@ -9,17 +9,12 @@ on:
   schedule:
     - cron: '0 */2 * * *' # run every 2 hours
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   Windows-D3D12-Warp-Clang:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: On
       TestTarget: check-hlsl-clang-warp-d3d12
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On
diff --git a/.github/workflows/windows-intel-dxc-d3d12.yaml b/.github/workflows/windows-intel-dxc-d3d12.yaml
@@ -9,18 +9,13 @@ on:
   schedule:
     - cron: '0 * * * *' # run every 30 minutes
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   Windows-D3D12-Intel-DXC:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: Off
       BuildType: Debug
       TestTarget: check-hlsl-d3d12
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha }}
+      OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
diff --git a/.github/workflows/windows-intel-dxc-vk.yaml b/.github/workflows/windows-intel-dxc-vk.yaml
@@ -9,18 +9,13 @@ on:
   schedule:
     - cron: '0 */2 * * *' # run every 2 hours
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   Windows-VK-Intel-DXC:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: Off
       BuildType: Debug
       TestTarget: check-hlsl-vk
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
diff --git a/.github/workflows/windows-intel-dxc-warp-d3d12.yaml b/.github/workflows/windows-intel-dxc-warp-d3d12.yaml
@@ -9,18 +9,13 @@ on:
   schedule:
     - cron: '0 */2 * * *' # run every 2 hours
 
-  pull_request:
-    branches:
-      - main
-
 jobs:
   Windows-D3D12-Warp-DXC:
-    uses: ./.github/workflows/test-all.yaml
+    uses: ./.github/workflows/build-and-test-callable.yaml
     with:
       OS: windows
       SKU: windows-intel
-      Test-Clang: Off
       BuildType: Debug
       TestTarget: check-hlsl-warp-d3d12
-      OffloadTest-branch: ${{ github.event.pull_request.head.sha || github.ref }}
+      OffloadTest-branch: ${{ github.ref }}
       LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
