clean up and add more tests

Author: joaosaffran

llvm/lib/Target/DirectX/DXILRootSignature.cpp

@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 #include "DXILRootSignature.h"
 #include "DirectX.h"
-#include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
@@ -31,7 +30,6 @@
 #include <cstdint>
 #include <optional>
 #include <utility>
-#include <variant>
 
 using namespace llvm;
 using namespace llvm::dxil;
@@ -227,10 +225,7 @@ static bool verifyRegisterSpace(uint32_t RegisterSpace) {
   return !(RegisterSpace >= 0xFFFFFFF0 && RegisterSpace <= 0xFFFFFFFF);
 }
 
-static bool verifyDescriptorFlag(uint32_t Flags) {
-  return (Flags & ~0xE) == 0;
-}
-
+static bool verifyDescriptorFlag(uint32_t Flags) { return (Flags & ~0xE) == 0; }
 
 static bool validate(LLVMContext *Ctx, const mcdxbc::RootSignatureDesc &RSD) {
 
@@ -249,37 +244,38 @@ static bool validate(LLVMContext *Ctx, const mcdxbc::RootSignatureDesc &RSD) {
 
     assert(dxbc::isValidParameterType(Info.Header.ParameterType) &&
            "Invalid value for ParameterType");
-    
-    
+
     auto P = RSD.ParametersContainer.getParameter(&Info);
-    if(!P)
-        return reportError(Ctx, "Cannot locate parameter from Header Info");
-    
-    if( std::holds_alternative<const dxbc::RTS0::v1::RootDescriptor *>(*P)){
-      auto *Descriptor = std::get<const dxbc::RTS0::v1::RootDescriptor *>(P.value());
+    if (!P)
+      return reportError(Ctx, "Cannot locate parameter from Header Info");
+
+    if (std::holds_alternative<const dxbc::RTS0::v1::RootDescriptor *>(*P)) {
+      auto *Descriptor =
+          std::get<const dxbc::RTS0::v1::RootDescriptor *>(P.value());
 
-      if(!verifyRegisterValue(Descriptor->ShaderRegister))
+      if (!verifyRegisterValue(Descriptor->ShaderRegister))
         return reportValueError(Ctx, "ShaderRegister",
                                 Descriptor->ShaderRegister);
-      
-      if(!verifyRegisterSpace(Descriptor->RegisterSpace))
+
+      if (!verifyRegisterSpace(Descriptor->RegisterSpace))
         return reportValueError(Ctx, "RegisterSpace",
                                 Descriptor->RegisterSpace);
 
-    } else if( std::holds_alternative<const dxbc::RTS0::v2::RootDescriptor *>(*P)){
-      auto *Descriptor = std::get<const dxbc::RTS0::v2::RootDescriptor *>(P.value());
+    } else if (std::holds_alternative<const dxbc::RTS0::v2::RootDescriptor *>(
+                   *P)) {
+      auto *Descriptor =
+          std::get<const dxbc::RTS0::v2::RootDescriptor *>(P.value());
 
-      if(!verifyRegisterValue(Descriptor->ShaderRegister))
+      if (!verifyRegisterValue(Descriptor->ShaderRegister))
         return reportValueError(Ctx, "ShaderRegister",
                                 Descriptor->ShaderRegister);
-      
-      if(!verifyRegisterSpace(Descriptor->RegisterSpace))
+
+      if (!verifyRegisterSpace(Descriptor->RegisterSpace))
         return reportValueError(Ctx, "RegisterSpace",
                                 Descriptor->RegisterSpace);
 
-      if(!verifyDescriptorFlag(Descriptor->Flags))
-        return reportValueError(Ctx, "DescriptorFlag",
-                                Descriptor->Flags);
+      if (!verifyDescriptorFlag(Descriptor->Flags))
+        return reportValueError(Ctx, "DescriptorFlag", Descriptor->Flags);
     }
   }
 
@@ -417,20 +413,21 @@ PreservedAnalyses RootSignatureAnalysisPrinter::run(Module &M,
            << "Shader Register: " << Constants->ShaderRegister << "\n";
         OS << indent(Space + 2)
            << "Num 32 Bit Values: " << Constants->Num32BitValues << "\n";
-      } else if (std::holds_alternative<const dxbc::RTS0::v1::RootDescriptor *>(*P)) {
+      } else if (std::holds_alternative<const dxbc::RTS0::v1::RootDescriptor *>(
+                     *P)) {
         auto *Constants = std::get<const dxbc::RTS0::v1::RootDescriptor *>(*P);
         OS << indent(Space + 2)
            << "Register Space: " << Constants->RegisterSpace << "\n";
         OS << indent(Space + 2)
            << "Shader Register: " << Constants->ShaderRegister << "\n";
-      } else if (std::holds_alternative<const dxbc::RTS0::v2::RootDescriptor *>(*P)) {
+      } else if (std::holds_alternative<const dxbc::RTS0::v2::RootDescriptor *>(
+                     *P)) {
         auto *Constants = std::get<const dxbc::RTS0::v2::RootDescriptor *>(*P);
         OS << indent(Space + 2)
            << "Register Space: " << Constants->RegisterSpace << "\n";
         OS << indent(Space + 2)
            << "Shader Register: " << Constants->ShaderRegister << "\n";
-        OS << indent(Space + 2)
-           << "Flags: " << Constants->Flags << "\n";
+        OS << indent(Space + 2) << "Flags: " << Constants->Flags << "\n";
       }
     }
     Space--;

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-RootDescriptor-Invalid-RegisterKind.ll

@@ -0,0 +1,18 @@
+; RUN: not opt -passes='print<dxil-root-signature>' %s -S -o - 2>&1 | FileCheck %s
+
+target triple = "dxil-unknown-shadermodel6.0-compute"
+
+
+; CHECK: error:  Invalid Root Signature Element: Invalid 
+; CHECK-NOT: Root Signature Definitions
+define void @main() #0 {
+entry:
+  ret void
+}
+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 = !{ !5 } ; list of root signature elements
+!5 = !{ !"Invalid", i32 0, i32 1, i32 2, i32 3  }