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

Author: joaosaffran

llvm/include/llvm/Frontend/HLSL/RootSignatureValidations.h

@@ -16,7 +16,6 @@
 
 #include "llvm/ADT/IntervalMap.h"
 #include "llvm/Frontend/HLSL/HLSLRootSignature.h"
-#include "llvm/Support/DXILABI.h"
 
 namespace llvm {
 namespace hlsl {
@@ -180,7 +179,7 @@ class RootSignatureBindingValidation {
   }
 };
 llvm::SmallVector<RangeInfo>
-findUnboundRanges(const llvm::SmallVectorImpl<RangeInfo> &Ranges,
+findUnboundRanges(const llvm::ArrayRef<RangeInfo> &Ranges,
                   const llvm::ArrayRef<RangeInfo> &Bindings);
 } // namespace rootsig
 } // namespace hlsl

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

@@ -317,7 +317,7 @@ findOverlappingRanges(llvm::SmallVector<RangeInfo> &Infos) {
 }
 
 llvm::SmallVector<RangeInfo>
-findUnboundRanges(const llvm::SmallVectorImpl<RangeInfo> &Ranges,
+findUnboundRanges(const llvm::ArrayRef<RangeInfo> &Ranges,
                   const llvm::ArrayRef<RangeInfo> &Bindings) {
   llvm::SmallVector<RangeInfo> Unbounds;
   for (const auto &Range : Ranges) {

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.cpp

@@ -13,18 +13,14 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
 #include "llvm/Analysis/DXILResource.h"
-#include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Frontend/HLSL/RootSignatureValidations.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/MC/DXContainerRootSignature.h"
-#include "llvm/Support/DXILABI.h"
 
 #define DEBUG_TYPE "dxil-post-optimization-validation"
 
@@ -152,7 +148,7 @@ static void reportRegNotBound(Module &M,
   OS << "register " << ResourceClassToString(Unbound.Class)
      << " (space=" << Unbound.Space << ", register=" << Unbound.LowerBound
      << ")"
-     << " is not defined in Root Signature";
+     << " does not have a binding in the Root Signature";
   M.getContext().diagnose(DiagnosticInfoGeneric(Message));
 }
 

llvm/lib/Target/DirectX/DXILPostOptimizationValidation.h

@@ -17,6 +17,7 @@
 #include "llvm/IR/PassManager.h"
 
 namespace llvm {
+
 class DXILPostOptimizationValidation
     : public PassInfoMixin<DXILPostOptimizationValidation> {
 public:

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

@@ -1,6 +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 CBuffer (space=665, register=3) is not defined in Root Signature
+; CHECK: error: register CBuffer (space=665, register=3) does not have a binding in the Root Signature
 
 ; Root Signature(
 ;   CBV(b3, space=666, visibility=SHADER_VISIBILITY_ALL)

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

@@ -1,5 +1,5 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
-; CHECK: error: register CBuffer (space=666, register=2) is not defined in Root Signature
+; CHECK: error: register CBuffer (space=666, register=2) does not have a binding in the Root Signature
 ; Root Signature(RootConstants(num32BitConstants=4, b2))
 
 %__cblayout_CB = type <{ float }>

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

@@ -1,6 +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 Sampler (space=2, register=3) is not defined in Root Signature
+; CHECK: error: register Sampler (space=2, register=3) does not have a binding in the Root Signature
 
 ; Root Signature(
 ;   CBV(b3, space=666, visibility=SHADER_VISIBILITY_ALL)

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

@@ -1,6 +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) is not defined in Root Signature 
+; 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)

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

@@ -1,6 +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=4294967295) is not defined in Root Signature
+; CHECK: error: register UAV (space=0, register=4294967295) does not have a binding in the Root Signature
 
 ; Root Signature(
 ;   CBV(b3, space=666, visibility=SHADER_VISIBILITY_ALL)