Skip to content

Commit c6bd0a7

Browse files
maksleventalmakslevental
committed
[mlir][NFC] update flang/Optimizer/Builder/Runtime create APIs (8/n) (#149687)
See #147168 for more info.
1 parent b7e332d commit c6bd0a7

21 files changed

+210
-205
lines changed

‎flang/lib/Optimizer/Builder/Runtime/Allocatable.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ mlir::Value fir::runtime::genMoveAlloc(fir::FirOpBuilder &builder,
3030
mlir::dyn_cast<fir::ClassType>(fir::dyn_cast_ptrEleTy(from.getType()));
3131
mlir::Type derivedType = fir::unwrapInnerType(clTy.getEleTy());
3232
declaredTypeDesc =
33-
builder.create<fir::TypeDescOp>(loc, mlir::TypeAttr::get(derivedType));
33+
fir::TypeDescOp::create(builder, loc, mlir::TypeAttr::get(derivedType));
3434
} else {
3535
declaredTypeDesc = builder.createNullConstant(loc);
3636
}
3737
llvm::SmallVector<mlir::Value> args{fir::runtime::createArguments(
3838
builder, loc, fTy, to, from, declaredTypeDesc, hasStat, errMsg,
3939
sourceFile, sourceLine)};
4040

41-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
41+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
4242
}
4343

