Skip to content

[mlir][EmitC] Do not inline expressions used by ops with the CExpression trait #93691

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

Merged
merged 5 commits into from
Jun 4, 2024
Merged

[mlir][EmitC] Do not inline expressions used by ops with the CExpression trait #93691

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5e1d95
[mlir][EmitC] Emit parentheses for users of expression ops
May 29, 2024
aa4b1bf
Skip parenthesis where its safe
May 29, 2024
c6817f8
Do not inline expressions into ops with the CExpression trait
Jun 3, 2024
fd5b962
Review comments
Jun 4, 2024
4c9b5da
Remove redundant check in shouldBeInlined
Jun 4, 2024
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
10 changes: 8 additions & 2 deletions mlir/lib/Target/Cpp/TranslateToCpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,12 @@ static bool shouldBeInlined(ExpressionOp expressionOp) {

// Do not inline expressions used by other expressions, as any desired
// expression folding was taken care of by transformations.
return !user->getParentOfType<ExpressionOp>();
if (user->getParentOfType<ExpressionOp>())
return false;

// Do not inline expressions used by ops with the CExpression trait. If this
// was intended, the user could have been merged into the expression op.
return !user->hasTrait<OpTrait::emitc::CExpression>();
}

static LogicalResult printConstantOp(CppEmitter &emitter, Operation *operation,
Expand Down Expand Up @@ -1338,8 +1343,9 @@ LogicalResult CppEmitter::emitOperand(Value value) {
}

auto expressionOp = dyn_cast_if_present<ExpressionOp>(value.getDefiningOp());
if (expressionOp && shouldBeInlined(expressionOp))
if (expressionOp && shouldBeInlined(expressionOp)) {
return emitExpression(expressionOp);
}

auto literalOp = dyn_cast_if_present<LiteralOp>(value.getDefiningOp());
if (!literalOp && !hasValueInScope(value))
Expand Down
80 changes: 80 additions & 0 deletions mlir/test/Target/Cpp/expressions.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,86 @@ func.func @parentheses_for_same_precedence(%arg0: i32, %arg1: i32, %arg2: i32) -
return %e : i32
}

// CPP-DEFAULT: int32_t user_with_expression_trait(int32_t [[VAL_1:v[0-9]+]], int32_t [[VAL_2:v[0-9]+]], int32_t [[VAL_3:v[0-9]+]]) {
// CPP-DEFAULT-NEXT: int32_t v4 = 0;
// CPP-DEFAULT-NEXT: int32_t [[EXP_0:v[0-9]+]] = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DEFAULT-NEXT: int32_t [[EXP_1:v[0-9]+]] = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DEFAULT-NEXT: int32_t [[EXP_2:v[0-9]+]] = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DEFAULT-NEXT: int32_t [[EXP_3:v[0-9]+]] = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DEFAULT-NEXT: bool v9 = (bool) [[EXP_0]];
// CPP-DEFAULT-NEXT: int32_t v10 = [[EXP_1]] + v4;
// CPP-DEFAULT-NEXT: int32_t v11 = bar([[EXP_2]], v4);
// CPP-DEFAULT-NEXT: int32_t v12 = v9 ? [[EXP_3]] : v4;
// CPP-DEFAULT-NEXT: int32_t v13;
// CPP-DEFAULT-NEXT: v13 = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DEFAULT-NEXT: return [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DEFAULT-NEXT: }

