From 424386cad1036b36250ac3ca9e9176c286ce68e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 12:06:26 -0700
Subject: [PATCH 01/20] test dxdiag on pipeline

---
 .github/workflows/build-and-test-callable.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 8c8012e5e..9351b0e2d 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -106,7 +106,21 @@ jobs:
     permissions:
       checks: write
     runs-on: [self-hosted, "hlsl-${{ inputs.SKU }}"]
+
     steps:
+      - name: Run dxdiag (Windows only)
+        if: inputs.OS == 'windows'
+        shell: pwsh
+        run: |
+          $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
+          dxdiag /t $output
+          Write-Host "DxDiag report saved to $output"
+      - name: Upload dxdiag result (Windows only)
+        if: inputs.OS == 'windows'
+        uses: actions/upload-artifact@v4
+        with:
+          name: dxdiag-report
+          path: ${{ runner.temp }}/dxdiag.txt
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

From d65eef69cc7d73c241d283dc8e9abfc3e1fcb2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 12:10:27 -0700
Subject: [PATCH 02/20] add variable

---
 .github/workflows/build-and-test-callable.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 9351b0e2d..50304d0d6 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -109,14 +109,14 @@ jobs:
 
     steps:
       - name: Run dxdiag (Windows only)
-        if: inputs.OS == 'windows'
+        if: inputs.OS == 'windows' && vars.RUN_DXDIAG == 'true'
         shell: pwsh
         run: |
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
       - name: Upload dxdiag result (Windows only)
-        if: inputs.OS == 'windows'
+        if: inputs.OS == 'windows' && vars.RUN_DXDIAG == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: dxdiag-report

From 57572a595c40e0a16559c636ee691f5f883a0082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 12:27:09 -0700
Subject: [PATCH 03/20] use workflow dispatch instead

---
 .github/workflows/build-and-test-callable.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 50304d0d6..6b2222c97 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -58,6 +58,11 @@ on:
         required: false
         default: ''
         type: string
+          inputs:
+      run_dxdiag:
+        description: "Run dxdiag"
+        required: true
+        default: "true"
   workflow_call:
     inputs:
       OffloadTest-branch:
@@ -109,14 +114,14 @@ jobs:
 
     steps:
       - name: Run dxdiag (Windows only)
-        if: inputs.OS == 'windows' && vars.RUN_DXDIAG == 'true'
+        if: inputs.OS == 'windows' && inputs.run_dxdiag == 'true'
         shell: pwsh
         run: |
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
       - name: Upload dxdiag result (Windows only)
-        if: inputs.OS == 'windows' && vars.RUN_DXDIAG == 'true'
+        if: inputs.OS == 'windows' && inputs.run_dxdiag == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: dxdiag-report

From 1151a1606dd94aca020e6a4fe6547d43c56fb2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 12:34:03 -0700
Subject: [PATCH 04/20] fix error

---
 .github/workflows/build-and-test-callable.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 6b2222c97..a193c7ad3 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -58,7 +58,6 @@ on:
         required: false
         default: ''
         type: string
-          inputs:
       run_dxdiag:
         description: "Run dxdiag"
         required: true

From a343410c3e5592df7167adc96fa5757678ffc459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 13:54:38 -0700
Subject: [PATCH 05/20] test

---
 .github/workflows/build-and-test-callable.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index a193c7ad3..7aa3a014b 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -61,7 +61,7 @@ on:
       run_dxdiag:
         description: "Run dxdiag"
         required: true
-        default: "true"
+        default: true
   workflow_call:
     inputs:
       OffloadTest-branch:
@@ -113,14 +113,14 @@ jobs:
 
     steps:
       - name: Run dxdiag (Windows only)
-        if: inputs.OS == 'windows' && inputs.run_dxdiag == 'true'
+        if: inputs.OS == windows
         shell: pwsh
         run: |
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
       - name: Upload dxdiag result (Windows only)
-        if: inputs.OS == 'windows' && inputs.run_dxdiag == 'true'
+        if: inputs.OS == windows
         uses: actions/upload-artifact@v4
         with:
           name: dxdiag-report

From 977580e50d21ad8d4c278a841709f4bb1b0dc98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 14:07:23 -0700
Subject: [PATCH 06/20] fix typo

---
 .github/workflows/build-and-test-callable.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 7aa3a014b..06ad999b1 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -113,14 +113,14 @@ jobs:
 
     steps:
       - name: Run dxdiag (Windows only)
-        if: inputs.OS == windows
+        if: inputs.OS == 'windows'
         shell: pwsh
         run: |
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
       - name: Upload dxdiag result (Windows only)
-        if: inputs.OS == windows
+        if: inputs.OS == 'windows'
         uses: actions/upload-artifact@v4
         with:
           name: dxdiag-report

