Skip to content

Commit d97eb7c

Browse files
Joao SaffranJoao Saffran
authored andcommitted
Merge branch 'validation/descriptor-tables' of https://github.com/joaosaffran/llvm-project into validation/descriptor-tables
2 parents ad0e1f3 + e5e73fe commit d97eb7c

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "llvm/Frontend/HLSL/HLSLRootSignature.h"
2020
#include "llvm/IR/Constants.h"
2121
#include "llvm/MC/DXContainerRootSignature.h"
22-
#include <cstdint>
2322

2423
namespace llvm {
2524
class LLVMContext;

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
2-
; CHECK: error: Cannot append range with implicit lower bound after an unbounded range UAV(register=3, space=4) exceeds maximum allowed value.
2+
; This test check if a resource is implicitly overflowing. That means, it is appending a resource after an unbounded range.
3+
4+
; CHECK: error: Cannot bind resource of type UAV(register=0, space=0), it exceeds the maximum allowed register value.
35

46
@TB.str = private unnamed_addr constant [3 x i8] c"TB\00", align 1
57

@@ -13,6 +15,7 @@ entry:
1315
!0 = !{ptr @CSMain, !1, i32 2}
1416
!1 = !{!3}
1517
!3 = !{!"DescriptorTable", i32 0, !4, !5}
16-
!4 = !{!"UAV", i32 -1, i32 1, i32 2, i32 -1, i32 0}
17-
!5 = !{!"UAV", i32 1, i32 3, i32 4, i32 -1, i32 0}
18+
!4 = !{!"UAV", i32 -1, i32 1, i32 0, i32 2, i32 0}
19+
!5 = !{!"UAV", i32 1, i32 0, i32 0, i32 -1, i32 0}
20+
1821

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
2-
; CHECK: error: Cannot append range with implicit lower bound after an unbounded range UAV(register=4294967295, space=0) exceeds maximum allowed value.
3-
2+
; CHECK: error: Cannot bind resource of type UAV(register=4294967295, space=0), it exceeds the maximum allowed register value.
43
@TB.str = private unnamed_addr constant [3 x i8] c"TB\00", align 1
54

65
define void @CSMain() "hlsl.shader"="compute" {

0 commit comments

Comments
 (0)