diff options
author | Johannes Doerfert <johannes@jdoerfert.de> | 2020-04-03 11:29:53 -0500 |
---|---|---|
committer | Johannes Doerfert <johannes@jdoerfert.de> | 2020-04-07 23:33:24 -0500 |
commit | a19eb1de726c1ccbf60dca6a1fbcd49b3157282f (patch) | |
tree | 5eec3afb54bbe4866934202d9101c6274feca286 /clang/lib/Parse/ParseOpenMP.cpp | |
parent | 8f0aa3f3a407994314371ee042854a8c79cea462 (diff) | |
download | llvm-a19eb1de726c1ccbf60dca6a1fbcd49b3157282f.zip llvm-a19eb1de726c1ccbf60dca6a1fbcd49b3157282f.tar.gz llvm-a19eb1de726c1ccbf60dca6a1fbcd49b3157282f.tar.bz2 |
[OpenMP] Add match_{all,any,none} declare variant selector extensions.
By default, all traits in the OpenMP context selector have to match for
it to be acceptable. Though, we sometimes want a single property out of
multiple to match (=any) or no match at all (=none). We offer these
choices as extensions via
`implementation={extension(match_{all,any,none})}`
to the user. The choice will affect the entire context selector not only
the traits following the match property.
The first user will be D75788. There we can replace
```
#pragma omp begin declare variant match(device={arch(nvptx64)})
#define __CUDA__
#include <__clang_cuda_cmath.h>
// TODO: Hack until we support an extension to the match clause that allows "or".
#undef __CLANG_CUDA_CMATH_H__
#undef __CUDA__
#pragma omp end declare variant
#pragma omp begin declare variant match(device={arch(nvptx)})
#define __CUDA__
#include <__clang_cuda_cmath.h>
#undef __CUDA__
#pragma omp end declare variant
```
with the much simpler
```
#pragma omp begin declare variant match(device={arch(nvptx, nvptx64)}, implementation={extension(match_any)})
#define __CUDA__
#include <__clang_cuda_cmath.h>
#undef __CUDA__
#pragma omp end declare variant
```
Reviewed By: mikerice
Differential Revision: https://reviews.llvm.org/D77414
Diffstat (limited to 'clang/lib/Parse/ParseOpenMP.cpp')
-rw-r--r-- | clang/lib/Parse/ParseOpenMP.cpp | 47 |
1 files changed, 45 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp index 4da1b41..c84579a 100644 --- a/clang/lib/Parse/ParseOpenMP.cpp +++ b/clang/lib/Parse/ParseOpenMP.cpp @@ -935,6 +935,43 @@ void Parser::parseOMPTraitPropertyKind( << CONTEXT_TRAIT_LVL << listOpenMPContextTraitProperties(Set, Selector); } +static bool checkExtensionProperty(Parser &P, SourceLocation Loc, + OMPTraitProperty &TIProperty, + OMPTraitSelector &TISelector, + llvm::StringMap<SourceLocation> &Seen) { + assert(TISelector.Kind == + llvm::omp::TraitSelector::implementation_extension && + "Only for extension properties, e.g., " + "`implementation={extension(PROPERTY)}`"); + if (TIProperty.Kind == TraitProperty::invalid) + return false; + + auto IsMatchExtension = [](OMPTraitProperty &TP) { + return (TP.Kind == + llvm::omp::TraitProperty::implementation_extension_match_all || + TP.Kind == + llvm::omp::TraitProperty::implementation_extension_match_any || + TP.Kind == + llvm::omp::TraitProperty::implementation_extension_match_none); + }; + + if (IsMatchExtension(TIProperty)) { + for (OMPTraitProperty &SeenProp : TISelector.Properties) + if (IsMatchExtension(SeenProp)) { + P.Diag(Loc, diag::err_omp_variant_ctx_second_match_extension); + StringRef SeenName = + llvm::omp::getOpenMPContextTraitPropertyName(SeenProp.Kind); + SourceLocation SeenLoc = Seen[SeenName]; + P.Diag(SeenLoc, diag::note_omp_declare_variant_ctx_used_here) + << CONTEXT_TRAIT_LVL << SeenName; + return false; + } + return true; + } + + llvm_unreachable("Unknown extension property!"); +} + void Parser::parseOMPContextProperty(OMPTraitSelector &TISelector, llvm::omp::TraitSet Set, llvm::StringMap<SourceLocation> &Seen) { @@ -945,6 +982,11 @@ void Parser::parseOMPContextProperty(OMPTraitSelector &TISelector, OMPTraitProperty TIProperty; parseOMPTraitPropertyKind(TIProperty, Set, TISelector.Kind, Seen); + if (TISelector.Kind == llvm::omp::TraitSelector::implementation_extension) + if (!checkExtensionProperty(*this, Tok.getLocation(), TIProperty, + TISelector, Seen)) + TIProperty.Kind = TraitProperty::invalid; + // If we have an invalid property here we already issued a warning. if (TIProperty.Kind == TraitProperty::invalid) { if (PropertyLoc != Tok.getLocation()) @@ -955,6 +997,7 @@ void Parser::parseOMPContextProperty(OMPTraitSelector &TISelector, if (isValidTraitPropertyForTraitSetAndSelector(TIProperty.Kind, TISelector.Kind, Set)) { + // If we make it here the property, selector, set, score, condition, ... are // all valid (or have been corrected). Thus we can record the property. TISelector.Properties.push_back(TIProperty); @@ -1783,11 +1826,11 @@ Parser::DeclGroupPtrTy Parser::ParseOpenMPDeclarativeDirectiveWithExtDecl( VariantMatchInfo VMI; ASTContext &ASTCtx = Actions.getASTContext(); - TI.getAsVariantMatchInfo(ASTCtx, VMI, /* DeviceSetOnly */ true); + TI.getAsVariantMatchInfo(ASTCtx, VMI); OMPContext OMPCtx(ASTCtx.getLangOpts().OpenMPIsDevice, ASTCtx.getTargetInfo().getTriple()); - if (isVariantApplicableInContext(VMI, OMPCtx)) { + if (isVariantApplicableInContext(VMI, OMPCtx, /* DeviceSetOnly */ true)) { Actions.ActOnOpenMPBeginDeclareVariant(Loc, TI); break; } |