Skip to content
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

Jump to bottom

[Substrait] Simplify assembly format of field_reference op. #849

Merged
merged 1 commit into from
Jul 23, 2024
Merged

[Substrait] Simplify assembly format of field_reference op. #849

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
2 changes: 1 addition & 1 deletion include/structured/Dialect/Substrait/IR/SubstraitOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def Substrait_FieldReferenceOp : Substrait_ExpressionOp<"field_reference", [
);
let results = (outs Substrait_FieldType:$result);
let assemblyFormat = [{
$container `[` $position `]` attr-dict `:` type($container)
$container `` $position attr-dict `:` type($container)
}];
}

Expand Down
4 changes: 2 additions & 2 deletions test/Dialect/Substrait/field-reference-invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ substrait.plan version 0 : 42 : 1 {
^bb0(%arg : tuple<si32>):
// expected-error@+2 {{can't extract element from type 'si32'}}
// expected-error@+1 {{mismatching position and type (position: array<i64: 0, 0>, type: 'tuple<si32>')}}
%2 = field_reference %arg[[0, 0]] : tuple<si32>
%2 = field_reference %arg[0, 0] : tuple<si32>
%3 = literal 0 : si1
yield %3 : si1
}
Expand All @@ -24,7 +24,7 @@ substrait.plan version 0 : 42 : 1 {
^bb0(%arg : tuple<si32>):
// expected-error@+2 {{2 is not a valid index for 'tuple<si32>'}}
// expected-error@+1 {{mismatching position and type (position: array<i64: 2>, type: 'tuple<si32>')}}
%2 = field_reference %arg[[2]] : tuple<si32>
%2 = field_reference %arg[2] : tuple<si32>
%3 = literal 0 : si1
yield %3 : si1
}
Expand Down
16 changes: 8 additions & 8 deletions test/Dialect/Substrait/field-reference.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
// CHECK-NEXT: named_table
// CHECK-NEXT: filter
// CHECK-NEXT: (%[[ARG0:.*]]: tuple<si1>):
// CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]]{{\[}}[0]] : tuple<si1>
// CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]][0] : tuple<si1>
// CHECK-NEXT: yield %[[V0]] : si1

