address comments

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -560,15 +560,17 @@ 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 {
-  uint32_t Register;
-  uint32_t Space;
-  uint32_t NumOfConstants;
+  uint32_t ShaderRegister;
+  uint32_t RegisterSpace;
+  uint32_t Num32BitValues;
 
   void swapBytes() {
-    sys::swapByteOrder(Register);
-    sys::swapByteOrder(Space);
-    sys::swapByteOrder(NumOfConstants);
+    sys::swapByteOrder(ShaderRegister);
+    sys::swapByteOrder(RegisterSpace);
+    sys::swapByteOrder(Num32BitValues);
   }
 };
 

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -76,9 +76,9 @@ struct ShaderHash {
 #define ROOT_ELEMENT_FLAG(Num, Val) bool Val = false;
 
 struct RootConstantsYaml {
-  uint32_t Register;
-  uint32_t Space;
-  uint32_t NumOfConstants;
+  uint32_t ShaderRegister;
+  uint32_t RegisterSpace;
+  uint32_t Num32BitValues;
 };
 
 struct RootParameterYamlDesc {

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -30,10 +30,10 @@ static void rewriteOffsetToCurrentByte(raw_svector_ostream &Stream,
 }
 
 size_t RootSignatureDesc::getSize() const {
-  size_t Size = sizeof(dxbc::RootSignatureHeader);
+  size_t Size = sizeof(dxbc::RootSignatureHeader) +
+                Parameters.size() * sizeof(dxbc::RootParameterHeader);
 
   for (const auto &P : Parameters) {
-    Size += sizeof(P.Header);
     switch (P.Header.ParameterType) {
     case dxbc::RootParameterType::Constants32Bit:
       Size += sizeof(dxbc::RootConstants);
@@ -47,15 +47,17 @@ void RootSignatureDesc::write(raw_ostream &OS) const {
   SmallString<256> Storage;
   raw_svector_ostream BOS(Storage);
   BOS.reserveExtraSpace(getSize());
+
   const uint32_t NumParameters = Parameters.size();
-  const uint32_t Zero = 0u;
+  const uint32_t StaticSamplerOffset = 0u;
+  const uint32_t NumStaticSamplers = 0u;
 
   support::endian::write(BOS, Header.Version, llvm::endianness::little);
   support::endian::write(BOS, NumParameters, llvm::endianness::little);
   support::endian::write(BOS, (uint32_t)sizeof(dxbc::RootSignatureHeader),
                          llvm::endianness::little);
-  support::endian::write(BOS, Zero, llvm::endianness::little);
-  support::endian::write(BOS, Zero, llvm::endianness::little);
+  support::endian::write(BOS, StaticSamplerOffset, llvm::endianness::little);
+  support::endian::write(BOS, NumStaticSamplers, llvm::endianness::little);
   support::endian::write(BOS, Header.Flags, llvm::endianness::little);
 
   SmallVector<uint32_t> ParamsOffsets;
@@ -75,14 +77,15 @@ void RootSignatureDesc::write(raw_ostream &OS) const {
 
     switch (P.Header.ParameterType) {
     case dxbc::RootParameterType::Constants32Bit:
-      support::endian::write(BOS, P.Constants.Register,
+      support::endian::write(BOS, P.Constants.ShaderRegister,
+                             llvm::endianness::little);
+      support::endian::write(BOS, P.Constants.RegisterSpace,
                              llvm::endianness::little);
-      support::endian::write(BOS, P.Constants.Space, llvm::endianness::little);
-      support::endian::write(BOS, P.Constants.NumOfConstants,
+      support::endian::write(BOS, P.Constants.Num32BitValues,
                              llvm::endianness::little);
       break;
     }
   }
-
+  assert(Storage.size() == getSize());
   OS.write(Storage.data(), Storage.size());
 }

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -277,9 +277,9 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
         switch (Param.Type) {
 
         case dxbc::RootParameterType::Constants32Bit:
-          NewParam.Constants.NumOfConstants = Param.Constants.NumOfConstants;
-          NewParam.Constants.Space = Param.Constants.Space;
-          NewParam.Constants.Register = Param.Constants.Register;
+          NewParam.Constants.Num32BitValues = Param.Constants.Num32BitValues;
+          NewParam.Constants.RegisterSpace = Param.Constants.RegisterSpace;
+          NewParam.Constants.ShaderRegister = Param.Constants.ShaderRegister;
           break;
         }
 

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -56,9 +56,9 @@ DXContainerYAML::RootSignatureYamlDesc::RootSignatureYamlDesc(
       if (!Constants)
         llvm::errs() << "Error: " << Constants.takeError() << "\n";
 
-      NewP.Constants.NumOfConstants = Constants->NumOfConstants;
-      NewP.Constants.Register = Constants->Register;
-      NewP.Constants.Space = Constants->Space;
+      NewP.Constants.Num32BitValues = Constants->Num32BitValues;
+      NewP.Constants.ShaderRegister = Constants->ShaderRegister;
+      NewP.Constants.RegisterSpace = Constants->RegisterSpace;
     }
     Parameters.push_back(NewP);
   }
@@ -247,9 +247,9 @@ void MappingTraits<DXContainerYAML::RootSignatureYamlDesc>::mapping(
 
 void MappingTraits<llvm::DXContainerYAML::RootConstantsYaml>::mapping(
     IO &IO, llvm::DXContainerYAML::RootConstantsYaml &C) {
-  IO.mapRequired("Num32BitValues", C.NumOfConstants);
-  IO.mapRequired("RegisterSpace", C.Space);
-  IO.mapRequired("ShaderRegister", C.Register);
+  IO.mapRequired("Num32BitValues", C.Num32BitValues);
+  IO.mapRequired("RegisterSpace", C.RegisterSpace);
+  IO.mapRequired("ShaderRegister", C.ShaderRegister);
 }
 
 void MappingTraits<llvm::DXContainerYAML::RootParameterYamlDesc>::mapping(

llvm/unittests/Object/DXContainerTest.cpp

@@ -906,8 +906,8 @@ TEST(RootSignature, ParseRootConstant) {
 
     ASSERT_THAT_ERROR(Constants.takeError(), Succeeded());
 
-    ASSERT_EQ(Constants->Register, 15u);
-    ASSERT_EQ(Constants->Space, 14u);
-    ASSERT_EQ(Constants->NumOfConstants, 16u);
+    ASSERT_EQ(Constants->ShaderRegister, 15u);
+    ASSERT_EQ(Constants->RegisterSpace, 14u);
+    ASSERT_EQ(Constants->Num32BitValues, 16u);
   }
 }