[Mlir-commits] [mlir] [MLIR] Removing dead values for branches (PR #117501)
Renat Idrisov
llvmlistbot at llvm.org
Wed Dec 4 10:30:12 PST 2024
https://github.com/parsifal-47 updated https://github.com/llvm/llvm-project/pull/117501
>From 437db73aa38da618dc10ef1a113b98034944bfdc Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Sun, 24 Nov 2024 18:26:41 +0000
Subject: [PATCH 01/13] Removing dead values for branches
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 55 ++++++++++++++------
mlir/test/Transforms/remove-dead-values.mlir | 23 ++++++--
2 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 0aa9dcb36681b3..638726e1212772 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -563,6 +563,44 @@ static void cleanRegionBranchOp(RegionBranchOpInterface regionBranchOp,
dropUsesAndEraseResults(regionBranchOp.getOperation(), resultsToKeep.flip());
}
+// 1. Iterate over each successor block of the given BranchOpInterface
+// operation.
+// 2. For each successor block:
+// a. Retrieve the operands passed to the successor.
+// b. Use the provided liveness analysis (`RunLivenessAnalysis`) to determine
+// which
+// operands are live in the successor block.
+// c. Mark each operand as live or dead based on the analysis.
+// 3. Remove dead operands from the branch operation and arguments accordingly
+
+static void cleanBranchOp(BranchOpInterface branchOp, RunLivenessAnalysis &la) {
+ unsigned numSuccessors = branchOp->getNumSuccessors();
+
+ // Do (1)
+ for (unsigned succIdx = 0; succIdx < numSuccessors; ++succIdx) {
+ Block *successorBlock = branchOp->getSuccessor(succIdx);
+
+ // Do (2)
+ SuccessorOperands successorOperands =
+ branchOp.getSuccessorOperands(succIdx);
+ SmallVector<Value> operandValues;
+ for (unsigned operandIdx = 0; operandIdx < successorOperands.size();
+ ++operandIdx) {
+ operandValues.push_back(successorOperands[operandIdx]);
+ }
+
+ BitVector successorLiveOperands = markLives(operandValues, la);
+
+ // Do (3)
+ for (int argIdx = successorLiveOperands.size() - 1; argIdx >= 0; --argIdx) {
+ if (!successorLiveOperands[argIdx]) {
+ successorOperands.erase(argIdx);
+ successorBlock->eraseArgument(argIdx);
+ }
+ }
+ }
+}
+
struct RemoveDeadValues : public impl::RemoveDeadValuesBase<RemoveDeadValues> {
void runOnOperation() override;
};
@@ -572,26 +610,13 @@ void RemoveDeadValues::runOnOperation() {
auto &la = getAnalysis<RunLivenessAnalysis>();
Operation *module = getOperation();
- // The removal of non-live values is performed iff there are no branch ops,
- // and all symbol user ops present in the IR are call-like.
- WalkResult acceptableIR = module->walk([&](Operation *op) {
- if (op == module)
- return WalkResult::advance();
- if (isa<BranchOpInterface>(op)) {
- op->emitError() << "cannot optimize an IR with branch ops\n";
- return WalkResult::interrupt();
- }
- return WalkResult::advance();
- });
-
- if (acceptableIR.wasInterrupted())
- return signalPassFailure();
-
module->walk([&](Operation *op) {
if (auto funcOp = dyn_cast<FunctionOpInterface>(op)) {
cleanFuncOp(funcOp, module, la);
} else if (auto regionBranchOp = dyn_cast<RegionBranchOpInterface>(op)) {
cleanRegionBranchOp(regionBranchOp, la);
+ } else if (auto branchOp = dyn_cast<BranchOpInterface>(op)) {
+ cleanBranchOp(branchOp, la);
} else if (op->hasTrait<::mlir::OpTrait::IsTerminator>()) {
// Nothing to do here because this is a terminator op and it should be
// honored with respect to its parent
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 826f6159a36b67..fda7ef3fe673e4 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -28,15 +28,32 @@ module @named_module_acceptable {
// -----
-// The IR remains untouched because of the presence of a branch op `cf.cond_br`.
+// The IR is optimized regardless of the presence of a branch op `cf.cond_br`.
//
-func.func @dont_touch_unacceptable_ir_has_cleanable_simple_op_with_branch_op(%arg0: i1) {
+func.func @acceptable_ir_has_cleanable_simple_op_with_branch_op(%arg0: i1) {
%non_live = arith.constant 0 : i32
- // expected-error @+1 {{cannot optimize an IR with branch ops}}
+ // CHECK-NOT: non_live
cf.cond_br %arg0, ^bb1(%non_live : i32), ^bb2(%non_live : i32)
^bb1(%non_live_0 : i32):
+ // CHECK-NOT: non_live_0
cf.br ^bb3
^bb2(%non_live_1 : i32):
+ // CHECK-NOT: non_live_1
+ cf.br ^bb3
+^bb3:
+ return
+}
+
+// -----
+
+// Arguments of unconditional branch op `cf.br` are properly removed.
+//
+func.func @acceptable_ir_has_cleanable_simple_op_with_unconditional_branch_op(%arg0: i1) {
+ %non_live = arith.constant 0 : i32
+ // CHECK-NOT: non_live
+ cf.br ^bb1(%non_live : i32)
+^bb1(%non_live_1 : i32):
+ // CHECK-NOT: non_live_1
cf.br ^bb3
^bb3:
return
>From 1663984b655856e91bdda9e120a42b0c318c6954 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Sun, 24 Nov 2024 23:00:37 +0000
Subject: [PATCH 02/13] Adding a test with scf.for and iter_args
---
mlir/test/Transforms/remove-dead-values.mlir | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index fda7ef3fe673e4..07136640732195 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -61,6 +61,25 @@ func.func @acceptable_ir_has_cleanable_simple_op_with_unconditional_branch_op(%a
// -----
+// Checking that iter_args are properly handled
+//
+func.func @cleanable_loop_iter_args_value(%arg0: index) -> index {
+ %c0 = arith.constant 0 : index
+ %c1 = arith.constant 1 : index
+ %c10 = arith.constant 10 : index
+ %non_live = arith.constant 0 : index
+ // CHECK-NOT: non_live
+ %result, %result_non_live = scf.for %i = %c0 to %c10 step %c1 iter_args(%live_arg = %arg0, %non_live_arg = %non_live) -> (index, index) {
+ %new_live = arith.addi %live_arg, %i : index
+ // CHECK-NOT: non_live_arg
+ scf.yield %new_live, %non_live_arg : index, index
+ }
+ // CHECK-NOT: result_non_live
+ return %result : index
+}
+
+// -----
+
// Note that this cleanup cannot be done by the `canonicalize` pass.
//
// CHECK-LABEL: func.func private @clean_func_op_remove_argument_and_return_value() {
>From 4617d02432e0d8f04e859d47829eca2bdba2ecf5 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Mon, 25 Nov 2024 21:02:35 +0000
Subject: [PATCH 03/13] Addressing review comment
---
mlir/test/Transforms/remove-dead-values.mlir | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 07136640732195..62c575aceeb4da 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -71,7 +71,7 @@ func.func @cleanable_loop_iter_args_value(%arg0: index) -> index {
// CHECK-NOT: non_live
%result, %result_non_live = scf.for %i = %c0 to %c10 step %c1 iter_args(%live_arg = %arg0, %non_live_arg = %non_live) -> (index, index) {
%new_live = arith.addi %live_arg, %i : index
- // CHECK-NOT: non_live_arg
+ // CHECK: scf.for %[[ARG_0:.*]] = %c0 to %c10 step %c1 iter_args(%[[ARG_1:.*]] = %arg0)
scf.yield %new_live, %non_live_arg : index, index
}
// CHECK-NOT: result_non_live
>From 473fc46afbc8d9542354ab34842e1ea5d5529dec Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:32:38 +0000
Subject: [PATCH 04/13] Addressing Code Review Feedback
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 18 +++++++++++++++++-
mlir/test/Transforms/remove-dead-values.mlir | 5 +++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 638726e1212772..0e43263cf2fe80 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -165,6 +165,17 @@ static SmallVector<OpOperand *> operandsToOpOperands(OperandRange operands) {
return opOperands;
}
+// Check if any of the operations implements BranchOpInterface
+template <typename UserRange>
+static bool anyBranchUsers(const UserRange &users) {
+ for (auto user : users) {
+ if (auto subBranchOp = dyn_cast<BranchOpInterface>(user)) {
+ return true;
+ }
+ }
+ return false;
+}
+
/// Clean a simple op `op`, given the liveness analysis information in `la`.
/// Here, cleaning means:
/// (1) Dropping all its uses, AND
@@ -175,7 +186,8 @@ static SmallVector<OpOperand *> operandsToOpOperands(OperandRange operands) {
/// symbol op, a symbol-user op, a region branch op, a branch op, a region
/// branch terminator op, or return-like.
static void cleanSimpleOp(Operation *op, RunLivenessAnalysis &la) {
- if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la))
+ if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la) ||
+ anyBranchUsers(op->getUsers()))
return;
op->dropAllUses();
@@ -594,6 +606,10 @@ static void cleanBranchOp(BranchOpInterface branchOp, RunLivenessAnalysis &la) {
// Do (3)
for (int argIdx = successorLiveOperands.size() - 1; argIdx >= 0; --argIdx) {
if (!successorLiveOperands[argIdx]) {
+ if (anyBranchUsers(successorBlock->getArgument(argIdx).getUsers())) {
+ continue;
+ }
+
successorOperands.erase(argIdx);
successorBlock->eraseArgument(argIdx);
}
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 62c575aceeb4da..5f7e518c40649e 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -54,8 +54,9 @@ func.func @acceptable_ir_has_cleanable_simple_op_with_unconditional_branch_op(%a
cf.br ^bb1(%non_live : i32)
^bb1(%non_live_1 : i32):
// CHECK-NOT: non_live_1
- cf.br ^bb3
-^bb3:
+ cf.br ^bb3(%non_live_1 : i32)
+ // CHECK-NOT: non_live_2
+^bb3(%non_live_2 : i32):
return
}
>From a84e5d00c02a818ac5b3b951eb2585358621de24 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:37:03 +0000
Subject: [PATCH 05/13] Addressing Code Review Feedback
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 20 ++++++------------
mlir/test/Transforms/remove-dead-values.mlir | 22 +++++++++++++-------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 0e43263cf2fe80..93c49479373801 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -165,17 +165,6 @@ static SmallVector<OpOperand *> operandsToOpOperands(OperandRange operands) {
return opOperands;
}
-// Check if any of the operations implements BranchOpInterface
-template <typename UserRange>
-static bool anyBranchUsers(const UserRange &users) {
- for (auto user : users) {
- if (auto subBranchOp = dyn_cast<BranchOpInterface>(user)) {
- return true;
- }
- }
- return false;
-}
-
/// Clean a simple op `op`, given the liveness analysis information in `la`.
/// Here, cleaning means:
/// (1) Dropping all its uses, AND
@@ -186,8 +175,7 @@ static bool anyBranchUsers(const UserRange &users) {
/// symbol op, a symbol-user op, a region branch op, a branch op, a region
/// branch terminator op, or return-like.
static void cleanSimpleOp(Operation *op, RunLivenessAnalysis &la) {
- if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la) ||
- anyBranchUsers(op->getUsers()))
+ if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la))
return;
op->dropAllUses();
@@ -606,10 +594,14 @@ static void cleanBranchOp(BranchOpInterface branchOp, RunLivenessAnalysis &la) {
// Do (3)
for (int argIdx = successorLiveOperands.size() - 1; argIdx >= 0; --argIdx) {
if (!successorLiveOperands[argIdx]) {
- if (anyBranchUsers(successorBlock->getArgument(argIdx).getUsers())) {
+ if (successorBlock->getNumArguments() < successorOperands.size()) {
+ // if block was cleaned through a different code path
+ // we only need to remove operands from the invokation
+ successorOperands.erase(argIdx);
continue;
}
+ successorBlock->getArgument(argIdx).dropAllUses();
successorOperands.erase(argIdx);
successorBlock->eraseArgument(argIdx);
}
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 5f7e518c40649e..8fc6d1cd453d46 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -46,17 +46,24 @@ func.func @acceptable_ir_has_cleanable_simple_op_with_branch_op(%arg0: i1) {
// -----
-// Arguments of unconditional branch op `cf.br` are properly removed.
+// The IR contains both conditional and unconditional branches with a loop
+// in which the last cf.cond_br is referncing the first cf.br
//
func.func @acceptable_ir_has_cleanable_simple_op_with_unconditional_branch_op(%arg0: i1) {
%non_live = arith.constant 0 : i32
- // CHECK-NOT: non_live
+ // CHECK-NOT: arith.constant
cf.br ^bb1(%non_live : i32)
^bb1(%non_live_1 : i32):
- // CHECK-NOT: non_live_1
+ // CHECK: ^[[BB1:bb[0-9]+]]:
cf.br ^bb3(%non_live_1 : i32)
- // CHECK-NOT: non_live_2
+ // CHECK: cf.br ^[[BB3:bb[0-9]+]]
+ // CHECK-NOT: i32
^bb3(%non_live_2 : i32):
+ // CHECK: ^[[BB3]]:
+ cf.cond_br %arg0, ^bb1(%non_live_2 : i32), ^bb4(%non_live_2 : i32)
+ // CHECK: cf.cond_br %arg0, ^[[BB1]], ^[[BB4:bb[0-9]+]]
+^bb4(%non_live_4 : i32):
+ // CHECK: ^[[BB4]]:
return
}
@@ -69,13 +76,14 @@ func.func @cleanable_loop_iter_args_value(%arg0: index) -> index {
%c1 = arith.constant 1 : index
%c10 = arith.constant 10 : index
%non_live = arith.constant 0 : index
- // CHECK-NOT: non_live
+ // CHECK: [[RESULT:%.+]] = scf.for [[ARG_1:%.*]] = %c0 to %c10 step %c1 iter_args([[ARG_2:%.*]] = %arg0) -> (index) {
%result, %result_non_live = scf.for %i = %c0 to %c10 step %c1 iter_args(%live_arg = %arg0, %non_live_arg = %non_live) -> (index, index) {
+ // CHECK: [[SUM:%.+]] = arith.addi [[ARG_2]], [[ARG_1]] : index
%new_live = arith.addi %live_arg, %i : index
- // CHECK: scf.for %[[ARG_0:.*]] = %c0 to %c10 step %c1 iter_args(%[[ARG_1:.*]] = %arg0)
+ // CHECK: scf.yield [[SUM:%.+]]
scf.yield %new_live, %non_live_arg : index, index
}
- // CHECK-NOT: result_non_live
+ // CHECK: return [[RESULT]] : index
return %result : index
}
>From 9e3d7b0bbcb061919f40edf4ceaf5308358f87e3 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:41:33 +0000
Subject: [PATCH 06/13] Removing redundant test
---
mlir/test/Transforms/remove-dead-values.mlir | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 8fc6d1cd453d46..6c97c53fe4d64b 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -28,24 +28,6 @@ module @named_module_acceptable {
// -----
-// The IR is optimized regardless of the presence of a branch op `cf.cond_br`.
-//
-func.func @acceptable_ir_has_cleanable_simple_op_with_branch_op(%arg0: i1) {
- %non_live = arith.constant 0 : i32
- // CHECK-NOT: non_live
- cf.cond_br %arg0, ^bb1(%non_live : i32), ^bb2(%non_live : i32)
-^bb1(%non_live_0 : i32):
- // CHECK-NOT: non_live_0
- cf.br ^bb3
-^bb2(%non_live_1 : i32):
- // CHECK-NOT: non_live_1
- cf.br ^bb3
-^bb3:
- return
-}
-
-// -----
-
// The IR contains both conditional and unconditional branches with a loop
// in which the last cf.cond_br is referncing the first cf.br
//
>From 4114c7e0d4219123ecbcb5a76a2cb43cf45928f7 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:43:45 +0000
Subject: [PATCH 07/13] Bettern name for LIT test
---
mlir/test/Transforms/remove-dead-values.mlir | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 6c97c53fe4d64b..491da8d7985490 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -31,7 +31,7 @@ module @named_module_acceptable {
// The IR contains both conditional and unconditional branches with a loop
// in which the last cf.cond_br is referncing the first cf.br
//
-func.func @acceptable_ir_has_cleanable_simple_op_with_unconditional_branch_op(%arg0: i1) {
+func.func @acceptable_ir_has_cleanable_loop_of_conditional_and_branch_op(%arg0: i1) {
%non_live = arith.constant 0 : i32
// CHECK-NOT: arith.constant
cf.br ^bb1(%non_live : i32)
>From 97a5531975137b3a7853f8a71e10d09147bf5b49 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Thu, 28 Nov 2024 21:24:12 +0000
Subject: [PATCH 08/13] Add second argument to one of the branches
---
mlir/test/Transforms/remove-dead-values.mlir | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 491da8d7985490..91d107f47ca9eb 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -37,10 +37,11 @@ func.func @acceptable_ir_has_cleanable_loop_of_conditional_and_branch_op(%arg0:
cf.br ^bb1(%non_live : i32)
^bb1(%non_live_1 : i32):
// CHECK: ^[[BB1:bb[0-9]+]]:
- cf.br ^bb3(%non_live_1 : i32)
+ %non_live_5 = arith.constant 1 : i32
+ cf.br ^bb3(%non_live_1, %non_live_5 : i32, i32)
// CHECK: cf.br ^[[BB3:bb[0-9]+]]
// CHECK-NOT: i32
-^bb3(%non_live_2 : i32):
+^bb3(%non_live_2 : i32, %non_live_6 : i32):
// CHECK: ^[[BB3]]:
cf.cond_br %arg0, ^bb1(%non_live_2 : i32), ^bb4(%non_live_2 : i32)
// CHECK: cf.cond_br %arg0, ^[[BB1]], ^[[BB4:bb[0-9]+]]
>From 5680ba5672b5df5d5b5e4120e86ee2ed98c0adc4 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:07:52 +0000
Subject: [PATCH 09/13] Addressing review feedback
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 93c49479373801..6879cf558b93fc 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -564,12 +564,11 @@ static void cleanRegionBranchOp(RegionBranchOpInterface regionBranchOp,
}
// 1. Iterate over each successor block of the given BranchOpInterface
-// operation.
+// operation.
// 2. For each successor block:
// a. Retrieve the operands passed to the successor.
// b. Use the provided liveness analysis (`RunLivenessAnalysis`) to determine
-// which
-// operands are live in the successor block.
+// which operands are live in the successor block.
// c. Mark each operand as live or dead based on the analysis.
// 3. Remove dead operands from the branch operation and arguments accordingly
>From 7ebf7843fbb1ae9fa7d2e82638cc30225679cefe Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:27:42 +0000
Subject: [PATCH 10/13] Addressing review feedback
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 6879cf558b93fc..6b328074ee2be0 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -172,8 +172,7 @@ static SmallVector<OpOperand *> operandsToOpOperands(OperandRange operands) {
/// iff it has no memory effects and none of its results are live.
///
/// It is assumed that `op` is simple. Here, a simple op is one which isn't a
-/// symbol op, a symbol-user op, a region branch op, a branch op, a region
-/// branch terminator op, or return-like.
+/// symbol op, or a symbol-user op.
static void cleanSimpleOp(Operation *op, RunLivenessAnalysis &la) {
if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la))
return;
>From b3e9c10ee729b5b4e68d017797dd6f857be3f792 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:06:31 +0000
Subject: [PATCH 11/13] Revert "Addressing review feedback"
This reverts commit 7ebf7843fbb1ae9fa7d2e82638cc30225679cefe.
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 6b328074ee2be0..6879cf558b93fc 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -172,7 +172,8 @@ static SmallVector<OpOperand *> operandsToOpOperands(OperandRange operands) {
/// iff it has no memory effects and none of its results are live.
///
/// It is assumed that `op` is simple. Here, a simple op is one which isn't a
-/// symbol op, or a symbol-user op.
+/// symbol op, a symbol-user op, a region branch op, a branch op, a region
+/// branch terminator op, or return-like.
static void cleanSimpleOp(Operation *op, RunLivenessAnalysis &la) {
if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la))
return;
>From 2b63c0f5b67a3024ca1713c5b83de617f9e5c211 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:08:18 +0000
Subject: [PATCH 12/13] Addressing review feedback
---
mlir/lib/Transforms/RemoveDeadValues.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index 6879cf558b93fc..4241974ee290da 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -172,7 +172,7 @@ static SmallVector<OpOperand *> operandsToOpOperands(OperandRange operands) {
/// iff it has no memory effects and none of its results are live.
///
/// It is assumed that `op` is simple. Here, a simple op is one which isn't a
-/// symbol op, a symbol-user op, a region branch op, a branch op, a region
+/// function-like op, a call-like op, a region branch op, a branch op, a region
/// branch terminator op, or return-like.
static void cleanSimpleOp(Operation *op, RunLivenessAnalysis &la) {
if (!isMemoryEffectFree(op) || hasLive(op->getResults(), la))
>From 6672caa38692cec545b80e76379990690fcca6d2 Mon Sep 17 00:00:00 2001
From: Renat Idrisov <parsifal-47 at users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:29:45 +0000
Subject: [PATCH 13/13] Addressing review feedback
---
mlir/test/Transforms/remove-dead-values.mlir | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mlir/test/Transforms/remove-dead-values.mlir b/mlir/test/Transforms/remove-dead-values.mlir
index 91d107f47ca9eb..5f06a54a1ef8ba 100644
--- a/mlir/test/Transforms/remove-dead-values.mlir
+++ b/mlir/test/Transforms/remove-dead-values.mlir
@@ -35,8 +35,9 @@ func.func @acceptable_ir_has_cleanable_loop_of_conditional_and_branch_op(%arg0:
%non_live = arith.constant 0 : i32
// CHECK-NOT: arith.constant
cf.br ^bb1(%non_live : i32)
+ // CHECK: cf.br ^[[BB1:bb[0-9]+]]
^bb1(%non_live_1 : i32):
- // CHECK: ^[[BB1:bb[0-9]+]]:
+ // CHECK: ^[[BB1]]:
%non_live_5 = arith.constant 1 : i32
cf.br ^bb3(%non_live_1, %non_live_5 : i32, i32)
// CHECK: cf.br ^[[BB3:bb[0-9]+]]
More information about the Mlir-commits
mailing list