[NFC] Move DxilValidation to a dedicated folder. (#6849)

Move DxilValidation out of HLSL. Also move code to validate dxil container into DxilContainerValidation.cpp from DxilValidation.cpp. This is a preparatory step for #6817. --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
microsoft · Aug 14, 2024 · 0e7591a · 0e7591a
1 parent f810e92
commit 0e7591a
Show file tree

Hide file tree

Showing 17 changed files with 1,408 additions and 1,266 deletions.
diff --git a/include/dxc/CMakeLists.txt b/include/dxc/CMakeLists.txt
@@ -17,7 +17,6 @@ configure_file(
 
 add_subdirectory(DXIL)
 add_subdirectory(DxilContainer)
-add_subdirectory(HLSL)
 add_subdirectory(Support)
 add_subdirectory(Tracing)
 

diff --git a/include/dxc/HLSL/DxilValidation.h → include/dxc/DxilValidation/DxilValidation.h b/include/dxc/HLSL/DxilValidation.h → include/dxc/DxilValidation/DxilValidation.h
@@ -26,29 +26,7 @@ class DiagnosticInfo;
 
 namespace hlsl {
 
-#include "dxc/HLSL/DxilValidation.inc"
-
-const char *GetValidationRuleText(ValidationRule value);
 void GetValidationVersion(unsigned *pMajor, unsigned *pMinor);
-HRESULT ValidateDxilModule(llvm::Module *pModule, llvm::Module *pDebugModule);
-
-// DXIL Container Verification Functions (return false on failure)
-
-bool VerifySignatureMatches(llvm::Module *pModule,
-                            hlsl::DXIL::SignatureKind SigKind,
-                            const void *pSigData, uint32_t SigSize);
-
-// PSV = data for Pipeline State Validation
-bool VerifyPSVMatches(llvm::Module *pModule, const void *pPSVData,
-                      uint32_t PSVSize);
-
-// PSV = data for Pipeline State Validation
-bool VerifyRDATMatches(llvm::Module *pModule, const void *pRDATData,
-                       uint32_t RDATSize);
-
-bool VerifyFeatureInfoMatches(llvm::Module *pModule,
-                              const void *pFeatureInfoData,
-                              uint32_t FeatureInfoSize);
 
 // Validate the container parts, assuming supplied module is valid, loaded from
 // the container provided
@@ -106,4 +84,5 @@ class PrintDiagnosticContext {
   static void PrintDiagnosticHandler(const llvm::DiagnosticInfo &DI,
                                      void *Context);
 };
+
 } // namespace hlsl
diff --git a/include/dxc/HLSL/CMakeLists.txt b/include/dxc/HLSL/CMakeLists.txt
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -30,6 +30,7 @@ add_subdirectory(DxilPdbInfo) # HLSL Change
 add_subdirectory(DxilPIXPasses) # HLSL Change
 add_subdirectory(DxilDia) # HLSL Change
 add_subdirectory(DxilRootSignature) # HLSL Change
+add_subdirectory(DxilValidation) # HLSL Change
 add_subdirectory(DxcBindingTable) # HLSL Change
 add_subdirectory(DxrFallback) # HLSL Change
 add_subdirectory(DxilCompression) # HLSL Change
diff --git a/lib/DxilValidation/CMakeLists.txt b/lib/DxilValidation/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (C) Microsoft Corporation. All rights reserved.
+# This file is distributed under the University of Illinois Open Source License. See LICENSE.TXT for details.
+add_hlsl_hctgen(DxilValidationInc OUTPUT DxilValidation.inc BUILD_DIR)
+add_hlsl_hctgen(DxilValidation OUTPUT DxilValidationImpl.inc BUILD_DIR)
+
+add_llvm_library(LLVMDxilValidation
+  DxilContainerValidation.cpp
+  DxilValidation.cpp
+  DxilValidationUtils.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/IR
+)
+
+add_dependencies(LLVMDxilValidation intrinsics_gen)