From c2a10a9cf7af88bd94ca7f7d262fc741e79ade9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 14:45:36 -0700
Subject: [PATCH 07/20] change shell

---
 .github/workflows/build-and-test-callable.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 06ad999b1..9cd4cdebd 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -60,7 +60,7 @@ on:
         type: string
       run_dxdiag:
         description: "Run dxdiag"
-        required: true
+        required: false
         default: true
   workflow_call:
     inputs:
@@ -114,7 +114,7 @@ jobs:
     steps:
       - name: Run dxdiag (Windows only)
         if: inputs.OS == 'windows'
-        shell: pwsh
+        shell: powershell
         run: |
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output

From c84f33fa5783046776b287d844d8219382acdba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 15:16:44 -0700
Subject: [PATCH 08/20] add workspace copy

---
 .github/workflows/build-and-test-callable.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 9cd4cdebd..79e13b951 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -119,12 +119,17 @@ jobs:
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
-      - name: Upload dxdiag result (Windows only)
+      - name: Copy dxdiag to workspace
+        if: inputs.OS == 'windows'
+        shell: powershell
+        run: Copy-Item $env:RUNNER_TEMP\dxdiag.txt "$env:GITHUB_WORKSPACE\dxdiag.txt"
+
+      - name: Upload dxdiag artifact
         if: inputs.OS == 'windows'
         uses: actions/upload-artifact@v4
         with:
           name: dxdiag-report
-          path: ${{ runner.temp }}/dxdiag.txt
+          path: dxdiag.txt
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

From 3f146c0287fa7aa64a5d021b654e2eb597aa79b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 15:50:57 -0700
Subject: [PATCH 09/20] remove copy

---
 .github/workflows/build-and-test-callable.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 79e13b951..3f6be0a18 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -119,10 +119,6 @@ jobs:
           $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
-      - name: Copy dxdiag to workspace
-        if: inputs.OS == 'windows'
-        shell: powershell
-        run: Copy-Item $env:RUNNER_TEMP\dxdiag.txt "$env:GITHUB_WORKSPACE\dxdiag.txt"
 
       - name: Upload dxdiag artifact
         if: inputs.OS == 'windows'

From 200f1ecf3a24b31bed2776f96f474442893debdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 16:12:30 -0700
Subject: [PATCH 10/20] change filename

---
 .github/workflows/build-and-test-callable.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 3f6be0a18..f968493fc 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -116,7 +116,8 @@ jobs:
         if: inputs.OS == 'windows'
         shell: powershell
         run: |
-          $output = Join-Path $env:RUNNER_TEMP "dxdiag.txt"
+          $fileName = "dxdiag-${{ inputs.SKU }}.txt"
+          $output = Join-Path $env:RUNNER_TEMP $fileName
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
 

From 8283131da3cb891eba1f3c54b07ec5632bfcfe27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 18:56:33 -0700
Subject: [PATCH 11/20] change filename

---
 .github/workflows/build-and-test-callable.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index f968493fc..bc74a38f4 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -126,7 +126,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: dxdiag-report
-          path: dxdiag.txt
+          path: dxdiag-${{ inputs.SKU }}.txt
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

From 4f3d8559502eb62978273639c31aa4fea8dafc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 19:11:34 -0700
Subject: [PATCH 12/20] fix path copy logic

---
 .github/workflows/build-and-test-callable.yaml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index bc74a38f4..649d0e44c 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -62,6 +62,7 @@ on:
         description: "Run dxdiag"
         required: false
         default: true
+        type: boolean  
   workflow_call:
     inputs:
       OffloadTest-branch:
@@ -104,29 +105,32 @@ on:
         required: false
         default: ''
         type: string
+      run_dxdiag:                   
+        description: "Run dxdiag"
+        required: false
+        default: true
+        type: boolean
 
 jobs:
   build:
     permissions:
       checks: write
     runs-on: [self-hosted, "hlsl-${{ inputs.SKU }}"]
-
     steps:
       - name: Run dxdiag (Windows only)
-        if: inputs.OS == 'windows'
+        if: inputs.OS == 'windows' && inputs.run_dxdiag 
         shell: powershell
         run: |
           $fileName = "dxdiag-${{ inputs.SKU }}.txt"
           $output = Join-Path $env:RUNNER_TEMP $fileName
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
-
       - name: Upload dxdiag artifact
-        if: inputs.OS == 'windows'
+        if: inputs.OS == 'windows' && inputs.run_dxdiag 
         uses: actions/upload-artifact@v4
         with:
-          name: dxdiag-report
-          path: dxdiag-${{ inputs.SKU }}.txt
+          name: dxdiag-${{ inputs.SKU }}-${{ inputs.BuildType }} 
+          path: ${{ runner.temp }}/dxdiag-${{ inputs.SKU }}.txt 
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

From a474c4a9fbc8a766ba64602f62f6430550462201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 22:50:36 -0700
Subject: [PATCH 13/20] change uniq id

