Skip to content

Commit 56ae9d9

Browse files
committed
fix up testcases using invalid num descriptors
1 parent ab274d2 commit 56ae9d9

6 files changed

+9
-9
lines changed

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-AllValidFlagCombinationsV1.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
1313
!2 = !{ ptr @main, !3, i32 1 } ; function, root signature
1414
!3 = !{ !5 } ; list of root signature elements
1515
!5 = !{ !"DescriptorTable", i32 0, !6, !7 }
16-
!6 = !{ !"Sampler", i32 0, i32 1, i32 0, i32 -1, i32 1 }
16+
!6 = !{ !"Sampler", i32 1, i32 1, i32 0, i32 -1, i32 1 }
1717
!7 = !{ !"UAV", i32 5, i32 1, i32 10, i32 5, i32 3 }
1818

1919

@@ -33,7 +33,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
3333
; DXC-NEXT: RangesOffset: 44
3434
; DXC-NEXT: Ranges:
3535
; DXC-NEXT: - RangeType: 3
36-
; DXC-NEXT: NumDescriptors: 0
36+
; DXC-NEXT: NumDescriptors: 1
3737
; DXC-NEXT: BaseShaderRegister: 1
3838
; DXC-NEXT: RegisterSpace: 0
3939
; DXC-NEXT: OffsetInDescriptorsFromTableStart: 4294967295

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-Invalid-Flag.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
1616
!2 = !{ ptr @main, !3, i32 2 } ; function, root signature
1717
!3 = !{ !5 } ; list of root signature elements
1818
!5 = !{ !"DescriptorTable", i32 0, !6, !7 }
19-
!6 = !{ !"SRV", i32 0, i32 1, i32 0, i32 -1, i32 22 }
19+
!6 = !{ !"SRV", i32 1, i32 1, i32 0, i32 -1, i32 22 }
2020
!7 = !{ !"UAV", i32 5, i32 1, i32 10, i32 5, i32 2 }

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-Invalid-RangeType.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
1616
!2 = !{ ptr @main, !3, i32 2 } ; function, root signature
1717
!3 = !{ !5 } ; list of root signature elements
1818
!5 = !{ !"DescriptorTable", i32 0, !6, !7 }
19-
!6 = !{ !"Invalid", i32 0, i32 0, i32 -1, i32 -1, i32 4 }
19+
!6 = !{ !"Invalid", i32 1, i32 0, i32 -1, i32 -1, i32 4 }
2020
!7 = !{ !"UAV", i32 5, i32 1, i32 10, i32 5, i32 2 }

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable-Invalid-RegisterSpace.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
1616
!2 = !{ ptr @main, !3, i32 2 } ; function, root signature
1717
!3 = !{ !5 } ; list of root signature elements
1818
!5 = !{ !"DescriptorTable", i32 0, !6, !7 }
19-
!6 = !{ !"SRV", i32 0, i32 0, i32 10, i32 -1, i32 4 }
19+
!6 = !{ !"SRV", i32 1, i32 0, i32 10, i32 -1, i32 4 }
2020
!7 = !{ !"UAV", i32 5, i32 1, i32 4294967280, i32 5, i32 2 }

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-DescriptorTable.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
1616
!2 = !{ ptr @main, !3, i32 2 } ; function, root signature
1717
!3 = !{ !5 } ; list of root signature elements
1818
!5 = !{ !"DescriptorTable", i32 0, !6, !7 }
19-
!6 = !{ !"SRV", i32 0, i32 1, i32 0, i32 -1, i32 4 }
19+
!6 = !{ !"SRV", i32 1, i32 1, i32 0, i32 -1, i32 4 }
2020
!7 = !{ !"UAV", i32 5, i32 1, i32 10, i32 5, i32 2 }
2121

2222
; DXC: - Name: RTS0
@@ -35,7 +35,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
3535
; DXC-NEXT: RangesOffset: 44
3636
; DXC-NEXT: Ranges:
3737
; DXC-NEXT: - RangeType: 0
38-
; DXC-NEXT: NumDescriptors: 0
38+
; DXC-NEXT: NumDescriptors: 1
3939
; DXC-NEXT: BaseShaderRegister: 1
4040
; DXC-NEXT: RegisterSpace: 0
4141
; DXC-NEXT: OffsetInDescriptorsFromTableStart: 4294967295

llvm/test/CodeGen/DirectX/ContainerData/RootSignature-Parameters.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
1717
!5 = !{ !"RootConstants", i32 0, i32 1, i32 2, i32 3 }
1818
!6 = !{ !"RootSRV", i32 1, i32 4, i32 5, i32 6 }
1919
!7 = !{ !"DescriptorTable", i32 0, !8, !9 }
20-
!8 = !{ !"SRV", i32 0, i32 1, i32 0, i32 -1, i32 4 }
20+
!8 = !{ !"SRV", i32 1, i32 1, i32 0, i32 -1, i32 4 }
2121
!9 = !{ !"UAV", i32 5, i32 1, i32 10, i32 5, i32 2 }
2222

2323
;CHECK-LABEL: Definition for 'main':
@@ -41,7 +41,7 @@ attributes #0 = { "hlsl.numthreads"="1,1,1" "hlsl.shader"="compute" }
4141
;CHECK-NEXT: - Range Type: 0
4242
;CHECK-NEXT: Register Space: 0
4343
;CHECK-NEXT: Base Shader Register: 1
44-
;CHECK-NEXT: Num Descriptors: 0
44+
;CHECK-NEXT: Num Descriptors: 1
4545
;CHECK-NEXT: Offset In Descriptors From Table Start: 4294967295
4646
;CHECK-NEXT: Flags: 4
4747
;CHECK-NEXT: - Range Type: 1

0 commit comments

Comments
 (0)