Skip to content

Commit 0fd3a1c

Browse files
River707River707
committed
[mlir][NFC] Update remaining textual references of un-namespaced func operations
The special case parsing of operations in the `func` dialect is being removed, and operations will require the dialect namespace prefix.
1 parent cda6aa7 commit 0fd3a1c

34 files changed

+127
-127
lines changed

‎mlir/test/CAPI/execution_engine.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ void testSimpleExecution() {
4545
MlirModule module = mlirModuleCreateParse(
4646
ctx, mlirStringRefCreateFromCString(
4747
// clang-format off
48-
"module { \n"
49-
" func @add(%arg0 : i32) -> i32 attributes { llvm.emit_c_interface } { \n"
50-
" %res = arith.addi %arg0, %arg0 : i32 \n"
51-
" return %res : i32 \n"
52-
" } \n"
48+
"module { \n"
49+
" func.func @add(%arg0 : i32) -> i32 attributes { llvm.emit_c_interface } { \n"
50+
" %res = arith.addi %arg0, %arg0 : i32 \n"
51+
" return %res : i32 \n"
52+
" } \n"
5353
"}"));
5454
// clang-format on
5555
lowerModuleToLLVM(ctx, module);

‎mlir/test/CAPI/pass.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void testRunPassOnModule() {
3030
ctx,
3131
// clang-format off
3232
mlirStringRefCreateFromCString(
33-
"func @foo(%arg0 : i32) -> i32 { \n"
33+
"func.func @foo(%arg0 : i32) -> i32 { \n"
3434
" %res = arith.addi %arg0, %arg0 : i32 \n"
3535
" return %res : i32 \n"
3636
"}"));
@@ -64,17 +64,17 @@ void testRunPassOnNestedModule() {
6464
MlirContext ctx = mlirContextCreate();
6565
mlirRegisterAllDialects(ctx);
6666

67-
MlirModule module =
68-
mlirModuleCreateParse(ctx,
69-
// clang-format off
67+
MlirModule module = mlirModuleCreateParse(
68+
ctx,
69+
// clang-format off
7070
mlirStringRefCreateFromCString(
71-
"func @foo(%arg0 : i32) -> i32 { \n"
71+
"func.func @foo(%arg0 : i32) -> i32 { \n"
7272
" %res = arith.addi %arg0, %arg0 : i32 \n"
7373
" return %res : i32 \n"
7474
"} \n"
7575
"module { \n"
76-
" func @bar(%arg0 : f32) -> f32 { \n"
77-
" %res = arith.addf %arg0, %arg0 : f32 \n"
76+
" func.func @bar(%arg0 : f32) -> f32 { \n"
77+
" %res = arith.addf %arg0, %arg0 : f32 \n"
7878
" return %res : f32 \n"
7979
" } \n"
8080
"}"));
@@ -268,7 +268,7 @@ void testExternalPass() {
268268
ctx,
269269
// clang-format off
270270
mlirStringRefCreateFromCString(
271-
"func @foo(%arg0 : i32) -> i32 { \n"
271+
"func.func @foo(%arg0 : i32) -> i32 { \n"
272272
" %res = arith.addi %arg0, %arg0 : i32 \n"
273273
" return %res : i32 \n"
274274
"}"));

‎mlir/test/Conversion/AffineToStandard/lower-affine.mlir

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func.func private @body(index) -> ()
1919
// CHECK-NEXT: }
2020
func.func @simple_loop() {
2121
affine.for %i = 1 to 42 {
22-
call @body(%i) : (index) -> ()
22+
func.call @body(%i) : (index) -> ()
2323
}
2424
return
2525
}
@@ -72,11 +72,11 @@ func.func private @post(index) -> ()
7272
// CHECK-NEXT: }
7373
func.func @imperfectly_nested_loops() {
7474
affine.for %i = 0 to 42 {
75-
call @pre(%i) : (index) -> ()
75+
func.call @pre(%i) : (index) -> ()
7676
affine.for %j = 7 to 56 step 2 {
77-
call @body2(%i, %j) : (index, index) -> ()
77+
func.call @body2(%i, %j) : (index, index) -> ()
7878
}
79-
call @post(%i) : (index) -> ()
79+
func.call @post(%i) : (index) -> ()
8080
}
8181
return
8282
}
@@ -111,15 +111,15 @@ func.func private @body3(index, index) -> ()
111111
// CHECK-NEXT: }
112112
func.func @more_imperfectly_nested_loops() {
113113
affine.for %i = 0 to 42 {
114-
call @pre(%i) : (index) -> ()
114+
func.call @pre(%i) : (index) -> ()
115115
affine.for %j = 7 to 56 step 2 {
116-
call @body2(%i, %j) : (index, index) -> ()
116+
func.call @body2(%i, %j) : (index, index) -> ()
117117
}
118-
call @mid(%i) : (index) -> ()
118+
func.call @mid(%i) : (index) -> ()
119119
affine.for %k = 18 to 37 step 3 {
120-
call @body3(%i, %k) : (index, index) -> ()
120+
func.call @body3(%i, %k) : (index, index) -> ()
121121
}
122-
call @post(%i) : (index) -> ()
122+
func.call @post(%i) : (index) -> ()
123123
}
124124
return
125125
}
@@ -139,7 +139,7 @@ func.func @more_imperfectly_nested_loops() {
139139
func.func @affine_apply_loops_shorthand(%N : index) {
140140
affine.for %i = 0 to %N {
141141
affine.for %j = affine_map<(d0)[]->(d0)>(%i)[] to 42 {
142-
call @body2(%i, %j) : (index, index) -> ()
142+
func.call @body2(%i, %j) : (index, index) -> ()
143143
}
144144
}
145145
return
@@ -168,7 +168,7 @@ func.func private @get_idx() -> (index)
168168
func.func @if_only() {
169169
%i = call @get_idx() : () -> (index)
170170
affine.if #set1(%i) {
171-
call @body(%i) : (index) -> ()
171+
func.call @body(%i) : (index) -> ()
172172
}
173173
return
174174
}
@@ -191,9 +191,9 @@ func.func @if_only() {
191191
func.func @if_else() {
192192
%i = call @get_idx() : () -> (index)
193193
affine.if #set1(%i) {
194-
call @body(%i) : (index) -> ()
194+
func.call @body(%i) : (index) -> ()
195195
} else {
196-
call @mid(%i) : (index) -> ()
196+
func.call @mid(%i) : (index) -> ()
197197
}
198198
return
199199
}
@@ -229,11 +229,11 @@ func.func @nested_ifs() {
229229
%i = call @get_idx() : () -> (index)
230230
affine.if #set1(%i) {
231231
affine.if #set2(%i) {
232-
call @body(%i) : (index) -> ()
232+
func.call @body(%i) : (index) -> ()
233233
}
234234
} else {
235235
affine.if #set2(%i) {
236-
call @mid(%i) : (index) -> ()
236+
func.call @mid(%i) : (index) -> ()
237237
}
238238
}
239239
return
@@ -303,9 +303,9 @@ func.func @if_with_yield() -> (i64) {
303303
func.func @multi_cond(%N : index, %M : index, %K : index, %L : index) {
304304
%i = call @get_idx() : () -> (index)
305305
affine.if #setN(%i)[%N,%M,%K,%L] {
306-
call @body(%i) : (index) -> ()
306+
func.call @body(%i) : (index) -> ()
307307
} else {
308-
call @mid(%i) : (index) -> ()
308+
func.call @mid(%i) : (index) -> ()
309309
}
310310
return
311311
}
@@ -334,7 +334,7 @@ func.func @if_for() {
334334
affine.if #set1(%i) {
335335
affine.for %j = 0 to 42 {
336336
affine.if #set2(%j) {
337-
call @body2(%i, %j) : (index, index) -> ()
337+
func.call @body2(%i, %j) : (index, index) -> ()
338338
}
339339
}
340340
}
@@ -354,7 +354,7 @@ func.func @if_for() {
354354
affine.for %k = 0 to 42 {
355355
affine.if #set2(%k) {
356356
affine.for %l = 0 to 42 {
357-
call @body3(%k, %l) : (index, index) -> ()
357+
func.call @body3(%k, %l) : (index, index) -> ()
358358
}
359359
}
360360
}
@@ -389,7 +389,7 @@ func.func @if_for() {
389389
func.func @loop_min_max(%N : index) {
390390
affine.for %i = 0 to 42 {
391391
affine.for %j = max #lbMultiMap(%i)[%N] to min #ubMultiMap(%i)[%N] {
392-
call @body2(%i, %j) : (index, index) -> ()
392+
func.call @body2(%i, %j) : (index, index) -> ()
393393
}
394394
}
395395
return
@@ -422,7 +422,7 @@ func.func @loop_min_max(%N : index) {
422422
// CHECK-NEXT: }
423423
func.func @min_reduction_tree(%v1 : index, %v2 : index, %v3 : index, %v4 : index, %v5 : index, %v6 : index, %v7 : index) {
424424
affine.for %i = 0 to min #map_7_values(%v1, %v2, %v3, %v4, %v5, %v6, %v7)[] {
425-
call @body(%i) : (index) -> ()
425+
func.call @body(%i) : (index) -> ()
426426
}
427427
return
428428
}

‎mlir/test/Conversion/SCFToControlFlow/convert-to-cfg.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func.func @parallel_reduce_loop(%arg0 : index, %arg1 : index, %arg2 : index,
389389
scf.reduce.return %1 : f32
390390
}
391391

392-
%2 = call @generate() : () -> i64
392+
%2 = func.call @generate() : () -> i64
393393
scf.reduce(%2) : i64 {
394394
^bb0(%lhs: i64, %rhs: i64):
395395
%3 = arith.ori %lhs, %rhs : i64

‎mlir/test/Conversion/VectorToSCF/vector-to-scf.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ func.func @transfer_read_within_async_execute(%A : memref<2x2xf32>) -> !async.to
495495
// CHECK: alloca
496496
%token = async.execute {
497497
%0 = vector.transfer_read %A[%c0, %c0], %f0 : memref<2x2xf32>, vector<2x2xf32>
498-
call @fake_side_effecting_fun(%0) : (vector<2x2xf32>) -> ()
498+
func.call @fake_side_effecting_fun(%0) : (vector<2x2xf32>) -> ()
499499
async.yield
500500
}
501501
return %token : !async.token

‎mlir/test/Dialect/Affine/inlining.mlir

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func.func @not_inline_in_affine_op() {
3030
// CHECK-NOT: affine.if
3131
// CHECK: call
3232
affine.for %i = 1 to 10 {
33-
call @func_with_affine_ops(%c) : (index) -> ()
33+
func.call @func_with_affine_ops(%c) : (index) -> ()
3434
}
3535
return
3636
}
@@ -63,7 +63,7 @@ func.func @func_noop() {
6363
func.func @inline_into_affine_ops() {
6464
// CHECK-NOT: call @func_noop
6565
affine.for %i = 1 to 10 {
66-
call @func_noop() : () -> ()
66+
func.call @func_noop() : () -> ()
6767
}
6868
return
6969
}
@@ -83,7 +83,7 @@ func.func @inline_dimension(%arg0: memref<?xf32>) {
8383
affine.for %i = 1 to 42 {
8484
// CHECK-NOT: call @func_dim
8585
// CHECK: affine.load %[[ARG0]][%[[IV]]]
86-
call @func_dim(%i, %arg0) : (index, memref<?xf32>) -> ()
86+
func.call @func_dim(%i, %arg0) : (index, memref<?xf32>) -> ()
8787
}
8888
return
8989
}
@@ -103,7 +103,7 @@ func.func @inline_dimension_vector(%arg0: memref<32xf32>) {
103103
affine.for %i = 1 to 42 {
104104
// CHECK-NOT: call @func_dim
105105
// CHECK: affine.vector_load %[[ARG0]][%[[IV]]]
106-
call @func_vector_dim(%i, %arg0) : (index, memref<32xf32>) -> ()
106+
func.call @func_vector_dim(%i, %arg0) : (index, memref<32xf32>) -> ()
107107
}
108108
return
109109
}
@@ -124,7 +124,7 @@ func.func @func_top_level(%arg0: memref<?xf32>) {
124124
func.func @no_inline_not_top_level(%arg0: memref<?xf32>) {
125125
affine.for %i = 1 to 42 {
126126
// CHECK: call @func_top_level
127-
call @func_top_level(%arg0) : (memref<?xf32>) -> ()
127+
func.call @func_top_level(%arg0) : (memref<?xf32>) -> ()
128128
}
129129
return
130130
}

‎mlir/test/Dialect/Affine/loop-unswitch.mlir

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func.func @if_else_imperfect(%A : memref<100xi32>, %B : memref<100xi32>, %v : i3
1212
affine.if affine_set<(d0) : (d0 - 2 >= 0)>(%i) {
1313
affine.store %v, %B[%j] : memref<100xi32>
1414
}
15-
call @external() : () -> ()
15+
func.call @external() : () -> ()
1616
}
1717
affine.store %v, %A[%i] : memref<100xi32>
1818
}
@@ -70,15 +70,15 @@ func.func @if_else_perfect(%A : memref<100xi32>, %v : i32) {
7070
affine.for %i = 0 to 99 {
7171
affine.for %j = 0 to 100 {
7272
affine.for %k = 0 to 100 {
73-
call @foo() : () -> ()
73+
func.call @foo() : () -> ()
7474
affine.if affine_set<(d0, d1) : (d0 - 2 >= 0, -d1 + 80 >= 0)>(%i, %j) {
7575
affine.store %v, %A[%i] : memref<100xi32>
76-
call @abc() : () -> ()
76+
func.call @abc() : () -> ()
7777
} else {
7878
affine.store %v, %A[%i + 1] : memref<100xi32>
79-
call @xyz() : () -> ()
79+
func.call @xyz() : () -> ()
8080
}
81-
call @bar() : () -> ()
81+
func.call @bar() : () -> ()
8282
}
8383
}
8484
}
@@ -134,7 +134,7 @@ func.func @hoist_after_canonicalize() {
134134
affine.if affine_set<(d0) : (d0 - 2 >= 0)>(%j) {
135135
affine.if affine_set<(d0, d1) : (d0 - 1 >= 0, -d0 + 99 >= 0)>(%i, %j) {
136136
// The call to external is to avoid DCE on affine.if.
137-
call @foo() : () -> ()
137+
func.call @foo() : () -> ()
138138
}
139139
}
140140
}
@@ -236,11 +236,11 @@ func.func @perfect_if_else(%arg0 : memref<?x?xf64>, %arg1 : memref<?x?xf64>, %v
236236
// CHECK-LABEL: func @multiple_if
237237
func.func @multiple_if(%N : index) {
238238
affine.if affine_set<() : (0 == 0)>() {
239-
call @external() : () -> ()
239+
func.call @external() : () -> ()
240240
}
241241
affine.for %i = 0 to 100 {
242242
affine.if affine_set<()[s0] : (s0 >= 0)>()[%N] {
243-
call @external() : () -> ()
243+
func.call @external() : () -> ()
244244
}
245245
}
246246
return

0 commit comments

Comments
 (0)