---
 .github/workflows/build-and-test-callable.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 649d0e44c..4991b5950 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -129,7 +129,7 @@ jobs:
         if: inputs.OS == 'windows' && inputs.run_dxdiag 
         uses: actions/upload-artifact@v4
         with:
-          name: dxdiag-${{ inputs.SKU }}-${{ inputs.BuildType }} 
+          name: dxdiag-${{ inputs.SKU }}-${{ github.run_id }}
           path: ${{ runner.temp }}/dxdiag-${{ inputs.SKU }}.txt 
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

From 0e0189c9a13f56039d98fbdb0941ec7415e34c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 22:51:10 -0700
Subject: [PATCH 14/20] change defaults to false

---
 .github/workflows/build-and-test-callable.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 4991b5950..f6ecb1f57 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -61,7 +61,7 @@ on:
       run_dxdiag:
         description: "Run dxdiag"
         required: false
-        default: true
+        default: false
         type: boolean  
   workflow_call:
     inputs:
@@ -108,7 +108,7 @@ on:
       run_dxdiag:                   
         description: "Run dxdiag"
         required: false
-        default: true
+        default: false
         type: boolean
 
 jobs:

From b80fd5595bf145534ceda9f8ccfb866c2e5fd450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 22:59:09 -0700
Subject: [PATCH 15/20] check if diag already exists

---
 .../workflows/build-and-test-callable.yaml    | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index f6ecb1f57..3a85218f3 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -61,7 +61,7 @@ on:
       run_dxdiag:
         description: "Run dxdiag"
         required: false
-        default: false
+        default: true
         type: boolean  
   workflow_call:
     inputs:
@@ -108,7 +108,7 @@ on:
       run_dxdiag:                   
         description: "Run dxdiag"
         required: false
-        default: false
+        default: true
         type: boolean
 
 jobs:
@@ -125,12 +125,23 @@ jobs:
           $output = Join-Path $env:RUNNER_TEMP $fileName
           dxdiag /t $output
           Write-Host "DxDiag report saved to $output"
+      - name: Check if dxdiag report exists
+        id: check_dxdiag
+        if: inputs.OS == 'windows' && inputs.run_dxdiag
+        shell: powershell
+        run: |
+          $filePath = Join-Path $env:RUNNER_TEMP "dxdiag-${{ inputs.SKU }}.txt"
+          if (Test-Path $filePath) {
+            echo "exists=true" >> $env:GITHUB_OUTPUT
+          } else {
+            echo "exists=false" >> $env:GITHUB_OUTPUT
+          }
       - name: Upload dxdiag artifact
-        if: inputs.OS == 'windows' && inputs.run_dxdiag 
+        if: inputs.OS == 'windows' && inputs.run_dxdiag && steps.check_dxdiag.outputs.exists == 'true'
         uses: actions/upload-artifact@v4
         with:
-          name: dxdiag-${{ inputs.SKU }}-${{ github.run_id }}
-          path: ${{ runner.temp }}/dxdiag-${{ inputs.SKU }}.txt 
+          name: dxdiag-${{ inputs.SKU }}
+          path: ${{ runner.temp }}/dxdiag-${{ inputs.SKU }}.txt
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

From a7dd1079f8faf7b65d9a9725fe345b007efd35a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Wed, 1 Apr 2026 22:59:50 -0700
Subject: [PATCH 16/20] move back to false

---
 .github/workflows/build-and-test-callable.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 3a85218f3..013d3852b 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -61,7 +61,7 @@ on:
       run_dxdiag:
         description: "Run dxdiag"
         required: false
-        default: true
+        default: false
         type: boolean  
   workflow_call:
     inputs:
@@ -108,7 +108,7 @@ on:
       run_dxdiag:                   
         description: "Run dxdiag"
         required: false
-        default: true
+        default: false
         type: boolean
 
 jobs:

From e1854f895dfeb7ad0e25bb28f383e75c2d4f5702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Thu, 2 Apr 2026 10:53:10 -0700
Subject: [PATCH 17/20] address comments from damyan

---
 .../workflows/build-and-test-callable.yaml    | 63 ++++++++-----------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 013d3852b..e63685056 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -58,11 +58,6 @@ on:
         required: false
         default: ''
         type: string
-      run_dxdiag:
-        description: "Run dxdiag"
-        required: false
-        default: false
-        type: boolean  
   workflow_call:
     inputs:
       OffloadTest-branch:
@@ -105,43 +100,13 @@ on:
         required: false
         default: ''
         type: string
-      run_dxdiag:                   
-        description: "Run dxdiag"
-        required: false
-        default: false
-        type: boolean
-
 jobs:
   build:
     permissions:
       checks: write
     runs-on: [self-hosted, "hlsl-${{ inputs.SKU }}"]
     steps:
