Skip to content

Commit 258daf5

Browse files
maksleventalmakslevental
authored
[mlir][NFC] update mlir create APIs (34/n) (#150660)
See #147168 for more info.
1 parent b465276 commit 258daf5

File tree

16 files changed

+214
-254
lines changed

16 files changed

+214
-254
lines changed

‎mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ class CastConversion : public OpConversionPattern<ArithOp> {
402402
Value actualOp = adaptValueType(adaptor.getIn(), rewriter, castSrcType);
403403

404404
// Actual cast (may change bitwidth)
405-
auto cast = rewriter.template create<emitc::CastOp>(op.getLoc(),
406-
castDestType, actualOp);
405+
auto cast =
406+
emitc::CastOp::create(rewriter, op.getLoc(), castDestType, actualOp);
407407

408408
// Cast to the expected output type
409409
auto result = adaptValueType(cast, rewriter, opReturnType);
@@ -507,8 +507,8 @@ class IntegerOpConversion final : public OpConversionPattern<ArithOp> {
507507
Value lhs = adaptValueType(adaptor.getLhs(), rewriter, arithmeticType);
508508
Value rhs = adaptValueType(adaptor.getRhs(), rewriter, arithmeticType);
509509

510-
Value arithmeticResult = rewriter.template create<EmitCOp>(
511-
op.getLoc(), arithmeticType, lhs, rhs);
510+
Value arithmeticResult =
511+
EmitCOp::create(rewriter, op.getLoc(), arithmeticType, lhs, rhs);
512512

513513
Value result = adaptValueType(arithmeticResult, rewriter, type);
514514

@@ -547,8 +547,8 @@ class BitwiseOpConversion : public OpConversionPattern<ArithOp> {
547547
Value lhs = adaptValueType(adaptor.getLhs(), rewriter, arithmeticType);
548548
Value rhs = adaptValueType(adaptor.getRhs(), rewriter, arithmeticType);
549549

550-
Value arithmeticResult = rewriter.template create<EmitCOp>(
551-
op.getLoc(), arithmeticType, lhs, rhs);
550+
Value arithmeticResult =
551+
EmitCOp::create(rewriter, op.getLoc(), arithmeticType, lhs, rhs);
552552

553553
Value result = adaptValueType(arithmeticResult, rewriter, type);
554554

@@ -748,8 +748,8 @@ class ItoFCastOpConversion : public OpConversionPattern<CastOp> {
748748
}
749749
Value fpCastOperand = adaptor.getIn();
750750
if (actualOperandType != operandType) {
751-
fpCastOperand = rewriter.template create<emitc::CastOp>(
752-
castOp.getLoc(), actualOperandType, fpCastOperand);
751+
fpCastOperand = emitc::CastOp::create(rewriter, castOp.getLoc(),
752+
actualOperandType, fpCastOperand);
753753
}
754754
rewriter.replaceOpWithNewOp<emitc::CastOp>(castOp, dstType, fpCastOperand);
755755

‎mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ struct CloneOpConversion : public OpConversionPattern<bufferization::CloneOp> {
6868

6969
scf::YieldOp::create(rewriter, loc, acc);
7070
};
71-
auto size = rewriter
72-
.create<scf::ForOp>(loc, zero, rank, one, ValueRange(one),
73-
loopBody)
71+
auto size = scf::ForOp::create(rewriter, loc, zero, rank, one,
72+
ValueRange(one), loopBody)
7473
.getResult(0);
7574

7675
MemRefType memrefType = MemRefType::get({ShapedType::kDynamic},

‎mlir/lib/Conversion/ControlFlowToSCF/ControlFlowToSCF.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,11 @@ ControlFlowToSCFTransformation::createUnreachableTerminator(Location loc,
144144
return emitError(loc, "Cannot create unreachable terminator for '")
145145
<< parentOp->getName() << "'";
146146

147-
return builder
148-
.create<func::ReturnOp>(
149-
loc, llvm::map_to_vector(funcOp.getResultTypes(),
150-
[&](Type type) {
151-
return getUndefValue(loc, builder, type);
152-
}))
147+
return func::ReturnOp::create(
148+
builder, loc,
149+
llvm::map_to_vector(
150+
funcOp.getResultTypes(),
151+
[&](Type type) { return getUndefValue(loc, builder, type); }))
153152
.getOperation();
154153
}
155154

‎mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ static Value createGroupReduceOpImpl(OpBuilder &builder, Location loc,
559559
builder, loc, builder.getI32Type(),
560560
builder.getIntegerAttr(builder.getI32Type(), *clusterSize));
561561

562-
return builder
563-
.create<NonUniformOp>(loc, type, scope, groupOp, arg, clusterSizeValue)
562+
return NonUniformOp::create(builder, loc, type, scope, groupOp, arg,
563+
clusterSizeValue)
564564
.getResult();
565565
}
566566

‎mlir/lib/Conversion/LLVMCommon/Pattern.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,13 @@ LogicalResult ConvertToLLVMPattern::copyUnrankedDescriptors(
272272

273273
// Allocate memory, copy, and free the source if necessary.
274274
Value memory =
275-
toDynamic
276-
? builder
277-
.create<LLVM::CallOp>(loc, mallocFunc.value(), allocationSize)
278-
.getResult()
279-
: LLVM::AllocaOp::create(builder, loc, getPtrType(),
280-
IntegerType::get(getContext(), 8),
281-
allocationSize,
282-
/*alignment=*/0);
275+
toDynamic ? LLVM::CallOp::create(builder, loc, mallocFunc.value(),
276+
allocationSize)
277+
.getResult()
278+
: LLVM::AllocaOp::create(builder, loc, getPtrType(),
279+
IntegerType::get(getContext(), 8),
280+
allocationSize,
281+
/*alignment=*/0);
283282
Value source = desc.memRefDescPtr(builder, loc);
284283
LLVM::MemcpyOp::create(builder, loc, memory, source, allocationSize, false);
285284
if (!toDynamic)

‎mlir/lib/Conversion/MPIToLLVM/MPIToLLVM.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static Op getOrDefineGlobal(ModuleOp &moduleOp, const Location loc,
3535
if (!(ret = moduleOp.lookupSymbol<Op>(name))) {
3636
ConversionPatternRewriter::InsertionGuard guard(rewriter);
3737
rewriter.setInsertionPointToStart(moduleOp.getBody());
38-
ret = rewriter.template create<Op>(loc, std::forward<Args>(args)...);
38+
ret = Op::create(rewriter, loc, std::forward<Args>(args)...);
3939
}
4040
return ret;
4141
}

‎mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ struct DimOpLowering : public ConvertOpToLLVMPattern<memref::DimOp> {
575575
Value sizePtr = LLVM::GEPOp::create(rewriter, loc, indexPtrTy,
576576
getTypeConverter()->getIndexType(),
577577
offsetPtr, idxPlusOne);
578-
return rewriter
579-
.create<LLVM::LoadOp>(loc, getTypeConverter()->getIndexType(), sizePtr)
578+
return LLVM::LoadOp::create(rewriter, loc,
579+
getTypeConverter()->getIndexType(), sizePtr)
580580
.getResult();
581581
}
582582

‎mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,20 +1493,20 @@ class ShiftPattern : public SPIRVToLLVMConversion<SPIRVOp> {
14931493
Value extended;
14941494
if (op2TypeWidth < dstTypeWidth) {
14951495
if (isUnsignedIntegerOrVector(op2Type)) {
1496-
extended = rewriter.template create<LLVM::ZExtOp>(
1497-
loc, dstType, adaptor.getOperand2());
1496+
extended =
1497+
LLVM::ZExtOp::create(rewriter, loc, dstType, adaptor.getOperand2());
14981498
} else {
1499-
extended = rewriter.template create<LLVM::SExtOp>(
1500-
loc, dstType, adaptor.getOperand2());
1499+
extended =
1500+
LLVM::SExtOp::create(rewriter, loc, dstType, adaptor.getOperand2());
15011501
}
15021502
} else if (op2TypeWidth == dstTypeWidth) {
15031503
extended = adaptor.getOperand2();
15041504
} else {
15051505
return failure();
15061506
}
15071507

1508-
Value result = rewriter.template create<LLVMOp>(
1509-
loc, dstType, adaptor.getOperand1(), extended);
1508+
Value result =
1509+
LLVMOp::create(rewriter, loc, dstType, adaptor.getOperand1(), extended);
15101510
rewriter.replaceOp(op, result);
15111511
return success();
15121512
}

‎mlir/lib/Conversion/ShardToMPI/ShardToMPI.cpp‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,8 @@ struct ConvertShardingOp : public OpConversionPattern<ShardingOp> {
177177
auto type = RankedTensorType::get({nSplits, 2}, i64);
178178
Value resHaloSizes =
179179
haloSizes.empty()
180-
? rewriter
181-
.create<tensor::EmptyOp>(loc, std::array<int64_t, 2>{0, 0},
182-
i64)
180+
? tensor::EmptyOp::create(rewriter, loc,
181+
std::array<int64_t, 2>{0, 0}, i64)
183182
.getResult()
184183
: tensor::FromElementsOp::create(rewriter, loc, type, haloSizes)
185184
.getResult();
@@ -306,13 +305,11 @@ class ConvertProcessLinearIndexOp
306305
auto ctx = op.getContext();
307306
Value commWorld =
308307
mpi::CommWorldOp::create(rewriter, loc, mpi::CommType::get(ctx));
309-
auto rank =
310-
rewriter
311-
.create<mpi::CommRankOp>(
312-
loc,
313-
TypeRange{mpi::RetvalType::get(ctx), rewriter.getI32Type()},
314-
commWorld)
315-
.getRank();
308+
auto rank = mpi::CommRankOp::create(
309+
rewriter, loc,
310+
TypeRange{mpi::RetvalType::get(ctx), rewriter.getI32Type()},
311+
commWorld)
312+
.getRank();
316313
rewriter.replaceOpWithNewOp<arith::IndexCastOp>(op, rewriter.getIndexType(),
317314
rank);
318315
return success();
@@ -703,10 +700,9 @@ struct ConvertUpdateHaloOp : public OpConversionPattern<UpdateHaloOp> {
703700
// subviews need Index values
704701
for (auto &sz : haloSizes) {
705702
if (auto value = dyn_cast<Value>(sz))
706-
sz =
707-
rewriter
708-
.create<arith::IndexCastOp>(loc, rewriter.getIndexType(), value)
709-
.getResult();
703+
sz = arith::IndexCastOp::create(rewriter, loc, rewriter.getIndexType(),
704+
value)
705+
.getResult();
710706
}
711707

712708
// most of the offset/size/stride data is the same for all dims
@@ -758,9 +754,8 @@ struct ConvertUpdateHaloOp : public OpConversionPattern<UpdateHaloOp> {
758754
assert(currHaloDim >= 0 && (size_t)currHaloDim < haloSizes.size() / 2);
759755
// Get the linearized ids of the neighbors (down and up) for the
760756
// given split
761-
auto tmp = rewriter
762-
.create<NeighborsLinearIndicesOp>(loc, grid, myMultiIndex,
763-
splitAxes)
757+
auto tmp = NeighborsLinearIndicesOp::create(rewriter, loc, grid,
758+
myMultiIndex, splitAxes)
764759
.getResults();
765760
// MPI operates on i32...
766761
Value neighbourIDs[2] = {

0 commit comments

Comments
 (0)