Merge branch 'validation/textures-not-bind-root-signatures' into validation/check-descriptors-are-bound

Author: joaosaffran

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -12,11 +12,13 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
 #include "llvm/Analysis/DXILResource.h"
+#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicsDirectX.h"
 #include "llvm/IR/Module.h"
 #include "llvm/InitializePasses.h"
+#include "llvm/Support/Casting.h"
 
 #define DEBUG_TYPE "dxil-post-optimization-validation"
 
@@ -84,6 +86,17 @@ static void reportOverlappingBinding(Module &M, DXILResourceMap &DRM) {
   }
 }
 
+static void
+reportInvalidHandleTyBoundInRs(Module &M, Twine Type,
+                               ResourceInfo::ResourceBinding Binding) {
+  SmallString<128> Message;
+  raw_svector_ostream OS(Message);
+  OS << "resource " << Type << " at register (space=" << Binding.Space
+     << ", register=" << Binding.LowerBound << ")"
+     << " is bound to a texture or typed buffer.";
+  M.getContext().diagnose(DiagnosticInfoGeneric(Message));
+}
+
 static void reportRegNotBound(Module &M, Twine Type,
                               ResourceInfo::ResourceBinding Binding) {
   SmallString<128> Message;
@@ -197,7 +210,7 @@ getRootSignature(RootSignatureBindingInfo &RSBI,
   return RootSigDesc;
 }
 
-static void reportUnboundRegisters(
+static void reportInvalidRegistersBinding(
     Module &M,
     const std::vector<llvm::dxil::ResourceInfo::ResourceBinding> &Bindings,
     iterator_range<SmallVector<dxil::ResourceInfo>::iterator> &Resources) {
@@ -214,6 +227,13 @@ static void reportUnboundRegisters(
     }
     if (!Bound) {
       reportRegNotBound(M, Res->getName(), Res->getBinding());
+    } else {
+      TargetExtType *Handle = Res->getHandleTy();
+      auto *TypedBuffer = dyn_cast_or_null<TypedBufferExtType>(Handle);
+      auto *Texture = dyn_cast_or_null<TextureExtType>(Handle);
+
+      if (TypedBuffer != nullptr || Texture != nullptr)
+        reportInvalidHandleTyBoundInRs(M, Res->getName(), Res->getBinding());
     }
   }
 }
@@ -241,14 +261,14 @@ static void reportErrors(Module &M, DXILResourceMap &DRM,
     auto UAVs = DRM.uavs();
     auto Samplers = DRM.samplers();
 
-    reportUnboundRegisters(
+    reportInvalidRegistersBinding(
         M, Validation.getBindingsOfType(dxbc::DescriptorRangeType::CBV), Cbufs);
-    reportUnboundRegisters(
+    reportInvalidRegistersBinding(
         M, Validation.getBindingsOfType(dxbc::DescriptorRangeType::UAV), UAVs);
-    reportUnboundRegisters(
+    reportInvalidRegistersBinding(
         M, Validation.getBindingsOfType(dxbc::DescriptorRangeType::Sampler),
         Samplers);
-    reportUnboundRegisters(
+    reportInvalidRegistersBinding(
         M, Validation.getBindingsOfType(dxbc::DescriptorRangeType::SRV), SRVs);
   }
 }

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

@@ -0,0 +1,31 @@
+; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
+; CHECK: error: resource TB at register (space=0, register=0) is bound to a texture or typed buffer.
+
+
+; Root Signature(
+;   CBV(b3, space=1, visibility=SHADER_VISIBILITY_ALL)
+;   DescriptorTable(SRV(t0, space=0, numDescriptors=1), visibility=SHADER_VISIBILITY_ALL)
+;   DescriptorTable(Sampler(s0, numDescriptors=2), visibility=SHADER_VISIBILITY_VERTEX)
+;   DescriptorTable(UAV(u0, numDescriptors=unbounded), visibility=SHADER_VISIBILITY_ALL)
+
+@TB.str = private unnamed_addr constant [3 x i8] c"TB\00", align 1
+
+define void @CSMain() "hlsl.shader"="compute" {
+entry:
+
+  %TB =  tail call target("dx.TypedBuffer", float, 1, 0, 0) @llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr nonnull @TB.str)
+
+  ret void
+}
+
+!dx.rootsignatures = !{!0}
+
+!0 = !{ptr @CSMain, !1, i32 2}
+!1 = !{!2, !3, !5, !7}
+!2 = !{!"RootCBV", i32 0, i32 3, i32 1, i32 4}
+!3 = !{!"DescriptorTable", i32 0, !4}
+!4 = !{!"SRV", i32 1, i32 0, i32 0, i32 -1, i32 0}
+!5 = !{!"DescriptorTable", i32 0, !6}
+!6 = !{!"Sampler", i32 5, i32 3, i32 2, i32 -1, i32 0}
+!7 = !{!"DescriptorTable", i32 0, !8}
+!8 = !{!"UAV", i32 -1, i32 0, i32 0, i32 -1, i32 2}

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

@@ -21,7 +21,7 @@ entry:
   %CB = tail call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB, 4, 0)) @llvm.dx.resource.handlefrombinding(i32 1, i32 3, i32 1, i32 0, i1 false, ptr nonnull @CB.str)
   %Sampler = call target("dx.Sampler", 0) @llvm.dx.resource.handlefrombinding(i32 2, i32 3, i32 1, i32 0, i1 false, ptr nonnull @Smp.str)
   %SB = tail call target("dx.RawBuffer", i32, 0, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_i32_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr nonnull @SB.str)
-  %RWB =  tail call target("dx.TypedBuffer", float, 1, 0, 0) @llvm.dx.resource.handlefrombinding.tdx.TypedBuffer_f32_1_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr nonnull @RWB.str)
+  %RWB =  tail call target("dx.RawBuffer", float, 1, 0, 0) @llvm.dx.resource.handlefrombinding.tdx.RawBuffer_f32_1_0_0t(i32 0, i32 0, i32 1, i32 0, i1 false, ptr nonnull @RWB.str)
 
   ret void
 }