Skip to content

Commit 24edc8d

Browse files
committed
[mlir][NFC] update Conversion create APIs (4/n) (#149687)
See #147168 for more info.
1 parent b7e332d commit 24edc8d

File tree

12 files changed

+631
-609
lines changed

12 files changed

+631
-609
lines changed

mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp

Lines changed: 143 additions & 135 deletions
Large diffs are not rendered by default.

mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ static Value buildMinMaxReductionSeq(Location loc,
5050
Value value = *valueIt++;
5151
for (; valueIt != values.end(); ++valueIt) {
5252
if (predicate == arith::CmpIPredicate::sgt)
53-
value = builder.create<arith::MaxSIOp>(loc, value, *valueIt);
53+
value = arith::MaxSIOp::create(builder, loc, value, *valueIt);
5454
else
55-
value = builder.create<arith::MinSIOp>(loc, value, *valueIt);
55+
value = arith::MinSIOp::create(builder, loc, value, *valueIt);
5656
}
5757

5858
return value;
@@ -154,9 +154,9 @@ class AffineForLowering : public OpRewritePattern<AffineForOp> {
154154
Value lowerBound = lowerAffineLowerBound(op, rewriter);
155155
Value upperBound = lowerAffineUpperBound(op, rewriter);
156156
Value step =
157-
rewriter.create<arith::ConstantIndexOp>(loc, op.getStepAsInt());
158-
auto scfForOp = rewriter.create<scf::ForOp>(loc, lowerBound, upperBound,
159-
step, op.getInits());
157+
arith::ConstantIndexOp::create(rewriter, loc, op.getStepAsInt());
158+
auto scfForOp = scf::ForOp::create(rewriter, loc, lowerBound, upperBound,
159+
step, op.getInits());
160160
rewriter.eraseBlock(scfForOp.getBody());
161161
rewriter.inlineRegionBefore(op.getRegion(), scfForOp.getRegion(),
162162
scfForOp.getRegion().end());
@@ -197,17 +197,17 @@ class AffineParallelLowering : public OpRewritePattern<AffineParallelOp> {
197197
}
198198
steps.reserve(op.getSteps().size());
199199
for (int64_t step : op.getSteps())
200-
steps.push_back(rewriter.create<arith::ConstantIndexOp>(loc, step));
200+
steps.push_back(arith::ConstantIndexOp::create(rewriter, loc, step));
201201

202202
// Get the terminator op.
203203
auto affineParOpTerminator =
204204
cast<AffineYieldOp>(op.getBody()->getTerminator());
205205
scf::ParallelOp parOp;
206206
if (op.getResults().empty()) {
207207
// Case with no reduction operations/return values.
208-
parOp = rewriter.create<scf::ParallelOp>(loc, lowerBoundTuple,
209-
upperBoundTuple, steps,
210-
/*bodyBuilderFn=*/nullptr);
208+
parOp = scf::ParallelOp::create(rewriter, loc, lowerBoundTuple,
209+
upperBoundTuple, steps,
210+
/*bodyBuilderFn=*/nullptr);
211211
rewriter.eraseBlock(parOp.getBody());
212212
rewriter.inlineRegionBefore(op.getRegion(), parOp.getRegion(),
213213
parOp.getRegion().end());
@@ -233,9 +233,9 @@ class AffineParallelLowering : public OpRewritePattern<AffineParallelOp> {
233233
identityVals.push_back(
234234
arith::getIdentityValue(reductionOpValue, resultType, rewriter, loc));
235235
}
236-
parOp = rewriter.create<scf::ParallelOp>(
237-
loc, lowerBoundTuple, upperBoundTuple, steps, identityVals,
238-
/*bodyBuilderFn=*/nullptr);
236+
parOp = scf::ParallelOp::create(rewriter, loc, lowerBoundTuple,
237+
upperBoundTuple, steps, identityVals,
238+
/*bodyBuilderFn=*/nullptr);
239239

240240
// Copy the body of the affine.parallel op.
241241
rewriter.eraseBlock(parOp.getBody());
@@ -261,7 +261,7 @@ class AffineParallelLowering : public OpRewritePattern<AffineParallelOp> {
261261
Value reductionResult = arith::getReductionOp(
262262
reductionOpValue, rewriter, loc, reductionBody.getArgument(0),
263263
reductionBody.getArgument(1));
264-
rewriter.create<scf::ReduceReturnOp>(loc, reductionResult);
264+
scf::ReduceReturnOp::create(rewriter, loc, reductionResult);
265265
}
266266
rewriter.replaceOp(op, parOp.getResults());
267267
return success();
@@ -278,7 +278,7 @@ class AffineIfLowering : public OpRewritePattern<AffineIfOp> {
278278

279279
// Now we just have to handle the condition logic.
280280
auto integerSet = op.getIntegerSet();
281-
Value zeroConstant = rewriter.create<arith::ConstantIndexOp>(loc, 0);
281+
Value zeroConstant = arith::ConstantIndexOp::create(rewriter, loc, 0);
282282
SmallVector<Value, 8> operands(op.getOperands());
283283
auto operandsRef = llvm::ArrayRef(operands);
284284

@@ -298,18 +298,18 @@ class AffineIfLowering : public OpRewritePattern<AffineIfOp> {
298298
auto pred =
299299
isEquality ? arith::CmpIPredicate::eq : arith::CmpIPredicate::sge;
300300
Value cmpVal =
301-
rewriter.create<arith::CmpIOp>(loc, pred, affResult, zeroConstant);
302-
cond = cond
303-
? rewriter.create<arith::AndIOp>(loc, cond, cmpVal).getResult()
304-
: cmpVal;
301+
arith::CmpIOp::create(rewriter, loc, pred, affResult, zeroConstant);
302+
cond =
303+
cond ? arith::AndIOp::create(rewriter, loc, cond, cmpVal).getResult()
304+
: cmpVal;
305305
}
306306
cond = cond ? cond
307-
: rewriter.create<arith::ConstantIntOp>(loc, /*value=*/1,
308-
/*width=*/1);
307+
: arith::ConstantIntOp::create(rewriter, loc, /*value=*/1,
308+
/*width=*/1);
309309

310310
bool hasElseRegion = !op.getElseRegion().empty();
311-
auto ifOp = rewriter.create<scf::IfOp>(loc, op.getResultTypes(), cond,
312-
hasElseRegion);
311+
auto ifOp = scf::IfOp::create(rewriter, loc, op.getResultTypes(), cond,
312+
hasElseRegion);
313313
rewriter.inlineRegionBefore(op.getThenRegion(),
314314
&ifOp.getThenRegion().back());
315315
rewriter.eraseBlock(&ifOp.getThenRegion().back());

0 commit comments

Comments
 (0)