refactoring

Author: joaosaffran

llvm/include/llvm/Frontend/HLSL/HLSLBinding.h

@@ -59,16 +59,13 @@ class BindingInfo {
     }
     // Size == -1 means unbounded array
     LLVM_ABI std::optional<uint32_t> findAvailableBinding(int32_t Size);
-    LLVM_ABI bool isBound(const BindingRange &Range) const;
   };
 
   struct BindingSpaces {
     dxil::ResourceClass RC;
     llvm::SmallVector<RegisterSpace> Spaces;
     BindingSpaces(dxil::ResourceClass RC) : RC(RC) {}
     LLVM_ABI RegisterSpace &getOrInsertSpace(uint32_t Space);
-    LLVM_ABI std::optional<const BindingInfo::RegisterSpace *>
-    contains(uint32_t Space) const;
   };
 
 private:
@@ -100,9 +97,6 @@ class BindingInfo {
   LLVM_ABI std::optional<uint32_t>
   findAvailableBinding(dxil::ResourceClass RC, uint32_t Space, int32_t Size);
 
-  LLVM_ABI bool isBound(dxil::ResourceClass RC, uint32_t Space,
-                        const BindingRange &Range) const;
-
   friend class BindingInfoBuilder;
 };
 
@@ -152,8 +146,8 @@ class BoundRegs {
            It->UpperBound >= UpperBound;
   }
 
