addressing inbelic comments

Author: Joao Saffran

llvm/lib/Frontend/HLSL/HLSLBinding.cpp

@@ -67,9 +67,13 @@ BindingInfo::RegisterSpace::findAvailableBinding(int32_t Size) {
 }
 
 bool BindingInfo::RegisterSpace::isBound(BindingRange B) {
-  for (BindingRange &R : FreeRanges) {
-    if (B.LowerBound >= R.LowerBound && B.LowerBound < R.UpperBound &&
-        B.UpperBound > R.LowerBound && B.UpperBound <= R.UpperBound)
+  BindingRange *It = llvm::lower_bound(
+      FreeRanges, B.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 (B.LowerBound >= It->LowerBound && B.UpperBound <= It->UpperBound)
       return false;
   }
   return true;

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -237,20 +237,18 @@ static void validateRootSignature(Module &M,
         reportOverlappingRegisters(M, ReportedBinding, Overlaping);
       });
   // Next checks require that the root signature definition is valid.
-  if (!HasOverlap) {
-    for (const auto &ResList :
-         {std::make_pair(ResourceClass::SRV, DRM.srvs()),
-          std::make_pair(ResourceClass::UAV, DRM.uavs()),
-          std::make_pair(ResourceClass::CBuffer, DRM.cbuffers()),
-          std::make_pair(ResourceClass::Sampler, DRM.samplers())}) {
-      for (auto Res : ResList.second) {
-        llvm::dxil::ResourceInfo::ResourceBinding ResBinding = Res.getBinding();
-        llvm::hlsl::BindingInfo::BindingRange ResRange(
-            ResBinding.LowerBound, ResBinding.LowerBound + ResBinding.Size);
-
-        if (!Info.isBound(ResList.first, ResBinding.Space, ResRange))
-          reportRegNotBound(M, ResList.first, ResBinding);
-      }
+  for (const auto &ResList :
+       {std::make_pair(ResourceClass::SRV, DRM.srvs()),
+        std::make_pair(ResourceClass::UAV, DRM.uavs()),
+        std::make_pair(ResourceClass::CBuffer, DRM.cbuffers()),
+        std::make_pair(ResourceClass::Sampler, DRM.samplers())}) {
+    for (auto Res : ResList.second) {
+      llvm::dxil::ResourceInfo::ResourceBinding ResBinding = Res.getBinding();
+      llvm::hlsl::BindingInfo::BindingRange ResRange(
+          ResBinding.LowerBound, ResBinding.LowerBound + ResBinding.Size);
+
+      if (!Info.isBound(ResList.first, ResBinding.Space, ResRange))
+        reportRegNotBound(M, ResList.first, ResBinding);
     }
   }
 }