changing version namings

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -427,7 +427,6 @@ struct SignatureElement {
 
 static_assert(sizeof(SignatureElement) == 4 * sizeof(uint32_t),
               "PSV Signature elements must fit in 16 bytes.");
-
 } // namespace v0
 
 namespace v1 {
@@ -468,7 +467,6 @@ struct RuntimeInfo : public v0::RuntimeInfo {
       sys::swapByteOrder(GeomData.MaxVertexCount);
   }
 };
-
 } // namespace v1
 
 namespace v2 {
@@ -585,37 +583,39 @@ struct ProgramSignatureElement {
 
 static_assert(sizeof(ProgramSignatureElement) == 32,
               "ProgramSignatureElement is misaligned");
-
-// following dx12 naming
-// https://learn.microsoft.com/en-us/windows/win32/api/d3d12/ns-d3d12-d3d12_root_constants
-struct RootConstants {
+namespace RST0 {
+namespace v0 {
+struct RootDescriptor {
   uint32_t ShaderRegister;
   uint32_t RegisterSpace;
-  uint32_t Num32BitValues;
-
   void swapBytes() {
     sys::swapByteOrder(ShaderRegister);
     sys::swapByteOrder(RegisterSpace);
-    sys::swapByteOrder(Num32BitValues);
   }
 };
-struct RootDescriptor_V1_0 {
-  uint32_t ShaderRegister;
-  uint32_t RegisterSpace;
+} // namespace v0
+
+namespace v1 {
+struct RootDescriptor : public v0::RootDescriptor {
+  uint32_t Flags;
   void swapBytes() {
-    sys::swapByteOrder(ShaderRegister);
-    sys::swapByteOrder(RegisterSpace);
+    v0::RootDescriptor::swapBytes();
+    sys::swapByteOrder(Flags);
   }
 };
-
-struct RootDescriptor_V1_1 {
+} // namespace v1
+} // namespace RST0
+// following dx12 naming
+// https://learn.microsoft.com/en-us/windows/win32/api/d3d12/ns-d3d12-d3d12_root_constants
+struct RootConstants {
   uint32_t ShaderRegister;
   uint32_t RegisterSpace;
-  uint32_t Flags;
+  uint32_t Num32BitValues;
+
   void swapBytes() {
     sys::swapByteOrder(ShaderRegister);
     sys::swapByteOrder(RegisterSpace);
-    sys::swapByteOrder(Flags);
+    sys::swapByteOrder(Num32BitValues);
   }
 };
 

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -19,8 +19,8 @@ struct RootParameter {
   dxbc::RootParameterHeader Header;
   union {
     dxbc::RootConstants Constants;
-    dxbc::RootDescriptor_V1_0 Descriptor_V10;
-    dxbc::RootDescriptor_V1_1 Descriptor_V11;
+    dxbc::RST0::v0::RootDescriptor Descriptor_V10;
+    dxbc::RST0::v1::RootDescriptor Descriptor_V11;
   };
 };
 struct RootSignatureDesc {

llvm/include/llvm/Object/DXContainer.h

@@ -161,8 +161,8 @@ struct RootDescriptorView_V1_0 : RootParameterView {
                  llvm::to_underlying(dxbc::RootParameterType::UAV)));
   }
 
-  llvm::Expected<dxbc::RootDescriptor_V1_0> read() {
-    return readParameter<dxbc::RootDescriptor_V1_0>();
+  llvm::Expected<dxbc::RST0::v0::RootDescriptor> read() {
+    return readParameter<dxbc::RST0::v0::RootDescriptor>();
   }
 };
 
@@ -177,8 +177,8 @@ struct RootDescriptorView_V1_1 : RootParameterView {
                  llvm::to_underlying(dxbc::RootParameterType::UAV)));
   }
 
-  llvm::Expected<dxbc::RootDescriptor_V1_1> read() {
-    return readParameter<dxbc::RootDescriptor_V1_1>();
+  llvm::Expected<dxbc::RST0::v1::RootDescriptor> read() {
+    return readParameter<dxbc::RST0::v1::RootDescriptor>();
   }
 };
 
@@ -229,9 +229,9 @@ class RootSignature {
     case dxbc::RootParameterType::SRV:
     case dxbc::RootParameterType::UAV:
       if (Version == 1)
-        DataSize = sizeof(dxbc::RootDescriptor_V1_0);
+        DataSize = sizeof(dxbc::RST0::v0::RootDescriptor);
       else
-        DataSize = sizeof(dxbc::RootDescriptor_V1_1);
+        DataSize = sizeof(dxbc::RST0::v1::RootDescriptor);
       break;
     }
     size_t EndOfSectionByte = getNumStaticSamplers() == 0

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -95,7 +95,7 @@ struct RootParameterYamlDesc {
   uint32_t Type;
   uint32_t Visibility;
   uint32_t Offset;
-  RootParameterYamlDesc() {};
+  RootParameterYamlDesc(){};
   RootParameterYamlDesc(uint32_t T) : Type(T) {
     switch (T) {
 

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -41,9 +41,9 @@ size_t RootSignatureDesc::getSize() const {
     case llvm::to_underlying(dxbc::RootParameterType::SRV):
     case llvm::to_underlying(dxbc::RootParameterType::UAV):
       if (Version == 1)
-        Size += sizeof(dxbc::RootDescriptor_V1_0);
+        Size += sizeof(dxbc::RST0::v0::RootDescriptor);
       else
-        Size += sizeof(dxbc::RootDescriptor_V1_1);
+        Size += sizeof(dxbc::RST0::v1::RootDescriptor);
 
       break;
     }

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -14,6 +14,7 @@
 #include "llvm/ObjectYAML/DXContainerYAML.h"
 #include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/ScopeExit.h"
+#include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Object/DXContainer.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ScopedPrinter.h"
@@ -80,7 +81,8 @@ DXContainerYAML::RootSignatureYamlDesc::create(
       NewP.Constants.RegisterSpace = Constants.RegisterSpace;
     } else if (auto *RDV = dyn_cast<object::DirectX::RootDescriptorView_V1_0>(
                    &ParamView)) {
-      llvm::Expected<dxbc::RootDescriptor_V1_0> DescriptorOrErr = RDV->read();
+      llvm::Expected<dxbc::RST0::v0::RootDescriptor> DescriptorOrErr =
+          RDV->read();
       if (Error E = DescriptorOrErr.takeError())
         return std::move(E);
       auto Descriptor = *DescriptorOrErr;
@@ -89,7 +91,8 @@ DXContainerYAML::RootSignatureYamlDesc::create(
       NewP.Descriptor.RegisterSpace = Descriptor.RegisterSpace;
     } else if (auto *RDV = dyn_cast<object::DirectX::RootDescriptorView_V1_1>(
                    &ParamView)) {
-      llvm::Expected<dxbc::RootDescriptor_V1_1> DescriptorOrErr = RDV->read();
+      llvm::Expected<dxbc::RST0::v1::RootDescriptor> DescriptorOrErr =
+          RDV->read();
       if (Error E = DescriptorOrErr.takeError())
         return std::move(E);
       auto Descriptor = *DescriptorOrErr;