Skip to content

Commit fcbcfe4

Browse files
authored
[mlir][NFC] update mlir/Dialect create APIs (32/n) (#150657)
See #147168 for more info.
1 parent c99b1bc commit fcbcfe4

20 files changed

+125
-150
lines changed

mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -791,9 +791,8 @@ struct FoldFillWithPad final : public OpRewritePattern<tensor::PadOp> {
791791
tensor::EmptyOp::create(rewriter, padOp.getLoc(), reifiedShape.front(),
792792
padOp.getResultType().getElementType());
793793
Value replacement =
794-
rewriter
795-
.create<FillOp>(fillOp.getLoc(), ValueRange{padValue},
796-
ValueRange{emptyTensor})
794+
FillOp::create(rewriter, fillOp.getLoc(), ValueRange{padValue},
795+
ValueRange{emptyTensor})
797796
.getResult(0);
798797
if (replacement.getType() != padOp.getResultType()) {
799798
replacement = tensor::CastOp::create(rewriter, fillOp.getLoc(),
@@ -2154,9 +2153,8 @@ struct SwapTransposeWithBroadcast : OpRewritePattern<linalg::TransposeOp> {
21542153

21552154
// Create broadcast(transpose(input)).
21562155
Value transposeResult =
2157-
rewriter
2158-
.create<TransposeOp>(loc, broadcastOp.getInput(), transposeInit,
2159-
resultPerms)
2156+
TransposeOp::create(rewriter, loc, broadcastOp.getInput(),
2157+
transposeInit, resultPerms)
21602158
->getResult(0);
21612159
rewriter.replaceOpWithNewOp<BroadcastOp>(
21622160
transposeOp, transposeResult, transposeOp.getInit(), resultDimensions);

mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4133,9 +4133,8 @@ DiagnosedSilenceableFailure doit(RewriterBase &rewriter, OpTy target,
41334133
Value extracted = tensor::ExtractSliceOp::create(
41344134
rewriter, target.getLoc(), target.getDest(), target.getMixedOffsets(),
41354135
target.getMixedSizes(), target.getMixedStrides());
4136-
Value copied = rewriter
4137-
.create<linalg::CopyOp>(target.getLoc(),
4138-
target.getSource(), extracted)
4136+
Value copied = linalg::CopyOp::create(rewriter, target.getLoc(),
4137+
target.getSource(), extracted)
41394138
.getResult(0);
41404139
// Reset the insertion point.
41414140
rewriter.setInsertionPoint(target);

mlir/lib/Dialect/Linalg/Transforms/DataLayoutPropagation.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,10 +1143,9 @@ pushDownUnPackOpThroughGenericOp(RewriterBase &rewriter, GenericOp genericOp,
11431143

11441144
// Insert an unPackOp right after the packed generic.
11451145
Value unPackOpRes =
1146-
rewriter
1147-
.create<linalg::UnPackOp>(genericOp.getLoc(), newResult,
1148-
destPack.getSource(), innerDimsPos,
1149-
mixedTiles, outerDimsPerm)
1146+
linalg::UnPackOp::create(rewriter, genericOp.getLoc(), newResult,
1147+
destPack.getSource(), innerDimsPos, mixedTiles,
1148+
outerDimsPerm)
11501149
.getResult();
11511150

11521151
return std::make_tuple(newGenericOp, unPackOpRes);

mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ expandValue(RewriterBase &rewriter, Location loc, Value result, Value origDest,
267267
assert(rankReductionStrategy ==
268268
ControlDropUnitDims::RankReductionStrategy::ReassociativeReshape &&
269269
"unknown rank reduction strategy");
270-
return rewriter
271-
.create<tensor::ExpandShapeOp>(loc, origResultType, result, reassociation)
270+
return tensor::ExpandShapeOp::create(rewriter, loc, origResultType, result,
271+
reassociation)
272272
.getResult();
273273
}
274274

mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,12 +1572,12 @@ static Value getCollapsedOpOperand(Location loc, LinalgOp op,
15721572

15731573
// Insert a reshape to collapse the dimensions.
15741574
if (isa<MemRefType>(operand.getType())) {
1575-
return builder
1576-
.create<memref::CollapseShapeOp>(loc, operand, operandReassociation)
1575+
return memref::CollapseShapeOp::create(builder, loc, operand,
1576+
operandReassociation)
15771577
.getResult();
15781578
}
1579-
return builder
1580-
.create<tensor::CollapseShapeOp>(loc, operand, operandReassociation)
1579+
return tensor::CollapseShapeOp::create(builder, loc, operand,
1580+
operandReassociation)
15811581
.getResult();
15821582
}
15831583

mlir/lib/Dialect/Linalg/Transforms/PackAndUnpackPatterns.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,8 @@ struct SimplifyPackToExpandShape : public OpRewritePattern<PackOp> {
8181
ArrayRef<ReassociationIndices> reassociation) const {
8282
if (operand.getType() == newOperandType)
8383
return operand;
84-
return rewriter
85-
.create<tensor::ExpandShapeOp>(loc, newOperandType, operand,
86-
reassociation)
84+
return tensor::ExpandShapeOp::create(rewriter, loc, newOperandType, operand,
85+
reassociation)
8786
.getResult();
8887
}
8988

mlir/lib/Dialect/Linalg/Transforms/Padding.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,17 +333,16 @@ linalg::rewriteAsPaddedOp(RewriterBase &rewriter, LinalgOp opToPad,
333333
for (auto it :
334334
llvm::zip(paddedSubtensorResults, opToPad.getDpsInitsMutable())) {
335335
if (options.copyBackOp == LinalgPaddingOptions::CopyBackOp::LinalgCopy) {
336-
replacements.push_back(rewriter
337-
.create<linalg::CopyOp>(loc, std::get<0>(it),
338-
std::get<1>(it).get())
336+
replacements.push_back(linalg::CopyOp::create(rewriter, loc,
337+
std::get<0>(it),
338+
std::get<1>(it).get())
339339
.getResult(0));
340340
} else if (options.copyBackOp ==
341341
LinalgPaddingOptions::CopyBackOp::
342342
BufferizationMaterializeInDestination) {
343343
replacements.push_back(
344-
rewriter
345-
.create<bufferization::MaterializeInDestinationOp>(
346-
loc, std::get<0>(it), std::get<1>(it).get())
344+
bufferization::MaterializeInDestinationOp::create(
345+
rewriter, loc, std::get<0>(it), std::get<1>(it).get())
347346
->getResult(0));
348347
} else {
349348
llvm_unreachable("unsupported copy back op");

mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,9 +947,9 @@ DecomposePadOpPattern::matchAndRewrite(tensor::PadOp padOp,
947947
auto getIdxValue = [&](OpFoldResult ofr) {
948948
if (auto val = llvm::dyn_cast_if_present<Value>(ofr))
949949
return val;
950-
return rewriter
951-
.create<arith::ConstantIndexOp>(
952-
padOp.getLoc(), cast<IntegerAttr>(cast<Attribute>(ofr)).getInt())
950+
return arith::ConstantIndexOp::create(
951+
rewriter, padOp.getLoc(),
952+
cast<IntegerAttr>(cast<Attribute>(ofr)).getInt())
953953
.getResult();
954954
};
955955

mlir/lib/Dialect/Linalg/Transforms/TransposeConv2D.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ FailureOr<Operation *> transposeConv2DHelper(RewriterBase &rewriter,
7070
input = tensor::EmptyOp::create(rewriter, loc, newFilterShape, elementTy)
7171
.getResult();
7272
} else {
73-
input = rewriter
74-
.create<memref::AllocOp>(
75-
loc, MemRefType::get(newFilterShape, elementTy))
73+
input = memref::AllocOp::create(rewriter, loc,
74+
MemRefType::get(newFilterShape, elementTy))
7675
.getResult();
7776
}
7877

mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3714,8 +3714,8 @@ struct Conv1DGenerator
37143714
}
37153715
}
37163716

3717-
return rewriter
3718-
.create<vector::TransferWriteOp>(loc, res, resShaped, resPadding)
3717+
return vector::TransferWriteOp::create(rewriter, loc, res, resShaped,
3718+
resPadding)
37193719
.getOperation();
37203720
}
37213721

0 commit comments

Comments
 (0)