Skip to content

Commit eaa67a3

Browse files
authored
[mlir][NFC] update Conversion create APIs (5/n) (#149887)
See #147168 for more info.
1 parent a415d68 commit eaa67a3

File tree

20 files changed

+1079
-1036
lines changed

20 files changed

+1079
-1036
lines changed

mlir/lib/Conversion/ComplexCommon/DivisionConverter.cpp

Lines changed: 308 additions & 294 deletions
Large diffs are not rendered by default.

mlir/lib/Conversion/ComplexToLLVM/ComplexToLLVM.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static constexpr unsigned kImaginaryPosInComplexNumberStruct = 1;
3535

3636
ComplexStructBuilder ComplexStructBuilder::poison(OpBuilder &builder,
3737
Location loc, Type type) {
38-
Value val = builder.create<LLVM::PoisonOp>(loc, type);
38+
Value val = LLVM::PoisonOp::create(builder, loc, type);
3939
return ComplexStructBuilder(val);
4040
}
4141

@@ -79,9 +79,9 @@ struct AbsOpConversion : public ConvertOpToLLVMPattern<complex::AbsOp> {
7979
LLVM::FastmathFlagsAttr fmf = LLVM::FastmathFlagsAttr::get(
8080
op.getContext(),
8181
convertArithFastMathFlagsToLLVM(complexFMFAttr.getValue()));
82-
Value sqNorm = rewriter.create<LLVM::FAddOp>(
83-
loc, rewriter.create<LLVM::FMulOp>(loc, real, real, fmf),
84-
rewriter.create<LLVM::FMulOp>(loc, imag, imag, fmf), fmf);
82+
Value sqNorm = LLVM::FAddOp::create(
83+
rewriter, loc, LLVM::FMulOp::create(rewriter, loc, real, real, fmf),
84+
LLVM::FMulOp::create(rewriter, loc, imag, imag, fmf), fmf);
8585

8686
rewriter.replaceOpWithNewOp<LLVM::SqrtOp>(op, sqNorm);
8787
return success();
@@ -191,10 +191,10 @@ struct AddOpConversion : public ConvertOpToLLVMPattern<complex::AddOp> {
191191
LLVM::FastmathFlagsAttr fmf = LLVM::FastmathFlagsAttr::get(
192192
op.getContext(),
193193
convertArithFastMathFlagsToLLVM(complexFMFAttr.getValue()));
194-
Value real =
195-
rewriter.create<LLVM::FAddOp>(loc, arg.lhs.real(), arg.rhs.real(), fmf);
196-
Value imag =
197-
rewriter.create<LLVM::FAddOp>(loc, arg.lhs.imag(), arg.rhs.imag(), fmf);
194+
Value real = LLVM::FAddOp::create(rewriter, loc, arg.lhs.real(),
195+
arg.rhs.real(), fmf);
196+
Value imag = LLVM::FAddOp::create(rewriter, loc, arg.lhs.imag(),
197+
arg.rhs.imag(), fmf);
198198
result.setReal(rewriter, loc, real);
199199
result.setImaginary(rewriter, loc, imag);
200200

@@ -278,13 +278,13 @@ struct MulOpConversion : public ConvertOpToLLVMPattern<complex::MulOp> {
278278
Value lhsRe = arg.lhs.real();
279279
Value lhsIm = arg.lhs.imag();
280280

281-
Value real = rewriter.create<LLVM::FSubOp>(
282-
loc, rewriter.create<LLVM::FMulOp>(loc, rhsRe, lhsRe, fmf),
283-
rewriter.create<LLVM::FMulOp>(loc, rhsIm, lhsIm, fmf), fmf);
281+
Value real = LLVM::FSubOp::create(
282+
rewriter, loc, LLVM::FMulOp::create(rewriter, loc, rhsRe, lhsRe, fmf),
283+
LLVM::FMulOp::create(rewriter, loc, rhsIm, lhsIm, fmf), fmf);
284284

285-
Value imag = rewriter.create<LLVM::FAddOp>(
286-
loc, rewriter.create<LLVM::FMulOp>(loc, lhsIm, rhsRe, fmf),
287-
rewriter.create<LLVM::FMulOp>(loc, lhsRe, rhsIm, fmf), fmf);
285+
Value imag = LLVM::FAddOp::create(
286+
rewriter, loc, LLVM::FMulOp::create(rewriter, loc, lhsIm, rhsRe, fmf),
287+
LLVM::FMulOp::create(rewriter, loc, lhsRe, rhsIm, fmf), fmf);
288288

289289
result.setReal(rewriter, loc, real);
290290
result.setImaginary(rewriter, loc, imag);
@@ -313,10 +313,10 @@ struct SubOpConversion : public ConvertOpToLLVMPattern<complex::SubOp> {
313313
LLVM::FastmathFlagsAttr fmf = LLVM::FastmathFlagsAttr::get(
314314
op.getContext(),
315315
convertArithFastMathFlagsToLLVM(complexFMFAttr.getValue()));
316-
Value real =
317-
rewriter.create<LLVM::FSubOp>(loc, arg.lhs.real(), arg.rhs.real(), fmf);
318-
Value imag =
319-
rewriter.create<LLVM::FSubOp>(loc, arg.lhs.imag(), arg.rhs.imag(), fmf);
316+
Value real = LLVM::FSubOp::create(rewriter, loc, arg.lhs.real(),
317+
arg.rhs.real(), fmf);
318+
Value imag = LLVM::FSubOp::create(rewriter, loc, arg.lhs.imag(),
319+
arg.rhs.imag(), fmf);
320320
result.setReal(rewriter, loc, real);
321321
result.setImaginary(rewriter, loc, imag);
322322

mlir/lib/Conversion/ComplexToLibm/ComplexToLibm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ LogicalResult ScalarOpToLibmCall<Op, TypeResolver>::matchAndRewrite(
8484
rewriter.setInsertionPointToStart(&module->getRegion(0).front());
8585
auto opFunctionTy = FunctionType::get(
8686
rewriter.getContext(), op->getOperandTypes(), op->getResultTypes());
87-
opFunc = rewriter.create<func::FuncOp>(rewriter.getUnknownLoc(), name,
88-
opFunctionTy);
87+
opFunc = func::FuncOp::create(rewriter, rewriter.getUnknownLoc(), name,
88+
opFunctionTy);
8989
opFunc.setPrivate();
9090
}
9191
assert(isa<FunctionOpInterface>(SymbolTable::lookupSymbolIn(module, name)));

mlir/lib/Conversion/ComplexToROCDLLibraryCalls/ComplexToROCDLLibraryCalls.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ struct ComplexOpToROCDLLibraryCalls : public OpRewritePattern<Op> {
4444
rewriter.setInsertionPointToStart(&symTable->getRegion(0).front());
4545
auto funcTy = FunctionType::get(
4646
rewriter.getContext(), op->getOperandTypes(), op->getResultTypes());
47-
opFunc = rewriter.create<func::FuncOp>(rewriter.getUnknownLoc(), funcName,
48-
funcTy);
47+
opFunc = func::FuncOp::create(rewriter, rewriter.getUnknownLoc(),
48+
funcName, funcTy);
4949
opFunc.setPrivate();
5050
}
5151
rewriter.replaceOpWithNewOp<func::CallOp>(op, funcName, op.getType(),

0 commit comments

Comments
 (0)