Skip to content

Commit 8efdb17

Browse files
authored
[Validation] Add 2025_07_14 release to validation back-compat test rotation (#8067)
This PR adds the latest point release, based on DXIL version 1.8, to the test rotation of older validators with which to test new compilers. Hcttest.cmd needs to be updated in how it handles arguments to compat-suite, since there may be multiple releases based on the same DXIL version with which we want to test new compilers against. Instead, compat-suite takes the date of the released validator. (E.g, 2025_02_20 and 2025_07_14 are both based on DXIL version 1.8)
1 parent ab0c968 commit 8efdb17

3 files changed

Lines changed: 22 additions & 11 deletions

File tree

azure-pipelines.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stages:
1313
- stage: Build
1414
jobs:
1515
- job: Windows
16-
timeoutInMinutes: 165
16+
timeoutInMinutes: 180
1717

1818
pool:
1919
vmImage: windows-2022
@@ -48,19 +48,24 @@ stages:
4848
displayName: 'DXIL Execution Tests'
4949
- script: |
5050
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
51-
call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.6
51+
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.6.2112
5252
displayName: 'DXIL Compat Suite Tests (1.6 release)'
5353
condition: succeededOrFailed()
5454
- script: |
5555
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
56-
call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.7
56+
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.7.2308
5757
displayName: 'DXIL Compat Suite Tests (1.7 release)'
5858
condition: succeededOrFailed()
5959
- script: |
6060
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
61-
call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.8
61+
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.8.2502
6262
displayName: 'DXIL Compat Suite Tests (1.8 release)'
6363
condition: succeededOrFailed()
64+
- script: |
65+
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
66+
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.8.2505.1
67+
displayName: 'DXIL Compat Suite Tests (1.8 point release)'
68+
condition: succeededOrFailed()
6469
6570
6671
- job: Nix

tools/clang/test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")
120120

121121
# Define DXC releases as (NAME VERSION) pairs
122122
set(DXC_RELEASES
123+
dxc_2025_07_14 v1.8.2505.1
123124
dxc_2025_02_20 v1.8.2502
124125
dxc_2023_08_14 v1.7.2308
125126
dxc_2021_12_08 v1.6.2112

utils/hct/hcttest.cmd

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -334,18 +334,22 @@ if "%TEST_USE_LIT%"=="1" (
334334
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-clang
335335
set RES_CLANG=!ERRORLEVEL!
336336
)
337-
if "!TEST_COMPAT_SUITE!"=="1.6" (
337+
if "!TEST_COMPAT_SUITE!"=="v1.6.2112" (
338338
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2021_12_08
339339
set RES_COMPAT_1_6=!ERRORLEVEL!
340340
)
341-
if "!TEST_COMPAT_SUITE!"=="1.7" (
341+
if "!TEST_COMPAT_SUITE!"=="v1.7.2308" (
342342
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2023_08_14
343343
set RES_COMPAT_1_7=!ERRORLEVEL!
344344
)
345-
if "!TEST_COMPAT_SUITE!"=="1.8" (
345+
if "!TEST_COMPAT_SUITE!"=="v1.8.2502" (
346346
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2025_02_20
347347
set RES_COMPAT_1_8=!ERRORLEVEL!
348348
)
349+
if "!TEST_COMPAT_SUITE!"=="v1.8.2505.1" (
350+
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2025_07_14
351+
set RES_COMPAT_1_8_POINT=!ERRORLEVEL!
352+
)
349353
if "!TEST_EXEC!"=="1" (
350354
if defined EXEC_ADAPTER (
351355
py %HLSL_SRC_DIR%/utils/lit/lit.py -v --no-progress-bar --param build_mode=%BUILD_CONFIG% --param clang_site_config=%HLSL_BLD_DIR%/tools/clang/test/lit.site.cfg --param clang_taef_exec_site_config=%HLSL_BLD_DIR%/tools/clang/test/taef_exec/lit.site.cfg %EXEC_ADAPTER% %HLSL_SRC_DIR%/tools/clang/test/taef_exec
@@ -512,9 +516,10 @@ if "%TEST_EXEC%"=="1" (
512516
call :check_result "hcttest-extras tests" %RES_EXTRAS%
513517
call :check_result "hcttest-after script" %RES_HCTTEST_AFTER%
514518
call :check_result "dxilconv tests" %RES_DXILCONV%
515-
call :check_result "compat-suite 1.6 tests" %RES_COMPAT_1_6%
516-
call :check_result "compat-suite 1.7 tests" %RES_COMPAT_1_7%
517-
call :check_result "compat-suite 1.8 tests" %RES_COMPAT_1_8%
519+
call :check_result "compat-suite v1.6.2112 tests" %RES_COMPAT_1_6%
520+
call :check_result "compat-suite v1.7.2308 tests" %RES_COMPAT_1_7%
521+
call :check_result "compat-suite v1.8.2502 tests" %RES_COMPAT_1_8%
522+
call :check_result "compat-suite v1.8.2505.1 tests" %RES_COMPAT_1_8_POINT%
518523

519524
set EXIT_CODE=%TESTS_FAILED%
520525
if not "%TESTS_PASSED%"=="0" (
@@ -564,7 +569,7 @@ echo clang - run clang tests.
564569
echo file-check - run file-check test on single file.
565570
echo - hcttest file-check "..\CodeGenHLSL\shader-compat-suite\lib_arg_flatten\lib_arg_flatten.hlsl"
566571
echo compat-suite - run compat-suite test.
567-
echo - hcttest compat-suite ^(1.6 ^| 1.7 ^| 1.8^)
572+
echo - hcttest compat-suite ^(v1.6.2112 ^| v1.7.2308 ^| v1.8.2505 ^| v1.8.2505.1^)
568573
echo cmd - run command line tool tests.
569574
echo dxilconv - run dxilconv tests
570575
echo v - run the subset of clang tests that are verified-based.

0 commit comments

Comments
 (0)