address comments

Author: Joao Saffran

llvm/include/llvm/Analysis/DXILResource.h

@@ -32,6 +32,20 @@ class DXILResourceTypeMap;
 
 namespace dxil {
 
+inline StringRef getResourceClassName(ResourceClass RC) {
+  switch (RC) {
+  case ResourceClass::SRV:
+    return "SRV";
+  case ResourceClass::UAV:
+    return "UAV";
+  case ResourceClass::CBuffer:
+    return "CBuffer";
+  case ResourceClass::Sampler:
+    return "Sampler";
+  }
+  llvm_unreachable("Unhandled ResourceClass");
+}
+
 // Returns the resource name from dx_resource_handlefrombinding or
 // dx_resource_handlefromimplicitbinding call
 LLVM_ABI StringRef getResourceNameFromBindingCall(CallInst *CI);

llvm/include/llvm/Frontend/HLSL/RootSignatureValidations.h

@@ -153,27 +153,26 @@ class RootSignatureBindingValidation {
       uint32_t InsertPos = Bindings.size();
       Bindings.push_back(Binding);
       Ranges[Type] = {InsertPos, InsertPos + 1};
-    } else {
-      uint32_t InsertPos = It->second.End;
-      Bindings.insert(Bindings.begin() + InsertPos, Binding);
+      return;
+    } 
+    uint32_t InsertPos = It->second.End;
+    Bindings.insert(Bindings.begin() + InsertPos, Binding);
 
-      It->second.End++;
+    It->second.End++;
 
-      for (auto &[Type, Range] : Ranges) {
-        if (Range.Start > InsertPos) {
-          Range.Start++;
-          Range.End++;
-        }
+    for (auto &[Type, Range] : Ranges) {
+      if (Range.Start > InsertPos) {
+        Range.Start++;
+        Range.End++;
       }
     }
   }
 
   llvm::ArrayRef<RangeInfo>
   getBindingsOfType(const dxil::ResourceClass &Type) const {
     auto It = Ranges.find(Type);
-    if (It == Ranges.end()) {
+    if (It == Ranges.end()) 
       return {};
-    }
     return llvm::ArrayRef<RangeInfo>(Bindings.data() + It->second.Start,
                                      It->second.End - It->second.Start);
   }

llvm/lib/Analysis/DXILResource.cpp

@@ -29,20 +29,6 @@
 using namespace llvm;
 using namespace dxil;
 
-static StringRef getResourceClassName(ResourceClass RC) {
-  switch (RC) {
-  case ResourceClass::SRV:
-    return "SRV";
-  case ResourceClass::UAV:
-    return "UAV";
-  case ResourceClass::CBuffer:
-    return "CBuffer";
-  case ResourceClass::Sampler:
-    return "Sampler";
-  }
-  llvm_unreachable("Unhandled ResourceClass");
-}
-
 static StringRef getResourceKindName(ResourceKind RK) {
   switch (RK) {
   case ResourceKind::Texture1D:

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

@@ -335,9 +335,8 @@ findUnboundRanges(const llvm::ArrayRef<RangeInfo> &Ranges,
         break;
       }
     }
-    if (!Bound) {
+    if (!Bound) 
       Unbounds.push_back(Range);
-    }
   }
   return Unbounds;
 }

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -11,6 +11,7 @@
 #include "DXILShaderFlags.h"
 #include "DirectX.h"
 #include "llvm/ADT/SmallString.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
 #include "llvm/Analysis/DXILResource.h"
 #include "llvm/Frontend/HLSL/RootSignatureValidations.h"
@@ -26,19 +27,6 @@ using namespace llvm;
 using namespace llvm::dxil;
 
 namespace {
-static const char *ResourceClassToString(llvm::dxil::ResourceClass Class) {
-  switch (Class) {
-  case ResourceClass::SRV:
-    return "SRV";
-  case ResourceClass::UAV:
-    return "UAV";
-  case ResourceClass::CBuffer:
-    return "CBuffer";
-  case ResourceClass::Sampler:
-    return "Sampler";
-  }
-}
-
 static ResourceClass RangeToResourceClass(uint32_t RangeType) {
   using namespace dxbc;
   switch (static_cast<DescriptorRangeType>(RangeType)) {
@@ -132,7 +120,7 @@ static void reportRegNotBound(Module &M,
                               llvm::hlsl::rootsig::RangeInfo Unbound) {
   SmallString<128> Message;
   raw_svector_ostream OS(Message);
-  OS << "register " << ResourceClassToString(Unbound.Class)
+  OS << "register " << getResourceClassName(Unbound.Class)
      << " (space=" << Unbound.Space << ", register=" << Unbound.LowerBound
      << ")"
      << " does not have a binding in the Root Signature";