Skip to content

[clang][OpenMP] Simplify handling of implicit DSA/mapping information #106786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 7, 2024
Merged

[clang][OpenMP] Simplify handling of implicit DSA/mapping information #106786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92e82b2
[clang][OpenMP] Simplify handling of implicit DSA/mapping information
kparzysz Aug 30, 2024
200b8b0
Merge branch 'main' into users/kparzysz/clang-impinfo
kparzysz Sep 2, 2024
eaf3f91
Use `enum_seq_inclusive`
kparzysz Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions clang/include/clang/Basic/OpenMPKinds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#define LLVM_CLANG_BASIC_OPENMPKINDS_H

#include "clang/Basic/LangOptions.h"
#include "llvm/ADT/Sequence.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Frontend/OpenMP/OMPConstants.h"

Expand Down Expand Up @@ -389,5 +390,9 @@ bool isOpenMPInformationalDirective(OpenMPDirectiveKind DKind);
bool isOpenMPCapturingDirective(OpenMPDirectiveKind DKind);
}

template <>
struct llvm::enum_iteration_traits<clang::OpenMPDefaultmapClauseKind> {
static constexpr bool is_iterable = true;
};
#endif

109 changes: 47 additions & 62 deletions clang/lib/Sema/SemaOpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "llvm/ADT/PointerEmbeddedInt.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/Sequence.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Frontend/OpenMP/OMPAssume.h"
Expand Down Expand Up @@ -3707,19 +3708,26 @@ getMapClauseKindFromModifier(OpenMPDefaultmapClauseModifier M,
}

namespace {
struct VariableImplicitInfo {
static const unsigned MapKindNum = OMPC_MAP_unknown;
static const unsigned DefaultmapKindNum = OMPC_DEFAULTMAP_unknown + 1;

llvm::SetVector<Expr *> Privates;
llvm::SetVector<Expr *> Firstprivates;
llvm::SetVector<Expr *> Mappings[DefaultmapKindNum][MapKindNum];
llvm::SmallVector<OpenMPMapModifierKind, NumberOfOMPMapClauseModifiers>
MapModifiers[DefaultmapKindNum];
};

class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
DSAStackTy *Stack;
Sema &SemaRef;
OpenMPDirectiveKind DKind = OMPD_unknown;
bool ErrorFound = false;
bool TryCaptureCXXThisMembers = false;
CapturedStmt *CS = nullptr;
const static unsigned DefaultmapKindNum = OMPC_DEFAULTMAP_unknown + 1;
llvm::SmallVector<Expr *, 4> ImplicitFirstprivate;
llvm::SmallVector<Expr *, 4> ImplicitPrivate;
llvm::SmallVector<Expr *, 4> ImplicitMap[DefaultmapKindNum][OMPC_MAP_delete];
llvm::SmallVector<OpenMPMapModifierKind, NumberOfOMPMapClauseModifiers>
ImplicitMapModifier[DefaultmapKindNum];

VariableImplicitInfo ImpInfo;
SemaOpenMP::VarsWithInheritedDSAType VarsWithInheritedDSA;
llvm::SmallDenseSet<const ValueDecl *, 4> ImplicitDeclarations;

Expand Down Expand Up @@ -3871,9 +3879,9 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
bool IsModifierPresent = Stack->getDefaultmapModifier(ClauseKind) ==
OMPC_DEFAULTMAP_MODIFIER_present;
if (IsModifierPresent) {
if (!llvm::is_contained(ImplicitMapModifier[ClauseKind],
if (!llvm::is_contained(ImpInfo.MapModifiers[ClauseKind],
OMPC_MAP_MODIFIER_present)) {
ImplicitMapModifier[ClauseKind].push_back(
ImpInfo.MapModifiers[ClauseKind].push_back(
OMPC_MAP_MODIFIER_present);
}
}
Expand Down Expand Up @@ -3913,13 +3921,13 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
IsFirstprivate =
IsFirstprivate || (Stack->mustBeFirstprivate(ClauseKind) && !Res);
if (IsFirstprivate) {
ImplicitFirstprivate.emplace_back(E);
ImpInfo.Firstprivates.insert(E);
} else {
OpenMPDefaultmapClauseModifier M =
Stack->getDefaultmapModifier(ClauseKind);
OpenMPMapClauseKind Kind = getMapClauseKindFromModifier(
M, ClauseKind == OMPC_DEFAULTMAP_aggregate || Res);
ImplicitMap[ClauseKind][Kind].emplace_back(E);
ImpInfo.Mappings[ClauseKind][Kind].insert(E);
}
return;
}
Expand Down Expand Up @@ -3956,9 +3964,9 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
!DVar.RefExpr)) &&
!Stack->isLoopControlVariable(VD).first) {
if (Stack->getDefaultDSA() == DSA_private)
ImplicitPrivate.push_back(E);
ImpInfo.Privates.insert(E);
else
ImplicitFirstprivate.push_back(E);
ImpInfo.Firstprivates.insert(E);
return;
}

