intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-28 00:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[mlir] Toy tutorial: avoid erasing and then re-creating loop terminators

Browse Source 
The lower-to-affine-loops pass in chapters 5-7 of the Toy tutorial has
been creating affine loops, erasing their terminator and creating it
anew using a PatternRewriter instance to work around the fact that
implicit terminators were created without notifying the rewriter. Now
that has been fixed in 3ccf4a5bd1, remove the code erasing and
re-creating the terminators and rely on the default ones.
This commit is contained in:
Alex Zinenko
2020-06-02 12:49:45 +02:00
parent c5b9fa1ccc
commit b596ecdd57
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp
View File

@@ -72,14 +72,9 @@ static void lowerOpToLoops(Operation *op, ArrayRef<Value> operands,
SmallVector<Value, 4> loopIvs;
for (auto dim : tensorType.getShape()) {
auto loop = rewriter.create<AffineForOp>(loc, /*lb=*/0, dim, /*step=*/1);
for (Operation &nested : *loop.getBody())
rewriter.eraseOp(&nested);
loopIvs.push_back(loop.getInductionVar());
// Terminate the loop body and update the rewriter insertion point to the
// beginning of the loop.
rewriter.setInsertionPointToStart(loop.getBody());
rewriter.create<AffineTerminatorOp>(loc);
// Update the rewriter insertion point to the beginning of the loop.
rewriter.setInsertionPointToStart(loop.getBody());
}

7
mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp
View File

@@ -72,14 +72,9 @@ static void lowerOpToLoops(Operation *op, ArrayRef<Value> operands,
SmallVector<Value, 4> loopIvs;
for (auto dim : tensorType.getShape()) {
auto loop = rewriter.create<AffineForOp>(loc, /*lb=*/0, dim, /*step=*/1);
for (Operation &nested : *loop.getBody())
rewriter.eraseOp(&nested);
loopIvs.push_back(loop.getInductionVar());
// Terminate the loop body and update the rewriter insertion point to the
// beginning of the loop.
rewriter.setInsertionPointToStart(loop.getBody());
rewriter.create<AffineTerminatorOp>(loc);
// Update the rewriter insertion point to the beginning of the loop.
rewriter.setInsertionPointToStart(loop.getBody());
}

7
mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp
View File

@@ -72,14 +72,9 @@ static void lowerOpToLoops(Operation *op, ArrayRef<Value> operands,
SmallVector<Value, 4> loopIvs;
for (auto dim : tensorType.getShape()) {
auto loop = rewriter.create<AffineForOp>(loc, /*lb=*/0, dim, /*step=*/1);
for (Operation &nested : *loop.getBody())
rewriter.eraseOp(&nested);
loopIvs.push_back(loop.getInductionVar());
// Terminate the loop body and update the rewriter insertion point to the
// beginning of the loop.
rewriter.setInsertionPointToStart(loop.getBody());
rewriter.create<AffineTerminatorOp>(loc);
// Update the rewriter insertion point to the beginning of the loop.
rewriter.setInsertionPointToStart(loop.getBody());
}