Skip to content

Commit 7724a12

Browse files
joaosaffranjoaosaffran
authored
[Root Signature] Updating tests to follow the new yaml representation (#440)
This patch updates the Root Signature tests to enums, instead of numbers, to represent certain fields in root signatures. This is required since we changed Root Signature's yaml representation recently in this pr: [llvm/llvm-project#154827](llvm/llvm-project#154827)
1 parent 83b8448 commit 7724a12

11 files changed

+82
-82
lines changed

‎test/Feature/RootSignatures/Defaults.test‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,38 +105,38 @@ DescriptorSets:
105105
# OBJ-NEXT: Parameters:
106106

107107
## RootConstants(num32BitConstants = 4, b0)
108-
# OBJ-NEXT: - ParameterType: 1
109-
# OBJ-NEXT: ShaderVisibility: 0
108+
# OBJ-NEXT: - ParameterType: Constants32Bit
109+
# OBJ-NEXT: ShaderVisibility: All
110110
# OBJ-NEXT: Constants:
111111
# OBJ-NEXT: Num32BitValues: 4
112112
# OBJ-NEXT: RegisterSpace: 0
113113
# OBJ-NEXT: ShaderRegister: 0
114114

115115
## DescriptorTable
116-
# OBJ: - ParameterType: 0
117-
# OBJ-NEXT: ShaderVisibility: 0
116+
# OBJ: - ParameterType: DescriptorTable
117+
# OBJ-NEXT: ShaderVisibility: All
118118
# OBJ-NEXT: Table:
119119
# OBJ-NEXT: NumRanges: 2
120120
# OBJ-NEXT: RangesOffset: 80
121121
# OBJ-NEXT: Ranges:
122122

123123
## SRV(t0)
124-
# OBJ-NEXT: - RangeType: 0
124+
# OBJ-NEXT: - RangeType: SRV
125125
# OBJ-NEXT: NumDescriptors: 1
126126
# OBJ-NEXT: BaseShaderRegister: 0
127127
# OBJ-NEXT: RegisterSpace: 0
128128
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
129129

130130
## UAV(u1)
131-
# OBJ: - RangeType: 1
131+
# OBJ: - RangeType: UAV
132132
# OBJ-NEXT: NumDescriptors: 1
133133
# OBJ-NEXT: BaseShaderRegister: 1
134134
# OBJ-NEXT: RegisterSpace: 0
135135
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
136136

137137
## UAV(u2)
138-
# OBJ: - ParameterType: 4
139-
# OBJ-NEXT: ShaderVisibility: 0
138+
# OBJ: - ParameterType: UAV
139+
# OBJ-NEXT: ShaderVisibility: All
140140
# OBJ-NEXT: Descriptor:
141141
# OBJ-NEXT: RegisterSpace: 0
142142
# OBJ-NEXT: ShaderRegister: 2

‎test/Feature/RootSignatures/DescriptorTables.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,23 @@ DescriptorSets:
7474
# OBJ-NEXT: NumStaticSamplers: 0
7575
# OBJ-NEXT: StaticSamplersOffset: 116
7676
# OBJ-NEXT: Parameters:
77-
# OBJ-NEXT: - ParameterType: 0
78-
# OBJ-NEXT: ShaderVisibility: 0
77+
# OBJ-NEXT: - ParameterType: DescriptorTable
78+
# OBJ-NEXT: ShaderVisibility: All
7979
# OBJ-NEXT: Table:
8080
# OBJ-NEXT: NumRanges: 3
8181
# OBJ-NEXT: RangesOffset: 44
8282
# OBJ-NEXT: Ranges:
83-
# OBJ-NEXT: - RangeType: 0
83+
# OBJ-NEXT: - RangeType: SRV
8484
# OBJ-NEXT: NumDescriptors: 1
8585
# OBJ-NEXT: BaseShaderRegister: 2
8686
# OBJ-NEXT: RegisterSpace: 0
8787
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
88-
# OBJ: - RangeType: 1
88+
# OBJ: - RangeType: UAV
8989
# OBJ-NEXT: NumDescriptors: 1
9090
# OBJ-NEXT: BaseShaderRegister: 1
9191
# OBJ-NEXT: RegisterSpace: 4
9292
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
93-
# OBJ: - RangeType: 1
93+
# OBJ: - RangeType: UAV
9494
# OBJ-NEXT: NumDescriptors: 1
9595
# OBJ-NEXT: BaseShaderRegister: 2
9696
# OBJ-NEXT: RegisterSpace: 4

‎test/Feature/RootSignatures/Flags.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ DescriptorSets:
115115
# OBJ-NEXT: Parameters:
116116

117117
## Descriptor Table
118-
# OBJ-NEXT: - ParameterType: 0
119-
# OBJ-NEXT: ShaderVisibility: 0
118+
# OBJ-NEXT: - ParameterType: DescriptorTable
119+
# OBJ-NEXT: ShaderVisibility: All
120120
# OBJ-NEXT: Table:
121121
# OBJ-NEXT: NumRanges: 4
122122
# OBJ-NEXT: RangesOffset: 44
123123
# OBJ-NEXT: Ranges:
124124

125125
## SRV(t0, flags = DATA_STATIC)
126-
# OBJ-NEXT: - RangeType: 0
126+
# OBJ-NEXT: - RangeType: SRV
127127
# OBJ-NEXT: NumDescriptors: 1
128128
# OBJ-NEXT: BaseShaderRegister: 0
129129
# OBJ-NEXT: RegisterSpace: 0
@@ -132,7 +132,7 @@ DescriptorSets:
132132
# OBJ-NEXT: DATA_STATIC: true
133133

134134
## SRV(t1, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)
135-
# OBJ-NEXT: - RangeType: 0
135+
# OBJ-NEXT: - RangeType: SRV
136136
# OBJ-NEXT: NumDescriptors: 1
137137
# OBJ-NEXT: BaseShaderRegister: 1
138138
# OBJ-NEXT: RegisterSpace: 0
@@ -141,7 +141,7 @@ DescriptorSets:
141141
# OBJ-NEXT: DATA_STATIC_WHILE_SET_AT_EXECUTE: true
142142

143143
## UAV(u1, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE)
144-
# OBJ-NEXT: - RangeType: 1
144+
# OBJ-NEXT: - RangeType: UAV
145145
# OBJ-NEXT: NumDescriptors: 1
146146
# OBJ-NEXT: BaseShaderRegister: 1
147147
# OBJ-NEXT: RegisterSpace: 0
@@ -151,7 +151,7 @@ DescriptorSets:
151151
# OBJ-NEXT: DATA_VOLATILE: true
152152

153153
## UAV(u2, flags = 0)
154-
# OBJ-NEXT: - RangeType: 1
154+
# OBJ-NEXT: - RangeType: UAV
155155
# OBJ-NEXT: NumDescriptors: 1
156156
# OBJ-NEXT: BaseShaderRegister: 2
157157
# OBJ-NEXT: RegisterSpace: 0

‎test/Feature/RootSignatures/ManualDescriptors.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,15 @@ DescriptorSets:
110110
# OBJ-NEXT: Parameters:
111111

112112
## DescriptorTable
113-
# OBJ-NEXT: - ParameterType: 0
114-
# OBJ-NEXT: ShaderVisibility: 0
113+
# OBJ-NEXT: - ParameterType: DescriptorTable
114+
# OBJ-NEXT: ShaderVisibility: All
115115
# OBJ-NEXT: Table:
116116
# OBJ-NEXT: NumRanges: 3
117117
# OBJ-NEXT: RangesOffset: 44
118118
# OBJ-NEXT: Ranges:
119119

120120
## UAV(u2, offset = 3, numDescriptors = unbounded)
121-
# OBJ: - RangeType: 1
121+
# OBJ: - RangeType: UAV
122122
## Ensure unbounded descriptors
123123
# OBJ-NEXT: NumDescriptors: -1
124124
# OBJ-NEXT: BaseShaderRegister: 2
@@ -127,7 +127,7 @@ DescriptorSets:
127127
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 3
128128

129129
## SRV(t0, offset = 0, numDescriptors = 2)
130-
# OBJ: - RangeType: 0
130+
# OBJ: - RangeType: SRV
131131
## Ensure 2 descriptors
132132
# OBJ-NEXT: NumDescriptors: 2
133133
# OBJ-NEXT: BaseShaderRegister: 0
@@ -139,7 +139,7 @@ DescriptorSets:
139139
## offset = DESCRIPTOR_RANGE_OFFSET_APPEND,
140140
## numDescriptors = 1
141141
## )
142-
# OBJ: - RangeType: 1
142+
# OBJ: - RangeType: UAV
143143
## Ensure 1 descriptor
144144
# OBJ-NEXT: NumDescriptors: 1
145145
# OBJ-NEXT: BaseShaderRegister: 1

‎test/Feature/RootSignatures/NumberParameters.test‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,41 +110,41 @@ DescriptorSets:
110110
# OBJ-NEXT: Parameters:
111111

112112
## RootConstants(num32BitConstants = +61, b0)
113-
# OBJ-NEXT: - ParameterType: 1
114-
# OBJ-NEXT: ShaderVisibility: 0
113+
# OBJ-NEXT: - ParameterType: Constants32Bit
114+
# OBJ-NEXT: ShaderVisibility: All
115115
# OBJ-NEXT: Constants:
116116
## Check positively signed integer
117117
# OBJ-NEXT: Num32BitValues: 61
118118
# OBJ-NEXT: RegisterSpace: 0
119119
# OBJ-NEXT: ShaderRegister: 0
120120

121121
## DescriptorTable
122-
# OBJ-NEXT: - ParameterType: 0
123-
# OBJ-NEXT: ShaderVisibility: 0
122+
# OBJ-NEXT: - ParameterType: DescriptorTable
123+
# OBJ-NEXT: ShaderVisibility: All
124124
# OBJ-NEXT: Table:
125125
# OBJ-NEXT: NumRanges: 2
126126
# OBJ-NEXT: RangesOffset: 80
127127
# OBJ-NEXT: Ranges:
128128

129129
## SRV(t4294967294)
130-
# OBJ-NEXT: - RangeType: 0
130+
# OBJ-NEXT: - RangeType: SRV
131131
# OBJ-NEXT: NumDescriptors: 1
132132
## Check edge-case
133133
# OBJ-NEXT: BaseShaderRegister: 4294967294
134134
# OBJ-NEXT: RegisterSpace: 0
135135
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
136136

137137
## UAV(u1, space = 4294967279)
138-
# OBJ: - RangeType: 1
138+
# OBJ: - RangeType: UAV
139139
# OBJ-NEXT: NumDescriptors: 1
140140
# OBJ-NEXT: BaseShaderRegister: 1
141141
## Check edge-case
142142
# OBJ-NEXT: RegisterSpace: 4294967279
143143
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
144144

145145
## UAV(u2)
146-
# OBJ: - ParameterType: 4
147-
# OBJ-NEXT: ShaderVisibility: 0
146+
# OBJ: - ParameterType: UAV
147+
# OBJ-NEXT: ShaderVisibility: All
148148
# OBJ-NEXT: Descriptor:
149149
# OBJ-NEXT: RegisterSpace: 0
150150
# OBJ-NEXT: ShaderRegister: 2

‎test/Feature/RootSignatures/ParameterInsensitivity.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,25 @@ DescriptorSets:
9292
# OBJ-NEXT: NumStaticSamplers: 0
9393
# OBJ-NEXT: StaticSamplersOffset: 116
9494
# OBJ-NEXT: Parameters:
95-
# OBJ-NEXT: - ParameterType: 1
96-
# OBJ-NEXT: ShaderVisibility: 0
95+
# OBJ-NEXT: - ParameterType: Constants32Bit
96+
# OBJ-NEXT: ShaderVisibility: All
9797
# OBJ-NEXT: Constants:
9898
# OBJ-NEXT: Num32BitValues: 4
9999
# OBJ-NEXT: RegisterSpace: 2
100100
# OBJ-NEXT: ShaderRegister: 0
101-
# OBJ-NEXT: - ParameterType: 0
102-
# OBJ-NEXT: ShaderVisibility: 0
101+
# OBJ-NEXT: - ParameterType: DescriptorTable
102+
# OBJ-NEXT: ShaderVisibility: All
103103
# OBJ-NEXT: Table:
104104
# OBJ-NEXT: NumRanges: 2
105105
# OBJ-NEXT: RangesOffset: 68
106106
# OBJ-NEXT: Ranges:
107-
# OBJ-NEXT: - RangeType: 0
107+
# OBJ-NEXT: - RangeType: SRV
108108
# OBJ-NEXT: NumDescriptors: 1
109109
# OBJ-NEXT: BaseShaderRegister: 0
110110
# OBJ-NEXT: RegisterSpace: 0
111111
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
112112
# OBJ-NEXT: DATA_STATIC: true
113-
# OBJ-NEXT: - RangeType: 1
113+
# OBJ-NEXT: - RangeType: UAV
114114
# OBJ-NEXT: NumDescriptors: -1
115115
# OBJ-NEXT: BaseShaderRegister: 1
116116
# OBJ-NEXT: RegisterSpace: 0

‎test/Feature/RootSignatures/RootConstants.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,24 @@ DescriptorSets:
7373
# OBJ-NEXT: NumStaticSamplers: 0
7474
# OBJ-NEXT: StaticSamplersOffset: 116
7575
# OBJ-NEXT: Parameters:
76-
# OBJ-NEXT: - ParameterType: 1
77-
# OBJ-NEXT: ShaderVisibility: 0
76+
# OBJ-NEXT: - ParameterType: Constants32Bit
77+
# OBJ-NEXT: ShaderVisibility: All
7878
# OBJ-NEXT: Constants:
7979
# OBJ-NEXT: Num32BitValues: 4
8080
# OBJ-NEXT: RegisterSpace: 0
8181
# OBJ-NEXT: ShaderRegister: 2
82-
# OBJ: - ParameterType: 0
83-
# OBJ-NEXT: ShaderVisibility: 0
82+
# OBJ: - ParameterType: DescriptorTable
83+
# OBJ-NEXT: ShaderVisibility: All
8484
# OBJ-NEXT: Table:
8585
# OBJ-NEXT: NumRanges: 2
8686
# OBJ-NEXT: RangesOffset: 68
8787
# OBJ-NEXT: Ranges:
88-
# OBJ: - RangeType: 0
88+
# OBJ: - RangeType: SRV
8989
# OBJ-NEXT: NumDescriptors: 1
9090
# OBJ-NEXT: BaseShaderRegister: 2
9191
# OBJ-NEXT: RegisterSpace: 0
9292
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
93-
# OBJ: - RangeType: 1
93+
# OBJ: - RangeType: UAV
9494
# OBJ-NEXT: NumDescriptors: 1
9595
# OBJ-NEXT: BaseShaderRegister: 1
9696
# OBJ-NEXT: RegisterSpace: 4

‎test/Feature/RootSignatures/RootDescriptorAndTables.test‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,24 @@ DescriptorSets:
7878
# OBJ-NEXT: NumStaticSamplers: 0
7979
# OBJ-NEXT: StaticSamplersOffset: 116
8080
# OBJ-NEXT: Parameters:
81-
# OBJ-NEXT: - ParameterType: 2
82-
# OBJ-NEXT: ShaderVisibility: 0
81+
# OBJ-NEXT: - ParameterType: CBV
82+
# OBJ-NEXT: ShaderVisibility: All
8383
# OBJ-NEXT: Descriptor:
8484
# OBJ-NEXT: RegisterSpace: 0
8585
# OBJ-NEXT: ShaderRegister: 2
86-
# OBJ: - ParameterType: 0
87-
# OBJ-NEXT: ShaderVisibility: 0
86+
# OBJ: - ParameterType: DescriptorTable
87+
# OBJ-NEXT: ShaderVisibility: All
8888
# OBJ-NEXT: Table:
8989
# OBJ-NEXT: NumRanges: 1
9090
# OBJ-NEXT: RangesOffset: 80
9191
# OBJ-NEXT: Ranges:
92-
# OBJ-NEXT: - RangeType: 0
92+
# OBJ-NEXT: - RangeType: SRV
9393
# OBJ-NEXT: NumDescriptors: 1
9494
# OBJ-NEXT: BaseShaderRegister: 2
9595
# OBJ-NEXT: RegisterSpace: 0
9696
# OBJ-NEXT: OffsetInDescriptorsFromTableStart: 4294967295
97-
# OBJ: - ParameterType: 4
98-
# OBJ-NEXT: ShaderVisibility: 0
97+
# OBJ: - ParameterType: UAV
98+
# OBJ-NEXT: ShaderVisibility: All
9999
# OBJ-NEXT: Descriptor:
100100
# OBJ-NEXT: RegisterSpace: 4
101101
# OBJ-NEXT: ShaderRegister: 1

‎test/Feature/RootSignatures/RootDescriptors.test‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ DescriptorSets: []
7575
# OBJ-NEXT: NumStaticSamplers: 0
7676
# OBJ-NEXT: StaticSamplersOffset: 96
7777
# OBJ-NEXT: Parameters:
78-
# OBJ-NEXT: - ParameterType: 2
79-
# OBJ-NEXT: ShaderVisibility: 0
78+
# OBJ-NEXT: - ParameterType: CBV
79+
# OBJ-NEXT: ShaderVisibility: All
8080
# OBJ-NEXT: Descriptor:
8181
# OBJ-NEXT: RegisterSpace: 0
8282
# OBJ-NEXT: ShaderRegister: 2
83-
# OBJ: - ParameterType: 3
84-
# OBJ-NEXT: ShaderVisibility: 0
83+
# OBJ: - ParameterType: SRV
84+
# OBJ-NEXT: ShaderVisibility: All
8585
# OBJ-NEXT: Descriptor:
8686
# OBJ-NEXT: RegisterSpace: 0
8787
# OBJ-NEXT: ShaderRegister: 2
88-
# OBJ: - ParameterType: 4
89-
# OBJ-NEXT: ShaderVisibility: 0
88+
# OBJ: - ParameterType: UAV
89+
# OBJ-NEXT: ShaderVisibility: All
9090
# OBJ-NEXT: Descriptor:
9191
# OBJ-NEXT: RegisterSpace: 4
9292
# OBJ-NEXT: ShaderRegister: 1

0 commit comments

Comments
 (0)