making validation function according to spec

Author: Joao Saffran

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -21,6 +21,7 @@
 #include "llvm/InitializePasses.h"
 #include "llvm/MC/DXContainerRootSignature.h"
 #include "llvm/Support/DXILABI.h"
+#include "llvm/Support/ErrorHandling.h"
 
 #define DEBUG_TYPE "dxil-post-optimization-validation"
 
@@ -274,8 +275,9 @@ static void reportIfDeniedShaderStageAccess(Module &M, dxbc::RootFlags Flags,
   }
 }
 
-static void validateRootFlags(Module &M, const mcdxbc::RootSignatureDesc &RSD,
-                              const dxil::ModuleMetadataInfo &MMI) {
+static void validateDeniedStagedNotInUse(Module &M,
+                                         const mcdxbc::RootSignatureDesc &RSD,
+                                         const dxil::ModuleMetadataInfo &MMI) {
   dxbc::RootFlags Flags = dxbc::RootFlags(RSD.Flags);
 
   switch (MMI.ShaderProfile) {
@@ -308,7 +310,7 @@ static void validateRootFlags(Module &M, const mcdxbc::RootSignatureDesc &RSD,
         M, Flags, dxbc::RootFlags::DenyAmplificationShaderRootAccess);
     break;
   default:
-    break;
+    llvm_unreachable("Invalid triple to shader stage conversion");
   }
 }
 
@@ -372,7 +374,7 @@ static void validateDescriptorTables(Module &M,
   }
 }
 
-static void validateRootSignatureBindings(Module &M,
+static bool validateRootSignatureBindings(Module &M,
                                           const mcdxbc::RootSignatureDesc &RSD,
                                           dxil::ModuleMetadataInfo &MMI,
                                           DXILResourceMap &DRM) {
@@ -444,6 +446,8 @@ static void validateRootSignatureBindings(Module &M,
             Builder.findOverlapping(ReportedBinding);
         reportOverlappingRegisters(M, ReportedBinding, Overlaping);
       });
+  bool HasBindings = false;
+
   // Next checks require that the root signature definition is valid.
   if (!HasOverlap) {
     SmallVector<ResourceInfo::ResourceBinding> RDs =
@@ -460,10 +464,13 @@ static void validateRootSignatureBindings(Module &M,
 
         if (!Info.isBound(ResList.first, ResBinding.Space, ResRange))
           reportRegNotBound(M, ResList.first, ResBinding);
+        else
+          HasBindings = true;
       }
       reportInvalidHandleTy(M, RDs, ResList.second);
     }
   }
+  return HasBindings;
 }
 
 mcdxbc::RootSignatureDesc *getRootSignature(RootSignatureBindingInfo &RSBI,
@@ -487,9 +494,10 @@ static void reportErrors(Module &M, DXILResourceMap &DRM,
                                        "DXILResourceImplicitBinding pass");
 
   if (mcdxbc::RootSignatureDesc *RSD = getRootSignature(RSBI, MMI)) {
-    validateRootSignatureBindings(M, *RSD, MMI, DRM);
+    bool HasBindings = validateRootSignatureBindings(M, *RSD, MMI, DRM);
     validateDescriptorTables(M, *RSD);
-    validateRootFlags(M, *RSD, MMI);
+    if (HasBindings && MMI.ShaderProfile != Triple::Compute)
+      validateDeniedStagedNotInUse(M, *RSD, MMI);
   }
 }
 

llvm/test/CodeGen/DirectX/rootsignature-validation-deny-no-binding.ll

@@ -0,0 +1,15 @@
+; RUN: opt -S -passes='dxil-post-optimization-validation' %s 2>&1 
+; expected-no-diagnostics
+target triple = "dxil-pc-shadermodel6.6-pixel"
+
+define void @CSMain() #0 {
+entry:
+  ret void
+}
+attributes #0 = { noinline nounwind "exp-shader"="cs" "hlsl.numthreads"="1,2,1" "hlsl.shader"="geometry" }
+
+!dx.rootsignatures = !{!0}
+
+!0 = !{ptr @CSMain, !1, i32 2}
+!1 = !{!2}
+!2 = !{ !"RootFlags", i32 294 } ; 32 = deny_pixel/hull/vertex/amplification_shader_root_access

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

@@ -13,4 +13,3 @@ attributes #0 = { noinline nounwind "exp-shader"="cs" "hlsl.numthreads"="1,2,1"
 !0 = !{ptr @CSMain, !1, i32 2}
 !1 = !{!2}
 !2 = !{ !"RootFlags", i32 294 } ; 32 = deny_pixel/hull/vertex/amplification_shader_root_access
-

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-deny-multiple-shader.ll

@@ -1,17 +1,21 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' %s 2>&1 | FileCheck %s
 
 ; CHECK: error: Shader has root bindings but root signature uses a DENY flag to disallow root binding access to the shader stage.
-target triple = "dxil-pc-shadermodel6.6-hull"
+target triple = "dxil-pc-shadermodel6.6-pixel"
 
-define void @CSMain() #0 {
+%__cblayout_CB = type <{ float }>
+
+@CB.str = private unnamed_addr constant [3 x i8] c"CB\00", align 1
+
+define void @CSMain() "hlsl.shader"="compute" {
 entry:
+  %CB = tail call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB, 4, 0)) @llvm.dx.resource.handlefrombinding(i32 0, i32 2, i32 1, i32 0, i1 false, ptr nonnull @CB.str)
   ret void
 }
-attributes #0 = { noinline nounwind "exp-shader"="cs" "hlsl.numthreads"="1,2,1" "hlsl.shader"="hull" }
 
 !dx.rootsignatures = !{!0}
 
 !0 = !{ptr @CSMain, !1, i32 2}
-!1 = !{!2}
-!2 = !{ !"RootFlags", i32 294 } ; 32 = deny_pixel/hull/vertex/amplification_shader_root_access
-
+!1 = !{!2, !3}
+!2 = !{!"RootConstants", i32 0, i32 2, i32 0, i32 4}
+!3 = !{!"RootFlags", i32 294} ; 294 = deny_pixel/hull/vertex/amplification_shader_root_access

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-deny-single-shader.ll

@@ -3,15 +3,19 @@
 ; CHECK: error: Shader has root bindings but root signature uses a DENY flag to disallow root binding access to the shader stage.
 target triple = "dxil-pc-shadermodel6.6-pixel"
 
-define void @CSMain() #0 {
+%__cblayout_CB = type <{ float }>
+
+@CB.str = private unnamed_addr constant [3 x i8] c"CB\00", align 1
+
+define void @CSMain() "hlsl.shader"="compute" {
 entry:
+  %CB = tail call target("dx.CBuffer", target("dx.Layout", %__cblayout_CB, 4, 0)) @llvm.dx.resource.handlefrombinding(i32 0, i32 2, i32 1, i32 0, i1 false, ptr nonnull @CB.str)
   ret void
 }
-attributes #0 = { noinline nounwind "exp-shader"="cs" "hlsl.numthreads"="1,2,1" "hlsl.shader"="pixel" }
 
 !dx.rootsignatures = !{!0}
 
 !0 = !{ptr @CSMain, !1, i32 2}
-!1 = !{!2}
-!2 = !{ !"RootFlags", i32 32 } ; 32 = deny_pixel_shader_root_access
-
+!1 = !{!2, !3}
+!2 = !{!"RootConstants", i32 0, i32 2, i32 0, i32 4}
+!3 = !{!"RootFlags", i32 32} ; 32 = deny_pixel_shader_root_access