fix test and change error message

Author: joaosaffran

llvm/include/llvm/Frontend/HLSL/RootSignatureMetadata.h

@@ -48,22 +48,20 @@ class RootSignatureValidationError
   }
 };
 
-class OffsetOverflowError : public ErrorInfo<OffsetOverflowError> {
+class OffsetAppendAfterOverflow : public ErrorInfo<OffsetAppendAfterOverflow> {
 public:
   static char ID;
   dxil::ResourceClass Type;
   uint32_t Register;
   uint32_t Space;
 
-  OffsetOverflowError(dxil::ResourceClass Type, uint32_t Register,
+  OffsetAppendAfterOverflow(dxil::ResourceClass Type, uint32_t Register,
                       uint32_t Space)
       : Type(Type), Register(Register), Space(Space) {}
 
   void log(raw_ostream &OS) const override {
-    OS << "Cannot append range with implicit lower bound after an unbounded "
-          "range "
-       << getResourceClassName(Type) << "(register=" << Register
-       << ", space=" << Space << ").";
+    OS << "Range " << getResourceClassName(Type) << "(register=" << Register
+       << ", space=" << Space << ") " << "cannot be appended after an unbounded range ";
   }
 
   std::error_code convertToErrorCode() const override {
@@ -93,20 +91,20 @@ class ShaderRegisterOverflowError
   }
 };
 
-class DescriptorRangeOverflowError
-    : public ErrorInfo<DescriptorRangeOverflowError> {
+class OffsetOverflowError
+    : public ErrorInfo<OffsetOverflowError> {
 public:
   static char ID;
   dxil::ResourceClass Type;
   uint32_t Register;
   uint32_t Space;
 
-  DescriptorRangeOverflowError(dxil::ResourceClass Type, uint32_t Register,
+  OffsetOverflowError(dxil::ResourceClass Type, uint32_t Register,
                                uint32_t Space)
       : Type(Type), Register(Register), Space(Space) {}
 
   void log(raw_ostream &OS) const override {
-    OS << "Overflow for descriptor range: " << getResourceClassName(Type)
+    OS << "Offset overflow for descriptor range: " << getResourceClassName(Type)
        << "(register=" << Register << ", space=" << Space << ").";
   }
 

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -30,7 +30,7 @@ char InvalidRSMetadataValue::ID;
 char TableSamplerMixinError::ID;
 char ShaderRegisterOverflowError::ID;
 char OffsetOverflowError::ID;
-char DescriptorRangeOverflowError::ID;
+char OffsetAppendAfterOverflow::ID;
 
 template <typename T> char RootSignatureValidationError<T>::ID;
 
@@ -581,14 +581,14 @@ validateDescriptorTableRegisterOverflow(const mcdxbc::DescriptorTable &Table,
       Offset = Range.OffsetInDescriptorsFromTableStart;
 
     if (IsPrevUnbound && IsAppending)
-      return make_error<ShaderRegisterOverflowError>(
+      return make_error<OffsetAppendAfterOverflow>(
           Range.RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
 
     const uint64_t OffsetBound =
         llvm::hlsl::rootsig::computeRangeBound(Offset, Range.NumDescriptors);
 
     if (!verifyNoOverflowedOffset(OffsetBound))
-      return make_error<DescriptorRangeOverflowError>(
+      return make_error<OffsetOverflowError>(
           Range.RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
 
     Offset = OffsetBound + 1;

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-appending-limits-multiples.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: Cannot append range with implicit lower bound after an unbounded range CBV(register=2, space=0).
+; CHECK: error: Offset overflow for descriptor range: CBV(register=2, space=0).
 
 define void @CSMain() "hlsl.shader"="compute" {
 entry:

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-appending-overflow.ll

@@ -1,7 +1,7 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
 ; This test check if a resource is implicitly overflowing. That means, it is appending a resource after an unbounded range.
 
-; CHECK: error: Cannot append range with implicit lower bound after an unbounded range UAV(register=0, space=0).
+; CHECK: error: Range UAV(register=0, space=0) cannot be appended after an unbounded range
 
 define void @CSMain() "hlsl.shader"="compute" {
 entry:

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-offset-overflow.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: Overflow for descriptor range: UAV(register=0, space=0)
+; CHECK: error:  Offset overflow for descriptor range: UAV(register=0, space=0).
 
 define void @CSMain() "hlsl.shader"="compute" {
 entry: