Skip to content

Commit

Permalink
[mlir][SCF][NFC] scf.for/scf.while: rename builder args (#111493)
Browse files Browse the repository at this point in the history
Rename builder args to make them consistent with the `args` in the
TableGen definition.
  • Loading branch information
matthias-springer authored Oct 8, 2024
1 parent 20b8d3f commit 634c57d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def ForOp : SCF_Op<"for",
let skipDefaultBuilders = 1;
let builders = [
OpBuilder<(ins "Value":$lowerBound, "Value":$upperBound, "Value":$step,
CArg<"ValueRange", "std::nullopt">:$iterArgs,
CArg<"ValueRange", "std::nullopt">:$initArgs,
CArg<"function_ref<void(OpBuilder &, Location, Value, ValueRange)>",
"nullptr">)>
];
Expand Down Expand Up @@ -1074,7 +1074,7 @@ def WhileOp : SCF_Op<"while",
let regions = (region SizedRegion<1>:$before, SizedRegion<1>:$after);

let builders = [
OpBuilder<(ins "TypeRange":$resultTypes, "ValueRange":$operands,
OpBuilder<(ins "TypeRange":$resultTypes, "ValueRange":$inits,
"function_ref<void(OpBuilder &, Location, ValueRange)>":$beforeBuilder,
"function_ref<void(OpBuilder &, Location, ValueRange)>":$afterBuilder)>
];
Expand Down
22 changes: 11 additions & 11 deletions mlir/lib/Dialect/SCF/IR/SCF.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,25 +312,25 @@ void ConditionOp::getSuccessorRegions(
//===----------------------------------------------------------------------===//

void ForOp::build(OpBuilder &builder, OperationState &result, Value lb,
Value ub, Value step, ValueRange iterArgs,
Value ub, Value step, ValueRange initArgs,
BodyBuilderFn bodyBuilder) {
OpBuilder::InsertionGuard guard(builder);

result.addOperands({lb, ub, step});
result.addOperands(iterArgs);
for (Value v : iterArgs)
result.addOperands(initArgs);
for (Value v : initArgs)
result.addTypes(v.getType());
Type t = lb.getType();
Region *bodyRegion = result.addRegion();
Block *bodyBlock = builder.createBlock(bodyRegion);
bodyBlock->addArgument(t, result.location);
for (Value v : iterArgs)
for (Value v : initArgs)
bodyBlock->addArgument(v.getType(), v.getLoc());

// Create the default terminator if the builder is not provided and if the
// iteration arguments are not provided. Otherwise, leave this to the caller
// because we don't know which values to return from the loop.
if (iterArgs.empty() && !bodyBuilder) {
if (initArgs.empty() && !bodyBuilder) {
ForOp::ensureTerminator(*bodyRegion, builder, result.location);
} else if (bodyBuilder) {
OpBuilder::InsertionGuard guard(builder);
Expand Down Expand Up @@ -3260,23 +3260,23 @@ LogicalResult ReduceReturnOp::verify() {

void WhileOp::build(::mlir::OpBuilder &odsBuilder,
::mlir::OperationState &odsState, TypeRange resultTypes,
ValueRange operands, BodyBuilderFn beforeBuilder,
ValueRange inits, BodyBuilderFn beforeBuilder,
BodyBuilderFn afterBuilder) {
odsState.addOperands(operands);
odsState.addOperands(inits);
odsState.addTypes(resultTypes);

OpBuilder::InsertionGuard guard(odsBuilder);

// Build before region.
SmallVector<Location, 4> beforeArgLocs;
beforeArgLocs.reserve(operands.size());
for (Value operand : operands) {
beforeArgLocs.reserve(inits.size());
for (Value operand : inits) {
beforeArgLocs.push_back(operand.getLoc());
}

Region *beforeRegion = odsState.addRegion();
Block *beforeBlock = odsBuilder.createBlock(
beforeRegion, /*insertPt=*/{}, operands.getTypes(), beforeArgLocs);
Block *beforeBlock = odsBuilder.createBlock(beforeRegion, /*insertPt=*/{},
inits.getTypes(), beforeArgLocs);
if (beforeBuilder)
beforeBuilder(odsBuilder, odsState.location, beforeBlock->getArguments());

Expand Down

0 comments on commit 634c57d

Please sign in to comment.