review: move version def from DXILABI to DXContainer

- funny how you can agree to do it one way in a meeting and then you
type out the complete other way in practice. whoops

Author: inbelic

clang/include/clang/AST/Decl.h

@@ -41,6 +41,7 @@
 #include "llvm/ADT/PointerUnion.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/iterator_range.h"
+#include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Frontend/HLSL/HLSLRootSignature.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/Compiler.h"
@@ -5179,7 +5180,7 @@ class HLSLRootSignatureDecl final
                                     llvm::hlsl::rootsig::RootElement> {
   friend TrailingObjects;
 
-  llvm::dxil::RootSignatureVersion RootSigVer;
+  llvm::dxbc::RootSignatureVersion RootSigVer;
 
   unsigned NumElems;
 
@@ -5190,19 +5191,19 @@ class HLSLRootSignatureDecl final
   }
 
   HLSLRootSignatureDecl(DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
-                        llvm::dxil::RootSignatureVersion RootSigVer,
+                        llvm::dxbc::RootSignatureVersion RootSigVer,
                         unsigned NumElems);
 
 public:
   static HLSLRootSignatureDecl *
   Create(ASTContext &C, DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
-         llvm::dxil::RootSignatureVersion RootSigVer,
+         llvm::dxbc::RootSignatureVersion RootSigVer,
          ArrayRef<llvm::hlsl::rootsig::RootElement> RootElements);
 
   static HLSLRootSignatureDecl *CreateDeserialized(ASTContext &C,
                                                    GlobalDeclID ID);
 
-  llvm::dxil::RootSignatureVersion getVersion() const { return RootSigVer; }
+  llvm::dxbc::RootSignatureVersion getVersion() const { return RootSigVer; }
 
   ArrayRef<llvm::hlsl::rootsig::RootElement> getRootElements() const {
     return {getElems(), NumElems};

clang/include/clang/Basic/LangOptions.h

@@ -24,7 +24,7 @@
 #include "clang/Basic/Visibility.h"
 #include "llvm/ADT/FloatingPointMode.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/DXILABI.h"
+#include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/TargetParser/Triple.h"
 #include <optional>
 #include <string>
@@ -625,8 +625,8 @@ class LangOptions : public LangOptionsBase {
   std::string OpenACCMacroOverride;
 
   /// The HLSL root signature version for dxil.
-  llvm::dxil::RootSignatureVersion HLSLRootSigVer =
-      llvm::dxil::RootSignatureVersion::rootsig_1_1;
+  llvm::dxbc::RootSignatureVersion HLSLRootSigVer =
+      llvm::dxbc::RootSignatureVersion::rootsig_1_1;
 
   // Indicates if the wasm-opt binary must be ignored in the case of a
   // WebAssembly target.

clang/include/clang/Driver/Options.td

@@ -9294,7 +9294,7 @@ def hlsl_rootsig_ver :
   Visibility<[ClangOption, CC1Option, DXCOption]>,
   HelpText<"Root Signature Version">,
   Values<"rootsig_1_0,rootsig_1_1">,
-  NormalizedValuesScope<"llvm::dxil::RootSignatureVersion">,
+  NormalizedValuesScope<"llvm::dxbc::RootSignatureVersion">,
   NormalizedValues<["rootsig_1_0", "rootsig_1_1"]>,
   MarshallingInfoEnum<LangOpts<"HLSLRootSigVer">, "rootsig_1_1">;
 def hlsl_entrypoint : Option<["-"], "hlsl-entry", KIND_SEPARATE>,

clang/lib/AST/Decl.cpp

@@ -5855,13 +5855,13 @@ bool HLSLBufferDecl::buffer_decls_empty() {
 
 HLSLRootSignatureDecl::HLSLRootSignatureDecl(
     DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
-    llvm::dxil::RootSignatureVersion RootSigVer, unsigned NumElems)
+    llvm::dxbc::RootSignatureVersion RootSigVer, unsigned NumElems)
     : NamedDecl(Decl::Kind::HLSLRootSignature, DC, Loc, DeclarationName(ID)),
       RootSigVer(RootSigVer), NumElems(NumElems) {}
 
 HLSLRootSignatureDecl *HLSLRootSignatureDecl::Create(
     ASTContext &C, DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
-    llvm::dxil::RootSignatureVersion RootSigVer,
+    llvm::dxbc::RootSignatureVersion RootSigVer,
     ArrayRef<llvm::hlsl::rootsig::RootElement> RootElements) {
   HLSLRootSignatureDecl *RSDecl =
       new (C, DC,
@@ -5878,7 +5878,7 @@ HLSLRootSignatureDecl *
 HLSLRootSignatureDecl::CreateDeserialized(ASTContext &C, GlobalDeclID ID) {
   HLSLRootSignatureDecl *Result = new (C, ID) HLSLRootSignatureDecl(
       nullptr, SourceLocation(), nullptr,
-      /*RootSigVer*/ llvm::dxil::RootSignatureVersion::rootsig_1_0,
+      /*RootSigVer*/ llvm::dxbc::RootSignatureVersion::rootsig_1_0,
       /*NumElems=*/0);
   return Result;
 }

clang/lib/AST/TextNodeDumper.cpp

@@ -3043,10 +3043,10 @@ void TextNodeDumper::VisitHLSLRootSignatureDecl(
   dumpName(D);
   OS << " version: ";
   switch (D->getVersion()) {
-  case llvm::dxil::RootSignatureVersion::rootsig_1_0:
+  case llvm::dxbc::RootSignatureVersion::rootsig_1_0:
     OS << "1.0";
     break;
-  case llvm::dxil::RootSignatureVersion::rootsig_1_1:
+  case llvm::dxbc::RootSignatureVersion::rootsig_1_1:
     OS << "1.1";
     break;
   }

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -66,7 +66,7 @@ void addDxilValVersion(StringRef ValVersionStr, llvm::Module &M) {
   DXILValMD->addOperand(Val);
 }
 
-void addRootSignature(llvm::dxil::RootSignatureVersion RootSigVer,
+void addRootSignature(llvm::dxbc::RootSignatureVersion RootSigVer,
                       ArrayRef<llvm::hlsl::rootsig::RootElement> Elements,
                       llvm::Function *Fn, llvm::Module &M) {
   auto &Ctx = M.getContext();

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -745,6 +745,12 @@ struct DescriptorRange : public v1::DescriptorRange {
 } // namespace v2
 } // namespace RTS0
 
+// D3D_ROOT_SIGNATURE_VERSION
+enum class RootSignatureVersion {
+  rootsig_1_0 = 0x1,
+  rootsig_1_1 = 0x2,
+};
+
 } // namespace dxbc
 } // namespace llvm
 

llvm/include/llvm/Support/DXILABI.h

@@ -99,12 +99,6 @@ enum class SamplerFeedbackType : uint32_t {
 const unsigned MinWaveSize = 4;
 const unsigned MaxWaveSize = 128;
 
-// D3D_ROOT_SIGNATURE_VERSION
-enum class RootSignatureVersion {
-  rootsig_1_0 = 0x1,
-  rootsig_1_1 = 0x2,
-};
-
 } // namespace dxil
 } // namespace llvm