Skip to content

Commit bf51a9e

Browse files
kuharkuhar
committed
[mlir][spirv] Upgrade spirv group op syntax in tests
Fixing forward a missed test from llvm#115662.
1 parent 39a8046 commit bf51a9e

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

‎mlir/test/Conversion/SPIRVToLLVM/non-uniform-ops-to-llvm.mlir

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// CHECK: llvm.return %[[VAL_3]] : i32
3030
// CHECK: }
3131
spirv.func @non_uniform_iadd(%arg0: i32) -> i32 "None" {
32-
%0 = spirv.GroupNonUniformIAdd "Subgroup" "Reduce" %arg0 : i32
32+
%0 = spirv.GroupNonUniformIAdd <Subgroup> <Reduce> %arg0 : i32 -> i32
3333
spirv.ReturnValue %0 : i32
3434
}
3535

@@ -43,7 +43,7 @@ spirv.func @non_uniform_iadd(%arg0: i32) -> i32 "None" {
4343
// CHECK: }
4444
spirv.func @non_uniform_fadd(%arg0: f32) -> f32 "None" {
4545
%0 = spirv.Constant 16 : i32
46-
%1 = spirv.GroupNonUniformFAdd "Subgroup" "ClusteredReduce" %arg0 cluster_size(%0) : f32
46+
%1 = spirv.GroupNonUniformFAdd <Subgroup> <ClusteredReduce> %arg0 cluster_size(%0) : f32, i32 -> f32
4747
spirv.ReturnValue %1 : f32
4848
}
4949

@@ -57,7 +57,7 @@ spirv.func @non_uniform_fadd(%arg0: f32) -> f32 "None" {
5757
// CHECK: }
5858
spirv.func @non_uniform_imul(%arg0: i32) -> i32 "None" {
5959
%0 = spirv.Constant 16 : i32
60-
%1 = spirv.GroupNonUniformIMul "Subgroup" "ClusteredReduce" %arg0 cluster_size(%0) : i32
60+
%1 = spirv.GroupNonUniformIMul <Subgroup> <ClusteredReduce> %arg0 cluster_size(%0) : i32, i32 -> i32
6161
spirv.ReturnValue %1 : i32
6262
}
6363

@@ -69,7 +69,7 @@ spirv.func @non_uniform_imul(%arg0: i32) -> i32 "None" {
6969
// CHECK: llvm.return %[[VAL_3]] : f32
7070
// CHECK: }
7171
spirv.func @non_uniform_fmul(%arg0: f32) -> f32 "None" {
72-
%0 = spirv.GroupNonUniformFMul "Subgroup" "Reduce" %arg0 : f32
72+
%0 = spirv.GroupNonUniformFMul <Subgroup> <Reduce> %arg0 : f32 -> f32
7373
spirv.ReturnValue %0 : f32
7474
}
7575

@@ -81,7 +81,7 @@ spirv.func @non_uniform_fmul(%arg0: f32) -> f32 "None" {
8181
// CHECK: llvm.return %[[VAL_3]] : i32
8282
// CHECK: }
8383
spirv.func @non_uniform_smin(%arg0: i32) -> i32 "None" {
84-
%0 = spirv.GroupNonUniformSMin "Subgroup" "Reduce" %arg0 : i32
84+
%0 = spirv.GroupNonUniformSMin <Subgroup> <Reduce> %arg0 : i32 -> i32
8585
spirv.ReturnValue %0 : i32
8686
}
8787

@@ -93,7 +93,7 @@ spirv.func @non_uniform_smin(%arg0: i32) -> i32 "None" {
9393
// CHECK: llvm.return %[[VAL_3]] : i32
9494
// CHECK: }
9595
spirv.func @non_uniform_umin(%arg0: i32) -> i32 "None" {
96-
%0 = spirv.GroupNonUniformUMin "Subgroup" "Reduce" %arg0 : i32
96+
%0 = spirv.GroupNonUniformUMin <Subgroup> <Reduce> %arg0 : i32 -> i32
9797
spirv.ReturnValue %0 : i32
9898
}
9999

@@ -105,7 +105,7 @@ spirv.func @non_uniform_umin(%arg0: i32) -> i32 "None" {
105105
// CHECK: llvm.return %[[VAL_3]] : f32
106106
// CHECK: }
107107
spirv.func @non_uniform_fmin(%arg0: f32) -> f32 "None" {
108-
%0 = spirv.GroupNonUniformFMin "Subgroup" "Reduce" %arg0 : f32
108+
%0 = spirv.GroupNonUniformFMin <Subgroup> <Reduce> %arg0 : f32 -> f32
109109
spirv.ReturnValue %0 : f32
110110
}
111111

@@ -119,7 +119,7 @@ spirv.func @non_uniform_fmin(%arg0: f32) -> f32 "None" {
119119
// CHECK: }
120120
spirv.func @non_uniform_fmin_cluster(%arg0: f32) -> f32 "None" {
121121
%0 = spirv.Constant 16 : i32
122-
%1 = spirv.GroupNonUniformFMin "Subgroup" "ClusteredReduce" %arg0 cluster_size(%0) : f32
122+
%1 = spirv.GroupNonUniformFMin <Subgroup> <ClusteredReduce> %arg0 cluster_size(%0) : f32, i32 -> f32
123123
spirv.ReturnValue %1 : f32
124124
}
125125

@@ -131,7 +131,7 @@ spirv.func @non_uniform_fmin_cluster(%arg0: f32) -> f32 "None" {
131131
// CHECK: llvm.return %[[VAL_3]] : i32
132132
// CHECK: }
133133
spirv.func @non_uniform_smax(%arg0: i32) -> i32 "None" {
134-
%0 = spirv.GroupNonUniformSMax "Subgroup" "Reduce" %arg0 : i32
134+
%0 = spirv.GroupNonUniformSMax <Subgroup> <Reduce> %arg0 : i32 -> i32
135135
spirv.ReturnValue %0 : i32
136136
}
137137

@@ -143,7 +143,7 @@ spirv.func @non_uniform_smax(%arg0: i32) -> i32 "None" {
143143
// CHECK: llvm.return %[[VAL_3]] : i32
144144
// CHECK: }
145145
spirv.func @non_uniform_umax(%arg0: i32) -> i32 "None" {
146-
%0 = spirv.GroupNonUniformUMax "Subgroup" "Reduce" %arg0 : i32
146+
%0 = spirv.GroupNonUniformUMax <Subgroup> <Reduce> %arg0 : i32 -> i32
147147
spirv.ReturnValue %0 : i32
148148
}
149149

@@ -155,7 +155,7 @@ spirv.func @non_uniform_umax(%arg0: i32) -> i32 "None" {
155155
// CHECK: llvm.return %[[VAL_3]] : f32
156156
// CHECK: }
157157
spirv.func @non_uniform_fmax(%arg0: f32) -> f32 "None" {
158-
%0 = spirv.GroupNonUniformFMax "Subgroup" "Reduce" %arg0 : f32
158+
%0 = spirv.GroupNonUniformFMax <Subgroup> <Reduce> %arg0 : f32 -> f32
159159
spirv.ReturnValue %0 : f32
160160
}
161161

@@ -169,7 +169,7 @@ spirv.func @non_uniform_fmax(%arg0: f32) -> f32 "None" {
169169
// CHECK: }
170170
spirv.func @non_uniform_smax_cluster(%arg0: i32) -> i32 "None" {
171171
%0 = spirv.Constant 16 : i32
172-
%1 = spirv.GroupNonUniformSMax "Subgroup" "ClusteredReduce" %arg0 cluster_size(%0) : i32
172+
%1 = spirv.GroupNonUniformSMax <Subgroup> <ClusteredReduce> %arg0 cluster_size(%0) : i32, i32 -> i32
173173
spirv.ReturnValue %1 : i32
174174
}
175175

@@ -181,7 +181,7 @@ spirv.func @non_uniform_smax_cluster(%arg0: i32) -> i32 "None" {
181181
// CHECK: llvm.return %[[VAL_3]] : i32
182182
// CHECK: }
183183
spirv.func @non_uniform_bitwise_and(%arg0: i32) -> i32 "None" {
184-
%0 = spirv.GroupNonUniformBitwiseAnd "Subgroup" "Reduce" %arg0 : i32
184+
%0 = spirv.GroupNonUniformBitwiseAnd <Subgroup> <Reduce> %arg0 : i32 -> i32
185185
spirv.ReturnValue %0 : i32
186186
}
187187

@@ -193,7 +193,7 @@ spirv.func @non_uniform_bitwise_and(%arg0: i32) -> i32 "None" {
193193
// CHECK: llvm.return %[[VAL_3]] : i32
194194
// CHECK: }
195195
spirv.func @non_uniform_bitwise_or(%arg0: i32) -> i32 "None" {
196-
%0 = spirv.GroupNonUniformBitwiseOr "Subgroup" "Reduce" %arg0 : i32
196+
%0 = spirv.GroupNonUniformBitwiseOr <Subgroup> <Reduce> %arg0 : i32 -> i32
197197
spirv.ReturnValue %0 : i32
198198
}
199199

@@ -205,7 +205,7 @@ spirv.func @non_uniform_bitwise_or(%arg0: i32) -> i32 "None" {
205205
// CHECK: llvm.return %[[VAL_3]] : i32
206206
// CHECK: }
207207
spirv.func @non_uniform_bitwise_xor(%arg0: i32) -> i32 "None" {
208-
%0 = spirv.GroupNonUniformBitwiseXor "Subgroup" "Reduce" %arg0 : i32
208+
%0 = spirv.GroupNonUniformBitwiseXor <Subgroup> <Reduce> %arg0 : i32 -> i32
209209
spirv.ReturnValue %0 : i32
210210
}
211211

@@ -217,7 +217,7 @@ spirv.func @non_uniform_bitwise_xor(%arg0: i32) -> i32 "None" {
217217
// CHECK: llvm.return %[[VAL_3]] : i1
218218
// CHECK: }
219219
spirv.func @non_uniform_logical_and(%arg0: i1) -> i1 "None" {
220-
%0 = spirv.GroupNonUniformLogicalAnd "Subgroup" "Reduce" %arg0 : i1
220+
%0 = spirv.GroupNonUniformLogicalAnd <Subgroup> <Reduce> %arg0 : i1 -> i1
221221
spirv.ReturnValue %0 : i1
222222
}
223223

@@ -229,7 +229,7 @@ spirv.func @non_uniform_logical_and(%arg0: i1) -> i1 "None" {
229229
// CHECK: llvm.return %[[VAL_3]] : i1
230230
// CHECK: }
231231
spirv.func @non_uniform_logical_or(%arg0: i1) -> i1 "None" {
232-
%0 = spirv.GroupNonUniformLogicalOr "Subgroup" "Reduce" %arg0 : i1
232+
%0 = spirv.GroupNonUniformLogicalOr <Subgroup> <Reduce> %arg0 : i1 -> i1
233233
spirv.ReturnValue %0 : i1
234234
}
235235

@@ -241,7 +241,6 @@ spirv.func @non_uniform_logical_or(%arg0: i1) -> i1 "None" {
241241
// CHECK: llvm.return %[[VAL_3]] : i1
242242
// CHECK: }
243243
spirv.func @non_uniform_logical_xor(%arg0: i1) -> i1 "None" {
244-
%0 = spirv.GroupNonUniformLogicalXor "Subgroup" "Reduce" %arg0 : i1
244+
%0 = spirv.GroupNonUniformLogicalXor <Subgroup> <Reduce> %arg0 : i1 -> i1
245245
spirv.ReturnValue %0 : i1
246246
}
247-

0 commit comments

Comments
 (0)