Skip to content

Commit 299fb04

Browse files
ergawyergawy
committed
Handle some comments.
1 parent 1dc1674 commit 299fb04

File tree

5 files changed

+34
-32
lines changed

5 files changed

+34
-32
lines changed

‎flang/lib/Lower/OpenMP.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class DataSharingProcessor {
163163

164164
bool useDelayedPrivatizationWhenPossible;
165165
Fortran::lower::SymMap *symTable;
166-
llvm::SetVector<mlir::SymbolRefAttr> privateInitializers;
166+
llvm::SetVector<mlir::SymbolRefAttr> privatizers;
167167
llvm::SetVector<mlir::Value> privateSymHostAddrsses;
168168

169169
bool needBarrier();
@@ -214,8 +214,8 @@ class DataSharingProcessor {
214214
loopIV = iv;
215215
}
216216

217-
const llvm::SetVector<mlir::SymbolRefAttr> &getPrivateInitializers() const {
218-
return privateInitializers;
217+
const llvm::SetVector<mlir::SymbolRefAttr> &getPrivatizers() const {
218+
return privatizers;
219219
};
220220

221221
const llvm::SetVector<mlir::Value> &getPrivateSymHostAddrsses() const {
@@ -547,7 +547,7 @@ void DataSharingProcessor::privatize() {
547547
symTable->popScope();
548548
firOpBuilder.restoreInsertionPoint(ip);
549549

550-
privateInitializers.insert(mlir::SymbolRefAttr::get(privatizerOp));
550+
privatizers.insert(mlir::SymbolRefAttr::get(privatizerOp));
551551
privateSymHostAddrsses.insert(hsb.getAddr());
552552
} else {
553553
cloneSymbol(sym);
@@ -2584,8 +2584,8 @@ genParallelOp(Fortran::lower::AbstractConverter &converter,
25842584
dsp.processStep1();
25852585
}
25862586

2587-
llvm::SmallVector<mlir::Attribute> privateInits(
2588-
dsp.getPrivateInitializers().begin(), dsp.getPrivateInitializers().end());
2587+
llvm::SmallVector<mlir::Attribute> privatizers(dsp.getPrivatizers().begin(),
2588+
dsp.getPrivatizers().end());
25892589

25902590
llvm::SmallVector<mlir::Value> privateSymAddresses(
25912591
dsp.getPrivateSymHostAddrsses().begin(),
@@ -2596,16 +2596,16 @@ genParallelOp(Fortran::lower::AbstractConverter &converter,
25962596
&dsp,
25972597
/*resultTypes=*/mlir::TypeRange(), ifClauseOperand,
25982598
numThreadsClauseOperand, allocateOperands, allocatorOperands,
2599-
reductionVars, privateSymAddresses,
2599+
reductionVars,
26002600
reductionDeclSymbols.empty()
26012601
? nullptr
26022602
: mlir::ArrayAttr::get(converter.getFirOpBuilder().getContext(),
26032603
reductionDeclSymbols),
2604-
procBindKindAttr,
2605-
privateInits.empty()
2604+
procBindKindAttr, privateSymAddresses,
2605+
privatizers.empty()
26062606
? nullptr
26072607
: mlir::ArrayAttr::get(converter.getFirOpBuilder().getContext(),
2608-
privateInits));
2608+
privatizers));
26092609
}
26102610

26112611
static mlir::omp::SectionOp

‎mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ def ParallelOp : OpenMP_Op<"parallel", [
179179
Variadic<AnyType>:$allocate_vars,
180180
Variadic<AnyType>:$allocators_vars,
181181
Variadic<OpenMP_PointerLikeType>:$reduction_vars,
182-
Variadic<AnyType>:$private_vars,
183182
OptionalAttr<SymbolRefArrayAttr>:$reductions,
184183
OptionalAttr<ProcBindKindAttr>:$proc_bind_val,
185-
OptionalAttr<SymbolRefArrayAttr>:$private_inits);
184+
Variadic<AnyType>:$private_vars,
185+
OptionalAttr<SymbolRefArrayAttr>:$privatizers);
186186

187187
let regions = (region AnyRegion:$region);
188188

@@ -208,7 +208,7 @@ def ParallelOp : OpenMP_Op<"parallel", [
208208
| `proc_bind` `(` custom<ClauseAttr>($proc_bind_val) `)`
209209
| `private` `(`
210210
custom<PrivateVarList>(
211-
$private_vars, type($private_vars), $private_inits
211+
$private_vars, type($private_vars), $privatizers
212212
) `)`
213213
) $region attr-dict
214214
}];

