clean up

Author: Joao Saffran

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -13,7 +13,6 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
 #include "llvm/Analysis/DXILResource.h"
-#include "llvm/Frontend/HLSL/HLSLBinding.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicsDirectX.h"

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-constants.ll renamed to llvm/test/CodeGen/DirectX/rootsignature-validation-fail-cbv-binding.ll

@@ -0,0 +1,18 @@
+; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
+; CHECK: error: register Sampler (space=2, register=3) does not have a binding in the Root Signature 
+
+@Smp.str = private unnamed_addr constant [4 x i8] c"Smp\00", align 1
+
+
+define void @CSMain() "hlsl.shader"="compute" {
+entry:
+  %Sampler = call target("dx.Sampler", 0) @llvm.dx.resource.handlefrombinding(i32 2, i32 3, i32 1, i32 0, i1 false, ptr nonnull @Smp.str)
+  ret void
+}
+
+!dx.rootsignatures = !{!0}
+
+!0 = !{ptr @CSMain, !1, i32 2}
+!1 = !{!2}
+!2 = !{!"DescriptorTable", i32 0, !3}
+!3 = !{!"Sampler", i32 1, i32 42, i32 0, i32 -1, i32 0}

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

@@ -1,12 +1,9 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
 ; CHECK: error: resource Sampler (space=0, registers=[42, 42]) overlaps with resource Sampler (space=0, registers=[42, 42])
 
-@Smp.str = private unnamed_addr constant [4 x i8] c"Smp\00", align 1
-
 
 define void @CSMain() "hlsl.shader"="compute" {
 entry:
-  %Sampler = call target("dx.Sampler", 0) @llvm.dx.resource.handlefrombinding(i32 2, i32 3, i32 1, i32 0, i1 false, ptr nonnull @Smp.str)
   ret void
 }
 

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

@@ -1,13 +1,6 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
-
 ; CHECK: error: register SRV (space=0, register=0) does not have a binding in the Root Signature
 
-; Root Signature(
-;   CBV(b3, space=666, visibility=SHADER_VISIBILITY_ALL)
-;   DescriptorTable(SRV(t0, space=0, numDescriptors=1), visibility=SHADER_VISIBILITY_VERTEX)
-;   DescriptorTable(Sampler(s0, numDescriptors=2), visibility=SHADER_VISIBILITY_ALL)
-;   DescriptorTable(UAV(u0, numDescriptors=unbounded), visibility=SHADER_VISIBILITY_ALL)
-
 @SB.str = private unnamed_addr constant [3 x i8] c"SB\00", align 1
 
 define void @CSMain() "hlsl.shader"="compute" {

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-srv.ll renamed to llvm/test/CodeGen/DirectX/rootsignature-validation-fail-srv-binding.ll

@@ -1,13 +1,6 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
-
 ; CHECK: error: register UAV (space=0, register=4294967294) does not have a binding in the Root Signature
 
-; Root Signature(
-;   CBV(b3, space=666, visibility=SHADER_VISIBILITY_ALL)
-;   DescriptorTable(SRV(t0, space=0, numDescriptors=1), visibility=SHADER_VISIBILITY_VERTEX)
-;   DescriptorTable(Sampler(s0, numDescriptors=2), visibility=SHADER_VISIBILITY_ALL)
-;   DescriptorTable(UAV(u0, numDescriptors=unbounded), visibility=SHADER_VISIBILITY_ALL)
-
 @RWB.str = private unnamed_addr constant [4 x i8] c"RWB\00", align 1
 
 define void @CSMain() "hlsl.shader"="compute" {