Skip to content

[mlir][SCF] ForOp: Remove getIterArgNumberForOpOperand #66629

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 1 commit into from
Sep 19, 2023
Merged

[mlir][SCF] ForOp: Remove getIterArgNumberForOpOperand #66629

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
10 changes: 0 additions & 10 deletions mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,16 +263,6 @@ def ForOp : SCF_Op<"for",
}
/// Number of operands controlling the loop: lb, ub, step
unsigned getNumControlOperands() { return 3; }
/// Get the iter arg number for an operand. If it isnt an iter arg
/// operand return std::nullopt.
std::optional<unsigned> getIterArgNumberForOpOperand(OpOperand &opOperand) {
if (opOperand.getOwner() != getOperation())
return std::nullopt;
unsigned operandNumber = opOperand.getOperandNumber();
if (operandNumber < getNumControlOperands())
return std::nullopt;
return operandNumber - getNumControlOperands();
}

/// Get the region iter arg that corresponds to an OpOperand.
/// This helper prevents internal op implementation detail leakage to
Expand Down
22 changes: 9 additions & 13 deletions mlir/lib/Dialect/Linalg/Transforms/HoistPadding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,13 +810,9 @@ padThroughLoopIterArg(RewriterBase &rewriter, Value paddedValueBeforeHoisting,
OpBuilder::InsertionGuard g(rewriter);
rewriter.setInsertionPointAfter(hoistedPackedTensor.getDefiningOp());

std::optional<unsigned> maybeOperandNumber =
forOp.getIterArgNumberForOpOperand(*pUse);
assert(maybeOperandNumber.has_value() && "expected a proper iter arg number");

int64_t operandNumber = maybeOperandNumber.value();
unsigned iterArgNumber = forOp.getResultForOpOperand(*pUse).getResultNumber();
auto yieldOp = cast<scf::YieldOp>(forOp.getBody(0)->getTerminator());
auto yieldingExtractSliceOp = yieldOp->getOperand(operandNumber)
auto yieldingExtractSliceOp = yieldOp->getOperand(iterArgNumber)
.getDefiningOp<tensor::ExtractSliceOp>();
if (!yieldingExtractSliceOp)
return tensor::ExtractSliceOp();
Expand All @@ -829,9 +825,9 @@ padThroughLoopIterArg(RewriterBase &rewriter, Value paddedValueBeforeHoisting,
return tensor::ExtractSliceOp();

SmallVector<Value> initArgs = forOp.getInitArgs();
initArgs[operandNumber] = hoistedPackedTensor;
initArgs[iterArgNumber] = hoistedPackedTensor;
SmallVector<Value> yieldOperands = yieldOp.getOperands();
yieldOperands[operandNumber] = yieldingExtractSliceOp.getSource();
yieldOperands[iterArgNumber] = yieldingExtractSliceOp.getSource();

int64_t numOriginalForOpResults = initArgs.size();
LLVM_DEBUG(DBGS() << "numOriginalForOpResults: " << numOriginalForOpResults
Expand All @@ -844,7 +840,7 @@ padThroughLoopIterArg(RewriterBase &rewriter, Value paddedValueBeforeHoisting,
hoistedPackedTensor.getLoc(), hoistedPackedTensor,
outerSliceOp.getMixedOffsets(), outerSliceOp.getMixedSizes(),
outerSliceOp.getMixedStrides());
rewriter.replaceAllUsesWith(forOp.getResult(operandNumber), extracted);
rewriter.replaceAllUsesWith(forOp.getResult(iterArgNumber), extracted);
}
scf::ForOp newForOp =
replaceLoopWithNewYields(rewriter, forOp, initArgs, yieldOperands);
Expand All @@ -853,20 +849,20 @@ padThroughLoopIterArg(RewriterBase &rewriter, Value paddedValueBeforeHoisting,
<< "\n");
LLVM_DEBUG(DBGS() << "replace source of: " << extracted << "\n");
LLVM_DEBUG(DBGS() << "with result #"
<< numOriginalForOpResults + operandNumber
<< numOriginalForOpResults + iterArgNumber
<< " of forOp, giving us: " << extracted << "\n");
rewriter.startRootUpdate(extracted);
extracted.getSourceMutable().assign(
newForOp.getResult(numOriginalForOpResults + operandNumber));
newForOp.getResult(numOriginalForOpResults + iterArgNumber));
rewriter.finalizeRootUpdate(extracted);

LLVM_DEBUG(DBGS() << "replace uses of: " << paddedValueBeforeHoisting
<< "\n");
LLVM_DEBUG(DBGS() << "with region iter arg #"
<< numOriginalForOpResults + operandNumber << "\n");
<< numOriginalForOpResults + iterArgNumber << "\n");
rewriter.replaceAllUsesWith(
paddedValueBeforeHoisting,
newForOp.getRegionIterArg(numOriginalForOpResults + operandNumber));
newForOp.getRegionIterArg(numOriginalForOpResults + iterArgNumber));

return extracted;
}
Expand Down
7 changes: 4 additions & 3 deletions mlir/lib/Dialect/SCF/Transforms/TileUsingInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,9 @@ mlir::scf::tileAndFuseProducerOfSlice(RewriterBase &rewriter,
scf::ForOp outerMostLoop = loops.front();
if (destinationInitArg &&
(*destinationInitArg)->getOwner() == outerMostLoop) {
std::optional<unsigned> iterArgNumber =
outerMostLoop.getIterArgNumberForOpOperand(**destinationInitArg);
unsigned iterArgNumber =
outerMostLoop.getResultForOpOperand(**destinationInitArg)
.getResultNumber();
int64_t resultNumber = fusableProducer.getResultNumber();
if (auto dstOp =
dyn_cast<DestinationStyleOpInterface>(fusableProducer.getOwner())) {
Expand All @@ -584,7 +585,7 @@ mlir::scf::tileAndFuseProducerOfSlice(RewriterBase &rewriter,
scf::ForOp innerMostLoop = loops.back();
updateDestinationOperandsForTiledOp(
rewriter, dstOp.getDpsInitOperand(resultNumber)->get(),
innerMostLoop.getRegionIterArgs()[iterArgNumber.value()]);
innerMostLoop.getRegionIterArgs()[iterArgNumber]);
}
}
return scf::SCFFuseProducerOfSliceResult{fusableProducer,
Expand Down