‎mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,10 @@ struct ParallelOpLowering : public OpRewritePattern<scf::ParallelOp> {
419419
/* allocate_vars = */ llvm::SmallVector<Value>{},
420420
/* allocators_vars = */ llvm::SmallVector<Value>{},
421421
/* reduction_vars = */ llvm::SmallVector<Value>{},
422-
/*private_vars=*/mlir::ValueRange{},
423422
/* reductions = */ ArrayAttr{},
424423
/* proc_bind_val = */ omp::ClauseProcBindKindAttr{},
425-
/*private_inits*/ nullptr);
424+
/*private_vars=*/mlir::ValueRange{},
425+
/*privatizers=*/nullptr);
426426
{
427427

428428
OpBuilder::InsertionGuard guard(rewriter);

‎mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -989,9 +989,10 @@ void ParallelOp::build(OpBuilder &builder, OperationState &state,
989989
ParallelOp::build(
990990
builder, state, /*if_expr_var=*/nullptr, /*num_threads_var=*/nullptr,
991991
/*allocate_vars=*/ValueRange(), /*allocators_vars=*/ValueRange(),
992-
/*reduction_vars=*/ValueRange(), /*private_vars=*/ValueRange(),
992+
/*reduction_vars=*/ValueRange(),
993993
/*reductions=*/nullptr,
994-
/*proc_bind_val=*/nullptr, /*private_inits*/ nullptr);
994+
/*proc_bind_val=*/nullptr, /*private_vars=*/ValueRange(),
995+
/*privatizers*/ nullptr);
995996
state.addAttributes(attributes);
996997
}
997998

@@ -1610,20 +1611,20 @@ void PrivateClauseOp::build(OpBuilder &odsBuilder, OperationState &odsState,
16101611
static ParseResult parsePrivateVarList(
16111612
OpAsmParser &parser,
16121613
llvm::SmallVector<OpAsmParser::UnresolvedOperand, 4> &privateVarsOperands,
1613-
llvm::SmallVector<Type, 1> &privateVarsTypes, ArrayAttr &privateInitsAttr) {
1614+
llvm::SmallVector<Type, 1> &privateVarsTypes, ArrayAttr &privatizersAttr) {
16141615
SymbolRefAttr privatizerSym;
16151616
OpAsmParser::UnresolvedOperand arg;
16161617
OpAsmParser::UnresolvedOperand blockArg;
16171618
Type argType;
16181619

1619-
SmallVector<SymbolRefAttr> privateInitsVec;
1620+
SmallVector<SymbolRefAttr> privatizersVec;
16201621

16211622
auto parsePrivatizers = [&]() -> ParseResult {
16221623
if (parser.parseAttribute(privatizerSym) || parser.parseOperand(arg)) {
16231624
return failure();
16241625
}
16251626

1626-
privateInitsVec.push_back(privatizerSym);
1627+
privatizersVec.push_back(privatizerSym);
16271628
privateVarsOperands.push_back(arg);
16281629
return success();
16291630
};
@@ -1638,9 +1639,9 @@ static ParseResult parsePrivateVarList(
16381639
if (parser.parseCommaSeparatedList(parsePrivatizers))
16391640
return failure();
16401641

1641-
SmallVector<Attribute> privateInits(privateInitsVec.begin(),
1642-
privateInitsVec.end());
1643-
privateInitsAttr = ArrayAttr::get(parser.getContext(), privateInits);
1642+
SmallVector<Attribute> privatizers(privatizersVec.begin(),
1643+
privatizersVec.end());
1644+
privatizersAttr = ArrayAttr::get(parser.getContext(), privatizers);
16441645

16451646
if (parser.parseColon())
16461647
return failure();
@@ -1654,17 +1655,18 @@ static ParseResult parsePrivateVarList(
16541655
static void printPrivateVarList(OpAsmPrinter &printer, Operation *op,
16551656
OperandRange privateVars,
16561657
TypeRange privateVarTypes,
1657-
std::optional<ArrayAttr> privateInitsAttr) {
1658+
std::optional<ArrayAttr> privatizersAttr) {
16581659
unsigned argIndex = 0;
1659-
assert(privateVars.size() == privateVarTypes.size() &&
1660-
((privateVars.empty()) ||
1661-
(*privateInitsAttr &&
1662-
(privateInitsAttr->size() == privateVars.size()))));
1660+
// TODO Add an op verifier instead of this assertion.
1661+
assert(
1662+
privateVars.size() == privateVarTypes.size() &&
1663+
((privateVars.empty()) ||
1664+
(*privatizersAttr && (privatizersAttr->size() == privateVars.size()))));
16631665

16641666
for (const auto &privateVar : privateVars) {
1665-
assert(privateInitsAttr);
1666-
const auto &privateInitSym = (*privateInitsAttr)[argIndex];
1667-
printer << privateInitSym << " " << privateVar;
1667+
assert(privatizersAttr);
1668+
const auto &privatizerSym = (*privatizersAttr)[argIndex];
1669+
printer << privatizerSym << " " << privateVar;
16681670

16691671
argIndex++;
16701672
if (argIndex < privateVars.size())

‎mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,7 @@ convertOmpParallel(omp::ParallelOp opInst, llvm::IRBuilderBase &builder,
10991099
privInit] = [&]() -> std::pair<mlir::Value, omp::PrivateClauseOp> {
11001100
if (!opInst.getPrivateVars().empty()) {
11011101
auto privVars = opInst.getPrivateVars();
1102-
auto privInits = opInst.getPrivateInits();
1102+
auto privInits = opInst.getPrivatizers();
11031103
assert(privInits && privInits->size() == privVars.size());
11041104

11051105
const auto *privInitIt = privInits->begin();

0 commit comments

Comments
 (0)