Skip to content

Commit c090ed5

Browse files
maksleventalmakslevental
authored
[mlir][NFC] update mlir/Dialect create APIs (33/n) (#150659)
See #147168 for more info.
1 parent 4df8f72 commit c090ed5

23 files changed

+135
-162
lines changed

‎mlir/lib/Dialect/AMX/IR/AMXDialect.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,8 @@ static Value getStride(Location loc, MemRefType mType, Value base,
9696
MemRefDescriptor memrefDescriptor(base);
9797
auto attr = rewriter.getI64IntegerAttr(bytes);
9898
Value scale = LLVM::ConstantOp::create(rewriter, loc, llvmInt64Type, attr);
99-
return rewriter
100-
.create<LLVM::MulOp>(loc, llvmInt64Type, scale,
101-
memrefDescriptor.stride(rewriter, loc, preLast))
99+
return LLVM::MulOp::create(rewriter, loc, llvmInt64Type, scale,
100+
memrefDescriptor.stride(rewriter, loc, preLast))
102101
.getResult();
103102
}
104103
// Use direct constant for static stride.

‎mlir/lib/Dialect/Bufferization/IR/BufferizableOpInterface.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,8 @@ FailureOr<Value> bufferization::getBuffer(RewriterBase &rewriter, Value value,
688688
if (failed(bufferType))
689689
return failure();
690690
ensureToBufferOpIsValid(value, *bufferType);
691-
return rewriter
692-
.create<bufferization::ToBufferOp>(value.getLoc(), *bufferType, value)
691+
return bufferization::ToBufferOp::create(rewriter, value.getLoc(),
692+
*bufferType, value)
693693
.getResult();
694694
}
695695

@@ -772,9 +772,8 @@ FailureOr<Value> BufferizationOptions::createAlloc(OpBuilder &b, Location loc,
772772

773773
// Default bufferallocation via AllocOp.
774774
if (bufferAlignment != 0)
775-
return b
776-
.create<memref::AllocOp>(loc, type, dynShape,
777-
b.getI64IntegerAttr(bufferAlignment))
775+
return memref::AllocOp::create(b, loc, type, dynShape,
776+
b.getI64IntegerAttr(bufferAlignment))
778777
.getResult();
779778
return memref::AllocOp::create(b, loc, type, dynShape).getResult();
780779
}

‎mlir/lib/Dialect/Bufferization/Transforms/LowerDeallocations.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,10 @@ func::FuncOp mlir::bufferization::buildDeallocationLibraryFunction(
482482

483483
// Build the first for loop that computes aliasing with retained
484484
// memrefs.
485-
Value noRetainAlias =
486-
builder
487-
.create<scf::ForOp>(
488-
loc, c0, toRetainSize, c1, trueValue,
485+
Value
486+
noRetainAlias =
487+
scf::ForOp::create(
488+
builder, loc, c0, toRetainSize, c1, trueValue,
489489
[&](OpBuilder &builder, Location loc, Value i,
490490
ValueRange iterArgs) {
491491
Value retainValue = memref::LoadOp::create(
@@ -512,14 +512,14 @@ func::FuncOp mlir::bufferization::buildDeallocationLibraryFunction(
512512
builder, loc, iterArgs[0], doesntAlias);
513513
scf::YieldOp::create(builder, loc, yieldValue);
514514
})
515-
.getResult(0);
515+
.getResult(0);
516516

517517
// Build the second for loop that adds aliasing with previously
518518
// deallocated memrefs.
519-
Value noAlias =
520-
builder
521-
.create<scf::ForOp>(
522-
loc, c0, outerIter, c1, noRetainAlias,
519+
Value
520+
noAlias =
521+
scf::ForOp::create(
522+
builder, loc, c0, outerIter, c1, noRetainAlias,
523523
[&](OpBuilder &builder, Location loc, Value i,
524524
ValueRange iterArgs) {
525525
Value prevDeallocValue = memref::LoadOp::create(
@@ -531,7 +531,7 @@ func::FuncOp mlir::bufferization::buildDeallocationLibraryFunction(
531531
builder, loc, iterArgs[0], doesntAlias);
532532
scf::YieldOp::create(builder, loc, yieldValue);
533533
})
534-
.getResult(0);
534+
.getResult(0);
535535

536536
Value shouldDealoc = arith::AndIOp::create(builder, loc, noAlias, cond);
537537
memref::StoreOp::create(builder, loc, shouldDealoc, deallocCondsMemref,

‎mlir/lib/Dialect/Bufferization/Transforms/OwnershipBasedBufferDeallocation.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -750,17 +750,16 @@ Value BufferDeallocation::materializeMemrefWithGuaranteedOwnership(
750750

751751
// Insert a runtime check and only clone if we still don't have ownership at
752752
// runtime.
753-
Value maybeClone = builder
754-
.create<scf::IfOp>(
755-
memref.getLoc(), condition,
756-
[&](OpBuilder &builder, Location loc) {
757-
scf::YieldOp::create(builder, loc, newMemref);
758-
},
759-
[&](OpBuilder &builder, Location loc) {
760-
Value clone = bufferization::CloneOp::create(
761-
builder, loc, newMemref);
762-
scf::YieldOp::create(builder, loc, clone);
763-
})
753+
Value maybeClone = scf::IfOp::create(
754+
builder, memref.getLoc(), condition,
755+
[&](OpBuilder &builder, Location loc) {
756+
scf::YieldOp::create(builder, loc, newMemref);
757+
},
758+
[&](OpBuilder &builder, Location loc) {
759+
Value clone = bufferization::CloneOp::create(
760+
builder, loc, newMemref);
761+
scf::YieldOp::create(builder, loc, clone);
762+
})
764763
.getResult(0);
765764
Value trueVal = buildBoolValue(builder, memref.getLoc(), true);
766765
state.updateOwnership(maybeClone, trueVal);

‎mlir/lib/Dialect/GPU/Transforms/ShuffleRewriter.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,12 @@ struct GpuShuffleRewriter : public OpRewritePattern<gpu::ShuffleOp> {
6060

6161
// Shuffle the values.
6262
ValueRange loRes =
63-
rewriter
64-
.create<gpu::ShuffleOp>(op.getLoc(), lo, op.getOffset(),
65-
op.getWidth(), op.getMode())
63+
gpu::ShuffleOp::create(rewriter, op.getLoc(), lo, op.getOffset(),
64+
op.getWidth(), op.getMode())
6665
.getResults();
6766
ValueRange hiRes =
68-
rewriter
69-
.create<gpu::ShuffleOp>(op.getLoc(), hi, op.getOffset(),
70-
op.getWidth(), op.getMode())
67+
gpu::ShuffleOp::create(rewriter, op.getLoc(), hi, op.getOffset(),
68+
op.getWidth(), op.getMode())
7169
.getResults();
7270

7371
// Convert lo back to i64.

‎mlir/lib/Dialect/GPU/Transforms/SubgroupReduceLowering.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,9 @@ Value createSubgroupShuffleReduction(OpBuilder &builder, Location loc,
197197
// Parallel reduction using butterfly shuffles.
198198
for (unsigned i = ci.clusterStride; i < ci.clusterStride * ci.clusterSize;
199199
i <<= 1) {
200-
Value shuffled = builder
201-
.create<gpu::ShuffleOp>(loc, packFn(laneVal), i,
202-
/*width=*/ci.subgroupSize,
203-
/*mode=*/gpu::ShuffleMode::XOR)
200+
Value shuffled = gpu::ShuffleOp::create(builder, loc, packFn(laneVal), i,
201+
/*width=*/ci.subgroupSize,
202+
/*mode=*/gpu::ShuffleMode::XOR)
204203
.getShuffleResult();
205204
laneVal = vector::makeArithReduction(builder, loc,
206205
gpu::convertReductionKind(mode),

‎mlir/lib/Dialect/MemRef/Transforms/IndependenceTransforms.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ FailureOr<Value> memref::buildIndependentOp(OpBuilder &b,
5656
// Create a memref::SubViewOp.
5757
SmallVector<OpFoldResult> offsets(newSizes.size(), b.getIndexAttr(0));
5858
SmallVector<OpFoldResult> strides(newSizes.size(), b.getIndexAttr(1));
59-
return b
60-
.create<SubViewOp>(loc, newAllocaOp, offsets, allocaOp.getMixedSizes(),
61-
strides)
59+
return SubViewOp::create(b, loc, newAllocaOp, offsets,
60+
allocaOp.getMixedSizes(), strides)
6261
.getResult();
6362
}
6463

‎mlir/lib/Dialect/MemRef/Transforms/RuntimeOpVerification.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,8 @@ struct CopyOpInterface
185185
int64_t dim) -> Value {
186186
return type.isDynamicDim(dim)
187187
? DimOp::create(builder, loc, memRef, dim).getResult()
188-
: builder
189-
.create<arith::ConstantIndexOp>(loc,
190-
type.getDimSize(dim))
188+
: arith::ConstantIndexOp::create(builder, loc,
189+
type.getDimSize(dim))
191190
.getResult();
192191
};
193192
Value sourceDim = getDimSize(copyOp.getSource(), rankedSourceType, i);

‎mlir/lib/Dialect/Quant/Transforms/LowerQuantOps.cpp

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,14 @@ flattenUnrankedTensorAroundAxis(OpBuilder &builder, Location loc, Value input,
148148
auto axisValue = arith::ConstantIndexOp::create(builder, loc, axis);
149149
auto axisNextValue = arith::ConstantIndexOp::create(builder, loc, axis + 1);
150150
auto shapeLeft =
151-
builder
152-
.create<shape::SplitAtOp>(loc, TypeRange{shapeType, shapeType},
153-
inputShape, axisValue)
151+
shape::SplitAtOp::create(builder, loc, TypeRange{shapeType, shapeType},
152+
inputShape, axisValue)
154153
.getResult(0);
155154
auto sizeLeft =
156155
shape::NumElementsOp::create(builder, loc, indexType, shapeLeft);
157156
auto shapeRight =
158-
builder
159-
.create<shape::SplitAtOp>(loc, TypeRange{shapeType, shapeType},
160-
inputShape, axisNextValue)
157+
shape::SplitAtOp::create(builder, loc, TypeRange{shapeType, shapeType},
158+
inputShape, axisNextValue)
161159
.getResult(1);
162160
auto sizeRight =
163161
shape::NumElementsOp::create(builder, loc, indexType, shapeRight);
@@ -557,25 +555,24 @@ Value convertPerChannelRanked(OpBuilder &builder, Location loc, Operation *op,
557555
SmallVector<AffineMap> indexingMaps{
558556
builder.getMultiDimIdentityMap(inputRank), channelAxisAffineMap,
559557
channelAxisAffineMap, builder.getMultiDimIdentityMap(inputRank)};
560-
auto result = builder
561-
.create<linalg::GenericOp>(
562-
loc,
563-
init.getType(), // resultType
564-
ValueRange{input, scales, zeroPoints}, // inputs
565-
ValueRange{init}, // outputs
566-
indexingMaps, iteratorTypes,
567-
[&](OpBuilder &builder, Location loc, ValueRange args) {
568-
assert(args.size() == 4);
569-
auto input = args[0];
570-
auto scale = args[1];
571-
auto zeroPoint = args[2];
572-
573-
auto result =
574-
convertRanked(builder, loc, op, input, {}, scale,
575-
zeroPoint, quantizedType);
576-
577-
linalg::YieldOp::create(builder, loc, result);
578-
})
558+
auto result = linalg::GenericOp::create(
559+
builder, loc,
560+
init.getType(), // resultType
561+
ValueRange{input, scales, zeroPoints}, // inputs
562+
ValueRange{init}, // outputs
563+
indexingMaps, iteratorTypes,
564+
[&](OpBuilder &builder, Location loc, ValueRange args) {
565+
assert(args.size() == 4);
566+
auto input = args[0];
567+
auto scale = args[1];
568+
auto zeroPoint = args[2];
569+
570+
auto result =
571+
convertRanked(builder, loc, op, input, {}, scale,
572+
zeroPoint, quantizedType);
573+
574+
linalg::YieldOp::create(builder, loc, result);
575+
})
579576
.getResult(0);
580577

581578
return result;
@@ -660,25 +657,24 @@ Value convertSubChannel(OpBuilder &builder, Location loc, Operation *op,
660657
SmallVector<AffineMap> indexingMaps{
661658
builder.getMultiDimIdentityMap(inputRank), affineMap, affineMap,
662659
builder.getMultiDimIdentityMap(inputRank)};
663-
auto result = builder
664-
.create<linalg::GenericOp>(
665-
loc,
666-
init.getType(), // resultType
667-
ValueRange{input, scales, zeroPoints}, // inputs
668-
ValueRange{init}, // outputs
669-
indexingMaps, iteratorTypes,
670-
[&](OpBuilder &builder, Location loc, ValueRange args) {
671-
assert(args.size() == 4);
672-
auto input = args[0];
673-
auto scale = args[1];
674-
auto zeroPoint = args[2];
675-
676-
auto result =
677-
convertRanked(builder, loc, op, input, {}, scale,
678-
zeroPoint, quantizedType);
679-
680-
linalg::YieldOp::create(builder, loc, result);
681-
})
660+
auto result = linalg::GenericOp::create(
661+
builder, loc,
662+
init.getType(), // resultType
663+
ValueRange{input, scales, zeroPoints}, // inputs
664+
ValueRange{init}, // outputs
665+
indexingMaps, iteratorTypes,
666+
[&](OpBuilder &builder, Location loc, ValueRange args) {
667+
assert(args.size() == 4);
668+
auto input = args[0];
669+
auto scale = args[1];
670+
auto zeroPoint = args[2];
671+
672+
auto result =
673+
convertRanked(builder, loc, op, input, {}, scale,
674+
zeroPoint, quantizedType);
675+
676+
linalg::YieldOp::create(builder, loc, result);
677+
})
682678
.getResult(0);
683679

684680
return result;

‎mlir/lib/Dialect/SCF/Transforms/BufferizableOpInterfaceImpl.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,10 @@ getBbArgReplacements(RewriterBase &rewriter, Block::BlockArgListType bbArgs,
497497
size_t idx = it.index();
498498
Value val = it.value();
499499
if (tensorIndices.contains(idx)) {
500-
result.push_back(rewriter
501-
.create<bufferization::ToTensorOp>(
502-
val.getLoc(), oldBbArgs[idx].getType(), val)
503-
.getResult());
500+
result.push_back(
501+
bufferization::ToTensorOp::create(rewriter, val.getLoc(),
502+
oldBbArgs[idx].getType(), val)
503+
.getResult());
504504
} else {
505505
result.push_back(val);
506506
}

0 commit comments

Comments
 (0)