Merge branch 'validation/descriptor-tables' into validation/root-flags

Author: joaosaffran

clang/lib/Sema/SemaHLSL.cpp

@@ -1394,8 +1394,9 @@ bool SemaHLSL::handleRootSignatureElements(
           Diag(Loc, diag::err_hlsl_offset_overflow) << Offset << RangeBound;
         }
 
-        Offset = llvm::hlsl::rootsig::updateOngoingOffset(
-            Offset, Clause->NumDescriptors, Clause->Offset);
+        Offset = RangeBound == llvm::hlsl::rootsig::NumDescriptorsUnbounded
+                     ? uint32_t(RangeBound)
+                     : uint32_t(RangeBound + 1);
 
         // Compute the register bounds and track resource binding
         uint32_t LowerBound(Clause->Reg.Number);

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -545,25 +545,13 @@ Error MetadataParser::parseRootSignatureElement(mcdxbc::RootSignatureDesc &RSD,
 
 Error validateDescriptorTableSamplerMixin(mcdxbc::DescriptorTable Table,
                                           uint32_t Location) {
-  bool HasSampler = false;
-  bool HasOtherRangeType = false;
-  dxil::ResourceClass OtherRangeType;
-
+  dxil::ResourceClass CurrRC = dxil::ResourceClass::Sampler;
   for (const mcdxbc::DescriptorRange &Range : Table.Ranges) {
-    dxil::ResourceClass RangeType =
-        static_cast<dxil::ResourceClass>(Range.RangeType);
-
-    if (RangeType == dxil::ResourceClass::Sampler) {
-      HasSampler = true;
-    } else {
-      HasOtherRangeType = true;
-      OtherRangeType = RangeType;
-    }
+    if (Range.RangeType == dxil::ResourceClass::Sampler &&
+        CurrRC != dxil::ResourceClass::Sampler)
+      return make_error<TableSamplerMixinError>(CurrRC, Location);
+    CurrRC = Range.RangeType;
   }
-
-  // Samplers cannot be mixed with other resources in a descriptor table.
-  if (HasSampler && HasOtherRangeType)
-    return make_error<TableSamplerMixinError>(OtherRangeType, Location);
   return Error::success();
 }
 
@@ -573,31 +561,29 @@ Error validateDescriptorTableRegisterOverflow(mcdxbc::DescriptorTable Table,
 
   for (const mcdxbc::DescriptorRange &Range : Table.Ranges) {
     // Validation of NumDescriptors should have happened by this point.
-    if (Range.NumDescriptors <= 0)
+    if (Range.NumDescriptors == 0)
       continue;
-    const dxil::ResourceClass &RangeType =
-        static_cast<dxil::ResourceClass>(Range.RangeType);
 
     if (Range.OffsetInDescriptorsFromTableStart != DescriptorTableOffsetAppend)
       Offset = Range.OffsetInDescriptorsFromTableStart;
 
     if (!verifyNoOverflowedOffset(Offset))
       return make_error<OffsetOverflowError>(
-          RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
+          Range.RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
 
     const uint64_t RangeBound = llvm::hlsl::rootsig::computeRangeBound(
         Range.BaseShaderRegister, Range.NumDescriptors);
 
     if (!verifyNoOverflowedOffset(RangeBound))
       return make_error<ShaderRegisterOverflowError>(
-          RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
+          Range.RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
 
     const uint64_t OffsetBound =
         llvm::hlsl::rootsig::computeRangeBound(Offset, Range.NumDescriptors);
 
     if (!verifyNoOverflowedOffset(OffsetBound))
       return make_error<DescriptorRangeOverflowError>(
-          RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
+          Range.RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
     Offset = updateOngoingOffset(Offset, Range.NumDescriptors,
                                  Range.OffsetInDescriptorsFromTableStart);
   }

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinations.ll

@@ -13,7 +13,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
 !2 = !{ ptr @main, !3, i32 2 } ; function, root signature
 !3 = !{ !5, !21 } ; list of root signature elements
 !5 = !{ !"DescriptorTable", i32 0, !10, !11, !12, !13, !14, !15, !16, !17, !18, !19, !20 }
-!21 = !{ !"DescriptorTable", i32 0,!6, !8, !9 }
+!21 = !{ !"DescriptorTable", i32 0, !6, !8, !9 }
 
 ; typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS {
 ;   NONE = 0,

llvm/test/CodeGen/DirectX/rootsignature-validation-appending-limits.ll

@@ -0,0 +1,16 @@
+; RUN: opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
+; This is correct according to DXC: https://hlsl.godbolt.org/z/KPG5o74KE
+; CHECK-NOT: error:
+
+define void @CSMain() "hlsl.shader"="compute" {
+entry:
+  ret void
+}
+
+!dx.rootsignatures = !{!0}
+
+!0 = !{ptr @CSMain, !1, i32 2}
+!1 = !{!3}
+!3 = !{!"DescriptorTable", i32 0, !4, !5}
+!4 = !{!"UAV", i32 1, i32 1, i32 0, i32 4294967294, i32 0}
+!5 = !{!"UAV", i32 1, i32 0, i32 0, i32 -1, i32 0}