substrait.plan version 0 : 42 : 1 {
relation {
%0 = named_table @t1 as ["a"] : tuple<si1>
%1 = filter %0 : tuple<si1> {
^bb0(%arg : tuple<si1>):
%2 = field_reference %arg[[0]] : tuple<si1>
%2 = field_reference %arg[0] : tuple<si1>
yield %2 : si1
}
yield %1 : tuple<si1>
Expand All @@ -28,15 +28,15 @@ substrait.plan version 0 : 42 : 1 {
// CHECK-NEXT: named_table
// CHECK-NEXT: filter
// CHECK-NEXT: (%[[ARG0:.*]]: tuple<si1, tuple<si1>>):
// CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]]{{\[}}[1, 0]] : tuple<si1, tuple<si1>>
// CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]][1, 0] : tuple<si1, tuple<si1>>
// CHECK-NEXT: yield %[[V0]] : si1

substrait.plan version 0 : 42 : 1 {
relation {
%0 = named_table @t1 as ["a", "b", "c"] : tuple<si1, tuple<si1>>
%1 = filter %0 : tuple<si1, tuple<si1>> {
^bb0(%arg : tuple<si1, tuple<si1>>):
%2 = field_reference %arg[[1, 0]] : tuple<si1, tuple<si1>>
%2 = field_reference %arg[1, 0] : tuple<si1, tuple<si1>>
yield %2 : si1
}
yield %1 : tuple<si1, tuple<si1>>
Expand All @@ -50,17 +50,17 @@ substrait.plan version 0 : 42 : 1 {
// CHECK-NEXT: named_table
// CHECK-NEXT: filter
// CHECK-NEXT: (%[[ARG0:.*]]: tuple<si1, tuple<si1>>):
// CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]]{{\[}}[1]] : tuple<si1, tuple<si1>>
// CHECK-NEXT: %[[V1:.*]] = field_reference %[[V0]]{{\[}}[0]] : tuple<si1>
// CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]][1] : tuple<si1, tuple<si1>>
// CHECK-NEXT: %[[V1:.*]] = field_reference %[[V0]][0] : tuple<si1>
// CHECK-NEXT: yield %[[V1]] : si1

substrait.plan version 0 : 42 : 1 {
relation {
%0 = named_table @t1 as ["a", "b", "c"] : tuple<si1, tuple<si1>>
%1 = filter %0 : tuple<si1, tuple<si1>> {
^bb0(%arg : tuple<si1, tuple<si1>>):
%2 = field_reference %arg[[1]] : tuple<si1, tuple<si1>>
%3 = field_reference %2[[0]] : tuple<si1>
%2 = field_reference %arg[1] : tuple<si1, tuple<si1>>
%3 = field_reference %2[0] : tuple<si1>
yield %3 : si1
}
yield %1 : tuple<si1, tuple<si1>>
Expand Down
2 changes: 1 addition & 1 deletion test/Dialect/Substrait/project-invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ substrait.plan version 0 : 42 : 1 {
// expected-error@+1 {{'substrait.project' op has 'expressions' region with mismatching argument type (has: 'tuple<si1>', expected: 'tuple<si32>')}}
%1 = project %0 : tuple<si32> -> tuple<si32, si1> {
^bb0(%arg : tuple<si1>):
%3 = field_reference %arg[[0]] : tuple<si1>
%3 = field_reference %arg[0] : tuple<si1>
yield %3 : si1
}
yield %1 : tuple<si32, si1>
Expand Down
6 changes: 3 additions & 3 deletions test/Target/SubstraitPB/Export/field-reference.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ substrait.plan version 0 : 42 : 1 {
%0 = named_table @t1 as ["a", "b", "c"] : tuple<si1, tuple<si1>>
%1 = filter %0 : tuple<si1, tuple<si1>> {
^bb0(%arg : tuple<si1, tuple<si1>>):
%2 = field_reference %arg[[1, 0]] : tuple<si1, tuple<si1>>
%2 = field_reference %arg[1, 0] : tuple<si1, tuple<si1>>
yield %2 : si1
}
yield %1 : tuple<si1, tuple<si1>>
Expand Down Expand Up @@ -67,8 +67,8 @@ substrait.plan version 0 : 42 : 1 {
%0 = named_table @t1 as ["a", "b", "c"] : tuple<si1, tuple<si1>>
%1 = filter %0 : tuple<si1, tuple<si1>> {
^bb0(%arg : tuple<si1, tuple<si1>>):
%2 = field_reference %arg[[1]] : tuple<si1, tuple<si1>>
%3 = field_reference %2[[0]] : tuple<si1>
%2 = field_reference %arg[1] : tuple<si1, tuple<si1>>
%3 = field_reference %2[0] : tuple<si1>
yield %3 : si1
}
yield %1 : tuple<si1, tuple<si1>>
Expand Down
6 changes: 3 additions & 3 deletions test/Target/SubstraitPB/Import/field-reference.textpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# CHECK-NEXT: named_table
# CHECK-NEXT: filter
# CHECK-NEXT: (%[[ARG0:.*]]: tuple<si1, tuple<si1>>)
# CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]]{{\[}}[1, 0]]
# CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]][1, 0]
# CHECK-SAME: : tuple<si1, tuple<si1>>
# CHECK-NEXT: yield %[[V0]] : si1

Expand Down Expand Up @@ -89,9 +89,9 @@ version {
# CHECK-NEXT: named_table
# CHECK-NEXT: filter
# CHECK-NEXT: (%[[ARG0:.*]]: tuple<si1, tuple<si1>>)
# CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]]{{\[}}[1]]
# CHECK-NEXT: %[[V0:.*]] = field_reference %[[ARG0]][1]
# CHECK-SAME: : tuple<si1, tuple<si1>>
# CHECK-NEXT: %[[V1:.*]] = field_reference %[[V0]]{{\[}}[0]]
# CHECK-NEXT: %[[V1:.*]] = field_reference %[[V0]][0]
# CHECK-SAME: : tuple<si1>
# CHECK-NEXT: yield %[[V1]] : si1

Expand Down
42 changes: 21 additions & 21 deletions test/Transforms/Substrait/emit-deduplication.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@ substrait.plan version 0 : 42 : 1 {
// CHECK-NEXT: %[[V1:.*]] = emit [1, 2, 0] from %[[V0]] :
// CHECK-NEXT: %[[V2:.*]] = filter %[[V1]] : {{.*}} {
// CHECK-NEXT: ^{{.*}}(%[[ARG0:.*]]: [[TYPE:.*]]):
// CHECK-NEXT: %[[V3:.*]] = field_reference %[[ARG0]]{{\[}}[0]] : [[TYPE]]
// CHECK-NEXT: %[[V5:.*]] = field_reference %[[ARG0]]{{\[}}[1, 0]] : [[TYPE]]
// CHECK-NEXT: %[[V6:.*]] = field_reference %[[ARG0]]{{\[}}[1]] : [[TYPE]]
// CHECK-NEXT: %[[V7:.*]] = field_reference %[[V6]]{{\[}}[1]] :
// CHECK-NEXT: %[[V9:.*]] = field_reference %[[ARG0]]{{\[}}[2]] : [[TYPE]]
// CHECK-NEXT: %[[V3:.*]] = field_reference %[[ARG0]][0] : [[TYPE]]
// CHECK-NEXT: %[[V5:.*]] = field_reference %[[ARG0]][1, 0] : [[TYPE]]
// CHECK-NEXT: %[[V6:.*]] = field_reference %[[ARG0]][1] : [[TYPE]]
// CHECK-NEXT: %[[V7:.*]] = field_reference %[[V6]][1] :
// CHECK-NEXT: %[[V9:.*]] = field_reference %[[ARG0]][2] : [[TYPE]]
// CHECK-NEXT: %[[Va:.*]] = func.call @f(%[[V3]], %[[V3]], %[[V5]], %[[V7]], %[[V3]], %[[V9]])
// CHECK-NEXT: yield %[[Va]] : si1
// CHECK-NEXT: }
Expand All @@ -182,13 +182,13 @@ substrait.plan version 0 : 42 : 1 {
: tuple<si1, si1, tuple<si1, si32>> -> tuple<si1, si1, tuple<si1, si32>, si1, si1>
%2 = filter %1 : tuple<si1, si1, tuple<si1, si32>, si1, si1> {
^bb0(%arg0: tuple<si1, si1, tuple<si1, si32>, si1, si1>):
%3 = field_reference %arg0[[0]] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%4 = field_reference %arg0[[1]] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%5 = field_reference %arg0[[2, 0]] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%6 = field_reference %arg0[[2]] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%7 = field_reference %6[[1]] : tuple<si1, si32>
%8 = field_reference %arg0[[3]] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%9 = field_reference %arg0[[4]] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%3 = field_reference %arg0[0] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%4 = field_reference %arg0[1] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%5 = field_reference %arg0[2, 0] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%6 = field_reference %arg0[2] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%7 = field_reference %6[1] : tuple<si1, si32>
%8 = field_reference %arg0[3] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%9 = field_reference %arg0[4] : tuple<si1, si1, tuple<si1, si32>, si1, si1>
%a = func.call @f(%3, %4, %5, %7, %8, %9) : (si1, si1, si1, si32, si1, si1) -> si1
yield %a : si1
}
Expand All @@ -206,7 +206,7 @@ substrait.plan version 0 : 42 : 1 {
// CHECK-NEXT: %[[V1:.*]] = emit [1] from %[[V0]] :
// CHECK-NEXT: %[[V2:.*]] = project %[[V1]] : tuple<si32> -> tuple<si32, si1> {
// CHECK-NEXT: ^{{.*}}(%[[ARG0:.*]]: [[TYPE:.*]]):
// CHECK-NEXT: %[[V3:.*]] = field_reference %[[ARG0]]{{\[}}[0]] : [[TYPE]]
// CHECK-NEXT: %[[V3:.*]] = field_reference %[[ARG0]][0] : [[TYPE]]
// CHECK-NEXT: %[[V5:.*]] = func.call @f(%[[V3]], %[[V3]]) :
// CHECK-NEXT: yield %[[V5]] : si1
// CHECK-NEXT: }
Expand All @@ -220,8 +220,8 @@ substrait.plan version 0 : 42 : 1 {
%1 = emit [1, 1] from %0 : tuple<si1, si32> -> tuple<si32, si32>
%2 = project %1 : tuple<si32, si32> -> tuple<si32, si32, si1> {
^bb0(%arg : tuple<si32, si32>):
%3 = field_reference %arg[[0]] : tuple<si32, si32>
%4 = field_reference %arg[[1]] : tuple<si32, si32>
%3 = field_reference %arg[0] : tuple<si32, si32>
%4 = field_reference %arg[1] : tuple<si32, si32>
%5 = func.call @f(%3, %4) : (si32, si32) -> si1
yield %5 : si1
}
Expand All @@ -238,7 +238,7 @@ substrait.plan version 0 : 42 : 1 {
// CHECK-NEXT: %[[V0:.*]] = named_table
// CHECK-NEXT: %[[V1:.*]] = project %[[V0]] : {{.*}} {
// CHECK-NEXT: ^{{.*}}(%[[ARG0:.*]]: [[TYPE:.*]]):
// CHECK-NEXT: %[[V2:.*]] = field_reference %[[ARG0]]{{\[}}[0]] : [[TYPE]]
// CHECK-NEXT: %[[V2:.*]] = field_reference %[[ARG0]][0] : [[TYPE]]
// CHECK-NEXT: %[[V3:.*]] = func.call @f(%[[V2]]) :
// CHECK-NEXT: yield %[[V3]] : si1
// CHECK-NEXT: }
Expand All @@ -251,7 +251,7 @@ substrait.plan version 0 : 42 : 1 {
%0 = named_table @t1 as ["a"] : tuple<si32>
%1 = project %0 : tuple<si32> -> tuple<si32, si1, si1> {
^bb0(%arg : tuple<si32>):
%2 = field_reference %arg[[0]] : tuple<si32>
%2 = field_reference %arg[0] : tuple<si32>
%3 = func.call @f(%2) : (si32) -> si1
// We yield two times the same value. This pattern should remove one of
// the two and re-establish the duplicate with an `amit` after the
Expand All @@ -271,7 +271,7 @@ substrait.plan version 0 : 42 : 1 {
// CHECK-NEXT: %[[V0:.*]] = named_table
// CHECK-NEXT: %[[V1:.*]] = project %[[V0]] : {{.*}} {
// CHECK-NEXT: ^{{.*}}(%[[ARG0:.*]]: [[TYPE:.*]]):
// CHECK-NEXT: %[[V2:.*]] = field_reference %[[ARG0]]{{\[}}[0]] : [[TYPE]]
// CHECK-NEXT: %[[V2:.*]] = field_reference %[[ARG0]][0] : [[TYPE]]
// CHECK-NEXT: %[[V3:.*]] = func.call @f(%[[V2]]) :
// CHECK-NEXT: yield %[[V3]] : si1
// CHECK-NEXT: }
Expand All @@ -284,7 +284,7 @@ substrait.plan version 0 : 42 : 1 {
%0 = named_table @t1 as ["a", "b"] : tuple<si32, si1>
%1 = project %0 : tuple<si32, si1> -> tuple<si32, si1, si32, si1> {
^bb0(%arg0: tuple<si32, si1>):
%2 = field_reference %arg0[[0]] : tuple<si32, si1>
%2 = field_reference %arg0[0] : tuple<si32, si1>
%3 = func.call @f(%2) : (si32) -> si1
// `%2` yields an input field without modifications. This pattern removes
// that yielding and re-establishes the duplicated field with an `emit`
Expand Down Expand Up @@ -319,8 +319,8 @@ substrait.plan version 0 : 42 : 1 {
%1 = emit [1, 1] from %0 : tuple<si1, si32> -> tuple<si32, si32>
%2 = project %1 : tuple<si32, si32> -> tuple<si32, si32, si32, si32> {
^bb0(%arg : tuple<si32, si32>):
%3 = field_reference %arg[[0]] : tuple<si32, si32>
%4 = field_reference %arg[[1]] : tuple<si32, si32>
%3 = field_reference %arg[0] : tuple<si32, si32>
%4 = field_reference %arg[1] : tuple<si32, si32>
yield %3, %4 : si32, si32
}
yield %2 : tuple<si32, si32, si32, si32>
Expand Down
Loading