addressing comments

Author: joaosaffran

llvm/lib/Target/DirectX/DXILRootSignature.cpp

@@ -118,11 +118,13 @@ static bool parseRootDescriptors(LLVMContext *Ctx,
                                  MDNode *RootDescriptorNode) {
 
   if (RootDescriptorNode->getNumOperands() != 5)
-    return reportError(Ctx, "Invalid format for RootConstants Element");
+    return reportError(Ctx, "Invalid format for Root Descriptor Element");
 
   std::optional<StringRef> ElementText =
       extractMdStringValue(RootDescriptorNode, 0);
-  assert(!ElementText->empty());
+
+  if (!ElementText.has_value())
+    return reportError(Ctx, "Root Descriptor, first element is not a string.");
 
   dxbc::RootParameterHeader Header;
   Header.ParameterType =
@@ -273,9 +275,9 @@ static bool validate(LLVMContext *Ctx, const mcdxbc::RootSignatureDesc &RSD) {
       if (!verifyRegisterSpace(Descriptor->RegisterSpace))
         return reportValueError(Ctx, "RegisterSpace",
                                 Descriptor->RegisterSpace);
-
-      if (!verifyDescriptorFlag(Descriptor->Flags))
-        return reportValueError(Ctx, "DescriptorFlag", Descriptor->Flags);
+      if (RSD.Version > 1)
+        if (!verifyDescriptorFlag(Descriptor->Flags))
+          return reportValueError(Ctx, "DescriptorFlag", Descriptor->Flags);
     }
   }
 

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-Parameters.ll

@@ -12,19 +12,25 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
 
 !dx.rootsignatures = !{!2} ; list of function/root signature pairs
 !2 = !{ ptr @main, !3 } ; function, root signature
-!3 = !{ !4, !5 } ; list of root signature elements
+!3 = !{ !4, !5, !6 } ; list of root signature elements
 !4 = !{ !"RootFlags", i32 1 } ; 1 = allow_input_assembler_input_layout
 !5 = !{ !"RootConstants", i32 0, i32 1, i32 2, i32 3 }
+!6 = !{ !"RootSRV", i32 1, i32 4, i32 5, i32 6 }
 
 ;CHECK-LABEL: Definition for 'main':
 ;CHECK-NEXT:  Flags: 0x000001
 ;CHECK-NEXT:  Version: 2
 ;CHECK-NEXT:  RootParametersOffset: 24
-;CHECK-NEXT:  NumParameters: 1
+;CHECK-NEXT:  NumParameters: 2
 ;CHECK-NEXT:   - Parameter Type: 1
 ;CHECK-NEXT:     Shader Visibility: 0
 ;CHECK-NEXT:     Register Space: 2
 ;CHECK-NEXT:     Shader Register: 1
 ;CHECK-NEXT:     Num 32 Bit Values: 3
+;CHECK-NEXT:   - Parameter Type: 3
+;CHECK-NEXT:     Shader Visibility: 1
+;CHECK-NEXT:     Register Space: 5
+;CHECK-NEXT:     Shader Register: 4
+;CHECK-NEXT:     Flags: 6
 ;CHECK-NEXT:  NumStaticSamplers: 0
 ;CHECK-NEXT:  StaticSamplersOffset: 0