[mlir][MemRef] Address TODO to use early_inc to simplify elimination of uses #155123
+27
−43
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir Author: Samarth Narang (snarang181) ChangesFull diff: https://github.com/llvm/llvm-project/pull/155123.diff 1 Files Affected:
diff --git a/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp b/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp
index 5d3cec402cab1..860384f954536 100644
--- a/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp
+++ b/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp
@@ -43,50 +43,34 @@ static bool overrideBuffer(Operation *op, Value buffer) {
/// propagate the type change and erase old subview ops.
static void replaceUsesAndPropagateType(RewriterBase &rewriter,
Operation *oldOp, Value val) {
- SmallVector<Operation *> opsToDelete;
- SmallVector<OpOperand *> operandsToReplace;
-
- // Save the operand to replace / delete later (avoid iterator invalidation).
- // TODO: can we use an early_inc iterator?
- for (OpOperand &use : oldOp->getUses()) {
- // Non-subview ops will be replaced by `val`.
- auto subviewUse = dyn_cast<memref::SubViewOp>(use.getOwner());
- if (!subviewUse) {
- operandsToReplace.push_back(&use);
+ // Iterate with early_inc to erase current user inside the loop.
+ for (OpOperand &use : llvm::make_early_inc_range(oldOp->getUses())) {
+ Operation *user = use.getOwner();
+ if (auto subviewUse = dyn_cast<memref::SubViewOp>(user)) {
+ // `subview(old_op)` is replaced by a new `subview(val)`.
+ OpBuilder::InsertionGuard g(rewriter);
+ rewriter.setInsertionPoint(subviewUse);
+ MemRefType newType = memref::SubViewOp::inferRankReducedResultType(
+ subviewUse.getType().getShape(), cast<MemRefType>(val.getType()),
+ subviewUse.getStaticOffsets(), subviewUse.getStaticSizes(),
+ subviewUse.getStaticStrides());
+ Value newSubview = memref::SubViewOp::create(
+ rewriter, subviewUse->getLoc(), newType, val,
+ subviewUse.getMixedOffsets(), subviewUse.getMixedSizes(),
+ subviewUse.getMixedStrides());
+
+ // Ouch recursion ... is this really necessary?
+ replaceUsesAndPropagateType(rewriter, subviewUse, newSubview);
+
+ // Safe to erase.
+ rewriter.eraseOp(subviewUse);
continue;
}
-
- // `subview(old_op)` is replaced by a new `subview(val)`.
- OpBuilder::InsertionGuard g(rewriter);
- rewriter.setInsertionPoint(subviewUse);
- MemRefType newType = memref::SubViewOp::inferRankReducedResultType(
- subviewUse.getType().getShape(), cast<MemRefType>(val.getType()),
- subviewUse.getStaticOffsets(), subviewUse.getStaticSizes(),
- subviewUse.getStaticStrides());
- Value newSubview = memref::SubViewOp::create(
- rewriter, subviewUse->getLoc(), newType, val,
- subviewUse.getMixedOffsets(), subviewUse.getMixedSizes(),
- subviewUse.getMixedStrides());
-
- // Ouch recursion ... is this really necessary?
- replaceUsesAndPropagateType(rewriter, subviewUse, newSubview);
-
- opsToDelete.push_back(use.getOwner());
+ // Non-subview: replace with new value.
+ rewriter.startOpModification(user);
+ use.set(val);
+ rewriter.finalizeOpModification(user);
}
-
- // Perform late replacement.
- // TODO: can we use an early_inc iterator?
- for (OpOperand *operand : operandsToReplace) {
- Operation *op = operand->getOwner();
- rewriter.startOpModification(op);
- operand->set(val);
- rewriter.finalizeOpModification(op);
- }
-
- // Perform late op erasure.
- // TODO: can we use an early_inc iterator?
- for (Operation *op : opsToDelete)
- rewriter.eraseOp(op);
}
// Transformation to do multi-buffering/array expansion to remove dependencies
@@ -216,8 +200,8 @@ mlir::memref::multiBuffer(RewriterBase &rewriter, memref::AllocOp allocOp,
offsets, sizes, strides);
LLVM_DEBUG(DBGS() << "--multi-buffered slice: " << subview << "\n");
- // 5. Due to the recursive nature of replaceUsesAndPropagateType , we need to
- // handle dealloc uses separately..
+ // 5. Due to the recursive nature of replaceUsesAndPropagateType , we need
+ // to handle dealloc uses separately..
for (OpOperand &use : llvm::make_early_inc_range(allocOp->getUses())) {
auto deallocOp = dyn_cast<memref::DeallocOp>(use.getOwner());
if (!deallocOp)
|
|
@llvm/pr-subscribers-mlir-memref Author: Samarth Narang (snarang181) ChangesFull diff: https://github.com/llvm/llvm-project/pull/155123.diff 1 Files Affected:
diff --git a/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp b/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp
index 5d3cec402cab1..860384f954536 100644
--- a/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp
+++ b/mlir/lib/Dialect/MemRef/Transforms/MultiBuffer.cpp
@@ -43,50 +43,34 @@ static bool overrideBuffer(Operation *op, Value buffer) {
/// propagate the type change and erase old subview ops.
static void replaceUsesAndPropagateType(RewriterBase &rewriter,
Operation *oldOp, Value val) {
- SmallVector<Operation *> opsToDelete;
- SmallVector<OpOperand *> operandsToReplace;
-
- // Save the operand to replace / delete later (avoid iterator invalidation).
- // TODO: can we use an early_inc iterator?
- for (OpOperand &use : oldOp->getUses()) {
- // Non-subview ops will be replaced by `val`.
- auto subviewUse = dyn_cast<memref::SubViewOp>(use.getOwner());
- if (!subviewUse) {
- operandsToReplace.push_back(&use);
+ // Iterate with early_inc to erase current user inside the loop.
+ for (OpOperand &use : llvm::make_early_inc_range(oldOp->getUses())) {
+ Operation *user = use.getOwner();
+ if (auto subviewUse = dyn_cast<memref::SubViewOp>(user)) {
+ // `subview(old_op)` is replaced by a new `subview(val)`.
+ OpBuilder::InsertionGuard g(rewriter);
+ rewriter.setInsertionPoint(subviewUse);
+ MemRefType newType = memref::SubViewOp::inferRankReducedResultType(
+ subviewUse.getType().getShape(), cast<MemRefType>(val.getType()),
+ subviewUse.getStaticOffsets(), subviewUse.getStaticSizes(),
+ subviewUse.getStaticStrides());
+ Value newSubview = memref::SubViewOp::create(
+ rewriter, subviewUse->getLoc(), newType, val,
+ subviewUse.getMixedOffsets(), subviewUse.getMixedSizes(),
+ subviewUse.getMixedStrides());
+
+ // Ouch recursion ... is this really necessary?
+ replaceUsesAndPropagateType(rewriter, subviewUse, newSubview);
+
+ // Safe to erase.
+ rewriter.eraseOp(subviewUse);
continue;
}
-
- // `subview(old_op)` is replaced by a new `subview(val)`.
- OpBuilder::InsertionGuard g(rewriter);
- rewriter.setInsertionPoint(subviewUse);
- MemRefType newType = memref::SubViewOp::inferRankReducedResultType(
- subviewUse.getType().getShape(), cast<MemRefType>(val.getType()),
- subviewUse.getStaticOffsets(), subviewUse.getStaticSizes(),
- subviewUse.getStaticStrides());
- Value newSubview = memref::SubViewOp::create(
- rewriter, subviewUse->getLoc(), newType, val,
- subviewUse.getMixedOffsets(), subviewUse.getMixedSizes(),
- subviewUse.getMixedStrides());
-
- // Ouch recursion ... is this really necessary?
- replaceUsesAndPropagateType(rewriter, subviewUse, newSubview);
-
- opsToDelete.push_back(use.getOwner());
+ // Non-subview: replace with new value.
+ rewriter.startOpModification(user);
+ use.set(val);
+ rewriter.finalizeOpModification(user);
}
-
- // Perform late replacement.
- // TODO: can we use an early_inc iterator?
- for (OpOperand *operand : operandsToReplace) {
- Operation *op = operand->getOwner();
- rewriter.startOpModification(op);
- operand->set(val);
- rewriter.finalizeOpModification(op);
- }
-
- // Perform late op erasure.
- // TODO: can we use an early_inc iterator?
- for (Operation *op : opsToDelete)
- rewriter.eraseOp(op);
}
// Transformation to do multi-buffering/array expansion to remove dependencies
@@ -216,8 +200,8 @@ mlir::memref::multiBuffer(RewriterBase &rewriter, memref::AllocOp allocOp,
offsets, sizes, strides);
LLVM_DEBUG(DBGS() << "--multi-buffered slice: " << subview << "\n");
- // 5. Due to the recursive nature of replaceUsesAndPropagateType , we need to
- // handle dealloc uses separately..
+ // 5. Due to the recursive nature of replaceUsesAndPropagateType , we need
+ // to handle dealloc uses separately..
for (OpOperand &use : llvm::make_early_inc_range(allocOp->getUses())) {
auto deallocOp = dyn_cast<memref::DeallocOp>(use.getOwner());
if (!deallocOp)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.