Enable lit by default on pipeline (#4993)

Enable lit by default in azure pipeline.

-disable-lit is set for appveyor because the output for taef changed.

appveyor.yml

@@ -38,14 +38,14 @@ before_build:
 - cmd: call utils\hct\hctstart %HLSL_SRC_DIR% %HLSL_BLD_DIR%
 
 build_script:
-- cmd: call utils\hct\hctbuild -%PLATFORM% -%CONFIGURATION% -show-cmake-log -spirvtest
+- cmd: call utils\hct\hctbuild -%PLATFORM% -%CONFIGURATION% -show-cmake-log -spirvtest -disable-lit
 - sh: mkdir build && cd build
 - sh: cmake .. -GNinja -C ../cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS=-Werror
 - sh: ninja
 
 test_script:
 - ps:  utils\appveyor\appveyor_test.ps1
-- cmd: call utils\hct\hcttest -rel spirv_only
+- cmd: call utils\hct\hcttest -rel spirv_only -disable-lit
 - sh: ./bin/dxc --help
 - sh: ./bin/dxc -T ps_6_0 ../tools/clang/test/CodeGenSPIRV/passthru-ps.hlsl2spv
 - sh: ./bin/dxc -T ps_6_0 -Fo passthru-ps.dxil ../tools/clang/test/CodeGenSPIRV/passthru-ps.hlsl2spv

azure-pipelines.yml

@@ -28,15 +28,15 @@ stages:
       submodules: true
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
-        call utils\hct\hctbuild.cmd -$(platform) -$(configuration) -show-cmake-log -spirvtest
+        call utils\hct\hctbuild.cmd -$(platform) -$(configuration) -show-cmake-log -spirvtest -enable-lit
       displayName: 'Building'
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
-        call utils\hct\hcttest.cmd -$(configuration) noexec
+        call utils\hct\hcttest.cmd -$(configuration) noexec -enable-lit
       displayName: 'DXIL Tests'
     - script: |
         call utils\hct\hctstart.cmd %HLSL_SRC_DIR% %HLSL_BLD_DIR%
-        call utils\hct\hcttest.cmd -$(configuration) spirv_only
+        call utils\hct\hcttest.cmd -$(configuration) spirv_only -enable-lit
       displayName: 'SPIRV Tests'
 
   - job: Nix

tools/clang/test/HLSLFileCheck/hlsl/resource_binding/resource_cleanup.hlsl

@@ -4,7 +4,7 @@
 // dxil.
 
 // CHECK-LABEL: ; Buffer Definitions:
-// CHECK-NOT: cb1 
+// CHECK-NOT: CB1            cb1
 
 cbuffer BAR {
   float bar;

utils/hct/hctbuild.cmd

@@ -42,6 +42,7 @@ set SPV_TEST=OFF
 set DXILCONV=ON
 set DXC_CMAKE_SYSTEM_VERSION=
 set SHOW_CMAKE_LOG=0
+set ENABLE_LIT=OFF
 set WINSDK_MIN_VERSION=10.0.17763.0
 
 :parse_args
@@ -187,9 +188,14 @@ if "%1"=="-show-cmake-log" (
   set SHOW_CMAKE_LOG=1
   shift /1 & goto :parse_args
 )  
+if "%1"=="-disable-lit" (
+  echo Disable LIT testing
+  set ENABLE_LIT=OFF
+  shift /1 & goto :parse_args
+)
 if "%1"=="-enable-lit" (
   echo Enable LIT testing
-  set ENABLE_LIT=On
+  set ENABLE_LIT=ON
   shift /1 & goto :parse_args
 )
 rem Begin SPIRV change
@@ -286,10 +292,6 @@ if "%DXC_CMAKE_SYSTEM_VERSION%"=="" (
   )
 )
 
-if "%ENABLE_LIT%"=="" (
-  set ENABLE_LIT=Off
-)
-
 set CMAKE_OPTS=%CMAKE_OPTS% -DHLSL_OPTIONAL_PROJS_IN_DEFAULT:BOOL=%ALL_DEFS%
 set CMAKE_OPTS=%CMAKE_OPTS% -DHLSL_ENABLE_ANALYZE:BOOL=%ANALYZE%
 set CMAKE_OPTS=%CMAKE_OPTS% -DHLSL_OFFICIAL_BUILD:BOOL=%OFFICIAL%

utils/hct/hcttest.cmd

@@ -148,6 +148,8 @@ if "%1"=="-clean" (
   set TEST_EXTRAS=1
 ) else if "%1"=="-ninja" (
   set GENERATOR_NINJA=1
+) else if "%1"=="-disable-lit" (
+  set TEST_USE_LIT=0
 ) else if "%1"=="-enable-lit" (
   set TEST_USE_LIT=1
 ) else if "%1"=="-rel" (
@@ -264,6 +266,10 @@ if "%TEST_USE_LIT%"=="1" (
   if "%TEST_EXEC%"=="1" (
     set TEST_CLANG=1
   )
+  rem LIT does not separate cmd tests from other clang hlsl tests.
+  if "%TEST_CMD%"=="1" (
+    set TEST_CLANG=1
+  )
   if "%TEST_SPIRV%"=="1" (
     set TEST_CLANG=1
   )
@@ -273,6 +279,7 @@ if "%TEST_USE_LIT%"=="1" (
     set RES_CLANG=!ERRORLEVEL!
     set RES_DXILCONV=%RES_CLANG%
     set RES_EXEC=%RES_CLANG%
+    set RES_CMD=%RES_CLANG%
   ) else (
     if "%TEST_DXILCONV%"=="1" (
       cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxilconv
@@ -282,12 +289,14 @@ if "%TEST_USE_LIT%"=="1" (
       cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-clang
       set RES_CLANG=!ERRORLEVEL!
       set RES_EXEC=%RES_CLANG%
+      set RES_CMD=%RES_CLANG%
     )
   )
   set TEST_CLANG=0
   set TEST_DXILCONV=0
   set TEST_SPIRV=0
   set TEST_EXEC=0
+  set TEST_CMD=0
 )
 
 if not exist %TEST_DIR% (mkdir %TEST_DIR%)
@@ -376,7 +385,7 @@ if "%TEST_EXEC%"=="1" (
 set EXEC_COMMON_ARGS=/p:"HlslDataDir=%HLSL_SRC_DIR%\tools\clang\unittests\HLSLExec" /p:"ExperimentalShaders=*" %TEST_ADAPTER% %USE_AGILITY_SDK%
 if "%TEST_EXEC%"=="1" (
   echo Sniffing for D3D12 configuration ...
-  call :runte exec-hlsl-tests.dll /select:"@Name='ExecutionTest::BasicTriangleTest' AND @Architecture='%TEST_ARCH%'" %EXEC_COMMON_ARGS% 
+  call :runte exec-hlsl-tests.dll /select:"@Name='ExecutionTest::BasicTriangleTest' AND @Architecture='%TEST_ARCH%'" %EXEC_COMMON_ARGS%
   set RES_EXEC=!ERRORLEVEL!
   if errorlevel 1 (
     if not "%TEST_EXEC_REQUIRED%"=="1" (