-  const Binding* getReg(dxil::ResourceClass RC, uint32_t Space, uint32_t LowerBound,
-               uint32_t UpperBound) const {
+  const Binding *getReg(dxil::ResourceClass RC, uint32_t Space,
+                        uint32_t LowerBound) const {
     const Binding *It =
         llvm::upper_bound(Bindings, Binding{RC, Space, LowerBound, 0, nullptr});
     if (It == Bindings.begin())

llvm/lib/Frontend/HLSL/HLSLBinding.cpp

@@ -8,8 +8,6 @@
 
 #include "llvm/Frontend/HLSL/HLSLBinding.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Error.h"
-#include <optional>
 
 using namespace llvm;
 using namespace hlsl;
@@ -34,18 +32,6 @@ BindingInfo::BindingSpaces::getOrInsertSpace(uint32_t Space) {
   return Spaces.emplace_back(Space);
 }
 
-std::optional<const BindingInfo::RegisterSpace *>
-BindingInfo::BindingSpaces::contains(uint32_t Space) const {
-  const BindingInfo::RegisterSpace *It = Spaces.begin();
-  for (auto *End = Spaces.end(); It != End; ++It) {
-    if (It->Space == Space)
-      break;
-  }
-  if (It == Spaces.end())
-    return std::nullopt;
-  return It;
-}
-
 std::optional<uint32_t>
 BindingInfo::RegisterSpace::findAvailableBinding(int32_t Size) {
   assert((Size == -1 || Size > 0) && "invalid size");
@@ -80,29 +66,6 @@ BindingInfo::RegisterSpace::findAvailableBinding(int32_t Size) {
   return std::nullopt;
 }
 
-bool BindingInfo::RegisterSpace::isBound(const BindingRange &Range) const {
-  const BindingRange *It = llvm::lower_bound(
-      FreeRanges, Range.LowerBound,
-      [](const BindingRange &R, uint32_t Val) { return R.UpperBound <= Val; });
-
-  if (It != FreeRanges.end()) {
-    // Check if B is fully contained in the found range
-    if (Range.LowerBound >= It->LowerBound &&
-        Range.UpperBound <= It->UpperBound)
-      return false;
-  }
-  return true;
-}
-
-bool BindingInfo::isBound(dxil::ResourceClass RC, uint32_t Space,
-                          const BindingRange &Range) const {
-  const BindingSpaces &BS = getBindingSpaces(RC);
-  std::optional<const BindingInfo::RegisterSpace *> RS = BS.contains(Space);
-  if (!RS)
-    return false;
-  return RS.value()->isBound(Range);
-}
-
 BindingInfo BindingInfoBuilder::calculateBindingInfo(
     llvm::function_ref<void(const BindingInfoBuilder &Builder,
                             const Binding &Overlapping)>

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -122,9 +122,10 @@ static void reportInvalidHandleTyError(Module &M, ResourceClass RC,
                                        ResourceInfo::ResourceBinding Binding) {
   SmallString<128> Message;
   raw_svector_ostream OS(Message);
-  OS << getResourceClassName(RC) << " at register " << Binding.LowerBound << " and space "
-     << Binding.Space << " is bound to a texture or typed buffer. " <<
-     "SRV or UAV root descriptors can only be Raw or Structured buffers.";
+  StringRef RCName = getResourceClassName(RC);
+  OS << RCName << " at register " << Binding.LowerBound << " and space "
+     << Binding.Space << " is bound to a texture or typed buffer. " << RCName
+     << " root descriptors can only be Raw or Structured buffers.";
   M.getContext().diagnose(DiagnosticInfoGeneric(Message));
 }
 
@@ -242,30 +243,25 @@ static void validateRootSignature(Module &M,
             Builder.findOverlapping(ReportedBinding);
         reportOverlappingRegisters(M, ReportedBinding, Overlaping);
       });
-
   const hlsl::BoundRegs &BoundRegs = Builder.takeBoundRegs();
-
   for (const ResourceInfo &RI : DRM) {
     const ResourceInfo::ResourceBinding &Binding = RI.getBinding();
     const dxil::ResourceTypeInfo &RTI = DRTM[RI.getHandleTy()];
     dxil::ResourceClass RC = RTI.getResourceClass();
     dxil::ResourceKind RK = RTI.getResourceKind();
     if (!BoundRegs.isBound(RC, Binding.Space, Binding.LowerBound,
-                           Binding.LowerBound + Binding.Size - 1))
+                           Binding.LowerBound + Binding.Size - 1)) {
       reportRegNotBound(M, RC, Binding);
-    else {
-
+    } else {
       const llvm::hlsl::Binding *Reg =
-          BoundRegs.getReg(RC, Binding.Space, Binding.LowerBound,
-                           Binding.LowerBound + Binding.Size - 1);
+          BoundRegs.getReg(RC, Binding.Space, Binding.LowerBound);
       const mcdxbc::RootParameterInfo *ParamInfo = static_cast<const mcdxbc::RootParameterInfo *>(Reg->Cookie);
 
       if((RC == ResourceClass::SRV || RC == ResourceClass::UAV) && 
             ParamInfo->Type != dxbc::RootParameterType::DescriptorTable &&
            !(RK == ResourceKind::RawBuffer || RK == ResourceKind::StructuredBuffer))
             reportInvalidHandleTyError(M, RC, Binding);
     }
-
   }
 }
 
@@ -332,7 +328,6 @@ class DXILPostOptimizationValidationLegacy : public ModulePass {
 
   static char ID; // Pass identification.
   void getAnalysisUsage(llvm::AnalysisUsage &AU) const override {
-
     AU.addRequired<DXILResourceWrapperPass>();
     AU.addRequired<DXILResourceBindingWrapperPass>();
     AU.addRequired<DXILMetadataAnalysisWrapperPass>();
@@ -343,7 +338,6 @@ class DXILPostOptimizationValidationLegacy : public ModulePass {
     AU.addPreserved<DXILMetadataAnalysisWrapperPass>();
     AU.addPreserved<ShaderFlagsAnalysisWrapper>();
     AU.addPreserved<RootSignatureAnalysisWrapper>();
-    AU.addPreserved<DXILResourceTypeWrapperPass>();
   }
 };
 char DXILPostOptimizationValidationLegacy::ID = 0;

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-sampler.ll

@@ -1,7 +1,6 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
 ; CHECK: error: resource Sampler (space=0, registers=[42, 42]) overlaps with resource Sampler (space=0, registers=[42, 42])
 
-
 define void @CSMain() "hlsl.shader"="compute" {
 entry:
   ret void