maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[OPENMP]Improve handling of analysis of unsupported VLAs in reductions. 

Fixed the processing of the unsupported VLAs in the reduction clauses.
Used targetDiag if the diagnostics can be delayed and emit it
immediately if the target does not support VLAs and we're parsing target
directive with the reduction clauses.

llvm-svn: 365821
This commit is contained in:
Alexey Bataev 2019-07-11 20:35:31 +00:00
parent f002fcb2ad
commit 8526031c5b
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Sema/Sema.h
View File

@ -9132,12 +9132,6 @@ public:
}
/// Return true inside OpenMP target region.
bool isInOpenMPTargetExecutionDirective() const;
/// Return true if (un)supported features for the current target should be
/// diagnosed if OpenMP (offloading) is enabled.
bool shouldDiagnoseTargetSupportFromOpenMP() const {
return !getLangOpts().OpenMPIsDevice || isInOpenMPDeclareTargetContext() ||
isInOpenMPTargetExecutionDirective();
}
/// Return the number of captured regions created for an OpenMP directive.
static int getOpenMPCaptureLevels(OpenMPDirectiveKind Kind);

12
clang/lib/Sema/SemaOpenMP.cpp
View File

@ -12140,10 +12140,14 @@ static bool actOnOMPReductionKindClause(
if ((OASE && !ConstantLengthOASE) ||
(!OASE && !ASE &&
D->getType().getNonReferenceType()->isVariablyModifiedType())) {
if (!Context.getTargetInfo().isVLASupported() &&
S.shouldDiagnoseTargetSupportFromOpenMP()) {
S.Diag(ELoc, diag::err_omp_reduction_vla_unsupported) << !!OASE;
S.Diag(ELoc, diag::note_vla_unsupported);
if (!Context.getTargetInfo().isVLASupported()) {
if (isOpenMPTargetExecutionDirective(Stack->getCurrentDirective())) {
S.Diag(ELoc, diag::err_omp_reduction_vla_unsupported) << !!OASE;
S.Diag(ELoc, diag::note_vla_unsupported);
} else {
S.targetDiag(ELoc, diag::err_omp_reduction_vla_unsupported) << !!OASE;
S.targetDiag(ELoc, diag::note_vla_unsupported);
}
continue;
}
// For arrays/array sections only:

6
clang/test/OpenMP/target_vla_messages.cpp
View File

@ -206,4 +206,10 @@ void for_reduction(int arg) {
#pragma omp parallel
#pragma omp for reduction(+: vla[0:arg])
for (int i = 0; i < arg; i++) ;
#ifdef NO_VLA
// expected-error@+3 {{cannot generate code for reduction on array section, which requires a variable length array}}
// expected-note@+2 {{variable length arrays are not supported for the current target}}
#endif
#pragma omp target reduction(+ : vla[0:arg])
for (int i = 0; i < arg; i++) ;
}