Skip to content

[mlir][emitc] Relax hasSideEffect rules for Var/Member #145011

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: main
Choose a base branch
from
+44 −16
Open

[mlir][emitc] Relax hasSideEffect rules for Var/Member #145011

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
11 changes: 11 additions & 0 deletions mlir/include/mlir/Dialect/EmitC/IR/EmitC.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,17 @@ def EmitC_LoadOp : EmitC_Op<"load", [CExpressionInterface,
let results = (outs AnyType:$result);

let assemblyFormat = "$operand attr-dict `:` type($operand)";

let extraClassDeclaration = [{
bool hasSideEffects() {
auto *defOp = this->getOperand().getDefiningOp();
// The load side effect semantic depends on the operation that was used to
// declare the load's operand, `VariableOp` and `MemberOp` perform loading
// from the stack, thus we may consider them as not having side effect to
// make end code more readable by letting those loads to get inlined.
return !defOp || !(isa<VariableOp>(defOp) || isa<MemberOp>(defOp));
}
}];
}

def EmitC_MulOp : EmitC_BinaryOp<"mul", []> {
Expand Down
23 changes: 10 additions & 13 deletions mlir/test/Dialect/EmitC/transforms.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,18 @@ func.func @single_result_requirement() -> (i32, i32) {
// CHECK-SAME: %[[VAL_1:.*]]: !emitc.ptr<i32>) -> i1 {
// CHECK: %[[VAL_2:.*]] = "emitc.constant"() <{value = 0 : i64}> : () -> i64
// CHECK: %[[VAL_3:.*]] = "emitc.variable"() <{value = #emitc.opaque<"42">}> : () -> !emitc.lvalue<i32>
// CHECK: %[[VAL_4:.*]] = emitc.expression : i32 {
// CHECK: %[[VAL_5:.*]] = load %[[VAL_3]] : <i32>
// CHECK: yield %[[VAL_5]] : i32
// CHECK: %[[VAL_4:.*]] = emitc.subscript %[[VAL_1]]{{\[}}%[[VAL_2]]] : (!emitc.ptr<i32>, i64) -> !emitc.lvalue<i32>
// CHECK: %[[VAL_5:.*]] = emitc.expression : i32 {
// CHECK: %[[VAL_6:.*]] = load %[[VAL_4]] : <i32>
// CHECK: yield %[[VAL_6]] : i32
// CHECK: }
// CHECK: %[[VAL_6:.*]] = emitc.subscript %[[VAL_1]]{{\[}}%[[VAL_2]]] : (!emitc.ptr<i32>, i64) -> !emitc.lvalue<i32>
// CHECK: %[[VAL_7:.*]] = emitc.expression : i32 {
// CHECK: %[[VAL_8:.*]] = load %[[VAL_6]] : <i32>
// CHECK: yield %[[VAL_8]] : i32
// CHECK: %[[VAL_7:.*]] = emitc.expression : i1 {
// CHECK: %[[VAL_8:.*]] = load %[[VAL_3]] : <i32>
// CHECK: %[[VAL_9:.*]] = add %[[VAL_8]], %[[VAL_5]] : (i32, i32) -> i32
// CHECK: %[[VAL_10:.*]] = cmp lt, %[[VAL_9]], %[[VAL_0]] : (i32, i32) -> i1
// CHECK: yield %[[VAL_10]] : i1
// CHECK: }
// CHECK: %[[VAL_9:.*]] = emitc.expression : i1 {
// CHECK: %[[VAL_10:.*]] = add %[[VAL_4]], %[[VAL_7]] : (i32, i32) -> i32
// CHECK: %[[VAL_11:.*]] = cmp lt, %[[VAL_10]], %[[VAL_0]] : (i32, i32) -> i1
// CHECK: yield %[[VAL_11]] : i1
// CHECK: }
// CHECK: return %[[VAL_9]] : i1
// CHECK: return %[[VAL_7]] : i1
// CHECK: }


Expand Down
26 changes: 23 additions & 3 deletions mlir/test/Target/Cpp/expressions.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,13 @@ func.func @expression_with_subscript_user(%arg0: !emitc.ptr<!emitc.opaque<"void"
return %res_load : i32
}

// CPP-DEFAULT: bool expression_with_load(int32_t [[VAL_1:v.+]], int32_t [[VAL_2:v.+]], int32_t* [[VAL_3:v.+]]) {
// CPP-DEFAULT: bool expression_with_var_load_and_subscript(int32_t [[VAL_1:v.+]], int32_t [[VAL_2:v.+]], int32_t* [[VAL_3:v.+]]) {
// CPP-DEFAULT-NEXT: int64_t [[VAL_4:v.+]] = 0;
// CPP-DEFAULT-NEXT: int32_t [[VAL_5:v.+]] = 42;
// CPP-DEFAULT-NEXT: bool [[VAL_6:v.+]] = [[VAL_5]] + [[VAL_2]] < [[VAL_3]][[[VAL_4]]] + [[VAL_1]];
// CPP-DEFAULT-NEXT: return [[VAL_6]];

// CPP-DECLTOP: bool expression_with_load(int32_t [[VAL_1:v.+]], int32_t [[VAL_2:v.+]], int32_t* [[VAL_3:v.+]]) {
// CPP-DECLTOP: bool expression_with_var_load_and_subscript(int32_t [[VAL_1:v.+]], int32_t [[VAL_2:v.+]], int32_t* [[VAL_3:v.+]]) {
// CPP-DECLTOP-NEXT: int64_t [[VAL_4:v.+]];
// CPP-DECLTOP-NEXT: int32_t [[VAL_5:v.+]];
// CPP-DECLTOP-NEXT: bool [[VAL_6:v.+]];
Expand All @@ -358,7 +358,7 @@ func.func @expression_with_subscript_user(%arg0: !emitc.ptr<!emitc.opaque<"void"
// CPP-DECLTOP-NEXT: [[VAL_6]] = [[VAL_5]] + [[VAL_2]] < [[VAL_3]][[[VAL_4]]] + [[VAL_1]];
// CPP-DECLTOP-NEXT: return [[VAL_6]];

func.func @expression_with_load(%arg0: i32, %arg1: i32, %arg2: !emitc.ptr<i32>) -> i1 {
func.func @expression_with_var_load_and_subscript(%arg0: i32, %arg1: i32, %arg2: !emitc.ptr<i32>) -> i1 {
%c0 = "emitc.constant"() {value = 0 : i64} : () -> i64
%0 = "emitc.variable"() <{value = #emitc.opaque<"42">}> : () -> !emitc.lvalue<i32>
%ptr = emitc.subscript %arg2[%c0] : (!emitc.ptr<i32>, i64) -> !emitc.lvalue<i32>
Expand All @@ -373,6 +373,26 @@ func.func @expression_with_load(%arg0: i32, %arg1: i32, %arg2: !emitc.ptr<i32>)
return %result : i1
}

// CPP-DEFAULT: bool expression_with_var_load(int32_t [[VAL_1:v.+]], int32_t [[VAL_2:v.+]]) {
// CPP-DEFAULT-NEXT: int32_t [[VAL_3:v.+]] = 42;
// CPP-DEFAULT-NEXT: return [[VAL_3]] + [[VAL_1]] < [[VAL_2]];

// CPP-DECLTOP: bool expression_with_var_load(int32_t [[VAL_1:v.+]], int32_t [[VAL_2:v.+]]) {
// CPP-DECLTOP-NEXT: int32_t [[VAL_3:v.+]];
// CPP-DECLTOP-NEXT: [[VAL_3]] = 42;
// CPP-DECLTOP-NEXT: return [[VAL_3]] + [[VAL_1]] < [[VAL_2]];

func.func @expression_with_var_load(%arg0: i32, %arg1: i32) -> i1 {
%0 = "emitc.variable"() <{value = #emitc.opaque<"42">}> : () -> !emitc.lvalue<i32>
%result = emitc.expression : i1 {
%a = emitc.load %0 : !emitc.lvalue<i32>
%b = emitc.add %a, %arg0 : (i32, i32) -> i32
%d = emitc.cmp lt, %b, %arg1 :(i32, i32) -> i1
yield %d : i1
}
return %result : i1
}

// CPP-DEFAULT: bool expression_with_load_and_call(int32_t* [[VAL_1:v.+]]) {
// CPP-DEFAULT-NEXT: int64_t [[VAL_2:v.+]] = 0;
// CPP-DEFAULT-NEXT: bool [[VAL_3:v.+]] = [[VAL_1]][[[VAL_2]]] + bar([[VAL_1]][[[VAL_2]]]) < [[VAL_1]][[[VAL_2]]];
Expand Down
Loading