Skip to content

Commit 890e6c8

Browse files
[Flang][OpenMP] NFC: Fix a few format issues
Change a few variable/class names to be in line with guidelines.
1 parent 2db71c9 commit 890e6c8

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

flang/lib/Lower/OpenMP.cpp

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ getOmpObjectSymbol(const Fortran::parser::OmpObject &ompObject) {
6161
return sym;
6262
}
6363

64-
class dataSharingProcessor {
64+
class DataSharingProcessor {
6565
bool hasLastPrivateOp;
6666
mlir::OpBuilder::InsertPoint lastPrivIP;
6767
mlir::OpBuilder::InsertPoint insPt;
@@ -92,7 +92,7 @@ class dataSharingProcessor {
9292
void insertLastPrivateCompare(mlir::Operation *op);
9393

9494
public:
95-
dataSharingProcessor(mlir::Operation *op,
95+
DataSharingProcessor(mlir::Operation *op,
9696
Fortran::lower::AbstractConverter &converter,
9797
const Fortran::parser::OmpClauseList &opClauseList,
9898
Fortran::lower::pft::Evaluation &eval)
@@ -102,7 +102,7 @@ class dataSharingProcessor {
102102
bool process();
103103
};
104104

105-
bool dataSharingProcessor::process() {
105+
bool DataSharingProcessor::process() {
106106
insPt = firOpBuilder.saveInsertionPoint();
107107
collectSymbolsForPrivatization();
108108
insertLastPrivateCompare(op);
@@ -118,7 +118,7 @@ bool dataSharingProcessor::process() {
118118
return hasLastPrivateOp;
119119
}
120120

121-
void dataSharingProcessor::privatizeSymbol(
121+
void DataSharingProcessor::privatizeSymbol(
122122
const Fortran::semantics::Symbol *sym,
123123
[[maybe_unused]] mlir::OpBuilder::InsertPoint *lastPrivIP) {
124124
// Privatization for symbols which are pre-determined (like loop index
@@ -144,7 +144,7 @@ void dataSharingProcessor::privatizeSymbol(
144144
converter.copyHostAssociateVar(*sym, lastPrivIP);
145145
}
146146

147-
void dataSharingProcessor::collectOmpObjectListSymbol(
147+
void DataSharingProcessor::collectOmpObjectListSymbol(
148148
const Fortran::parser::OmpObjectList &ompObjectList,
149149
llvm::SetVector<const Fortran::semantics::Symbol *> &symbolSet) {
150150
for (const Fortran::parser::OmpObject &ompObject : ompObjectList.v) {
@@ -153,7 +153,7 @@ void dataSharingProcessor::collectOmpObjectListSymbol(
153153
}
154154
}
155155

156-
void dataSharingProcessor::collectSymbolsForPrivatization() {
156+
void DataSharingProcessor::collectSymbolsForPrivatization() {
157157
bool hasCollapse = false;
158158
for (const Fortran::parser::OmpClause &clause : opClauseList.v) {
159159
if (const auto &privateClause =
@@ -177,7 +177,7 @@ void dataSharingProcessor::collectSymbolsForPrivatization() {
177177
TODO(converter.getCurrentLocation(), "Collapse clause with lastprivate");
178178
}
179179

180-
bool dataSharingProcessor ::needBarrier() {
180+
bool DataSharingProcessor ::needBarrier() {
181181
for (auto sym : privatizedSymbols) {
182182
if (sym->test(Fortran::semantics::Symbol::Flag::OmpFirstPrivate) &&
183183
sym->test(Fortran::semantics::Symbol::Flag::OmpLastPrivate))
@@ -186,7 +186,7 @@ bool dataSharingProcessor ::needBarrier() {
186186
return false;
187187
}
188188

189-
void dataSharingProcessor ::insertBarrier() {
189+
void DataSharingProcessor ::insertBarrier() {
190190
// Emit implicit barrier to synchronize threads and avoid data races on
191191
// initialization of firstprivate variables and post-update of lastprivate
192192
// variables.
@@ -198,7 +198,7 @@ void dataSharingProcessor ::insertBarrier() {
198198
firOpBuilder.create<mlir::omp::BarrierOp>(converter.getCurrentLocation());
199199
}
200200

201-
void dataSharingProcessor::insertLastPrivateCompare(mlir::Operation *op) {
201+
void DataSharingProcessor::insertLastPrivateCompare(mlir::Operation *op) {
202202
mlir::arith::CmpIOp cmpOp;
203203
bool cmpCreated = false;
204204
for (const Fortran::parser::OmpClause &clause : opClauseList.v) {
@@ -302,7 +302,7 @@ void dataSharingProcessor::insertLastPrivateCompare(mlir::Operation *op) {
302302
}
303303
}
304304

305-
void dataSharingProcessor::collectSymbols(
305+
void DataSharingProcessor::collectSymbols(
306306
Fortran::semantics::Symbol::Flag flag) {
307307
converter.collectSymbolSet(eval, defaultSymbols, flag,
308308
/*collectSymbols=*/true,
@@ -319,7 +319,7 @@ void dataSharingProcessor::collectSymbols(
319319
}
320320
}
321321

322-
void dataSharingProcessor::collectDefaultSymbols() {
322+
void DataSharingProcessor::collectDefaultSymbols() {
323323
for (const Fortran::parser::OmpClause &clause : opClauseList.v) {
324324
if (const auto &defaultClause =
325325
std::get_if<Fortran::parser::OmpClause::Default>(&clause.u)) {
@@ -333,12 +333,12 @@ void dataSharingProcessor::collectDefaultSymbols() {
333333
}
334334
}
335335

336-
void dataSharingProcessor::privatize() {
336+
void DataSharingProcessor::privatize() {
337337
for (auto sym : privatizedSymbols)
338338
privatizeSymbol(sym, &lastPrivIP);
339339
}
340340

341-
void dataSharingProcessor::defaultPrivatize() {
341+
void DataSharingProcessor::defaultPrivatize() {
342342
for (auto sym : defaultSymbols)
343343
if (!symbolsInNestedRegions.contains(sym) &&
344344
!symbolsInParentRegions.contains(sym) &&
@@ -645,7 +645,7 @@ createBodyOfOp(Op &op, Fortran::lower::AbstractConverter &converter,
645645

646646
// Handle privatization. Do not privatize if this is the outer operation.
647647
if (clauses && !outerCombined) {
648-
dataSharingProcessor dsp(op, converter, *clauses, eval);
648+
DataSharingProcessor dsp(op, converter, *clauses, eval);
649649
bool lastPrivateOp = dsp.process();
650650
// LastPrivatization, due to introduction of
651651
// new control flow, changes the insertion point,
@@ -1112,7 +1112,8 @@ static int getOperationIdentity(llvm::StringRef reductionOpName,
11121112
mlir::Location loc) {
11131113
if (reductionOpName.contains("add"))
11141114
return 0;
1115-
if (reductionOpName.contains("multiply") || reductionOpName.contains("and") || reductionOpName.contains("eqv"))
1115+
if (reductionOpName.contains("multiply") || reductionOpName.contains("and") ||
1116+
reductionOpName.contains("eqv"))
11161117
return 1;
11171118
TODO(loc, "Reduction of some intrinsic operators is not supported");
11181119
}
@@ -1193,20 +1194,20 @@ static omp::ReductionDeclareOp createReductionDecl(
11931194
builder, type, loc, op1, op2);
11941195
break;
11951196
case Fortran::parser::DefinedOperator::IntrinsicOperator::AND: {
1196-
Value op1_i1 = builder.createConvert(loc, builder.getI1Type(), op1);
1197-
Value op2_i1 = builder.createConvert(loc, builder.getI1Type(), op2);
1197+
Value op1I1 = builder.createConvert(loc, builder.getI1Type(), op1);
1198+
Value op2I1 = builder.createConvert(loc, builder.getI1Type(), op2);
11981199

1199-
Value andiOp = builder.create<mlir::arith::AndIOp>(loc, op1_i1, op2_i1);
1200+
Value andiOp = builder.create<mlir::arith::AndIOp>(loc, op1I1, op2I1);
12001201

12011202
reductionOp = builder.createConvert(loc, type, andiOp);
12021203
break;
12031204
}
12041205
case Fortran::parser::DefinedOperator::IntrinsicOperator::EQV: {
1205-
Value op1_i1 = builder.createConvert(loc, builder.getI1Type(), op1);
1206-
Value op2_i1 = builder.createConvert(loc, builder.getI1Type(), op2);
1206+
Value op1I1 = builder.createConvert(loc, builder.getI1Type(), op1);
1207+
Value op2I1 = builder.createConvert(loc, builder.getI1Type(), op2);
12071208

12081209
Value cmpiOp = builder.create<mlir::arith::CmpIOp>(
1209-
loc, arith::CmpIPredicate::eq, op1_i1, op2_i1);
1210+
loc, arith::CmpIPredicate::eq, op1I1, op2I1);
12101211

12111212
reductionOp = builder.createConvert(loc, type, cmpiOp);
12121213
break;

0 commit comments

Comments
 (0)