clean up

Author: joaosaffran

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -70,7 +70,10 @@ extractShaderVisibility(MDNode *Node, unsigned int OpId) {
 
 static uint64_t updateOngoingOffset(uint64_t CurOfset, uint64_t NumDescriptors,
                                     uint64_t Offset) {
-  return Offset == ~0U ? CurOfset + NumDescriptors : Offset + NumDescriptors;
+  // Append to the current offset if DescriptorTableOffsetAppend is set,
+  // otherwise calculate the new Offset.
+  return Offset == DescriptorTableOffsetAppend ? CurOfset + NumDescriptors
+                                               : Offset + NumDescriptors;
 }
 
 namespace {
@@ -558,7 +561,7 @@ Error validateDescriptorTableRegisterOverflow(mcdxbc::DescriptorTable Table,
     // Errors for this check should be emitted before this point.
     if (Range.NumDescriptors <= 0)
       continue;
-    dxil::ResourceClass RangeType =
+    const dxil::ResourceClass &RangeType =
         static_cast<dxil::ResourceClass>(Range.RangeType);
 
     if (Range.OffsetInDescriptorsFromTableStart != DescriptorTableOffsetAppend)
@@ -584,8 +587,6 @@ Error validateDescriptorTableRegisterOverflow(mcdxbc::DescriptorTable Table,
       return make_error<DescriptorRangeOverflowError>(
           RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
 
-    // Append to the current offset if DescriptorTableOffsetAppend, otherwise
-    // calculate the new Offset.
     Offset = updateOngoingOffset(Offset, Range.NumDescriptors,
                                  Range.OffsetInDescriptorsFromTableStart);
   }
@@ -668,14 +669,12 @@ Error MetadataParser::validateRootSignature(
                              "DescriptorFlag", Range.Flags));
 
         if (Error Err =
-                validateDescriptorTableSamplerMixin(Table, Info.Location)) {
+                validateDescriptorTableSamplerMixin(Table, Info.Location))
           DeferredErrs = joinErrors(std::move(DeferredErrs), std::move(Err));
-        }
 
         if (Error Err =
-                validateDescriptorTableRegisterOverflow(Table, Info.Location)) {
+                validateDescriptorTableRegisterOverflow(Table, Info.Location))
           DeferredErrs = joinErrors(std::move(DeferredErrs), std::move(Err));
-        }
       }
       break;
     }

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

@@ -181,6 +181,7 @@ uint64_t computeRangeBound(uint32_t Offset, uint32_t Size) {
 
   return uint64_t(Offset) + uint64_t(Size) - 1;
 }
+
 } // namespace rootsig
 } // namespace hlsl
 } // namespace llvm

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

@@ -15,4 +15,3 @@ entry:
 !3 = !{!"DescriptorTable", i32 0, !4, !5}
 !4 = !{!"UAV", i32 1, i32 0, i32 0, i32 -1, i32 0}
 !5 = !{!"Sampler", i32 2, i32 0, i32 0, i32 -1, i32 0}
-