removing version

Author: joaosaffran

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -17,7 +17,6 @@ class raw_ostream;
 
 namespace mcdxbc {
 struct RootSignatureHeader {
-  uint32_t Version;
   uint32_t Flags;
   SmallVector<dxbc::RootParameter> Parameters;
 

llvm/include/llvm/Object/DXContainer.h

@@ -124,7 +124,6 @@ class RootSignature {
 private:
   StringRef Data;
   uint32_t Size;
-  uint32_t Version;
   uint32_t Flags;
   uint32_t NParameters;
   ParametersArray Parameters;
@@ -136,8 +135,6 @@ class RootSignature {
 
   uint32_t getSize() const { return Size; }
 
-  uint32_t getVersion() const { return Version; }
-
   uint32_t getFlags() const { return Flags; }
 
   uint32_t getNParameters() const { return NParameters; }

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -80,7 +80,6 @@ struct RootSignatureDesc {
 
   uint32_t getEncodedFlags();
   uint32_t Size;
-  uint32_t Version;
   uint32_t NumParameters;
   SmallVector<dxbc::RootParameter> Parameters;
 

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -18,7 +18,6 @@ void RootSignatureHeader::write(raw_ostream &OS) {
   uint32_t SizeInfo = sizeof(RootSignatureHeader);
   uint32_t ParamsSize = Parameters.size();
   support::endian::write(OS, SizeInfo, llvm::endianness::little);
-  support::endian::write(OS, Version, llvm::endianness::little);
   support::endian::write(OS, Flags, llvm::endianness::little);
   support::endian::write(OS, ParamsSize, llvm::endianness::little);
 

llvm/lib/Object/DXContainer.cpp

@@ -248,9 +248,6 @@ Error DirectX::RootSignature::parse() {
   Size = support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 
-  Version = support::endian::read<uint32_t, llvm::endianness::little>(Current);
-  Current += sizeof(uint32_t);
-
   Flags = support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -267,7 +267,6 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
         continue;
 
       mcdxbc::RootSignatureHeader Header;
-      Header.Version = P.RootSignature->Version;
       Header.Flags = P.RootSignature->getEncodedFlags();
       Header.Parameters = P.RootSignature->Parameters;
 

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -32,8 +32,7 @@ DXContainerYAML::ShaderFeatureFlags::ShaderFeatureFlags(uint64_t FlagData) {
 
 DXContainerYAML::RootSignatureDesc::RootSignatureDesc(
     const object::DirectX::RootSignature &Data)
-    : Size(Data.getSize()), Version(Data.getVersion()),
-      NumParameters(Data.getNParameters()) {
+    : Size(Data.getSize()), NumParameters(Data.getNParameters()) {
   uint32_t Flags = Data.getFlags();
 
   for (const auto &Param : Data.getParameters())
@@ -215,7 +214,6 @@ void MappingTraits<DXContainerYAML::Signature>::mapping(
 void MappingTraits<DXContainerYAML::RootSignatureDesc>::mapping(
     IO &IO, DXContainerYAML::RootSignatureDesc &S) {
   IO.mapRequired("Size", S.Size);
-  IO.mapRequired("Version", S.Version);
   IO.mapRequired("NumParameters", S.NumParameters);
   IO.mapRequired("Parameters", S.Parameters);
 #define ROOT_ELEMENT_FLAG(Num, Val, Str) IO.mapOptional(#Val, S.Val, false);

llvm/lib/Target/DirectX/DXContainerGlobals.cpp

@@ -162,7 +162,7 @@ void DXContainerGlobals::addRootSignature(Module &M,
 
   RootSignatureHeader RSH;
   RSH.Flags = MRS->Flags;
-  RSH.Version = MRS->Version;
+
   RSH.write(OS);
 
   Constant *Constant =

llvm/lib/Target/DirectX/DXILRootSignature.cpp

@@ -80,8 +80,7 @@ static bool parseRootSignatureElement(ModuleRootSignature *MRS,
   return true;
 }
 
-bool ModuleRootSignature::parse(int32_t Version, NamedMDNode *Root) {
-  this->Version = Version;
+bool ModuleRootSignature::parse(NamedMDNode *Root) {
   bool HasError = false;
 
   /** Root Signature are specified as following in the metadata:
@@ -127,7 +126,7 @@ ModuleRootSignature ModuleRootSignature::analyzeModule(Module &M) {
 
   NamedMDNode *RootSignatureNode = M.getNamedMetadata("dx.rootsignatures");
   if (RootSignatureNode) {
-    if (MRS.parse(1, RootSignatureNode))
+    if (MRS.parse(RootSignatureNode))
       llvm_unreachable("Invalid Root Signature Metadata.");
   }
 

llvm/lib/Target/DirectX/DXILRootSignature.h

@@ -30,12 +30,11 @@ enum class RootSignatureElementKind {
 };
 
 struct ModuleRootSignature {
-  uint32_t Version;
   uint32_t Flags;
 
   ModuleRootSignature() = default;
 
-  bool parse(int32_t Version, NamedMDNode *Root);
+  bool parse(NamedMDNode *Root);
 
   static ModuleRootSignature analyzeModule(Module &M);
 };