diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 98aa60af4a..865aef4c49 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ stages: - stage: Build jobs: - job: Windows - timeoutInMinutes: 165 + timeoutInMinutes: 180 pool: vmImage: windows-2022 @@ -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 diff --git a/tools/clang/test/CMakeLists.txt b/tools/clang/test/CMakeLists.txt index 438105b2eb..7b7422649c 100644 --- a/tools/clang/test/CMakeLists.txt +++ b/tools/clang/test/CMakeLists.txt @@ -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 diff --git a/utils/hct/hcttest.cmd b/utils/hct/hcttest.cmd index 705bc0ef89..7dd36bdffc 100644 --- a/utils/hct/hcttest.cmd +++ b/utils/hct/hcttest.cmd @@ -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 @@ -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" ( @@ -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.