-      - name: Run dxdiag (Windows only)
-        if: inputs.OS == 'windows' && inputs.run_dxdiag 
-        shell: powershell
-        run: |
-          $fileName = "dxdiag-${{ inputs.SKU }}.txt"
-          $output = Join-Path $env:RUNNER_TEMP $fileName
-          dxdiag /t $output
-          Write-Host "DxDiag report saved to $output"
-      - name: Check if dxdiag report exists
-        id: check_dxdiag
-        if: inputs.OS == 'windows' && inputs.run_dxdiag
-        shell: powershell
-        run: |
-          $filePath = Join-Path $env:RUNNER_TEMP "dxdiag-${{ inputs.SKU }}.txt"
-          if (Test-Path $filePath) {
-            echo "exists=true" >> $env:GITHUB_OUTPUT
-          } else {
-            echo "exists=false" >> $env:GITHUB_OUTPUT
-          }
-      - name: Upload dxdiag artifact
-        if: inputs.OS == 'windows' && inputs.run_dxdiag && steps.check_dxdiag.outputs.exists == 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: dxdiag-${{ inputs.SKU }}
-          path: ${{ runner.temp }}/dxdiag-${{ inputs.SKU }}.txt
+  
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
@@ -217,6 +182,32 @@ jobs:
         with:
           comment_mode: off
           files: llvm-project/build/**/testresults.xunit.xml
+      - name: Run dxdiag (Windows only)
+        if: inputs.OS == 'windows' && failure()
+        shell: powershell
+        run: |
+          $fileName = "dxdiag.txt"
+          $output = Join-Path $env:RUNNER_TEMP $fileName
+          dxdiag /t $output
+          
+          $timeout = 60
+          $elapsed = 0
+          Write-Host "Waiting for dxdiag to finish..."
+          while (-not (Test-Path $output) -or (Get-Item $output).Length -eq 0) {
+            if ($elapsed -ge $timeout) {
+              Write-Error "Timed out waiting for dxdiag to produce $output"
+              exit 1
+            }
+            Start-Sleep -Seconds 2
+            $elapsed += 2
+          }
+          Write-Host "DxDiag report saved to $output"
+      - name: Upload dxdiag artifact
+        if: inputs.OS == 'windows' && failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: dxdiag-${{ inputs.SKU }}-${{inputs.TestTarget}}.txt
+          path: ${{ runner.temp }}/dxdiag.txt
       #- name: Publish Test Results
       #  uses: EnricoMi/publish-unit-test-result-action/windows@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
       #  if: always() && inputs.OS == 'windows'

From c080556a990832ad6c4a7a7ee50ddd4aaee1f5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Thu, 2 Apr 2026 10:53:43 -0700
Subject: [PATCH 18/20] format

---
 .github/workflows/build-and-test-callable.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index e63685056..fc3debcf8 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -100,6 +100,7 @@ on:
         required: false
         default: ''
         type: string
+
 jobs:
   build:
     permissions:

From 9524e9a1a12daf808a34a4d0054843a9abf543b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Thu, 2 Apr 2026 10:54:28 -0700
Subject: [PATCH 19/20] fix spaces

---
 .github/workflows/build-and-test-callable.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index fc3debcf8..9d69474c5 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -107,7 +107,6 @@ jobs:
       checks: write
     runs-on: [self-hosted, "hlsl-${{ inputs.SKU }}"]
     steps:
-  
       - name: Checkout DXC
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:

From 5215f7741d7e706e36dacaf6245ba40dddbb1562 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Saffran?= <joaosaffranllvm@gmail.com>
Date: Thu, 2 Apr 2026 11:26:38 -0700
Subject: [PATCH 20/20] simplify dxdiag await logic

---
 .github/workflows/build-and-test-callable.yaml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-test-callable.yaml b/.github/workflows/build-and-test-callable.yaml
index 9d69474c5..f9a543822 100644
--- a/.github/workflows/build-and-test-callable.yaml
+++ b/.github/workflows/build-and-test-callable.yaml
@@ -188,19 +188,7 @@ jobs:
         run: |
           $fileName = "dxdiag.txt"
           $output = Join-Path $env:RUNNER_TEMP $fileName
-          dxdiag /t $output
-          
-          $timeout = 60
-          $elapsed = 0
-          Write-Host "Waiting for dxdiag to finish..."
-          while (-not (Test-Path $output) -or (Get-Item $output).Length -eq 0) {
-            if ($elapsed -ge $timeout) {
-              Write-Error "Timed out waiting for dxdiag to produce $output"
-              exit 1
-            }
-            Start-Sleep -Seconds 2
-            $elapsed += 2
-          }
+          dxdiag /t $output | Out-Null
           Write-Host "DxDiag report saved to $output"
       - name: Upload dxdiag artifact
         if: inputs.OS == 'windows' && failure()