4444
void fir::runtime::genAllocatableApplyMold(fir::FirOpBuilder &builder,
@@ -52,7 +52,7 @@ void fir::runtime::genAllocatableApplyMold(fir::FirOpBuilder &builder,
5252
builder.createIntegerConstant(loc, fTy.getInput(2), rank);
5353
llvm::SmallVector<mlir::Value> args{
5454
fir::runtime::createArguments(builder, loc, fTy, desc, mold, rankVal)};
55-
builder.create<fir::CallOp>(loc, func, args);
55+
fir::CallOp::create(builder, loc, func, args);
5656
}
5757

5858
void fir::runtime::genAllocatableSetBounds(fir::FirOpBuilder &builder,
@@ -66,7 +66,7 @@ void fir::runtime::genAllocatableSetBounds(fir::FirOpBuilder &builder,
6666
mlir::FunctionType fTy{func.getFunctionType()};
6767
llvm::SmallVector<mlir::Value> args{fir::runtime::createArguments(
6868
builder, loc, fTy, desc, dimIndex, lowerBound, upperBound)};
69-
builder.create<fir::CallOp>(loc, func, args);
69+
fir::CallOp::create(builder, loc, func, args);
7070
}
7171

7272
void fir::runtime::genAllocatableAllocate(fir::FirOpBuilder &builder,
@@ -84,10 +84,10 @@ void fir::runtime::genAllocatableAllocate(fir::FirOpBuilder &builder,
8484
hasStat = builder.createBool(loc, false);
8585
if (!errMsg) {
8686
mlir::Type boxNoneTy = fir::BoxType::get(builder.getNoneType());
87-
errMsg = builder.create<fir::AbsentOp>(loc, boxNoneTy).getResult();
87+
errMsg = fir::AbsentOp::create(builder, loc, boxNoneTy).getResult();
8888
}
8989
llvm::SmallVector<mlir::Value> args{
9090
fir::runtime::createArguments(builder, loc, fTy, desc, asyncObject,
9191
hasStat, errMsg, sourceFile, sourceLine)};
92-
builder.create<fir::CallOp>(loc, func, args);
92+
fir::CallOp::create(builder, loc, func, args);
9393
}

‎flang/lib/Optimizer/Builder/Runtime/ArrayConstructor.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ mlir::Value fir::runtime::genInitArrayConstructorVector(
5050
auto args = fir::runtime::createArguments(builder, loc, funcType, cookie,
5151
toBox, useValueLengthParameters,
5252
sourceFile, sourceLine);
53-
builder.create<fir::CallOp>(loc, func, args);
53+
fir::CallOp::create(builder, loc, func, args);
5454
return cookie;
5555
}
5656

@@ -63,7 +63,7 @@ void fir::runtime::genPushArrayConstructorValue(
6363
mlir::FunctionType funcType = func.getFunctionType();
6464
auto args = fir::runtime::createArguments(builder, loc, funcType,
6565
arrayConstructorVector, fromBox);
66-
builder.create<fir::CallOp>(loc, func, args);
66+
fir::CallOp::create(builder, loc, func, args);
6767
}
6868

6969
void fir::runtime::genPushArrayConstructorSimpleScalar(
@@ -75,5 +75,5 @@ void fir::runtime::genPushArrayConstructorSimpleScalar(
7575
mlir::FunctionType funcType = func.getFunctionType();
7676
auto args = fir::runtime::createArguments(
7777
builder, loc, funcType, arrayConstructorVector, fromAddress);
78-
builder.create<fir::CallOp>(loc, func, args);
78+
fir::CallOp::create(builder, loc, func, args);
7979
}

‎flang/lib/Optimizer/Builder/Runtime/Assign.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void fir::runtime::genAssign(fir::FirOpBuilder &builder, mlir::Location loc,
2222
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
2323
auto args = fir::runtime::createArguments(builder, loc, fTy, destBox,
2424
sourceBox, sourceFile, sourceLine);
25-
builder.create<fir::CallOp>(loc, func, args);
25+
fir::CallOp::create(builder, loc, func, args);
2626
}
2727

2828
void fir::runtime::genAssignPolymorphic(fir::FirOpBuilder &builder,
@@ -36,7 +36,7 @@ void fir::runtime::genAssignPolymorphic(fir::FirOpBuilder &builder,
3636
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
3737
auto args = fir::runtime::createArguments(builder, loc, fTy, destBox,
3838
sourceBox, sourceFile, sourceLine);
39-
builder.create<fir::CallOp>(loc, func, args);
39+
fir::CallOp::create(builder, loc, func, args);
4040
}
4141

4242
void fir::runtime::genAssignExplicitLengthCharacter(fir::FirOpBuilder &builder,
@@ -52,7 +52,7 @@ void fir::runtime::genAssignExplicitLengthCharacter(fir::FirOpBuilder &builder,
5252
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
5353
auto args = fir::runtime::createArguments(builder, loc, fTy, destBox,
5454
sourceBox, sourceFile, sourceLine);
55-
builder.create<fir::CallOp>(loc, func, args);
55+
fir::CallOp::create(builder, loc, func, args);
5656
}
5757

5858
void fir::runtime::genAssignTemporary(fir::FirOpBuilder &builder,
@@ -66,7 +66,7 @@ void fir::runtime::genAssignTemporary(fir::FirOpBuilder &builder,
6666
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
6767
auto args = fir::runtime::createArguments(builder, loc, fTy, destBox,
6868
sourceBox, sourceFile, sourceLine);
69-
builder.create<fir::CallOp>(loc, func, args);
69+
fir::CallOp::create(builder, loc, func, args);
7070
}
7171

7272
void fir::runtime::genCopyInAssign(fir::FirOpBuilder &builder,
@@ -79,7 +79,7 @@ void fir::runtime::genCopyInAssign(fir::FirOpBuilder &builder,
7979
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
8080
auto args = fir::runtime::createArguments(builder, loc, fTy, destBox,
8181
sourceBox, sourceFile, sourceLine);
82-
builder.create<fir::CallOp>(loc, func, args);
82+
fir::CallOp::create(builder, loc, func, args);
8383
}
8484

8585
void fir::runtime::genCopyOutAssign(fir::FirOpBuilder &builder,
@@ -93,5 +93,5 @@ void fir::runtime::genCopyOutAssign(fir::FirOpBuilder &builder,
9393
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
9494
auto args = fir::runtime::createArguments(builder, loc, fTy, destBox,
9595
sourceBox, sourceFile, sourceLine);
96-
builder.create<fir::CallOp>(loc, func, args);
96+
fir::CallOp::create(builder, loc, func, args);
9797
}

‎flang/lib/Optimizer/Builder/Runtime/CUDA/Descriptor.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void fir::runtime::cuda::genSyncGlobalDescriptor(fir::FirOpBuilder &builder,
3030
fir::factory::locationToLineNo(builder, loc, fTy.getInput(2));
3131
llvm::SmallVector<mlir::Value> args{fir::runtime::createArguments(
3232
builder, loc, fTy, hostPtr, sourceFile, sourceLine)};
33-
builder.create<fir::CallOp>(loc, callee, args);
33+
fir::CallOp::create(builder, loc, callee, args);
3434
}
3535

3636
void fir::runtime::cuda::genDescriptorCheckSection(fir::FirOpBuilder &builder,
@@ -45,7 +45,7 @@ void fir::runtime::cuda::genDescriptorCheckSection(fir::FirOpBuilder &builder,
4545
fir::factory::locationToLineNo(builder, loc, fTy.getInput(2));
4646
llvm::SmallVector<mlir::Value> args{fir::runtime::createArguments(
4747
builder, loc, fTy, desc, sourceFile, sourceLine)};
48-
builder.create<fir::CallOp>(loc, func, args);
48+
fir::CallOp::create(builder, loc, func, args);
4949
}
5050

5151
void fir::runtime::cuda::genSetAllocatorIndex(fir::FirOpBuilder &builder,
@@ -60,5 +60,5 @@ void fir::runtime::cuda::genSetAllocatorIndex(fir::FirOpBuilder &builder,
6060
fir::factory::locationToLineNo(builder, loc, fTy.getInput(3));
6161
llvm::SmallVector<mlir::Value> args{fir::runtime::createArguments(
6262
builder, loc, fTy, desc, index, sourceFile, sourceLine)};
63-
builder.create<fir::CallOp>(loc, func, args);
63+
fir::CallOp::create(builder, loc, func, args);
6464
}

‎flang/lib/Optimizer/Builder/Runtime/Character.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static void genCharacterSearch(FN func, fir::FirOpBuilder &builder,
3434
auto args = fir::runtime::createArguments(builder, loc, fTy, resultBox,
3535
string1Box, string2Box, backBox,
3636
kind, sourceFile, sourceLine);
37-
builder.create<fir::CallOp>(loc, func, args);
37+
fir::CallOp::create(builder, loc, func, args);
3838
}
3939

4040
/// Helper function to recover the KIND from the FIR type.
@@ -72,7 +72,7 @@ static void genAdjust(fir::FirOpBuilder &builder, mlir::Location loc,
7272
auto sourceFile = fir::factory::locationToFilename(builder, loc);
7373
auto args = fir::runtime::createArguments(builder, loc, fTy, resultBox,
7474
stringBox, sourceFile, sourceLine);
75-
builder.create<fir::CallOp>(loc, adjustFunc, args);
75+
fir::CallOp::create(builder, loc, adjustFunc, args);
7676
}
7777

7878
void fir::runtime::genAdjustL(fir::FirOpBuilder &builder, mlir::Location loc,
@@ -114,9 +114,9 @@ fir::runtime::genCharCompare(fir::FirOpBuilder &builder, mlir::Location loc,
114114
auto fTy = beginFunc.getFunctionType();
115115
auto args = fir::runtime::createArguments(builder, loc, fTy, lhsBuff, rhsBuff,
116116
lhsLen, rhsLen);
117-
auto tri = builder.create<fir::CallOp>(loc, beginFunc, args).getResult(0);
117+
auto tri = fir::CallOp::create(builder, loc, beginFunc, args).getResult(0);
118118
auto zero = builder.createIntegerConstant(loc, tri.getType(), 0);
119-
return builder.create<mlir::arith::CmpIOp>(loc, cmp, tri, zero);
119+
return mlir::arith::CmpIOp::create(builder, loc, cmp, tri, zero);
120120
}
121121

122122
mlir::Value fir::runtime::genCharCompare(fir::FirOpBuilder &builder,
@@ -130,8 +130,8 @@ mlir::Value fir::runtime::genCharCompare(fir::FirOpBuilder &builder,
130130
if (fir::isa_ref_type(base.getType()))
131131
return base;
132132
auto mem =
133-
builder.create<fir::AllocaOp>(loc, base.getType(), /*pinned=*/false);
134-
builder.create<fir::StoreOp>(loc, base, mem);
133+
fir::AllocaOp::create(builder, loc, base.getType(), /*pinned=*/false);
134+
fir::StoreOp::create(builder, loc, base, mem);
135135
return mem;
136136
};
137137
auto lhsBuffer = allocateIfNotInMemory(fir::getBase(lhs));
@@ -165,7 +165,7 @@ mlir::Value fir::runtime::genIndex(fir::FirOpBuilder &builder,
165165
auto args =
166166
fir::runtime::createArguments(builder, loc, fTy, stringBase, stringLen,
167167
substringBase, substringLen, back);
168-
return builder.create<fir::CallOp>(loc, indexFunc, args).getResult(0);
168+
return fir::CallOp::create(builder, loc, indexFunc, args).getResult(0);
169169
}
170170

171171
void fir::runtime::genIndexDescriptor(fir::FirOpBuilder &builder,
@@ -189,7 +189,7 @@ void fir::runtime::genRepeat(fir::FirOpBuilder &builder, mlir::Location loc,
189189

190190
auto args = fir::runtime::createArguments(
191191
builder, loc, fTy, resultBox, stringBox, ncopies, sourceFile, sourceLine);
192-
builder.create<fir::CallOp>(loc, repeatFunc, args);
192+
fir::CallOp::create(builder, loc, repeatFunc, args);
193193
}
194194

195195
void fir::runtime::genTrim(fir::FirOpBuilder &builder, mlir::Location loc,
@@ -202,7 +202,7 @@ void fir::runtime::genTrim(fir::FirOpBuilder &builder, mlir::Location loc,
202202

203203
auto args = fir::runtime::createArguments(builder, loc, fTy, resultBox,
204204
stringBox, sourceFile, sourceLine);
205-
builder.create<fir::CallOp>(loc, trimFunc, args);
205+
fir::CallOp::create(builder, loc, trimFunc, args);
206206
}
207207

208208
void fir::runtime::genScanDescriptor(fir::FirOpBuilder &builder,
@@ -237,7 +237,7 @@ mlir::Value fir::runtime::genScan(fir::FirOpBuilder &builder,
237237
auto fTy = func.getFunctionType();
238238
auto args = fir::runtime::createArguments(builder, loc, fTy, stringBase,
239239
stringLen, setBase, setLen, back);
240-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
240+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
241241
}
242242

243243
void fir::runtime::genVerifyDescriptor(fir::FirOpBuilder &builder,
@@ -274,5 +274,5 @@ mlir::Value fir::runtime::genVerify(fir::FirOpBuilder &builder,
274274
auto fTy = func.getFunctionType();
275275
auto args = fir::runtime::createArguments(builder, loc, fTy, stringBase,
276276
stringLen, setBase, setLen, back);
277-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
277+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
278278
}

‎flang/lib/Optimizer/Builder/Runtime/Command.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mlir::Value fir::runtime::genCommandArgumentCount(fir::FirOpBuilder &builder,
3030
mlir::Location loc) {
3131
auto argumentCountFunc =
3232
fir::runtime::getRuntimeFunc<mkRTKey(ArgumentCount)>(loc, builder);
33-
return builder.create<fir::CallOp>(loc, argumentCountFunc).getResult(0);
33+
return fir::CallOp::create(builder, loc, argumentCountFunc).getResult(0);
3434
}
3535

3636
mlir::Value fir::runtime::genGetCommand(fir::FirOpBuilder &builder,
@@ -46,15 +46,15 @@ mlir::Value fir::runtime::genGetCommand(fir::FirOpBuilder &builder,
4646
llvm::SmallVector<mlir::Value> args =
4747
fir::runtime::createArguments(builder, loc, runtimeFuncTy, command,
4848
length, errmsg, sourceFile, sourceLine);
49-
return builder.create<fir::CallOp>(loc, runtimeFunc, args).getResult(0);
49+
return fir::CallOp::create(builder, loc, runtimeFunc, args).getResult(0);
5050
}
5151

5252
mlir::Value fir::runtime::genGetPID(fir::FirOpBuilder &builder,
5353
mlir::Location loc) {
5454
auto runtimeFunc =
5555
fir::runtime::getRuntimeFunc<mkRTKey(GetPID)>(loc, builder);
5656

57-
return builder.create<fir::CallOp>(loc, runtimeFunc).getResult(0);
57+
return fir::CallOp::create(builder, loc, runtimeFunc).getResult(0);
5858
}
5959

6060
mlir::Value fir::runtime::genGetCommandArgument(
@@ -69,7 +69,7 @@ mlir::Value fir::runtime::genGetCommandArgument(
6969
llvm::SmallVector<mlir::Value> args =
7070
fir::runtime::createArguments(builder, loc, runtimeFuncTy, number, value,
7171
length, errmsg, sourceFile, sourceLine);
72-
return builder.create<fir::CallOp>(loc, runtimeFunc, args).getResult(0);
72+
return fir::CallOp::create(builder, loc, runtimeFunc, args).getResult(0);
7373
}
7474

7575
mlir::Value fir::runtime::genGetEnvVariable(fir::FirOpBuilder &builder,
@@ -87,7 +87,7 @@ mlir::Value fir::runtime::genGetEnvVariable(fir::FirOpBuilder &builder,
8787
llvm::SmallVector<mlir::Value> args = fir::runtime::createArguments(
8888
builder, loc, runtimeFuncTy, name, value, length, trimName, errmsg,
8989
sourceFile, sourceLine);
90-
return builder.create<fir::CallOp>(loc, runtimeFunc, args).getResult(0);
90+
return fir::CallOp::create(builder, loc, runtimeFunc, args).getResult(0);
9191
}
9292

9393
mlir::Value fir::runtime::genGetCwd(fir::FirOpBuilder &builder,
@@ -100,7 +100,7 @@ mlir::Value fir::runtime::genGetCwd(fir::FirOpBuilder &builder,
100100
fir::factory::locationToLineNo(builder, loc, runtimeFuncTy.getInput(2));
101101
llvm::SmallVector<mlir::Value> args = fir::runtime::createArguments(
102102
builder, loc, runtimeFuncTy, cwd, sourceFile, sourceLine);
103-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
103+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
104104
}
105105

106106
mlir::Value fir::runtime::genHostnm(fir::FirOpBuilder &builder,
@@ -113,7 +113,7 @@ mlir::Value fir::runtime::genHostnm(fir::FirOpBuilder &builder,
113113
fir::factory::locationToLineNo(builder, loc, runtimeFuncTy.getInput(2));
114114
llvm::SmallVector<mlir::Value> args = fir::runtime::createArguments(
115115
builder, loc, runtimeFuncTy, res, sourceFile, sourceLine);
116-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
116+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
117117
}
118118

119119
void fir::runtime::genPerror(fir::FirOpBuilder &builder, mlir::Location loc,
@@ -123,7 +123,7 @@ void fir::runtime::genPerror(fir::FirOpBuilder &builder, mlir::Location loc,
123123
mlir::FunctionType runtimeFuncTy = runtimeFunc.getFunctionType();
124124
llvm::SmallVector<mlir::Value> args =
125125
fir::runtime::createArguments(builder, loc, runtimeFuncTy, string);
126-
builder.create<fir::CallOp>(loc, runtimeFunc, args);
126+
fir::CallOp::create(builder, loc, runtimeFunc, args);
127127
}
128128

129129
mlir::Value fir::runtime::genPutEnv(fir::FirOpBuilder &builder,
@@ -137,7 +137,7 @@ mlir::Value fir::runtime::genPutEnv(fir::FirOpBuilder &builder,
137137
fir::factory::locationToLineNo(builder, loc, runtimeFuncTy.getInput(1));
138138
llvm::SmallVector<mlir::Value> args = fir::runtime::createArguments(
139139
builder, loc, runtimeFuncTy, str, strLength, sourceFile, sourceLine);
140-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
140+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
141141
}
142142

143143
mlir::Value fir::runtime::genUnlink(fir::FirOpBuilder &builder,
@@ -151,5 +151,5 @@ mlir::Value fir::runtime::genUnlink(fir::FirOpBuilder &builder,
151151
fir::factory::locationToLineNo(builder, loc, runtimeFuncTy.getInput(1));
152152
llvm::SmallVector<mlir::Value> args = fir::runtime::createArguments(
153153
builder, loc, runtimeFuncTy, path, pathLength, sourceFile, sourceLine);
154-
return builder.create<fir::CallOp>(loc, func, args).getResult(0);
154+
return fir::CallOp::create(builder, loc, func, args).getResult(0);
155155
}

0 commit comments

Comments
 (0)