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

Merged
merged 5 commits into from
Nov 11, 2025
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ac6d51
[clang][OpenMP] 6.0: Add default clause support for 'target' directive
ddpagan Sep 20, 2025
db1d668
Updated OpenMPSupport.rst file
ddpagan Oct 13, 2025
ee3680f
Per comment:
ddpagan Nov 3, 2025
fa311f8
Per comments:
ddpagan Nov 5, 2025
522cd23
Modified lambda definition to use "auto" instead of "auto &&".
ddpagan Nov 11, 2025
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
2 changes: 1 addition & 1 deletion clang/docs/OpenMPSupport.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ implementation.
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
| Clarifications to Fortran map semantics | :none:`unclaimed` | :none:`unclaimed` | |
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
| default clause at target construct | :part:`In Progress` | :none:`unclaimed` | |
| default clause at target construct | :good:`done` | :none:`unclaimed` | https://github.com/llvm/llvm-project/pull/162910 |
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
| ref count update use_device_{ptr, addr} | :none:`unclaimed` | :none:`unclaimed` | |
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
Expand Down
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 @@ -689,6 +689,7 @@ OpenMP Support
- Added support for 'omp fuse' directive.
- Updated parsing and semantic analysis support for ``nowait`` clause to accept
optional argument in OpenMP >= 60.
- Added support for ``default`` clause on ``target`` directive.

Improvements
^^^^^^^^^^^^
Expand Down
127 changes: 92 additions & 35 deletions clang/lib/Sema/SemaOpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17316,45 +17316,102 @@ OMPClause *SemaOpenMP::ActOnOpenMPDefaultClause(
<< getOpenMPClauseNameForDiag(OMPC_default);
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");
}

switch (VCKind) {
case OMPC_DEFAULT_VC_aggregate:
DSAStack->setDefaultDSAVCAggregate(VCKindLoc);
break;
case OMPC_DEFAULT_VC_all:
DSAStack->setDefaultDSAVCAll(VCKindLoc);
break;
case OMPC_DEFAULT_VC_allocatable:
DSAStack->setDefaultDSAVCAllocatable(VCKindLoc);
break;
case OMPC_DEFAULT_VC_pointer:
DSAStack->setDefaultDSAVCPointer(VCKindLoc);
break;
case OMPC_DEFAULT_VC_scalar:
DSAStack->setDefaultDSAVCScalar(VCKindLoc);
break;
default:
if (VCKind == OMPC_DEFAULT_VC_unknown) {
Diag(VCKindLoc, diag::err_omp_default_vc)
<< getOpenMPSimpleClauseTypeName(OMPC_default, unsigned(M));
return nullptr;
}

bool IsTargetDefault =
Copy link
Member

@alexey-bataev alexey-bataev Nov 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about combined directives?

Copy link
Contributor Author

@ddpagan ddpagan Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct. This should apply for combined directives. Thanks for catching this, Alexey.

getLangOpts().OpenMP >= 60 &&
isOpenMPTargetExecutionDirective(DSAStack->getCurrentDirective());

// OpenMP 6.0, page 224, lines 3-4 default Clause, Semantics
// If data-sharing-attribute is shared then the clause has no effect
// on a target construct;
if (IsTargetDefault && M == OMP_DEFAULT_shared)
return nullptr;

auto &&SetDefaultClauseAttrs = [&](llvm::omp::DefaultKind M,
Copy link
Member

@alexey-bataev alexey-bataev Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
auto &&SetDefaultClauseAttrs = [&](llvm::omp::DefaultKind M,
auto SetDefaultClauseAttrs = [&](llvm::omp::DefaultKind M,

Copy link
Contributor Author

@ddpagan ddpagan Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks, Alexey.

OpenMPDefaultClauseVariableCategory
VCKind) {
OpenMPDefaultmapClauseModifier DefMapMod;
OpenMPDefaultmapClauseKind DefMapKind;
// default data-sharing-attribute
switch (M) {
case OMP_DEFAULT_none:
if (IsTargetDefault)
DefMapMod = OMPC_DEFAULTMAP_MODIFIER_none;
else
DSAStack->setDefaultDSANone(MLoc);
break;
case OMP_DEFAULT_firstprivate:
if (IsTargetDefault)
DefMapMod = OMPC_DEFAULTMAP_MODIFIER_firstprivate;
else
DSAStack->setDefaultDSAFirstPrivate(MLoc);
break;
case OMP_DEFAULT_private:
if (IsTargetDefault)
DefMapMod = OMPC_DEFAULTMAP_MODIFIER_private;
else
DSAStack->setDefaultDSAPrivate(MLoc);
break;
case OMP_DEFAULT_shared:
assert(!IsTargetDefault && "DSA shared invalid with target directive");
DSAStack->setDefaultDSAShared(MLoc);
break;
default:
llvm_unreachable("unexpected DSA in OpenMP default clause");
}
// default variable-category
switch (VCKind) {
case OMPC_DEFAULT_VC_aggregate:
if (IsTargetDefault)
DefMapKind = OMPC_DEFAULTMAP_aggregate;
else
DSAStack->setDefaultDSAVCAggregate(VCKindLoc);
break;
case OMPC_DEFAULT_VC_pointer:
if (IsTargetDefault)
DefMapKind = OMPC_DEFAULTMAP_pointer;
else
DSAStack->setDefaultDSAVCPointer(VCKindLoc);
break;
case OMPC_DEFAULT_VC_scalar:
if (IsTargetDefault)
DefMapKind = OMPC_DEFAULTMAP_scalar;
else
DSAStack->setDefaultDSAVCScalar(VCKindLoc);
break;
case OMPC_DEFAULT_VC_all:
if (IsTargetDefault)
DefMapKind = OMPC_DEFAULTMAP_all;
else
DSAStack->setDefaultDSAVCAll(VCKindLoc);
break;
default:
llvm_unreachable("unexpected variable category in OpenMP default clause");
}
// OpenMP 6.0, page 224, lines 4-5 default Clause, Semantics
// otherwise, its effect on a target construct is equivalent to
// specifying the defaultmap clause with the same data-sharing-attribute
// and variable-category.
//
// If earlier than OpenMP 6.0, or not a target directive, the default DSA
// is/was set as before.
if (IsTargetDefault) {
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);
}
}
};

SetDefaultClauseAttrs(M, VCKind);
return new (getASTContext())
OMPDefaultClause(M, MLoc, VCKind, VCKindLoc, StartLoc, LParenLoc, EndLoc);
}
Expand Down
Loading