Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:
- stage: Build
jobs:
- job: Windows
timeoutInMinutes: 165
timeoutInMinutes: 180

pool:
vmImage: windows-2022
Expand Down Expand Up @@ -48,19 +48,24 @@ stages:
displayName: 'DXIL Execution Tests'
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.6
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.6.2112
displayName: 'DXIL Compat Suite Tests (1.6 release)'
condition: succeededOrFailed()
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.7
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.7.2308
displayName: 'DXIL Compat Suite Tests (1.7 release)'
condition: succeededOrFailed()
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
call utils\hct\hcttest.cmd -$(configuration) compat-suite 1.8
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.8.2502
displayName: 'DXIL Compat Suite Tests (1.8 release)'
condition: succeededOrFailed()
- script: |
call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
call utils\hct\hcttest.cmd -$(configuration) compat-suite v1.8.2505.1
displayName: 'DXIL Compat Suite Tests (1.8 point release)'
condition: succeededOrFailed()


- job: Nix
Expand Down
1 change: 1 addition & 0 deletions tools/clang/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")

# Define DXC releases as (NAME VERSION) pairs
set(DXC_RELEASES
dxc_2025_07_14 v1.8.2505.1
dxc_2025_02_20 v1.8.2502
dxc_2023_08_14 v1.7.2308
dxc_2021_12_08 v1.6.2112
Expand Down
19 changes: 12 additions & 7 deletions utils/hct/hcttest.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -334,18 +334,22 @@ if "%TEST_USE_LIT%"=="1" (
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-clang
set RES_CLANG=!ERRORLEVEL!
)
if "!TEST_COMPAT_SUITE!"=="1.6" (
if "!TEST_COMPAT_SUITE!"=="v1.6.2112" (
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2021_12_08
set RES_COMPAT_1_6=!ERRORLEVEL!
)
if "!TEST_COMPAT_SUITE!"=="1.7" (
if "!TEST_COMPAT_SUITE!"=="v1.7.2308" (
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2023_08_14
set RES_COMPAT_1_7=!ERRORLEVEL!
)
if "!TEST_COMPAT_SUITE!"=="1.8" (
if "!TEST_COMPAT_SUITE!"=="v1.8.2502" (
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2025_02_20
set RES_COMPAT_1_8=!ERRORLEVEL!
)
if "!TEST_COMPAT_SUITE!"=="v1.8.2505.1" (
cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilcompat-dxc_2025_07_14
set RES_COMPAT_1_8_POINT=!ERRORLEVEL!
)
if "!TEST_EXEC!"=="1" (
if defined EXEC_ADAPTER (
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
Expand Down Expand Up @@ -512,9 +516,10 @@ if "%TEST_EXEC%"=="1" (
call :check_result "hcttest-extras tests" %RES_EXTRAS%
call :check_result "hcttest-after script" %RES_HCTTEST_AFTER%
call :check_result "dxilconv tests" %RES_DXILCONV%
call :check_result "compat-suite 1.6 tests" %RES_COMPAT_1_6%
call :check_result "compat-suite 1.7 tests" %RES_COMPAT_1_7%
call :check_result "compat-suite 1.8 tests" %RES_COMPAT_1_8%
call :check_result "compat-suite v1.6.2112 tests" %RES_COMPAT_1_6%
call :check_result "compat-suite v1.7.2308 tests" %RES_COMPAT_1_7%
call :check_result "compat-suite v1.8.2502 tests" %RES_COMPAT_1_8%
call :check_result "compat-suite v1.8.2505.1 tests" %RES_COMPAT_1_8_POINT%

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