more cleanup

Author: bob80905

tools/clang/test/CMakeLists.txt

@@ -179,7 +179,7 @@ foreach(i RANGE 0 ${loop_end})
     set(DXC_PATH ${CMAKE_BINARY_DIR}/tools/clang/test/dxc_releases/${version}/${name}/bin/${TARGET_ARCH}/dxil.dll)
 
     # Create a lit target for this release
-    add_lit_target("check-clang-${name}" "Running clang regression tests with ${name}\n"
+    add_lit_target("check-${name}" "Running clang regression tests with ${name}\n"
       ${CMAKE_CURRENT_SOURCE_DIR}
       PARAMS ${CLANG_TEST_PARAMS}
       DXC_DXIL_DLL_PATH=${DXC_PATH} 
@@ -194,9 +194,6 @@ foreach(i RANGE 0 ${loop_end})
       add_custom_target(check-clang)
     endif()
 
-    # Make check-clang depend on this particular release's tests
-    add_dependencies(check-clang "check-clang-${name}")
-
     # Hook into check-all
     if (WIN32 AND TARGET check-all)
       add_dependencies(check-all "check-clang-${name}")

tools/clang/tools/dxclib/dxc.cpp

@@ -891,8 +891,13 @@ int DxcContext::Compile() {
                                    pIncludeHandler,
                                    IID_PPV_ARGS(&pCompileResult)));
 
+          // dont validate when validation was disabled, or
+          // there are compilation errors
+          HRESULT CompHR;
+          pCompileResult->GetStatus(&CompHR);
+
           // Then validate
-          if (!m_Opts.DisableValidation) {
+          if (!m_Opts.DisableValidation && !DXC_FAILED(CompHR)) {
 
             CComPtr<IDxcValidator> pValidator;
             IFT(CreateInstance(CLSID_DxcValidator, &pValidator));
@@ -901,9 +906,7 @@ int DxcContext::Compile() {
             CComPtr<IDxcOperationResult> pValResult;
 
             IFT(pCompileResult->GetResult(&pProgram));
-            /*if (llvm::getDebugMetadataVersionFromModule(pProgram) != 0) {
-              llvmModuleWithDebugInfo.reset(llvm::CloneModule(inputs.pM.get()));
-            }*/
+
             IFT(pValidator->Validate(pProgram,
                                      DxcValidatorFlags_RootSignatureOnly |
                                          DxcValidatorFlags_InPlaceEdit,

utils/hct/hcttest.cmd

@@ -335,13 +335,13 @@ if "%TEST_USE_LIT%"=="1" (
       set RES_CLANG=!ERRORLEVEL!
     )
     if "!TEST_COMPAT_SUITE!"=="2021" (       
-        cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-clang-dxc_2021_12_08        
+        cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxc_2021_12_08        
     )
     if "!TEST_COMPAT_SUITE!"=="2023" (       
-        cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-clang-dxc_2023_08_14
+        cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxc_2023_08_14
     )
     if "!TEST_COMPAT_SUITE!"=="2025" (       
-        cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-clang-dxc_2025_02_20
+        cmake --build %HLSL_BLD_DIR% --config %BUILD_CONFIG% --target check-dxc_2025_02_20
     )
     if "!TEST_EXEC!"=="1" (
       if defined EXEC_ADAPTER (