Expand Down Expand Up @@ -4015,7 +4023,7 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
getVariableCategoryFromDecl(SemaRef.getLangOpts(), FD);
OpenMPMapClauseKind Kind = getMapClauseKindFromModifier(
Modifier, /*IsAggregateOrDeclareTarget=*/true);
ImplicitMap[ClauseKind][Kind].emplace_back(E);
ImpInfo.Mappings[ClauseKind][Kind].insert(E);
return;
}

Expand Down Expand Up @@ -4050,7 +4058,7 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
// expression.
// TODO: try to make it firstprivate.
if (DVar.CKind != OMPC_unknown)
ImplicitFirstprivate.push_back(E);
ImpInfo.Firstprivates.insert(E);
}
return;
}
Expand Down Expand Up @@ -4172,18 +4180,7 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> {
}
}
bool isErrorFound() const { return ErrorFound; }
ArrayRef<Expr *> getImplicitFirstprivate() const {
return ImplicitFirstprivate;
}
ArrayRef<Expr *> getImplicitPrivate() const { return ImplicitPrivate; }
ArrayRef<Expr *> getImplicitMap(OpenMPDefaultmapClauseKind DK,
OpenMPMapClauseKind MK) const {
return ImplicitMap[DK][MK];
}
ArrayRef<OpenMPMapModifierKind>
getImplicitMapModifier(OpenMPDefaultmapClauseKind Kind) const {
return ImplicitMapModifier[Kind];
}
const VariableImplicitInfo &getImplicitInfo() const { return ImpInfo; }
const SemaOpenMP::VarsWithInheritedDSAType &getVarsWithInheritedDSA() const {
return VarsWithInheritedDSA;
}
Expand Down Expand Up @@ -6060,69 +6057,56 @@ StmtResult SemaOpenMP::ActOnOpenMPExecutableDirective(
return StmtError();
// Generate list of implicitly defined firstprivate variables.
VarsWithInheritedDSA = DSAChecker.getVarsWithInheritedDSA();
VariableImplicitInfo ImpInfo = DSAChecker.getImplicitInfo();

SmallVector<Expr *, 4> ImplicitFirstprivates(
DSAChecker.getImplicitFirstprivate());
SmallVector<Expr *, 4> ImplicitPrivates(DSAChecker.getImplicitPrivate());
const unsigned DefaultmapKindNum = OMPC_DEFAULTMAP_unknown + 1;
SmallVector<Expr *, 4> ImplicitMaps[DefaultmapKindNum][OMPC_MAP_delete];
SmallVector<OpenMPMapModifierKind, NumberOfOMPMapClauseModifiers>
ImplicitMapModifiers[DefaultmapKindNum];
SmallVector<SourceLocation, NumberOfOMPMapClauseModifiers>
ImplicitMapModifiersLoc[DefaultmapKindNum];
ImplicitMapModifiersLoc[VariableImplicitInfo::DefaultmapKindNum];
// Get the original location of present modifier from Defaultmap clause.
SourceLocation PresentModifierLocs[DefaultmapKindNum];
SourceLocation PresentModifierLocs[VariableImplicitInfo::DefaultmapKindNum];
for (OMPClause *C : Clauses) {
if (auto *DMC = dyn_cast<OMPDefaultmapClause>(C))
if (DMC->getDefaultmapModifier() == OMPC_DEFAULTMAP_MODIFIER_present)
PresentModifierLocs[DMC->getDefaultmapKind()] =
DMC->getDefaultmapModifierLoc();
}
for (unsigned VC = 0; VC < DefaultmapKindNum; ++VC) {
auto K = static_cast<OpenMPDefaultmapClauseKind>(VC);
for (unsigned I = 0; I < OMPC_MAP_delete; ++I) {
ArrayRef<Expr *> ImplicitMap =
DSAChecker.getImplicitMap(K, static_cast<OpenMPMapClauseKind>(I));
ImplicitMaps[VC][I].append(ImplicitMap.begin(), ImplicitMap.end());
}
ArrayRef<OpenMPMapModifierKind> ImplicitModifier =
DSAChecker.getImplicitMapModifier(K);
ImplicitMapModifiers[VC].append(ImplicitModifier.begin(),
ImplicitModifier.end());
std::fill_n(std::back_inserter(ImplicitMapModifiersLoc[VC]),
ImplicitModifier.size(), PresentModifierLocs[VC]);

for (OpenMPDefaultmapClauseKind K :
llvm::enum_seq_inclusive<OpenMPDefaultmapClauseKind>(
OpenMPDefaultmapClauseKind(), OMPC_DEFAULTMAP_unknown)) {
std::fill_n(std::back_inserter(ImplicitMapModifiersLoc[K]),
ImpInfo.MapModifiers[K].size(), PresentModifierLocs[K]);
}
// Mark taskgroup task_reduction descriptors as implicitly firstprivate.
for (OMPClause *C : Clauses) {
if (auto *IRC = dyn_cast<OMPInReductionClause>(C)) {
for (Expr *E : IRC->taskgroup_descriptors())
if (E)
ImplicitFirstprivates.emplace_back(E);
ImpInfo.Firstprivates.insert(E);
}
// OpenMP 5.0, 2.10.1 task Construct
// [detach clause]... The event-handle will be considered as if it was
// specified on a firstprivate clause.
if (auto *DC = dyn_cast<OMPDetachClause>(C))
ImplicitFirstprivates.push_back(DC->getEventHandler());
ImpInfo.Firstprivates.insert(DC->getEventHandler());
}
if (!ImplicitFirstprivates.empty()) {
if (!ImpInfo.Firstprivates.empty()) {
if (OMPClause *Implicit = ActOnOpenMPFirstprivateClause(
ImplicitFirstprivates, SourceLocation(), SourceLocation(),
SourceLocation())) {
ImpInfo.Firstprivates.getArrayRef(), SourceLocation(),
SourceLocation(), SourceLocation())) {
ClausesWithImplicit.push_back(Implicit);
ErrorFound = cast<OMPFirstprivateClause>(Implicit)->varlist_size() !=
ImplicitFirstprivates.size();
ImpInfo.Firstprivates.size();
} else {
ErrorFound = true;
}
}
if (!ImplicitPrivates.empty()) {
if (OMPClause *Implicit =
ActOnOpenMPPrivateClause(ImplicitPrivates, SourceLocation(),
SourceLocation(), SourceLocation())) {
if (!ImpInfo.Privates.empty()) {
if (OMPClause *Implicit = ActOnOpenMPPrivateClause(
ImpInfo.Privates.getArrayRef(), SourceLocation(),
SourceLocation(), SourceLocation())) {
ClausesWithImplicit.push_back(Implicit);
ErrorFound = cast<OMPPrivateClause>(Implicit)->varlist_size() !=
ImplicitPrivates.size();
ImpInfo.Privates.size();
} else {
ErrorFound = true;
}
Expand Down Expand Up @@ -6152,17 +6136,18 @@ StmtResult SemaOpenMP::ActOnOpenMPExecutableDirective(
ClausesWithImplicit.emplace_back(Implicit);
}
}
for (unsigned I = 0, E = DefaultmapKindNum; I < E; ++I) {
for (unsigned I = 0; I < VariableImplicitInfo::DefaultmapKindNum; ++I) {
int ClauseKindCnt = -1;
for (ArrayRef<Expr *> ImplicitMap : ImplicitMaps[I]) {
for (unsigned J = 0; J < VariableImplicitInfo::MapKindNum; ++J) {
ArrayRef<Expr *> ImplicitMap = ImpInfo.Mappings[I][J].getArrayRef();
++ClauseKindCnt;
if (ImplicitMap.empty())
continue;
CXXScopeSpec MapperIdScopeSpec;
DeclarationNameInfo MapperId;
auto K = static_cast<OpenMPMapClauseKind>(ClauseKindCnt);
if (OMPClause *Implicit = ActOnOpenMPMapClause(
nullptr, ImplicitMapModifiers[I], ImplicitMapModifiersLoc[I],
nullptr, ImpInfo.MapModifiers[I], ImplicitMapModifiersLoc[I],
MapperIdScopeSpec, MapperId, K, /*IsMapTypeImplicit=*/true,
SourceLocation(), SourceLocation(), ImplicitMap,
OMPVarListLocTy())) {
Expand Down
Loading