refactoring isBound to return the bound reg

Author: joaosaffran

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

@@ -133,27 +133,21 @@ class BoundRegs {
 public:
   BoundRegs(SmallVector<Binding> &&Bindings) : Bindings(std::move(Bindings)) {}
 
-  bool isBound(dxil::ResourceClass RC, uint32_t Space, uint32_t LowerBound,
-               uint32_t UpperBound) const {
+  std::optional<const Binding *> getBoundRegister(dxil::ResourceClass RC,
+                                                  uint32_t Space,
+                                                  uint32_t LowerBound,
+                                                  uint32_t UpperBound) const {
     // UpperBound and Cookie are given dummy values, since they aren't
     // interesting for operator<
     const Binding *It =
         llvm::upper_bound(Bindings, Binding{RC, Space, LowerBound, 0, nullptr});
     if (It == Bindings.begin())
-      return false;
+      return std::nullopt;
     --It;
-    return It->RC == RC && It->Space == Space && It->LowerBound <= LowerBound &&
-           It->UpperBound >= UpperBound;
-  }
-
-  const Binding *getReg(dxil::ResourceClass RC, uint32_t Space,
-                        uint32_t LowerBound) const {
-    // UpperBound and Cookie are  not used in operator<
-    const Binding *It =
-        llvm::upper_bound(Bindings, Binding{RC, Space, LowerBound, 0, nullptr});
-    if (It == Bindings.begin())
-      llvm_unreachable("getReg expectes to be called only when isBound is true");
-    return --It;
+    if (It->RC == RC && It->Space == Space && It->LowerBound <= LowerBound &&
+        It->UpperBound >= UpperBound)
+      return It;
+    return std::nullopt;
   }
 };
 

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -249,18 +249,25 @@ static void validateRootSignature(Module &M,
     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)) {
-      reportRegNotBound(M, RC, Binding);
+
+    std::optional<const llvm::hlsl::Binding *> Reg =
+        BoundRegs.getBoundRegister(RC, Binding.Space, Binding.LowerBound,
+                                   Binding.LowerBound + Binding.Size - 1);
+
+    if (Reg.has_value()) {
+      const auto *ParamInfo =
+          static_cast<const mcdxbc::RootParameterInfo *>((*Reg)->Cookie);
+
+      if (RC != ResourceClass::SRV && RC != ResourceClass::UAV)
+        continue;
+
+      if (ParamInfo->Type == dxbc::RootParameterType::DescriptorTable)
+        continue;
+
+      if (RK != ResourceKind::RawBuffer && RK != ResourceKind::StructuredBuffer)
+        reportInvalidHandleTyError(M, RC, Binding);
     } else {
-      const llvm::hlsl::Binding *Reg =
-          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);
+      reportRegNotBound(M, RC, Binding);
     }
   }
 }