Skip to content

Add func namespace in MLIR files #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −18
Open

Add func namespace in MLIR files #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/canonicalization.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func @deduplicate_map_input(%arg0: f32) {
^bb0(%arg1: f32, %arg2: f32):
// CHECK: addf %[[V1]], %[[V1]] : f32
%1 = arith.addf %arg1, %arg2 : f32
call @use(%1) : (f32) -> ()
func.call @use(%1) : (f32) -> ()
sair.return
// CHECK: } : #sair.shape<()>, (f32) -> ()
} : #sair.shape<()>, (f32, f32) -> ()
Expand All @@ -40,7 +40,7 @@ func @deduplicate_map_input_instances(%arg0: f32) {
} {
^bb0(%arg1: f32, %arg2: f32):
%1 = arith.addf %arg1, %arg2 : f32
call @use(%1) : (f32) -> ()
func.call @use(%1) : (f32) -> ()
sair.return
} : #sair.shape<()>, (f32, f32) -> ()
sair.exit
Expand Down
24 changes: 12 additions & 12 deletions test/introduce_loops.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func @map(%arg0: index) {
// CHECK-DAG: %[[C3:.*]] = arith.constant 1 : index
// CHECK: scf.for %[[V2:.*]] = %[[C2]] to %[[ARG1]] step %[[C3]] {
// CHECK: call @foo(%[[V2]], %[[V1]]) : (index, index) -> ()
call @foo(%arg1, %arg2) : (index, index) -> ()
func.call @foo(%arg1, %arg2) : (index, index) -> ()
// CHECK: }
// CHECK: }
// CHECK: sair.return
Expand Down Expand Up @@ -113,7 +113,7 @@ func @fuse(%arg0: f32) {
// CHECK: scf.for %[[I0:.*]] = %{{.*}} to %{{.*}}
// CHECK: scf.for %[[I1:.*]] = %{{.*}} to %{{.*}}
// CHECK: call @foo(%[[I0]], %[[I1]])
call @foo(%arg1, %arg2) : (index, index) -> ()
func.call @foo(%arg1, %arg2) : (index, index) -> ()
// CHECK: %[[V1:.*]] = arith.constant
%4 = arith.constant 1.0 : f32
sair.return %4 : f32
Expand All @@ -129,11 +129,11 @@ func @fuse(%arg0: f32) {
} {
^bb0(%arg1:index, %arg2: index, %arg3: f32, %arg4: f32):
// CHECK: call @foo(%[[I1]], %[[I0]])
call @foo(%arg1, %arg2) : (index, index) -> ()
func.call @foo(%arg1, %arg2) : (index, index) -> ()
// CHECK: call @bar(%[[ARG0]])
call @bar(%arg3) : (f32) -> f32
func.call @bar(%arg3) : (f32) -> f32
// CHECK: call @bar(%[[V1]])
call @bar(%arg4) : (f32) -> f32
func.call @bar(%arg4) : (f32) -> f32
sair.return
} : #sair.shape<d0:static_range<8> x d1:static_range<4>>, (f32, f32) -> ()
sair.exit { instances = [{}] }
Expand Down Expand Up @@ -178,7 +178,7 @@ func @fuse_reorder(%arg0: f32) {
}]
} {
^bb0(%arg1: index, %arg2: index, %arg3: f32):
call @foo(%arg1, %arg2) : (index, index) -> ()
func.call @foo(%arg1, %arg2) : (index, index) -> ()
%4 = arith.constant 1.0 : f32
%5 = arith.addf %arg3, %4 : f32
sair.return %5 : f32
Expand Down Expand Up @@ -208,7 +208,7 @@ func @fuse_reorder(%arg0: f32) {
^bb0(%arg1: index, %arg2: index):
%9 = arith.index_cast %arg1 : index to i32
%10 = arith.sitofp %9 : i32 to f32
call @bar(%10) : (f32) -> f32
func.call @bar(%10) : (f32) -> f32
sair.return
} : #sair.shape<d0:static_range<8> x d1:static_range<16>>, () -> ()
sair.exit { instances = [{}] }
Expand Down Expand Up @@ -254,7 +254,7 @@ func @dependent_dims() {
} {
^bb0(%arg0: index, %arg1: index):
// CHECK: call @foo(%[[V3]], %[[V7]])
call @foo(%arg0, %arg1) : (index, index) -> ()
func.call @foo(%arg0, %arg1) : (index, index) -> ()
sair.return
} : #sair.shape<d0:static_range<64, 8> x d1:dyn_range(d0)>, () -> ()
// CHECK: }
Expand Down Expand Up @@ -285,7 +285,7 @@ func @full_unroll() {
}]
} {
^bb0(%arg0: index):
call @baz() : () -> ()
func.call @baz() : () -> ()
sair.return
} : #sair.shape<d0:static_range<3>>, () -> ()
sair.exit { instances = [{}] }
Expand Down Expand Up @@ -314,7 +314,7 @@ func @partial_unroll() {
}]
} {
^bb0(%arg0: index):
call @baz() : () -> ()
func.call @baz() : () -> ()
sair.return
} : #sair.shape<d0:static_range<5>>, () -> ()
sair.exit { instances = [{}] }
Expand Down Expand Up @@ -344,7 +344,7 @@ func @dyn_range_unroll(%sz: index) {
}]
} {
^bb0(%arg0: index):
call @baz() : () -> ()
func.call @baz() : () -> ()
sair.return
} : #sair.shape<d0:dyn_range>, () -> ()
sair.exit { instances = [{}] }
Expand All @@ -370,7 +370,7 @@ func @nested_unroll() {
}]
} {
^bb0(%arg0: index, %arg1: index, %arg2: index):
call @baz() : () -> ()
func.call @baz() : () -> ()
sair.return
} : #sair.shape<d0:static_range<2> x d1:static_range<2> x d2:static_range<2>>, () -> ()
sair.exit { instances = [{}] }
Expand Down
2 changes: 1 addition & 1 deletion test/introduce_loops_invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func @size_not_in_register(%arg0: index) {
instances = [{loop_nest = [{name = "A", iter = #sair.mapping_expr<d0>}]}]
} {
^bb0(%arg1: index):
call @foo() : () -> ()
func.call @foo() : () -> ()
sair.return
} : #sair.shape<d0:dyn_range>, () -> ()
sair.exit { instances = [{}] }
Expand Down
6 changes: 3 additions & 3 deletions test/normalize_loops.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func @sequence_attr(%arg0: f32) {
}]
} {
^bb0(%arg1: index, %arg2: f32):
call @foo(%arg1, %arg2) : (index, f32) -> ()
func.call @foo(%arg1, %arg2) : (index, f32) -> ()
sair.return
} : #sair.shape<d0:static_range<16>>, (f32) -> ()

Expand All @@ -277,7 +277,7 @@ func @sequence_attr(%arg0: f32) {
}]
} {
^bb0(%arg1: index, %arg2: f32):
call @foo(%arg1, %arg2) : (index, f32) -> ()
func.call @foo(%arg1, %arg2) : (index, f32) -> ()
sair.return
} : #sair.shape<d0:static_range<16>>, (f32) -> ()

Expand All @@ -293,7 +293,7 @@ func @sequence_attr(%arg0: f32) {
}]
} {
^bb0(%arg1: index, %arg2: f32):
call @foo(%arg1, %arg2) : (index, f32) -> ()
func.call @foo(%arg1, %arg2) : (index, f32) -> ()
sair.return
} : #sair.shape<d0:static_range<16>>, (f32) -> ()
sair.exit { instances = [{}] }
Expand Down