fix test

Author: joaosaffran

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -113,12 +113,8 @@ struct DescriptorTableYaml {
   SmallVector<DescriptorRangeYaml> Ranges;
 };
 
-
-using ParameterData = std::variant<
-RootConstantsYaml,
-RootDescriptorYaml,
-DescriptorTableYaml
->;
+using ParameterData =
+    std::variant<RootConstantsYaml, RootDescriptorYaml, DescriptorTableYaml>;
 
 struct RootParameterYamlDesc {
   uint32_t Type;
@@ -127,9 +123,7 @@ struct RootParameterYamlDesc {
   ParameterData Data;
 
   RootParameterYamlDesc(){};
-  RootParameterYamlDesc(uint32_t T) : Type(T) {
-   
-  }
+  RootParameterYamlDesc(uint32_t T) : Type(T) {}
 };
 
 struct RootSignatureYamlDesc {

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -280,16 +280,20 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
         auto Header = dxbc::RootParameterHeader{Param.Type, Param.Visibility,
                                                 Param.Offset};
 
-        if(std::holds_alternative<DXContainerYAML::RootConstantsYaml>(Param.Data)){
-          auto ConstantYaml = std::get<DXContainerYAML::RootConstantsYaml>(Param.Data);
+        if (std::holds_alternative<DXContainerYAML::RootConstantsYaml>(
+                Param.Data)) {
+          auto ConstantYaml =
+              std::get<DXContainerYAML::RootConstantsYaml>(Param.Data);
 
           dxbc::RootConstants Constants;
           Constants.Num32BitValues = ConstantYaml.Num32BitValues;
           Constants.RegisterSpace = ConstantYaml.RegisterSpace;
           Constants.ShaderRegister = ConstantYaml.ShaderRegister;
           RS.ParametersContainer.addParameter(Header, Constants);
-        } else if (std::holds_alternative<DXContainerYAML::RootDescriptorYaml>(Param.Data)){
-          auto DescriptorYaml = std::get<DXContainerYAML::RootDescriptorYaml>(Param.Data);
+        } else if (std::holds_alternative<DXContainerYAML::RootDescriptorYaml>(
+                       Param.Data)) {
+          auto DescriptorYaml =
+              std::get<DXContainerYAML::RootDescriptorYaml>(Param.Data);
 
           if (RS.Version == 1) {
             dxbc::RST0::v0::RootDescriptor Descriptor;
@@ -301,11 +305,13 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
             Descriptor.RegisterSpace = DescriptorYaml.RegisterSpace;
             Descriptor.ShaderRegister = DescriptorYaml.ShaderRegister;
             Descriptor.Flags = DescriptorYaml.getEncodedFlags();
-          RS.ParametersContainer.addParameter(Header, Descriptor);
+            RS.ParametersContainer.addParameter(Header, Descriptor);
           }
-        }else if (std::holds_alternative<DXContainerYAML::DescriptorTableYaml>(Param.Data)) {
+        } else if (std::holds_alternative<DXContainerYAML::DescriptorTableYaml>(
+                       Param.Data)) {
           mcdxbc::DescriptorTable Table;
-          auto TableYaml = std::get<DXContainerYAML::DescriptorTableYaml>(Param.Data);
+          auto TableYaml =
+              std::get<DXContainerYAML::DescriptorTableYaml>(Param.Data);
 
           for (const auto &R : TableYaml.Ranges) {
             if (RS.Version == 1) {

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -93,7 +93,7 @@ DXContainerYAML::RootSignatureYamlDesc::create(
       YamlDescriptor.RegisterSpace = Descriptor.RegisterSpace;
       if (Version > 1) {
 #define ROOT_DESCRIPTOR_FLAG(Num, Val)                                         \
-  YamlDescriptor.Val =                                                        \
+  YamlDescriptor.Val =                                                         \
       (Descriptor.Flags &                                                      \
        llvm::to_underlying(dxbc::RootDescriptorFlag::Val)) > 0;
 #include "llvm/BinaryFormat/DXContainerConstants.def"
@@ -403,24 +403,24 @@ void MappingTraits<llvm::DXContainerYAML::RootParameterYamlDesc>::mapping(
   switch (P.Type) {
   case llvm::to_underlying(dxbc::RootParameterType::Constants32Bit): {
     DXContainerYAML::RootConstantsYaml Constants;
-    if(IO.outputting())
+    if (IO.outputting())
       Constants = std::get<DXContainerYAML::RootConstantsYaml>(P.Data);
     IO.mapRequired("Constants", Constants);
     P.Data = Constants;
   } break;
   case llvm::to_underlying(dxbc::RootParameterType::CBV):
   case llvm::to_underlying(dxbc::RootParameterType::SRV):
-  case llvm::to_underlying(dxbc::RootParameterType::UAV):{
+  case llvm::to_underlying(dxbc::RootParameterType::UAV): {
     DXContainerYAML::RootDescriptorYaml Descriptor;
-    if(IO.outputting())
+    if (IO.outputting())
       Descriptor = std::get<DXContainerYAML::RootDescriptorYaml>(P.Data);
     IO.mapRequired("Descriptor", Descriptor);
     P.Data = Descriptor;
   } break;
   case llvm::to_underlying(dxbc::RootParameterType::DescriptorTable): {
     DXContainerYAML::DescriptorTableYaml Table;
-    if(IO.outputting())
-    Table = std::get<DXContainerYAML::DescriptorTableYaml>(P.Data);
+    if (IO.outputting())
+      Table = std::get<DXContainerYAML::DescriptorTableYaml>(P.Data);
     IO.mapRequired("Table", Table);
     P.Data = Table;
   } break;

llvm/test/ObjectYAML/DXContainer/RootSignature-MultipleParameters.yaml

@@ -14,7 +14,7 @@ Parts:
     Size:            200
     RootSignature:
       Version: 2
-      NumRootParameters: 3
+      NumRootParameters: 4
       RootParametersOffset: 24
       NumStaticSamplers: 0
       StaticSamplersOffset: 60
@@ -37,6 +37,18 @@ Parts:
           ShaderRegister: 31
           RegisterSpace: 32
           DATA_STATIC_WHILE_SET_AT_EXECUTE: true
+      - ParameterType:   0
+        ShaderVisibility: 3
+        Table:
+          NumRanges:       1
+          RangesOffset:    116
+          Ranges:
+            - RangeType:       0
+              NumDescriptors:  41
+              BaseShaderRegister: 42
+              RegisterSpace:   43
+              OffsetInDescriptorsFromTableStart: -1
+              DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS: true
       AllowInputAssemblerInputLayout: true
       DenyGeometryShaderRootAccess: true