Skip to content

Commit 3f51bc2

Browse files
Address comments (round 2)
- Remove passing as `const &` for the `llvm::function_ref`. - Fix ordering of interface methods.
1 parent ed64536 commit 3f51bc2

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

mlir/include/mlir/Dialect/SCF/IR/SCFOps.td

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,11 @@ def ExecuteRegionOp : SCF_Op<"execute_region", [
135135

136136
def ForOp : SCF_Op<"for",
137137
[AutomaticAllocationScope, DeclareOpInterfaceMethods<LoopLikeOpInterface,
138-
["getInitsMutable", "getRegionIterArgs", "getSingleInductionVar",
139-
"getSingleLowerBound", "getSingleStep", "getSingleUpperBound",
140-
"getYieldedValuesMutable", "getLoopResults", "promoteIfSingleIteration",
141-
"replaceWithAdditionalYields", "yieldTiledValuesAndReplace"]>,
138+
["getInitsMutable", "getLoopResults", "getRegionIterArgs",
139+
"getSingleInductionVar", "getSingleLowerBound", "getSingleStep",
140+
"getSingleUpperBound", "getYieldedValuesMutable",
141+
"promoteIfSingleIteration", "replaceWithAdditionalYields",
142+
"yieldTiledValuesAndReplace"]>,
142143
AllTypesMatch<["lowerBound", "upperBound", "step"]>,
143144
ConditionallySpeculatable,
144145
DeclareOpInterfaceMethods<RegionBranchOpInterface,

mlir/include/mlir/Interfaces/LoopLikeInterface.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def LoopLikeOpInterface : OpInterface<"LoopLikeOpInterface"> {
263263
/*methodName=*/"yieldTiledValuesAndReplace",
264264
/*args=*/(ins "::mlir::RewriterBase &":$rewriter,
265265
"::mlir::ValueRange":$newInitOperands,
266-
"const ::mlir::YieldTiledValuesFn &":$yieldTiledValuesFn),
266+
"::mlir::YieldTiledValuesFn":$yieldTiledValuesFn),
267267
/*methodBody=*/"",
268268
/*defaultImplementation=*/[{
269269
return ::mlir::failure();

mlir/lib/Dialect/SCF/IR/SCF.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,10 @@ ForOp::replaceWithAdditionalYields(RewriterBase &rewriter,
588588
return cast<LoopLikeOpInterface>(newLoop.getOperation());
589589
}
590590

591-
FailureOr<LoopLikeOpInterface> ForOp::yieldTiledValuesAndReplace(
592-
RewriterBase &rewriter, ValueRange newInitOperands,
593-
const YieldTiledValuesFn &yieldTiledValuesFn) {
591+
FailureOr<LoopLikeOpInterface>
592+
ForOp::yieldTiledValuesAndReplace(RewriterBase &rewriter,
593+
ValueRange newInitOperands,
594+
YieldTiledValuesFn yieldTiledValuesFn) {
594595
OpBuilder::InsertionGuard g(rewriter);
595596
rewriter.setInsertionPoint(getOperation());
596597

@@ -691,9 +692,10 @@ MutableArrayRef<OpOperand> ForallOp::getInitsMutable() {
691692
return getOutputsMutable();
692693
}
693694

694-
FailureOr<LoopLikeOpInterface> ForallOp::yieldTiledValuesAndReplace(
695-
RewriterBase &rewriter, ValueRange newInitOperands,
696-
const YieldTiledValuesFn &yieldTiledValuesFn) {
695+
FailureOr<LoopLikeOpInterface>
696+
ForallOp::yieldTiledValuesAndReplace(RewriterBase &rewriter,
697+
ValueRange newInitOperands,
698+
YieldTiledValuesFn yieldTiledValuesFn) {
697699
OpBuilder::InsertionGuard g(rewriter);
698700
rewriter.setInsertionPoint(getOperation());
699701
auto inits = llvm::to_vector(getOutputs());

0 commit comments

Comments
 (0)