Skip to content

[clang][OpenMP] 6.0: Add default clause support for 'target' directive #162910

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+1,605 −15
Open

[clang][OpenMP] 6.0: Add default clause support for 'target' directive #162910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions clang/docs/ReleaseNotes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ OpenMP Support
- Added support for ``defaultmap`` directive implicit-behavior ``private``.
- Added parsing and semantic analysis support for ``groupprivate`` directive.
- Added support for 'omp fuse' directive.
- Added support for ``default`` clause on ``target`` directive.

Improvements
^^^^^^^^^^^^
Expand Down
86 changes: 71 additions & 15 deletions clang/lib/Sema/SemaOpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17297,6 +17297,43 @@ OMPClause *SemaOpenMP::ActOnOpenMPSimpleClause(
return Res;
}

static std::pair<OpenMPDefaultmapClauseModifier, OpenMPDefaultmapClauseKind>
getDefaultmapModifierAndKind(llvm::omp::DefaultKind M,
OpenMPDefaultClauseVariableCategory VCKind) {
OpenMPDefaultmapClauseModifier DefMapMod;
OpenMPDefaultmapClauseKind DefMapKind;
switch (M) {
case OMP_DEFAULT_none:
DefMapMod = OMPC_DEFAULTMAP_MODIFIER_none;
break;
case OMP_DEFAULT_firstprivate:
DefMapMod = OMPC_DEFAULTMAP_MODIFIER_firstprivate;
break;
case OMP_DEFAULT_private:
DefMapMod = OMPC_DEFAULTMAP_MODIFIER_private;
break;
default:
llvm_unreachable("unexpected DSA in OpenMP default clause");
}
switch (VCKind) {
case OMPC_DEFAULT_VC_aggregate:
DefMapKind = OMPC_DEFAULTMAP_aggregate;
break;
case OMPC_DEFAULT_VC_pointer:
DefMapKind = OMPC_DEFAULTMAP_pointer;
break;
case OMPC_DEFAULT_VC_scalar:
DefMapKind = OMPC_DEFAULTMAP_scalar;
break;
case OMPC_DEFAULT_VC_all:
DefMapKind = OMPC_DEFAULTMAP_all;
break;
default:
llvm_unreachable("unexpected variable category in OpenMP default clause");
}
return std::make_pair(DefMapMod, DefMapKind);
}

OMPClause *SemaOpenMP::ActOnOpenMPDefaultClause(
llvm::omp::DefaultKind M, SourceLocation MLoc,
OpenMPDefaultClauseVariableCategory VCKind, SourceLocation VCKindLoc,
Expand All @@ -17309,21 +17346,40 @@ OMPClause *SemaOpenMP::ActOnOpenMPDefaultClause(
return nullptr;
}

switch (M) {
case OMP_DEFAULT_none:
DSAStack->setDefaultDSANone(MLoc);
break;
case OMP_DEFAULT_shared:
DSAStack->setDefaultDSAShared(MLoc);
break;
case OMP_DEFAULT_firstprivate:
DSAStack->setDefaultDSAFirstPrivate(MLoc);
break;
case OMP_DEFAULT_private:
DSAStack->setDefaultDSAPrivate(MLoc);
break;
default:
llvm_unreachable("DSA unexpected in OpenMP default clause");
if (getLangOpts().OpenMP >= 60 &&
DSAStack->getCurrentDirective() == OMPD_target) {
// OpenMP 6.0 (see page 224, lines 3-5) default Clause, Semantics
// If data-sharing-attribute is shared then the clause has no effect
// on a target construct; otherwise, its effect on a target construct is
// equivalent to specifying the defaultmap clause with the same
// data-sharing-attribute and variable-category.
if (M != OMP_DEFAULT_shared) {
auto [DefMapMod, DefMapKind] = getDefaultmapModifierAndKind(M, VCKind);
if (DefMapKind == OMPC_DEFAULTMAP_all) {
DSAStack->setDefaultDMAAttr(DefMapMod, OMPC_DEFAULTMAP_aggregate, MLoc);
DSAStack->setDefaultDMAAttr(DefMapMod, OMPC_DEFAULTMAP_scalar, MLoc);
DSAStack->setDefaultDMAAttr(DefMapMod, OMPC_DEFAULTMAP_pointer, MLoc);
} else {
DSAStack->setDefaultDMAAttr(DefMapMod, DefMapKind, MLoc);
}
}
} else {
switch (M) {
case OMP_DEFAULT_none:
DSAStack->setDefaultDSANone(MLoc);
break;
case OMP_DEFAULT_shared:
DSAStack->setDefaultDSAShared(MLoc);
break;
case OMP_DEFAULT_firstprivate:
DSAStack->setDefaultDSAFirstPrivate(MLoc);
break;
case OMP_DEFAULT_private:
DSAStack->setDefaultDSAPrivate(MLoc);
break;
default:
llvm_unreachable("DSA unexpected in OpenMP default clause");
}
}

switch (VCKind) {
Expand Down
Loading