// CPP-DECLTOP: int32_t user_with_expression_trait(int32_t [[VAL_1:v[0-9]+]], int32_t [[VAL_2:v[0-9]+]], int32_t [[VAL_3:v[0-9]+]]) {
// CPP-DECLTOP-NEXT: int32_t v4;
// CPP-DECLTOP-NEXT: int32_t v5;
// CPP-DECLTOP-NEXT: int32_t v6;
// CPP-DECLTOP-NEXT: int32_t v7;
// CPP-DECLTOP-NEXT: int32_t v8;
// CPP-DECLTOP-NEXT: bool v9;
// CPP-DECLTOP-NEXT: int32_t v10;
// CPP-DECLTOP-NEXT: int32_t v11;
// CPP-DECLTOP-NEXT: int32_t v12;
// CPP-DECLTOP-NEXT: int32_t v13;
// CPP-DECLTOP-NEXT: v4 = 0;
// CPP-DECLTOP-NEXT: v5 = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DECLTOP-NEXT: v6 = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DECLTOP-NEXT: v7 = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DECLTOP-NEXT: v8 = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DECLTOP-NEXT: v9 = (bool) v5;
// CPP-DECLTOP-NEXT: v10 = v6 + v4;
// CPP-DECLTOP-NEXT: v11 = bar(v7, v4);
// CPP-DECLTOP-NEXT: v12 = v9 ? v8 : v4;
// CPP-DECLTOP-NEXT: ;
// CPP-DECLTOP-NEXT: v13 = [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DECLTOP-NEXT: return [[VAL_3]] / ([[VAL_1]] * [[VAL_2]]);
// CPP-DECLTOP-NEXT: }
func.func @user_with_expression_trait(%arg0: i32, %arg1: i32, %arg2: i32) -> i32 {
%c0 = "emitc.constant"() {value = 0 : i32} : () -> i32
%e0 = emitc.expression : i32 {
%0 = emitc.mul %arg0, %arg1 : (i32, i32) -> i32
%1 = emitc.div %arg2, %0 : (i32, i32) -> i32
emitc.yield %1 : i32
}
%e1 = emitc.expression : i32 {
%0 = emitc.mul %arg0, %arg1 : (i32, i32) -> i32
%1 = emitc.div %arg2, %0 : (i32, i32) -> i32
emitc.yield %1 : i32
}
%e2 = emitc.expression : i32 {
%0 = emitc.mul %arg0, %arg1 : (i32, i32) -> i32
%1 = emitc.div %arg2, %0 : (i32, i32) -> i32
emitc.yield %1 : i32
}
%e3 = emitc.expression : i32 {
%0 = emitc.mul %arg0, %arg1 : (i32, i32) -> i32
%1 = emitc.div %arg2, %0 : (i32, i32) -> i32
emitc.yield %1 : i32
}
%e4 = emitc.expression : i32 {
%0 = emitc.mul %arg0, %arg1 : (i32, i32) -> i32
%1 = emitc.div %arg2, %0 : (i32, i32) -> i32
emitc.yield %1 : i32
}
%e5 = emitc.expression : i32 {
%0 = emitc.mul %arg0, %arg1 : (i32, i32) -> i32
%1 = emitc.div %arg2, %0 : (i32, i32) -> i32
emitc.yield %1 : i32
}
%cast = emitc.cast %e0 : i32 to i1
%add = emitc.add %e1, %c0 : (i32, i32) -> i32
%call = emitc.call_opaque "bar" (%e2, %c0) : (i32, i32) -> (i32)
%cond = emitc.conditional %cast, %e3, %c0 : i32
%var = "emitc.variable"() {value = #emitc.opaque<"">} : () -> i32
emitc.assign %e4 : i32 to %var : i32
return %e5 : i32
}

// CPP-DEFAULT: int32_t multiple_uses(int32_t [[VAL_1:v[0-9]+]], int32_t [[VAL_2:v[0-9]+]], int32_t [[VAL_3:v[0-9]+]], int32_t [[VAL_4:v[0-9]+]]) {
// CPP-DEFAULT-NEXT: bool [[VAL_5:v[0-9]+]] = bar([[VAL_1]] * [[VAL_2]], [[VAL_3]]) - [[VAL_4]] < [[VAL_2]];
// CPP-DEFAULT-NEXT: int32_t [[VAL_6:v[0-9]+]];
Expand Down
Loading