[mlir][SCF][NFC] scf.for/scf.while: rename builder args
#111493
Merged
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
Rename builder args to make them consistent with the `args` in the TableGen definition.
|
@llvm/pr-subscribers-mlir Author: Matthias Springer (matthias-springer) ChangesRename builder args to make them consistent with the Full diff: https://github.com/llvm/llvm-project/pull/111493.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
index 847040466a85fd..361f8e0cf79ec6 100644
--- a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
+++ b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
@@ -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">)>
];
@@ -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)>
];
diff --git a/mlir/lib/Dialect/SCF/IR/SCF.cpp b/mlir/lib/Dialect/SCF/IR/SCF.cpp
index d1c9fd2d217dad..2582d4e0df1920 100644
--- a/mlir/lib/Dialect/SCF/IR/SCF.cpp
+++ b/mlir/lib/Dialect/SCF/IR/SCF.cpp
@@ -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);
@@ -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());
|
|
@llvm/pr-subscribers-mlir-scf Author: Matthias Springer (matthias-springer) ChangesRename builder args to make them consistent with the Full diff: https://github.com/llvm/llvm-project/pull/111493.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
index 847040466a85fd..361f8e0cf79ec6 100644
--- a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
+++ b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
@@ -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">)>
];
@@ -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)>
];
diff --git a/mlir/lib/Dialect/SCF/IR/SCF.cpp b/mlir/lib/Dialect/SCF/IR/SCF.cpp
index d1c9fd2d217dad..2582d4e0df1920 100644
--- a/mlir/lib/Dialect/SCF/IR/SCF.cpp
+++ b/mlir/lib/Dialect/SCF/IR/SCF.cpp
@@ -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);
@@ -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());
|
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.
Rename builder args to make them consistent with the
argsin the TableGen definition.