Skip to content

Commit 4bf3395

Browse files
authored
[mlir] Update builders to use new form. (#154132)
Mechanically applied using clang-tidy.
1 parent f15c6ff commit 4bf3395

File tree

9 files changed

+49
-46
lines changed

9 files changed

+49
-46
lines changed

mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,28 +156,30 @@ struct ConvertAlloc final : public OpConversionPattern<memref::AllocOp> {
156156
Type sizeTType = emitc::SizeTType::get(rewriter.getContext());
157157
Type elementType = memrefType.getElementType();
158158
IndexType indexType = rewriter.getIndexType();
159-
emitc::CallOpaqueOp sizeofElementOp = rewriter.create<emitc::CallOpaqueOp>(
160-
loc, sizeTType, rewriter.getStringAttr("sizeof"), ValueRange{},
159+
emitc::CallOpaqueOp sizeofElementOp = emitc::CallOpaqueOp::create(
160+
rewriter, loc, sizeTType, rewriter.getStringAttr("sizeof"),
161+
ValueRange{},
161162
ArrayAttr::get(rewriter.getContext(), {TypeAttr::get(elementType)}));
162163

163164
int64_t numElements = 1;
164165
for (int64_t dimSize : memrefType.getShape()) {
165166
numElements *= dimSize;
166167
}
167-
Value numElementsValue = rewriter.create<emitc::ConstantOp>(
168-
loc, indexType, rewriter.getIndexAttr(numElements));
168+
Value numElementsValue = emitc::ConstantOp::create(
169+
rewriter, loc, indexType, rewriter.getIndexAttr(numElements));
169170

170-
Value totalSizeBytes = rewriter.create<emitc::MulOp>(
171-
loc, sizeTType, sizeofElementOp.getResult(0), numElementsValue);
171+
Value totalSizeBytes =
172+
emitc::MulOp::create(rewriter, loc, sizeTType,
173+
sizeofElementOp.getResult(0), numElementsValue);
172174

173175
emitc::CallOpaqueOp allocCall;
174176
StringAttr allocFunctionName;
175177
Value alignmentValue;
176178
SmallVector<Value, 2> argsVec;
177179
if (allocOp.getAlignment()) {
178180
allocFunctionName = rewriter.getStringAttr(alignedAllocFunctionName);
179-
alignmentValue = rewriter.create<emitc::ConstantOp>(
180-
loc, sizeTType,
181+
alignmentValue = emitc::ConstantOp::create(
182+
rewriter, loc, sizeTType,
181183
rewriter.getIntegerAttr(indexType,
182184
allocOp.getAlignment().value_or(0)));
183185
argsVec.push_back(alignmentValue);
@@ -188,15 +190,15 @@ struct ConvertAlloc final : public OpConversionPattern<memref::AllocOp> {
188190
argsVec.push_back(totalSizeBytes);
189191
ValueRange args(argsVec);
190192

191-
allocCall = rewriter.create<emitc::CallOpaqueOp>(
192-
loc,
193+
allocCall = emitc::CallOpaqueOp::create(
194+
rewriter, loc,
193195
emitc::PointerType::get(
194196
emitc::OpaqueType::get(rewriter.getContext(), "void")),
195197
allocFunctionName, args);
196198

197199
emitc::PointerType targetPointerType = emitc::PointerType::get(elementType);
198-
emitc::CastOp castOp = rewriter.create<emitc::CastOp>(
199-
loc, targetPointerType, allocCall.getResult(0));
200+
emitc::CastOp castOp = emitc::CastOp::create(
201+
rewriter, loc, targetPointerType, allocCall.getResult(0));
200202

201203
rewriter.replaceOp(allocOp, castOp);
202204
return success();

mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitCPass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ namespace {
3333
emitc::IncludeOp addStandardHeader(OpBuilder &builder, ModuleOp module,
3434
StringRef headerName) {
3535
StringAttr includeAttr = builder.getStringAttr(headerName);
36-
return builder.create<emitc::IncludeOp>(
37-
module.getLoc(), includeAttr,
36+
return emitc::IncludeOp::create(
37+
builder, module.getLoc(), includeAttr,
3838
/*is_standard_include=*/builder.getUnitAttr());
3939
}
4040

mlir/lib/Dialect/EmitC/Transforms/WrapFuncInClass.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class WrapFuncInClass : public OpRewritePattern<emitc::FuncOp> {
6464
TypeAttr typeAttr = TypeAttr::get(val.getType());
6565
fields.push_back({fieldName, typeAttr});
6666

67-
FieldOp fieldop = rewriter.create<emitc::FieldOp>(
68-
funcOp->getLoc(), fieldName, typeAttr, nullptr);
67+
FieldOp fieldop = emitc::FieldOp::create(rewriter, funcOp->getLoc(),
68+
fieldName, typeAttr, nullptr);
6969

7070
if (argAttrs && idx < argAttrs->size()) {
7171
fieldop->setDiscardableAttrs(funcOp.getArgAttrDict(idx));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,9 +691,9 @@ struct DropPadUnitDims : public OpRewritePattern<tensor::PadOp> {
691691

692692
auto newResultType = RankedTensorType::get(
693693
newResultShape, padOp.getResultType().getElementType());
694-
auto newPadOp = rewriter.create<tensor::PadOp>(
695-
padOp.getLoc(), /*result=*/newResultType, collapsedSource, newLowPad,
696-
newHighPad, paddingVal, padOp.getNofold());
694+
auto newPadOp = tensor::PadOp::create(
695+
rewriter, padOp.getLoc(), /*result=*/newResultType, collapsedSource,
696+
newLowPad, newHighPad, paddingVal, padOp.getNofold());
697697

698698
Value dest = padOp.getResult();
699699
if (options.rankReductionStrategy ==

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ FailureOr<Operation *> mlir::linalg::transposeMatmul(RewriterBase &rewriter,
5252
dynamicDims.push_back(tensor::DimOp::create(rewriter, loc, input, 0));
5353

5454
ArrayRef<int64_t> shape = type.getShape();
55-
Value empty = rewriter.create<tensor::EmptyOp>(
56-
loc, ArrayRef<int64_t>{shape[1], shape[0]}, type.getElementType(),
57-
dynamicDims);
58-
auto transposeOp = rewriter.create<linalg::TransposeOp>(
59-
loc, input, empty, ArrayRef<int64_t>{1, 0});
55+
Value empty = tensor::EmptyOp::create(rewriter, loc,
56+
ArrayRef<int64_t>{shape[1], shape[0]},
57+
type.getElementType(), dynamicDims);
58+
auto transposeOp = linalg::TransposeOp::create(rewriter, loc, input, empty,
59+
ArrayRef<int64_t>{1, 0});
6060
Operation *newMatmulOp;
6161
if (transposeLHS) {
6262
newMatmulOp = MatmulTransposeAOp::create(
@@ -112,8 +112,8 @@ mlir::linalg::transposeBatchMatmul(RewriterBase &rewriter,
112112
Value empty = tensor::EmptyOp::create(
113113
rewriter, loc, ArrayRef<int64_t>{shape[0], shape[2], shape[1]},
114114
type.getElementType(), dynamicDims);
115-
auto transposeOp = rewriter.create<linalg::TransposeOp>(
116-
loc, input, empty, ArrayRef<int64_t>{0, 2, 1});
115+
auto transposeOp = linalg::TransposeOp::create(rewriter, loc, input, empty,
116+
ArrayRef<int64_t>{0, 2, 1});
117117
Operation *newMatmulOp;
118118
if (transposeLHS) {
119119
newMatmulOp = BatchMatmulTransposeAOp::create(

mlir/lib/Dialect/XeGPU/IR/XeGPUDialect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ genOffsetsComputingInsts(OpBuilder &builder, Location loc,
6767
StaticTileOffsetRange(sizePerWg, distUnit)) {
6868
SmallVector<Value> base =
6969
llvm::map_to_vector(unitOffs, [&](int64_t d) -> Value {
70-
return builder.create<arith::ConstantIndexOp>(loc, d);
70+
return arith::ConstantIndexOp::create(builder, loc, d);
7171
});
7272

7373
SmallVector<Value> adds = llvm::map_to_vector(
@@ -80,7 +80,7 @@ genOffsetsComputingInsts(OpBuilder &builder, Location loc,
8080
llvm::zip_equal(adds, sizePerWg), [&](const auto &t) -> Value {
8181
return builder.createOrFold<index::RemUOp>(
8282
loc, std::get<0>(t),
83-
builder.create<arith::ConstantIndexOp>(loc, std::get<1>(t)));
83+
arith::ConstantIndexOp::create(builder, loc, std::get<1>(t)));
8484
});
8585

8686
offsets.push_back(mods);

mlir/lib/Dialect/XeGPU/Transforms/XeGPUWgToSgDistribute.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ struct WgToSgCreateNdOp : public OpConversionPattern<xegpu::CreateNdDescOp> {
166166
// Subtract startOfRange from the original subgroup id to get
167167
// the adjusted sg id
168168
Value startOfRangeVal =
169-
rewriter.create<arith::ConstantIndexOp>(loc, startOfRange);
169+
arith::ConstantIndexOp::create(rewriter, loc, startOfRange);
170170
linearSgId =
171171
rewriter.createOrFold<index::SubOp>(loc, linearSgId, startOfRangeVal);
172172
}
@@ -675,7 +675,7 @@ struct WgToSgArithConstantOp : public OpConversionPattern<arith::ConstantOp> {
675675
auto newType = VectorType::get(sgShape, vecType.getElementType());
676676
auto sgAttr = DenseElementsAttr::get(newType, singleVal);
677677
auto cstOp =
678-
rewriter.create<arith::ConstantOp>(op.getLoc(), newType, sgAttr);
678+
arith::ConstantOp::create(rewriter, op.getLoc(), newType, sgAttr);
679679
if (auto newLayout = layout.dropSgLayoutAndData())
680680
xegpu::setLayoutAttr(cstOp->getResult(0), newLayout);
681681
SmallVector<Value> newConsts(count, cstOp);

mlir/lib/Target/Wasm/TranslateFromWasm.cpp

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,9 @@ parsed_inst_t ExpressionParser::parseConstInst(
780780
auto parsedConstant = parser.parseLiteral<valueT>();
781781
if (failed(parsedConstant))
782782
return failure();
783-
auto constOp = builder.create<ConstOp>(
784-
*currentOpLoc, buildLiteralAttr<valueT>(builder, *parsedConstant));
783+
auto constOp =
784+
ConstOp::create(builder, *currentOpLoc,
785+
buildLiteralAttr<valueT>(builder, *parsedConstant));
785786
return {{constOp.getResult()}};
786787
}
787788

@@ -929,8 +930,8 @@ class WasmBinaryParser {
929930
<< " type registration.";
930931
FunctionType type = symbols.moduleFuncTypes[tid.id];
931932
std::string symbol = symbols.getNewFuncSymbolName();
932-
auto funcOp =
933-
builder.create<FuncImportOp>(loc, symbol, moduleName, importName, type);
933+
auto funcOp = FuncImportOp::create(builder, loc, symbol, moduleName,
934+
importName, type);
934935
symbols.funcSymbols.push_back({{FlatSymbolRefAttr::get(funcOp)}, type});
935936
return funcOp.verify();
936937
}
@@ -939,8 +940,8 @@ class WasmBinaryParser {
939940
LogicalResult visitImport(Location loc, StringRef moduleName,
940941
StringRef importName, LimitType limitType) {
941942
std::string symbol = symbols.getNewMemorySymbolName();
942-
auto memOp = builder.create<MemImportOp>(loc, symbol, moduleName,
943-
importName, limitType);
943+
auto memOp = MemImportOp::create(builder, loc, symbol, moduleName,
944+
importName, limitType);
944945
symbols.memSymbols.push_back({FlatSymbolRefAttr::get(memOp)});
945946
return memOp.verify();
946947
}
@@ -949,8 +950,8 @@ class WasmBinaryParser {
949950
LogicalResult visitImport(Location loc, StringRef moduleName,
950951
StringRef importName, TableType tableType) {
951952
std::string symbol = symbols.getNewTableSymbolName();
952-
auto tableOp = builder.create<TableImportOp>(loc, symbol, moduleName,
953-
importName, tableType);
953+
auto tableOp = TableImportOp::create(builder, loc, symbol, moduleName,
954+
importName, tableType);
954955
symbols.tableSymbols.push_back({FlatSymbolRefAttr::get(tableOp)});
955956
return tableOp.verify();
956957
}
@@ -960,8 +961,8 @@ class WasmBinaryParser {
960961
StringRef importName, GlobalTypeRecord globalType) {
961962
std::string symbol = symbols.getNewGlobalSymbolName();
962963
auto giOp =
963-
builder.create<GlobalImportOp>(loc, symbol, moduleName, importName,
964-
globalType.type, globalType.isMutable);
964+
GlobalImportOp::create(builder, loc, symbol, moduleName, importName,
965+
globalType.type, globalType.isMutable);
965966
symbols.globalSymbols.push_back(
966967
{{FlatSymbolRefAttr::get(giOp)}, giOp.getType()});
967968
return giOp.verify();
@@ -1012,7 +1013,7 @@ class WasmBinaryParser {
10121013
if (failed(fillRegistry))
10131014
return;
10141015

1015-
mOp = builder.create<ModuleOp>(getLocation());
1016+
mOp = ModuleOp::create(builder, getLocation());
10161017
builder.setInsertionPointToStart(&mOp.getBodyRegion().front());
10171018
LogicalResult parsingTypes = parseSection<WasmSectionType::TYPE>();
10181019
if (failed(parsingTypes))
@@ -1172,7 +1173,7 @@ WasmBinaryParser::parseSectionItem<WasmSectionType::TABLE>(ParserHead &ph,
11721173
LDBG() << " Parsed table description: " << *tableType;
11731174
StringAttr symbol = builder.getStringAttr(symbols.getNewTableSymbolName());
11741175
auto tableOp =
1175-
builder.create<TableOp>(opLocation, symbol.strref(), *tableType);
1176+
TableOp::create(builder, opLocation, symbol.strref(), *tableType);
11761177
symbols.tableSymbols.push_back({SymbolRefAttr::get(tableOp)});
11771178
return success();
11781179
}
@@ -1190,11 +1191,11 @@ WasmBinaryParser::parseSectionItem<WasmSectionType::FUNCTION>(ParserHead &ph,
11901191
return emitError(getLocation(), "invalid type index: ") << typeIdx;
11911192
std::string symbol = symbols.getNewFuncSymbolName();
11921193
auto funcOp =
1193-
builder.create<FuncOp>(opLoc, symbol, symbols.moduleFuncTypes[typeIdx]);
1194+
FuncOp::create(builder, opLoc, symbol, symbols.moduleFuncTypes[typeIdx]);
11941195
Block *block = funcOp.addEntryBlock();
11951196
auto ip = builder.saveInsertionPoint();
11961197
builder.setInsertionPointToEnd(block);
1197-
builder.create<ReturnOp>(opLoc);
1198+
ReturnOp::create(builder, opLoc);
11981199
builder.restoreInsertionPoint(ip);
11991200
symbols.funcSymbols.push_back(
12001201
{{FlatSymbolRefAttr::get(funcOp.getSymNameAttr())},
@@ -1225,7 +1226,7 @@ WasmBinaryParser::parseSectionItem<WasmSectionType::MEMORY>(ParserHead &ph,
12251226

12261227
LDBG() << " Registering memory " << *memory;
12271228
std::string symbol = symbols.getNewMemorySymbolName();
1228-
auto memOp = builder.create<MemOp>(opLocation, symbol, *memory);
1229+
auto memOp = MemOp::create(builder, opLocation, symbol, *memory);
12291230
symbols.memSymbols.push_back({SymbolRefAttr::get(memOp)});
12301231
return success();
12311232
}

mlir/test/lib/Dialect/XeGPU/TestXeGPUTransforms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ struct TestXeGPULayoutInterface
228228
auto materializeCast = [&](mlir::OpBuilder &builder, mlir::Type type,
229229
mlir::ValueRange inputs,
230230
mlir::Location loc) -> mlir::Value {
231-
return builder.create<UnrealizedConversionCastOp>(loc, type, inputs)
231+
return UnrealizedConversionCastOp::create(builder, loc, type, inputs)
232232
.getResult(0);
233233
};
234234
typeConverter.addSourceMaterialization(materializeCast);

0 commit comments

Comments
 (0)