diff options
| author | Kelvin Li <kkwli0@gmail.com> | 2016-08-05 14:37:37 +0000 |
|---|---|---|
| committer | Kelvin Li <kkwli0@gmail.com> | 2016-08-05 14:37:37 +0000 |
| commit | 231f2fcd9fd01e866bc1ff41a18061b3ad211b52 (patch) | |
| tree | d8d1d8675e912a3417d5a472d48318fd007b24af | |
| parent | 0cfb8c87dfc0a8366d6db83f93aa50e9514dbf9d (diff) | |
[OpenMP] Sema and parsing for 'teams distribute' pragma
This patch is to implement sema and parsing for 'teams distribute' pragma.
Differential Revision: https://reviews.llvm.org/D23189
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@277818 91177308-0d34-0410-b5e6-96231b3b80d8
36 files changed, 3543 insertions, 13 deletions
diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h index dbc5c33ddf..170e4e7fad 100644 --- a/include/clang-c/Index.h +++ b/include/clang-c/Index.h @@ -2329,7 +2329,11 @@ enum CXCursorKind { */ CXCursor_OMPTargetSimdDirective = 270, - CXCursor_LastStmt = CXCursor_OMPTargetSimdDirective, + /** \brief OpenMP teams distribute directive. + */ + CXCursor_OMPTeamsDistributeDirective = 271, + + CXCursor_LastStmt = CXCursor_OMPTeamsDistributeDirective, /** * \brief Cursor that represents the translation unit itself. diff --git a/include/clang/AST/RecursiveASTVisitor.h b/include/clang/AST/RecursiveASTVisitor.h index 8c49785cd0..1812b55094 100644 --- a/include/clang/AST/RecursiveASTVisitor.h +++ b/include/clang/AST/RecursiveASTVisitor.h @@ -2592,6 +2592,9 @@ DEF_TRAVERSE_STMT(OMPTargetParallelForSimdDirective, DEF_TRAVERSE_STMT(OMPTargetSimdDirective, { TRY_TO(TraverseOMPExecutableDirective(S)); }) +DEF_TRAVERSE_STMT(OMPTeamsDistributeDirective, + { TRY_TO(TraverseOMPExecutableDirective(S)); }) + // OpenMP clauses. template <typename Derived> bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) { diff --git a/include/clang/AST/StmtOpenMP.h b/include/clang/AST/StmtOpenMP.h index 90be6242a3..de603f489f 100644 --- a/include/clang/AST/StmtOpenMP.h +++ b/include/clang/AST/StmtOpenMP.h @@ -774,7 +774,8 @@ public: T->getStmtClass() == OMPDistributeParallelForSimdDirectiveClass || T->getStmtClass() == OMPDistributeSimdDirectiveClass || T->getStmtClass() == OMPTargetParallelForSimdDirectiveClass || - T->getStmtClass() == OMPTargetSimdDirectiveClass; + T->getStmtClass() == OMPTargetSimdDirectiveClass || + T->getStmtClass() == OMPTeamsDistributeDirectiveClass; } }; @@ -3158,6 +3159,73 @@ public: } }; +/// This represents '#pragma omp teams distribute' directive. +/// +/// \code +/// #pragma omp teams distribute private(a,b) +/// \endcode +/// In this example directive '#pragma omp teams distribute' has clauses +/// 'private' with the variables 'a' and 'b' +/// +class OMPTeamsDistributeDirective final : public OMPLoopDirective { + friend class ASTStmtReader; + + /// Build directive with the given start and end location. + /// + /// \param StartLoc Starting location of the directive kind. + /// \param EndLoc Ending location of the directive. + /// \param CollapsedNum Number of collapsed nested loops. + /// \param NumClauses Number of clauses. + /// + OMPTeamsDistributeDirective(SourceLocation StartLoc, SourceLocation EndLoc, + unsigned CollapsedNum, unsigned NumClauses) + : OMPLoopDirective(this, OMPTeamsDistributeDirectiveClass, + OMPD_teams_distribute, StartLoc, EndLoc, + CollapsedNum, NumClauses) {} + + /// Build an empty directive. + /// + /// \param CollapsedNum Number of collapsed nested loops. + /// \param NumClauses Number of clauses. + /// + explicit OMPTeamsDistributeDirective(unsigned CollapsedNum, + unsigned NumClauses) + : OMPLoopDirective(this, OMPTeamsDistributeDirectiveClass, + OMPD_teams_distribute, SourceLocation(), + SourceLocation(), CollapsedNum, NumClauses) {} + +public: + /// Creates directive with a list of \a Clauses. + /// + /// \param C AST context. + /// \param StartLoc Starting location of the directive kind. + /// \param EndLoc Ending Location of the directive. + /// \param CollapsedNum Number of collapsed loops. + /// \param Clauses List of clauses. + /// \param AssociatedStmt Statement, associated with the directive. + /// \param Exprs Helper expressions for CodeGen. + /// + static OMPTeamsDistributeDirective * + Create(const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc, + unsigned CollapsedNum, ArrayRef<OMPClause *> Clauses, + Stmt *AssociatedStmt, const HelperExprs &Exprs); + + /// Creates an empty directive with the place for \a NumClauses clauses. + /// + /// \param C AST context. + /// \param CollapsedNum Number of collapsed nested loops. + /// \param NumClauses Number of clauses. + /// + static OMPTeamsDistributeDirective *CreateEmpty(const ASTContext &C, + unsigned NumClauses, + unsigned CollapsedNum, + EmptyShell); + + static bool classof(const Stmt *T) { + return T->getStmtClass() == OMPTeamsDistributeDirectiveClass; + } +}; + } // end namespace clang #endif diff --git a/include/clang/Basic/OpenMPKinds.def b/include/clang/Basic/OpenMPKinds.def index c4a272304c..0d0cc1c07e 100644 --- a/include/clang/Basic/OpenMPKinds.def +++ b/include/clang/Basic/OpenMPKinds.def @@ -141,6 +141,9 @@ #ifndef OPENMP_TARGET_SIMD_CLAUSE #define OPENMP_TARGET_SIMD_CLAUSE(Name) #endif +#ifndef OPENMP_TEAMS_DISTRIBUTE_CLAUSE +#define OPENMP_TEAMS_DISTRIBUTE_CLAUSE(Name) +#endif // OpenMP directives. OPENMP_DIRECTIVE(threadprivate) @@ -186,6 +189,7 @@ OPENMP_DIRECTIVE_EXT(distribute_parallel_for_simd, "distribute parallel for simd OPENMP_DIRECTIVE_EXT(distribute_simd, "distribute simd") OPENMP_DIRECTIVE_EXT(target_parallel_for_simd, "target parallel for simd") OPENMP_DIRECTIVE_EXT(target_simd, "target simd") +OPENMP_DIRECTIVE_EXT(teams_distribute, "teams distribute") // OpenMP clauses. OPENMP_CLAUSE(if, OMPIfClause) @@ -642,6 +646,18 @@ OPENMP_TARGET_SIMD_CLAUSE(simdlen) OPENMP_TARGET_SIMD_CLAUSE(collapse) OPENMP_TARGET_SIMD_CLAUSE(reduction) +// Clauses allowed for OpenMP directive 'teams distribute'. +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(default) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(private) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(firstprivate) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(shared) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(reduction) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(num_teams) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(thread_limit) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(lastprivate) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(collapse) +OPENMP_TEAMS_DISTRIBUTE_CLAUSE(dist_schedule) + #undef OPENMP_TASKLOOP_SIMD_CLAUSE #undef OPENMP_TASKLOOP_CLAUSE #undef OPENMP_LINEAR_KIND @@ -685,3 +701,4 @@ OPENMP_TARGET_SIMD_CLAUSE(reduction) #undef OPENMP_DISTRIBUTE_SIMD_CLAUSE #undef OPENMP_TARGET_PARALLEL_FOR_SIMD_CLAUSE #undef OPENMP_TARGET_SIMD_CLAUSE +#undef OPENMP_TEAMS_DISTRIBUTE_CLAUSE diff --git a/include/clang/Basic/OpenMPKinds.h b/include/clang/Basic/OpenMPKinds.h index 0a8e890b7c..105a15687e 100644 --- a/include/clang/Basic/OpenMPKinds.h +++ b/include/clang/Basic/OpenMPKinds.h @@ -198,6 +198,14 @@ bool isOpenMPSimdDirective(OpenMPDirectiveKind DKind); /// otherwise - false. bool isOpenMPDistributeDirective(OpenMPDirectiveKind DKind); +/// Checks if the specified composite/combined directive constitutes a +/// distribute directive in the outermost nest. For example, +/// 'omp distribute parallel for' or 'omp distribute'. +/// \param DKind Specified directive. +/// \return true - the directive has distribute on the outermost nest. +/// otherwise - false. +bool isOpenMPNestingDistributeDirective(OpenMPDirectiveKind DKind); + /// \brief Checks if the specified clause is one of private clauses like /// 'private', 'firstprivate', 'reduction' etc.. /// \param Kind Clause kind. diff --git a/include/clang/Basic/StmtNodes.td b/include/clang/Basic/StmtNodes.td index 416e922c54..554f19ff08 100644 --- a/include/clang/Basic/StmtNodes.td +++ b/include/clang/Basic/StmtNodes.td @@ -234,3 +234,4 @@ def OMPDistributeParallelForSimdDirective : DStmt<OMPLoopDirective>; def OMPDistributeSimdDirective : DStmt<OMPLoopDirective>; def OMPTargetParallelForSimdDirective : DStmt<OMPLoopDirective>; def OMPTargetSimdDirective : DStmt<OMPLoopDirective>; +def OMPTeamsDistributeDirective : DStmt<OMPLoopDirective>; diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index dd99abe9f6..5e8b3cb90e 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -8251,6 +8251,12 @@ public: ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, SourceLocation EndLoc, llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA); + /// Called on well-formed '\#pragma omp teams distribute' after parsing of + /// the associated statement. + StmtResult ActOnOpenMPTeamsDistributeDirective( + ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, + SourceLocation EndLoc, + llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA); /// Checks correctness of linear modifiers. bool CheckOpenMPLinearModifier(OpenMPLinearClauseKind LinKind, diff --git a/include/clang/Serialization/ASTBitCodes.h b/include/clang/Serialization/ASTBitCodes.h index f9b6ca4555..cd71410d2c 100644 --- a/include/clang/Serialization/ASTBitCodes.h +++ b/include/clang/Serialization/ASTBitCodes.h @@ -1485,6 +1485,7 @@ namespace clang { STMT_OMP_DISTRIBUTE_SIMD_DIRECTIVE, STMT_OMP_TARGET_PARALLEL_FOR_SIMD_DIRECTIVE, STMT_OMP_TARGET_SIMD_DIRECTIVE, + STMT_OMP_TEAMS_DISTRIBUTE_DIRECTIVE, EXPR_OMP_ARRAY_SECTION, // ARC diff --git a/lib/AST/StmtOpenMP.cpp b/lib/AST/StmtOpenMP.cpp index 504efdf9af..7197586e39 100644 --- a/lib/AST/StmtOpenMP.cpp +++ b/lib/AST/StmtOpenMP.cpp @@ -1311,3 +1311,54 @@ OMPTargetSimdDirective::CreateEmpty(const ASTContext &C, unsigned NumClauses, numLoopChildren(CollapsedNum, OMPD_target_simd)); return new (Mem) OMPTargetSimdDirective(CollapsedNum, NumClauses); } + +OMPTeamsDistributeDirective *OMPTeamsDistributeDirective::Create( + const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc, + unsigned CollapsedNum, ArrayRef<OMPClause *> Clauses, Stmt *AssociatedStmt, + const HelperExprs &Exprs) { + unsigned Size = llvm::alignTo(sizeof(OMPTeamsDistributeDirective), + llvm::alignOf<OMPClause *>()); + void *Mem = C.Allocate( + Size + sizeof(OMPClause *) * Clauses.size() + + sizeof(Stmt *) * numLoopChildren(CollapsedNum, OMPD_teams_distribute)); + OMPTeamsDistributeDirective *Dir = new (Mem) OMPTeamsDistributeDirective( + StartLoc, EndLoc, CollapsedNum, Clauses.size()); + Dir->setClauses(Clauses); + Dir->setAssociatedStmt(AssociatedStmt); + Dir->setIterationVariable(Exprs.IterationVarRef); + Dir->setLastIteration(Exprs.LastIteration); + Dir->setCalcLastIteration(Exprs.CalcLastIteration); + Dir->setPreCond(Exprs.PreCond); + Dir->setCond(Exprs.Cond); + Dir->setInit(Exprs.Init); + Dir->setInc(Exprs.Inc); + Dir->setIsLastIterVariable(Exprs.IL); + Dir->setLowerBoundVariable(Exprs.LB); + Dir->setUpperBoundVariable(Exprs.UB); + Dir->setStrideVariable(Exprs.ST); + Dir->setEnsureUpperBound(Exprs.EUB); + Dir->setNextLowerBound(Exprs.NLB); + Dir->setNextUpperBound(Exprs.NUB); + Dir->setNumIterations(Exprs.NumIterations); + Dir->setPrevLowerBoundVariable(Exprs.PrevLB); + Dir->setPrevUpperBoundVariable(Exprs.PrevUB); + Dir->setCounters(Exprs.Counters); + Dir->setPrivateCounters(Exprs.PrivateCounters); + Dir->setInits(Exprs.Inits); + Dir->setUpdates(Exprs.Updates); + Dir->setFinals(Exprs.Finals); + Dir->setPreInits(Exprs.PreInits); + return Dir; +} + +OMPTeamsDistributeDirective * +OMPTeamsDistributeDirective::CreateEmpty(const ASTContext &C, + unsigned NumClauses, + unsigned CollapsedNum, EmptyShell) { + unsigned Size = llvm::alignTo(sizeof(OMPTeamsDistributeDirective), + llvm::alignOf<OMPClause *>()); + void *Mem = C.Allocate( + Size + sizeof(OMPClause *) * NumClauses + + sizeof(Stmt *) * numLoopChildren(CollapsedNum, OMPD_teams_distribute)); + return new (Mem) OMPTeamsDistributeDirective(CollapsedNum, NumClauses); +} diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp index 8033ea263d..0b103f96a5 100644 --- a/lib/AST/StmtPrinter.cpp +++ b/lib/AST/StmtPrinter.cpp @@ -1203,6 +1203,12 @@ void StmtPrinter::VisitOMPTargetSimdDirective(OMPTargetSimdDirective *Node) { PrintOMPExecutableDirective(Node); } +void StmtPrinter::VisitOMPTeamsDistributeDirective( + OMPTeamsDistributeDirective *Node) { + Indent() << "#pragma omp teams distribute "; + PrintOMPExecutableDirective(Node); +} + //===----------------------------------------------------------------------===// // Expr printing methods. //===----------------------------------------------------------------------===// diff --git a/lib/AST/StmtProfile.cpp b/lib/AST/StmtProfile.cpp index 776a672c7f..cff836959d 100644 --- a/lib/AST/StmtProfile.cpp +++ b/lib/AST/StmtProfile.cpp @@ -732,6 +732,11 @@ void StmtProfiler::VisitOMPTargetSimdDirective( VisitOMPLoopDirective(S); } +void StmtProfiler::VisitOMPTeamsDistributeDirective( + const OMPTeamsDistributeDirective *S) { + VisitOMPLoopDirective(S); +} + void StmtProfiler::VisitExpr(const Expr *S) { VisitStmt(S); } diff --git a/lib/Basic/OpenMPKinds.cpp b/lib/Basic/OpenMPKinds.cpp index ac89983d0c..4b41ab186d 100644 --- a/lib/Basic/OpenMPKinds.cpp +++ b/lib/Basic/OpenMPKinds.cpp @@ -620,6 +620,16 @@ bool clang::isAllowedClauseForDirective(OpenMPDirectiveKind DKind, break; } break; + case OMPD_teams_distribute: + switch (CKind) { +#define OPENMP_TEAMS_DISTRIBUTE_CLAUSE(Name) \ + case OMPC_##Name: \ + return true; +#include "clang/Basic/OpenMPKinds.def" + default: + break; + } + break; case OMPD_declare_target: case OMPD_end_declare_target: case OMPD_unknown: @@ -645,7 +655,8 @@ bool clang::isOpenMPLoopDirective(OpenMPDirectiveKind DKind) { DKind == OMPD_distribute_parallel_for || DKind == OMPD_distribute_parallel_for_simd || DKind == OMPD_distribute_simd || - DKind == OMPD_target_parallel_for_simd || DKind == OMPD_target_simd; + DKind == OMPD_target_parallel_for_simd || DKind == OMPD_target_simd || + DKind == OMPD_teams_distribute; // TODO add next directives. } @@ -688,7 +699,8 @@ bool clang::isOpenMPTargetDataManagementDirective(OpenMPDirectiveKind DKind) { } bool clang::isOpenMPTeamsDirective(OpenMPDirectiveKind DKind) { - return DKind == OMPD_teams; // TODO add next directives. + return DKind == OMPD_teams || DKind == OMPD_teams_distribute; + // TODO add next directives. } bool clang::isOpenMPSimdDirective(OpenMPDirectiveKind DKind) { @@ -699,13 +711,19 @@ bool clang::isOpenMPSimdDirective(OpenMPDirectiveKind DKind) { // TODO add next directives. } -bool clang::isOpenMPDistributeDirective(OpenMPDirectiveKind Kind) { +bool clang::isOpenMPNestingDistributeDirective(OpenMPDirectiveKind Kind) { return Kind == OMPD_distribute || Kind == OMPD_distribute_parallel_for || Kind == OMPD_distribute_parallel_for_simd || Kind == OMPD_distribute_simd; // TODO add next directives. } +bool clang::isOpenMPDistributeDirective(OpenMPDirectiveKind Kind) { + return isOpenMPNestingDistributeDirective(Kind) || + Kind == OMPD_teams_distribute; + // TODO add next directives. +} + bool clang::isOpenMPPrivate(OpenMPClauseKind Kind) { return Kind == OMPC_private || Kind == OMPC_firstprivate || Kind == OMPC_lastprivate || Kind == OMPC_linear || @@ -723,5 +741,5 @@ bool clang::isOpenMPTaskingDirective(OpenMPDirectiveKind Kind) { bool clang::isOpenMPLoopBoundSharingDirective(OpenMPDirectiveKind Kind) { return Kind == OMPD_distribute_parallel_for || Kind == OMPD_distribute_parallel_for_simd || - Kind == OMPD_distribute_simd; + Kind == OMPD_distribute_simd || Kind == OMPD_teams_distribute; } diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp index 2adb1770ea..aa457ad5f3 100644 --- a/lib/CodeGen/CGStmt.cpp +++ b/lib/CodeGen/CGStmt.cpp @@ -298,6 +298,9 @@ void CodeGenFunction::EmitStmt(const Stmt *S) { case Stmt::OMPTargetSimdDirectiveClass: EmitOMPTargetSimdDirective(cast<OMPTargetSimdDirective>(*S)); break; + case Stmt::OMPTeamsDistributeDirectiveClass: + EmitOMPTeamsDistributeDirective(cast<OMPTeamsDistributeDirective>(*S)); + break; } } diff --git a/lib/CodeGen/CGStmtOpenMP.cpp b/lib/CodeGen/CGStmtOpenMP.cpp index 954721e16a..f2b9942858 100644 --- a/lib/CodeGen/CGStmtOpenMP.cpp +++ b/lib/CodeGen/CGStmtOpenMP.cpp @@ -1934,6 +1934,18 @@ void CodeGenFunction::EmitOMPTargetSimdDirective( }); } +void CodeGenFunction::EmitOMPTeamsDistributeDirective( + const OMPTeamsDistributeDirective &S) { + OMPLexicalScope Scope(*this, S, /*AsInlined=*/true); + CGM.getOpenMPRuntime().emitInlinedDirective( + *this, OMPD_teams_distribute, + [&S](CodeGenFunction &CGF, PrePostActionTy &) { + OMPLoopScope PreInitScope(CGF, S); + CGF.EmitStmt( + cast<CapturedStmt>(S.getAssociatedStmt())->getCapturedStmt()); + }); +} + /// \brief Emit a helper variable and return corresponding lvalue. static LValue EmitOMPHelperVar(CodeGenFunction &CGF, const DeclRefExpr *Helper) { diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index 24ead4c309..bb0437157e 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -2512,6 +2512,7 @@ public: void EmitOMPTargetParallelForSimdDirective( const OMPTargetParallelForSimdDirective &S); void EmitOMPTargetSimdDirective(const OMPTargetSimdDirective &S); + void EmitOMPTeamsDistributeDirective(const OMPTeamsDistributeDirective &S); /// Emit outlined function for the target directive. static std::pair<llvm::Function * /*OutlinedFn*/, diff --git a/lib/Parse/ParseOpenMP.cpp b/lib/Parse/ParseOpenMP.cpp index d5d2f08d99..d4cdc8e859 100644 --- a/lib/Parse/ParseOpenMP.cpp +++ b/lib/Parse/ParseOpenMP.cpp @@ -108,7 +108,8 @@ static OpenMPDirectiveKind ParseOpenMPDirectiveKind(Parser &P) { { OMPD_target, OMPD_parallel, OMPD_target_parallel }, { OMPD_target, OMPD_simd, OMPD_target_simd }, { OMPD_target_parallel, OMPD_for, OMPD_target_parallel_for }, - { OMPD_target_parallel_for, OMPD_simd, OMPD_target_parallel_for_simd } + { OMPD_target_parallel_for, OMPD_simd, OMPD_target_parallel_for_simd }, + { OMPD_teams, OMPD_distribute, OMPD_teams_distribute } }; enum { CancellationPoint = 0, DeclareReduction = 1, TargetData = 2 }; auto Tok = P.getCurToken(); @@ -742,6 +743,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpenMPDeclarativeDirectiveWithExtDecl( case OMPD_distribute_simd: case OMPD_target_parallel_for_simd: case OMPD_target_simd: + case OMPD_teams_distribute: Diag(Tok, diag::err_omp_unexpected_directive) << getOpenMPDirectiveName(DKind); break; @@ -775,7 +777,8 @@ Parser::DeclGroupPtrTy Parser::ParseOpenMPDeclarativeDirectiveWithExtDecl( /// 'target parallel' | 'target parallel for' | /// 'target update' | 'distribute parallel for' | /// 'distribute paralle for simd' | 'distribute simd' | -/// 'target parallel for simd' | 'target simd' {clause} +/// 'target parallel for simd' | 'target simd' | +/// 'teams distribute' {clause} /// annot_pragma_openmp_end /// StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective( @@ -884,7 +887,8 @@ StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective( case OMPD_distribute_parallel_for_simd: case OMPD_distribute_simd: case OMPD_target_parallel_for_simd: - case OMPD_target_simd: { + case OMPD_target_simd: + case OMPD_teams_distribute: { ConsumeToken(); // Parse directive name of the 'critical' directive if any. if (DKind == OMPD_critical) { diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp index 79c4d1c4aa..8194e161ea 100644 --- a/lib/Sema/SemaOpenMP.cpp +++ b/lib/Sema/SemaOpenMP.cpp @@ -1694,7 +1694,8 @@ void Sema::ActOnOpenMPRegionStart(OpenMPDirectiveKind DKind, Scope *CurScope) { } case OMPD_distribute_parallel_for_simd: case OMPD_distribute_simd: - case OMPD_distribute_parallel_for: { + case OMPD_distribute_parallel_for: + case OMPD_teams_distribute: { QualType KmpInt32Ty = Context.getIntTypeForBitwidth(32, 1); QualType KmpInt32PtrTy = Context.getPointerType(KmpInt32Ty).withConst().withRestrict(); @@ -1922,6 +1923,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | |parallel for simd| | // | parallel | distribute simd | + | // | parallel | target simd | * | + // | parallel | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | for | parallel | * | // | for | for | + | @@ -1966,6 +1968,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | for | target parallel | + | // | | for simd | | // | for | target simd | * | + // | for | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | master | parallel | * | // | master | for | + | @@ -2010,6 +2013,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | master | target parallel | + | // | | for simd | | // | master | target simd | * | + // | master | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | critical | parallel | * | // | critical | for | + | @@ -2053,6 +2057,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | critical | target parallel | + | // | | for simd | | // | critical | target simd | * | + // | critical | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | simd | parallel | | // | simd | for | | @@ -2097,6 +2102,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | simd | target parallel | | // | | for simd | | // | simd | target simd | | + // | simd | teams distribute| | // +------------------+-----------------+------------------------------------+ // | for simd | parallel | | // | for simd | for | | @@ -2141,6 +2147,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | for simd | target parallel | | // | | for simd | | // | for simd | target simd | | + // | for simd | teams distribute| | // +------------------+-----------------+------------------------------------+ // | parallel for simd| parallel | | // | parallel for simd| for | | @@ -2184,6 +2191,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | parallel for simd| distribute simd | | // | | for simd | | // | parallel for simd| target simd | | + // | parallel for simd| teams distribute| | // +------------------+-----------------+------------------------------------+ // | sections | parallel | * | // | sections | for | + | @@ -2272,6 +2280,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | section | target parallel | + | // | | for simd | | // | section | target simd | * | + // | section | teams distrubte | + | // +------------------+-----------------+------------------------------------+ // | single | parallel | * | // | single | for | + | @@ -2316,6 +2325,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | single | target parallel | + | // | | for simd | | // | single | target simd | * | + // | single | teams distrubte | + | // +------------------+-----------------+------------------------------------+ // | parallel for | parallel | * | // | parallel for | for | + | @@ -2360,6 +2370,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | parallel for | target parallel | + | // | | for simd | | // | parallel for | target simd | * | + // | parallel for | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | parallel sections| parallel | * | // | parallel sections| for | + | @@ -2404,6 +2415,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | parallel sections| target parallel | + | // | | for simd | | // | parallel sections| target simd | * | + // | parallel sections| teams distribute| + | // +------------------+-----------------+------------------------------------+ // | task | parallel | * | // | task | for | + | @@ -2448,6 +2460,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | task | target parallel | + | // | | for simd | | // | task | target simd | * | + // | task | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | ordered | parallel | * | // | ordered | for | + | @@ -2492,6 +2505,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | ordered | target parallel | + | // | | for simd | | // | ordered | target simd | * | + // | ordered | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | atomic | parallel | | // | atomic | for | | @@ -2536,6 +2550,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | atomic | target parallel | | // | | for simd | | // | atomic | target simd | | + // | atomic | teams distribute| | // +------------------+-----------------+------------------------------------+ // | target | parallel | * | // | target | for | * | @@ -2580,6 +2595,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | target | target parallel | | // | | for simd | | // | target | target simd | | + // | target | teams distribute| | // +------------------+-----------------+------------------------------------+ // | target parallel | parallel | * | // | target parallel | for | * | @@ -2624,6 +2640,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | target parallel | target parallel | | // | | for simd | | // | target parallel | target simd | | + // | target parallel | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | target parallel | parallel | * | // | for | | | @@ -2697,6 +2714,8 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | for | for simd | | // | target parallel | target simd | | // | for | | | + // | target parallel | teams distribute| | + // | for | | | // +------------------+-----------------+------------------------------------+ // | teams | parallel | * | // | teams | for | + | @@ -2741,6 +2760,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | teams | target parallel | + | // | | for simd | | // | teams | target simd | + | + // | teams | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | taskloop | parallel | * | // | taskloop | for | + | @@ -2784,6 +2804,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | taskloop | target parallel | * | // | | for simd | | // | taskloop | target simd | * | + // | taskloop | teams distribute| + | // +------------------+-----------------+------------------------------------+ // | taskloop simd | parallel | | // | taskloop simd | for | | @@ -2828,6 +2849,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | taskloop simd | target parallel | | // | | for simd | | // | taskloop simd | target simd | | + // | taskloop simd | teams distribute| | // +------------------+-----------------+------------------------------------+ // | distribute | parallel | * | // | distribute | for | * | @@ -2872,6 +2894,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | distribute | target parallel | | // | | for simd | | // | distribute | target simd | | + // | distribute | teams distribute| | // +------------------+-----------------+------------------------------------+ // | distribute | parallel | * | // | parallel for | | | @@ -2946,6 +2969,8 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | parallel for | for simd | | // | distribute | target simd | | // | parallel for | | | + // | distribute | teams distribute| | + // | parallel for | | | // +------------------+-----------------+------------------------------------+ // | distribute | parallel | * | // | parallel for simd| | | @@ -3019,6 +3044,8 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | parallel for simd| for simd | | // | distribute | target simd | | // | parallel for simd| | | + // | distribute | teams distribute| | + // | parallel for simd| | | // +------------------+-----------------+------------------------------------+ // | distribute simd | parallel | * | // | distribute simd | for | * | @@ -3063,6 +3090,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | distribute simd | target parallel | * | // | | for simd | | // | distribute simd | target simd | * | + // | distribute simd | teams distribute| * | // +------------------+-----------------+------------------------------------+ // | target parallel | parallel | * | // | for simd | | | @@ -3136,6 +3164,8 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | for simd | for simd | | // | target parallel | target simd | * | // | for simd | | | + // | target parallel | teams distribute| * | + // | for simd | | | // +------------------+-----------------+------------------------------------+ // | target simd | parallel | | // | target simd | for | | @@ -3180,6 +3210,51 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // | target simd | target parallel | | // | | for simd | | // | target simd | target simd | | + // | target simd | teams distribute| | + // +------------------+-----------------+------------------------------------+ + // | teams distribute | parallel | | + // | teams distribute | for | | + // | teams distribute | for simd | | + // | teams distribute | master | | + // | teams distribute | critical | | + // | teams distribute | simd | | + // | teams distribute | sections | | + // | teams distribute | section | | + // | teams distribute | single | | + // | teams distribute | parallel for | | + // | teams distribute |parallel for simd| | + // | teams distribute |parallel sections| | + // | teams distribute | task | | + // | teams distribute | taskyield | | + // | teams distribute | barrier | | + // | teams distribute | taskwait | | + // | teams distribute | taskgroup | | + // | teams distribute | flush | | + // | teams distribute | ordered | + (with simd clause) | + // | teams distribute | atomic | | + // | teams distribute | target | | + // | teams distribute | target parallel | | + // | teams distribute | target parallel | | + // | | for | | + // | teams distribute | target enter | | + // | | data | | + // | teams distribute | target exit | | + // | | data | | + // | teams distribute | teams | | + // | teams distribute | cancellation | | + // | | point | | + // | teams distribute | cancel | | + // | teams distribute | taskloop | | + // | teams distribute | taskloop simd | | + // | teams distribute | distribute | | + // | teams distribute | distribute | | + // | | parallel for | | + // | teams distribute | distribute | | + // | |parallel for simd| | + // | teams distribute | distribute simd | | + // | teams distribute | target parallel | | + // | | for simd | | + // | teams distribute | teams distribute| | // +------------------+-----------------+------------------------------------+ if (Stack->getCurScope()) { auto ParentRegion = Stack->getParentDirective(); @@ -3335,7 +3410,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, Recommend = ShouldBeInTargetRegion; Stack->setParentTeamsRegionLoc(Stack->getConstructLoc()); } - if (!NestingProhibited && isOpenMPTeamsDirective(ParentRegion)) { + if (!NestingProhibited && ParentRegion == OMPD_teams) { // OpenMP [2.16, Nesting of Regions] // distribute, parallel, parallel sections, parallel workshare, and the // parallel loop and parallel loop SIMD constructs are the only OpenMP @@ -3344,11 +3419,12 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, !isOpenMPDistributeDirective(CurrentRegion); Recommend = ShouldBeInParallelRegion; } - if (!NestingProhibited && isOpenMPDistributeDirective(CurrentRegion)) { + if (!NestingProhibited && + isOpenMPNestingDistributeDirective(CurrentRegion)) { // OpenMP 4.5 [2.17 Nesting of Regions] // The region associated with the distribute construct must be strictly // nested inside a teams region - NestingProhibited = !isOpenMPTeamsDirective(ParentRegion); + NestingProhibited = ParentRegion != OMPD_teams; Recommend = ShouldBeInTeamsRegion; } if (!NestingProhibited && @@ -3698,6 +3774,11 @@ StmtResult Sema::ActOnOpenMPExecutableDirective( EndLoc, VarsWithInheritedDSA); AllowedNameModifiers.push_back(OMPD_target); break; + case OMPD_teams_distribute: + Res = ActOnOpenMPTeamsDistributeDirective(ClausesWithImplicit, AStmt, + StartLoc, EndLoc, + VarsWithInheritedDSA); + break; case OMPD_declare_target: case OMPD_end_declare_target: case OMPD_threadprivate: @@ -7350,6 +7431,40 @@ StmtResult Sema::ActOnOpenMPTargetSimdDirective( NestedLoopCount, Clauses, AStmt, B); } +StmtResult Sema::ActOnOpenMPTeamsDistributeDirective( + ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, + SourceLocation EndLoc, + llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA) { + if (!AStmt) + return StmtError(); + + CapturedStmt *CS = cast<CapturedStmt>(AStmt); + // 1.2.2 OpenMP Language Terminology + // Structured block - An executable statement with a single entry at the + // top and a single exit at the bottom. + // The point of exit cannot be a branch out of the structured block. + // longjmp() and throw() must not violate the entry/exit criteria. + CS->getCapturedDecl()->setNothrow(); + + OMPLoopDirective::HelperExprs B; + // In presence of clause 'collapse' with number of loops, it will + // define the nested loops number. + unsigned NestedLoopCount = + CheckOpenMPLoop(OMPD_teams_distribute, getCollapseNumberExpr(Clauses), + nullptr /*ordered not a clause on distribute*/, AStmt, + *this, *DSAStack, VarsWithImplicitDSA, B); + if (NestedLoopCount == 0) + return StmtError(); + + assert((CurContext->isDependentContext() || B.builtAll()) && + "omp teams distribute loop exprs were not built"); + + getCurFunction()->setHasBranchProtectedScope(); + return OMPTeamsDistributeDirective::Create(Context, StartLoc, EndLoc, + NestedLoopCount, Clauses, AStmt, + B); +} + OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr, SourceLocation StartLoc, SourceLocation LParenLoc, diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 9c55478ca8..f68cdcaee8 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -7637,6 +7637,17 @@ StmtResult TreeTransform<Derived>::TransformOMPTargetSimdDirective( return Res; } +template <typename Derived> +StmtResult TreeTransform<Derived>::TransformOMPTeamsDistributeDirective( + OMPTeamsDistributeDirective *D) { + DeclarationNameInfo DirName; + getDerived().getSema().StartOpenMPDSABlock(OMPD_teams_distribute, DirName, + nullptr, D->getLocStart()); + StmtResult Res = getDerived().TransformOMPExecutableDirective(D); + getDerived().getSema().EndOpenMPDSABlock(Res.get()); + return Res; +} + //===----------------------------------------------------------------------===// // OpenMP clause transformation //===----------------------------------------------------------------------===// diff --git a/lib/Serialization/ASTReaderStmt.cpp b/lib/Serialization/ASTReaderStmt.cpp index f437ed1ef3..331932e015 100644 --- a/lib/Serialization/ASTReaderStmt.cpp +++ b/lib/Serialization/ASTReaderStmt.cpp @@ -2864,6 +2864,11 @@ void ASTStmtReader::VisitOMPTargetSimdDirective(OMPTargetSimdDirective *D) { VisitOMPLoopDirective(D); } +void ASTStmtReader::VisitOMPTeamsDistributeDirective( + OMPTeamsDistributeDirective *D) { + VisitOMPLoopDirective(D); +} + //===----------------------------------------------------------------------===// // ASTReader Implementation //===----------------------------------------------------------------------===// @@ -3583,6 +3588,14 @@ Stmt *ASTReader::ReadStmtFromStream(ModuleFile &F) { break; } + case STMT_OMP_TEAMS_DISTRIBUTE_DIRECTIVE: { + auto NumClauses = Record[ASTStmtReader::NumStmtFields]; + auto CollapsedNum = Record[ASTStmtReader::NumStmtFields + 1]; + S = OMPTeamsDistributeDirective::CreateEmpty(Context, NumClauses, + CollapsedNum, Empty); + break; + } + case EXPR_CXX_OPERATOR_CALL: S = new (Context) CXXOperatorCallExpr(Context, Empty); break; diff --git a/lib/Serialization/ASTWriterStmt.cpp b/lib/Serialization/ASTWriterStmt.cpp index 9cc867a518..19b1e20d36 100644 --- a/lib/Serialization/ASTWriterStmt.cpp +++ b/lib/Serialization/ASTWriterStmt.cpp @@ -2512,6 +2512,12 @@ void ASTStmtWriter::VisitOMPTargetSimdDirective(OMPTargetSimdDirective *D) { Code = serialization::STMT_OMP_TARGET_SIMD_DIRECTIVE; } +void ASTStmtWriter::VisitOMPTeamsDistributeDirective( + OMPTeamsDistributeDirective *D) { + VisitOMPLoopDirective(D); + Code = serialization::STMT_OMP_TEAMS_DISTRIBUTE_DIRECTIVE; +} + //===----------------------------------------------------------------------===// // ASTWriter Implementation //===----------------------------------------------------------------------===// diff --git a/lib/StaticAnalyzer/Core/ExprEngine.cpp b/lib/StaticAnalyzer/Core/ExprEngine.cpp index a3c5fc40fd..6ca24c78a1 100644 --- a/lib/StaticAnalyzer/Core/ExprEngine.cpp +++ b/lib/StaticAnalyzer/Core/ExprEngine.cpp @@ -847,6 +847,7 @@ void ExprEngine::Visit(const Stmt *S, ExplodedNode *Pred, case Stmt::OMPDistributeSimdDirectiveClass: case Stmt::OMPTargetParallelForSimdDirectiveClass: case Stmt::OMPTargetSimdDirectiveClass: + case Stmt::OMPTeamsDistributeDirectiveClass: llvm_unreachable("Stmt should not be in analyzer evaluation loop"); case Stmt::ObjCSubscriptRefExprClass: diff --git a/test/OpenMP/nesting_of_regions.cpp b/test/OpenMP/nesting_of_regions.cpp index 6c44d94a67..8f6fb35bd3 100644 --- a/test/OpenMP/nesting_of_regions.cpp +++ b/test/OpenMP/nesting_of_regions.cpp @@ -161,6 +161,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp parallel + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'parallel' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // SIMD DIRECTIVE #pragma omp simd @@ -359,6 +365,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int j = 0; j < 10; ++j) + ; + } // FOR DIRECTIVE #pragma omp for @@ -570,6 +582,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // FOR SIMD DIRECTIVE #pragma omp for simd @@ -769,6 +787,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp for simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int j = 0; j < 10; ++j) + ; + } // SECTIONS DIRECTIVE #pragma omp sections @@ -985,6 +1009,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp sections + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // SECTION DIRECTIVE #pragma omp section // expected-error {{orphaned 'omp section' directives are prohibited, it must be closely nested to a sections region}} @@ -1259,6 +1289,13 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp sections + { +#pragma omp section +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'section' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // SINGLE DIRECTIVE #pragma omp single @@ -1461,6 +1498,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp single + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'single' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // MASTER DIRECTIVE #pragma omp master @@ -1663,6 +1706,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp master + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'master' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // CRITICAL DIRECTIVE #pragma omp critical @@ -1879,6 +1928,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp critical + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'critical' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // PARALLEL FOR DIRECTIVE #pragma omp parallel for @@ -2095,6 +2150,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp parallel for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // PARALLEL FOR SIMD DIRECTIVE #pragma omp parallel for simd @@ -2312,6 +2373,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp parallel for simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int j = 0; j < 10; ++j) + ; + } // PARALLEL SECTIONS DIRECTIVE #pragma omp parallel sections @@ -2517,6 +2584,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp parallel sections + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'parallel sections' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // TASK DIRECTIVE #pragma omp task @@ -2669,6 +2742,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp task + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'task' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // ORDERED DIRECTIVE #pragma omp ordered @@ -2892,6 +2971,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp ordered + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'ordered' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // ATOMIC DIRECTIVE #pragma omp atomic @@ -3145,6 +3230,14 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp atomic + // expected-error@+2 {{the statement for 'atomic' must be an expression statement of form '++x;', '--x;', 'x++;', 'x--;', 'x binop= expr;', 'x = x binop expr' or 'x = expr binop x', where x is an l-value expression with scalar type}} + // expected-note@+1 {{expected an expression statement}} + { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside an atomic region}} + for (int i = 0; i < 10; ++i) + ; + } // TARGET DIRECTIVE #pragma omp target @@ -3313,6 +3406,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target + { +#pragma omp teams distribute // OK + for (int i = 0; i < 10; ++i) + ; + } // TARGET PARALLEL DIRECTIVE #pragma omp target parallel @@ -3475,6 +3574,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target parallel + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'target parallel' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // TARGET PARALLEL FOR DIRECTIVE #pragma omp target parallel for @@ -3691,6 +3796,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp target parallel for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'target parallel for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // TEAMS DIRECTIVE #pragma omp teams // expected-error {{orphaned 'omp teams' directives are prohibited; perhaps you forget to enclose the directive into a target region?}} @@ -3898,6 +4009,13 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target +#pragma omp teams + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'teams' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // TASKLOOP DIRECTIVE #pragma omp taskloop @@ -4105,6 +4223,12 @@ void foo() { for (int j = 0; j < 10; ++j) ++a; } +#pragma omp taskloop + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'taskloop' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ++a; + } // DISTRIBUTE DIRECTIVE #pragma omp target @@ -4338,6 +4462,14 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp target +#pragma omp teams +#pragma omp distribute + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'distribute' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // DISTRIBUTE PARALLEL FOR DIRECTIVE #pragma omp target @@ -4579,6 +4711,14 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target +#pragma omp teams +#pragma omp distribute parallel for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'distribute parallel for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // DISTRIBUTE PARALLEL FOR SIMD DIRECTIVE #pragma omp target @@ -4828,6 +4968,14 @@ void foo() { for (int i = 0; i < 10; ++i) ++a; } +#pragma omp target +#pragma omp teams +#pragma omp distribute parallel for simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int i = 0; i < 10; ++i) + ++a; + } // TARGET SIMD DIRECTIVE #pragma omp target simd @@ -5015,6 +5163,240 @@ void foo() { for (int i = 0; i < 10; ++i) ++a; } +#pragma omp target simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int i = 0; i < 10; ++i) + ++a; + } + +// TEAMS DISTRIBUTE DIRECTIVE +#pragma omp teams distribute // expected-error {{orphaned 'omp teams distribute' directives are prohibited; perhaps you forget to enclose the directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp distribute parallel for simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp distribute parallel for simd' directive into a teams region?}} + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp distribute // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp distribute' directive into a teams region?}} + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp for // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp simd // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp for simd // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp sections // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp section // expected-error {{'omp section' directive must be closely nested to a sections region, not a teams distribute region}} + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp single // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp master // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp critical // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel // OK + { +#pragma omp single + { + bar(); + } + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel for // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel for simd // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel sections // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp task // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp taskyield // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp barrier // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp taskwait // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp flush // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp ordered // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp ordered' directive into a for or a parallel for region with 'ordered' clause?}} + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp atomic // OK + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target parallel // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target parallel for // expected-error {{region cannot be nested inside 'target' region}} + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target enter data map(to: a) // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target exit data map(from: a) // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp teams // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams' directive into a target region?}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target update to(a) // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp distribute simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp distribute simd' directive into a teams region?}} + for (int i = 0; i < 10; ++i) + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target simd // expected-error {{region cannot be nested inside 'target' region}} + for (int i = 0; i < 10; ++i) + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ++a; + } } void foo() { @@ -5174,6 +5556,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp parallel + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'parallel' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // SIMD DIRECTIVE #pragma omp simd @@ -5356,6 +5744,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int j = 0; j < 10; ++j) + ; + } // FOR DIRECTIVE #pragma omp for @@ -5558,6 +5952,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // FOR SIMD DIRECTIVE #pragma omp for simd @@ -5740,6 +6140,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp for simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int j = 0; j < 10; ++j) + ; + } // SECTIONS DIRECTIVE #pragma omp sections @@ -5931,6 +6337,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp sections + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // SECTION DIRECTIVE #pragma omp section // expected-error {{orphaned 'omp section' directives are prohibited, it must be closely nested to a sections region}} @@ -6215,6 +6627,13 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp sections + { +#pragma omp section +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'section' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // SINGLE DIRECTIVE #pragma omp single @@ -6407,6 +6826,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp single + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'single' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // MASTER DIRECTIVE #pragma omp master @@ -6609,6 +7034,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp master + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'master' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // CRITICAL DIRECTIVE #pragma omp critical @@ -6830,6 +7261,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp critical + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'critical' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // PARALLEL FOR DIRECTIVE #pragma omp parallel for @@ -7047,6 +7484,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp parallel for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // PARALLEL FOR SIMD DIRECTIVE #pragma omp parallel for simd @@ -7264,6 +7707,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp parallel for simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int j = 0; j < 10; ++j) + ; + } // PARALLEL SECTIONS DIRECTIVE #pragma omp parallel sections @@ -7465,6 +7914,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp parallel sections + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'parallel sections' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // TASK DIRECTIVE #pragma omp task @@ -7616,6 +8071,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp task + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'task' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // ATOMIC DIRECTIVE #pragma omp atomic @@ -7868,6 +8329,14 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp atomic + // expected-error@+2 {{the statement for 'atomic' must be an expression statement of form '++x;', '--x;', 'x++;', 'x--;', 'x binop= expr;', 'x = x binop expr' or 'x = expr binop x', where x is an l-value expression with scalar type}} + // expected-note@+1 {{expected an expression statement}} + { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside an atomic region}} + for (int i = 0; i < 10; ++i) + ; + } // TARGET DIRECTIVE #pragma omp target @@ -8033,6 +8502,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target + { +#pragma omp teams distribute // OK + for (int i = 0; i < 10; ++i) + ; + } // TARGET PARALLEL DIRECTIVE #pragma omp target parallel @@ -8195,6 +8670,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target parallel + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'target parallel' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // TARGET PARALLEL FOR DIRECTIVE #pragma omp target parallel for @@ -8412,6 +8893,12 @@ void foo() { for (int j = 0; j < 10; ++j) ; } +#pragma omp target parallel for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'target parallel for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int j = 0; j < 10; ++j) + ; + } // TEAMS DIRECTIVE #pragma omp target @@ -8621,6 +9108,13 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target +#pragma omp teams + { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'teams' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // TASKLOOP DIRECTIVE #pragma omp taskloop @@ -8828,6 +9322,12 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp taskloop + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'taskloop' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; + } // DISTRIBUTE DIRECTIVE #pragma omp target @@ -9337,6 +9837,14 @@ void foo() { for (int i = 0; i < 10; ++i) ++a; } +#pragma omp target +#pragma omp teams +#pragma omp distribute parallel for + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'distribute parallel for' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ++a; + } // DISTRIBUTE PARALLEL FOR SIMD DIRECTIVE #pragma omp target @@ -9579,6 +10087,14 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target +#pragma omp teams +#pragma omp distribute parallel for simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int i = 0; i < 10; ++i) + ; + } // DISTRIBUTE SIMD DIRECTIVE #pragma omp target @@ -9821,6 +10337,14 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target +#pragma omp teams +#pragma omp distribute simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int i = 0; i < 10; ++i) + ; + } // TARGET SIMD DIRECTIVE #pragma omp target simd @@ -10002,5 +10526,239 @@ void foo() { for (int i = 0; i < 10; ++i) ; } +#pragma omp target simd + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}} + for (int i = 0; i < 10; ++i) + ; + } + +// TEAMS DISTRIBUTE DIRECTIVE +#pragma omp teams distribute // expected-error {{orphaned 'omp teams distribute' directives are prohibited; perhaps you forget to enclose the directive into a target region?}} + for (int i = 0; i < 10; ++i) + ; +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp distribute parallel for simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp distribute parallel for simd' directive into a teams region?}} + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp distribute // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp distribute' directive into a teams region?}} + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp for // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp simd // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp for simd // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp sections // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp section // expected-error {{'omp section' directive must be closely nested to a sections region, not a teams distribute region}} + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp single // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp master // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp critical // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel // OK + { +#pragma omp single + { + bar(); + } + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel for // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel for simd // OK + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp parallel sections // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp task // OK + { + bar(); + } + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp taskyield // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp barrier // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp taskwait // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp flush // OK + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp ordered // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp ordered' directive into a for or a parallel for region with 'ordered' clause?}} + bar(); + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp atomic // OK + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target parallel // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target parallel for // expected-error {{region cannot be nested inside 'target' region}} + for (int i = 0; i < 10; ++i) + ; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target enter data map(to: a) // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target exit data map(from: a) // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp teams // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams' directive into a target region?}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target update to(a) // expected-error {{region cannot be nested inside 'target' region}} + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp distribute simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp distribute simd' directive into a teams region?}} + for (int i = 0; i < 10; ++i) + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp target simd // expected-error {{region cannot be nested inside 'target' region}} + for (int i = 0; i < 10; ++i) + ++a; + } +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { +#pragma omp teams distribute // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams distribute' directive into a target region?}} + for (int i = 0; i < 10; ++i) + ++a; + } return foo<int>(); } diff --git a/test/OpenMP/teams_distribute_ast_print.cpp b/test/OpenMP/teams_distribute_ast_print.cpp new file mode 100644 index 0000000000..5dd71c9d1a --- /dev/null +++ b/test/OpenMP/teams_distribute_ast_print.cpp @@ -0,0 +1,179 @@ +// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s +// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s +// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -fsyntax-only -verify %s -ast-print | FileCheck %s +// expected-no-diagnostics + +#ifndef HEADER +#define HEADER + +void foo() {} + +struct S { + S(): a(0) {} + S(int v) : a(v) {} + int a; + typedef int type; +}; + +template <typename T> +class S7 : public T { +protected: + T a; + S7() : a(0) {} + +public: + S7(typename T::type v) : a(v) { +#pragma omp target +#pragma omp teams distribute private(a) private(this->a) private(T::a) + for (int k = 0; k < a.a; ++k) + ++this->a.a; + } + S7 &operator=(S7 &s) { +#pragma omp target +#pragma omp teams distribute private(a) private(this->a) + for (int k = 0; k < s.a.a; ++k) + ++s.a.a; + return *this; + } + + void foo() { + int b, argv, d, c, e, f; +#pragma omp target +#pragma omp teams distribute default(none), private(b) firstprivate(argv) shared(d) reduction(+:c) reduction(max:e) num_teams(f) thread_limit(d) + for (int k = 0; k < a.a; ++k) + ++a.a; + } +}; +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(this->a) private(this->a) private(this->S::a) +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(this->a) private(this->a) private(T::a) +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(this->a) private(this->a) +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute default(none) private(b) firstprivate(argv) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d) + +class S8 : public S7<S> { + S8() {} + +public: + S8(int v) : S7<S>(v){ +#pragma omp target +#pragma omp teams distribute private(a) private(this->a) private(S7<S>::a) + for (int k = 0; k < a.a; ++k) + ++this->a.a; + } + S8 &operator=(S8 &s) { +#pragma omp target +#pragma omp teams distribute private(a) private(this->a) + for (int k = 0; k < s.a.a; ++k) + ++s.a.a; + return *this; + } + + void bar() { + int b, argv, d, c, e, f; +#pragma omp target +#pragma omp teams distribute default(none), private(b) firstprivate(argv) shared(d) reduction(+:c) reduction(max:e) num_teams(f) thread_limit(d) + for (int k = 0; k < a.a; ++k) + ++a.a; + } +}; +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(this->a) private(this->a) private(this->S7<S>::a) +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(this->a) private(this->a) +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute default(none) private(b) firstprivate(argv) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d) + +template <class T, int N> +T tmain(T argc) { + T b = argc, c, d, e, f, g; + static T a; +// CHECK: static T a; +#pragma omp target +#pragma omp teams distribute + for (int i=0; i < 2; ++i) + a = 2; +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute +// CHECK-NEXT: for (int i = 0; i < 2; ++i) +// CHECK-NEXT: a = 2; +#pragma omp target +#pragma omp teams distribute private(argc, b), firstprivate(c, d), collapse(2) + for (int i = 0; i < 10; ++i) + for (int j = 0; j < 10; ++j) + foo(); +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(argc,b) firstprivate(c,d) collapse(2) +// CHECK-NEXT: for (int i = 0; i < 10; ++i) +// CHECK-NEXT: for (int j = 0; j < 10; ++j) +// CHECK-NEXT: foo(); + for (int i = 0; i < 10; ++i) + foo(); +// CHECK: for (int i = 0; i < 10; ++i) +// CHECK-NEXT: foo(); +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) + foo(); +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute +// CHECK-NEXT: for (int i = 0; i < 10; ++i) +// CHECK-NEXT: foo(); +#pragma omp target +#pragma omp teams distribute default(none), private(b) firstprivate(argc) shared(d) reduction(+:c) reduction(max:e) num_teams(f) thread_limit(d) + for (int k = 0; k < 10; ++k) + e += d + argc; +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute default(none) private(b) firstprivate(argc) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d) +// CHECK-NEXT: for (int k = 0; k < 10; ++k) +// CHECK-NEXT: e += d + argc; + return T(); +} + +int main (int argc, char **argv) { + int b = argc, c, d, e, f, g; + static int a; +// CHECK: static int a; +#pragma omp target +#pragma omp teams distribute + for (int i=0; i < 2; ++i) + a = 2; +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute +// CHECK-NEXT: for (int i = 0; i < 2; ++i) +// CHECK-NEXT: a = 2; +#pragma omp target +#pragma omp teams distribute private(argc,b),firstprivate(argv, c), collapse(2) + for (int i = 0; i < 10; ++i) + for (int j = 0; j < 10; ++j) + foo(); +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute private(argc,b) firstprivate(argv,c) collapse(2) +// CHECK-NEXT: for (int i = 0; i < 10; ++i) +// CHECK-NEXT: for (int j = 0; j < 10; ++j) +// CHECK-NEXT: foo(); + for (int i = 0; i < 10; ++i) + foo(); +// CHECK: for (int i = 0; i < 10; ++i) +// CHECK-NEXT: foo(); +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i)foo(); +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute +// CHECK-NEXT: for (int i = 0; i < 10; ++i) +// CHECK-NEXT: foo(); +#pragma omp target +#pragma omp teams distribute default(none), private(b) firstprivate(argc) shared(d) reduction(+:c) reduction(max:e) num_teams(f) thread_limit(d) + for (int k = 0; k < 10; ++k) + e += d + argc; +// CHECK: #pragma omp target +// CHECK-NEXT: #pragma omp teams distribute default(none) private(b) firstprivate(argc) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d) +// CHECK-NEXT: for (int k = 0; k < 10; ++k) +// CHECK-NEXT: e += d + argc; + return (0); +} + +#endif diff --git a/test/OpenMP/teams_distribute_collapse_messages.cpp b/test/OpenMP/teams_distribute_collapse_messages.cpp new file mode 100644 index 0000000000..e21eab28c3 --- /dev/null +++ b/test/OpenMP/teams_distribute_collapse_messages.cpp @@ -0,0 +1,150 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note {{declared here}} + +template <class T, typename S, int N, int ST> // expected-note {{declared here}} +T tmain(T argc, S **argv) { //expected-note 2 {{declared here}} +#pragma omp target +#pragma omp teams distribute collapse // expected-error {{expected '(' after 'collapse'}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp target +#pragma omp teams distribute collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = ST; i < N; i++) + + argv[0][i] = argv[0][i] - argv[0][i-ST]; +#pragma omp target +#pragma omp teams distribute collapse () // expected-error {{expected expression}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +// expected-error@+4 {{expected ')'}} expected-note@+4 {{to match this '('}} +// expected-error@+3 2 {{expression is not an integral constant expression}} +// expected-note@+2 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} +#pragma omp target +#pragma omp teams distribute collapse (argc + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +// expected-error@+2 2 {{argument to 'collapse' clause must be a strictly positive integer value}} +#pragma omp target +#pragma omp teams distribute collapse (ST // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp target +#pragma omp teams distribute collapse (1)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp target +#pragma omp teams distribute collapse ((ST > 0) ? 1 + ST : 2) // expected-note 2 {{as specified in 'collapse' clause}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp teams distribute', but found only 1}} + +// expected-error@+4 2 {{directive '#pragma omp teams distribute' cannot contain more than one 'collapse' clause}} +// expected-error@+3 2 {{argument to 'collapse' clause must be a strictly positive integer value}} +// expected-error@+2 2 {{expression is not an integral constant expression}} +#pragma omp target +#pragma omp teams distribute collapse (foobool(argc)), collapse (true), collapse (-5) + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp distribute collapse (S) // expected-error {{'S' does not refer to a value}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +// expected-error@+2 2 {{expression is not an integral constant expression}} +#pragma omp target +#pragma omp teams distribute collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp target +#pragma omp teams distribute collapse (1) + for (int i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp target +#pragma omp teams distribute collapse (N) // expected-error {{argument to 'collapse' clause must be a strictly positive integer value}} + for (T i = ST; i < N; i++) + argv[0][i] = argv[0][i] - argv[0][i-ST]; + +#pragma omp target +#pragma omp teams distribute collapse (2) // expected-note {{as specified in 'collapse' clause}} + foo(); // expected-error {{expected 2 for loops after '#pragma omp teams distribute'}} + return argc; +} + +int main(int argc, char **argv) { +#pragma omp target +#pragma omp teams distribute collapse // expected-error {{expected '(' after 'collapse'}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +#pragma omp target +#pragma omp teams distribute collapse ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +#pragma omp target +#pragma omp teams distribute collapse () // expected-error {{expected expression}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +#pragma omp target +#pragma omp teams distribute collapse (4 // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-note {{as specified in 'collapse' clause}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute', but found only 1}} + +#pragma omp target +#pragma omp teams distribute collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} expected-note {{as specified in 'collapse' clause}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute', but found only 1}} + +#pragma omp target +#pragma omp teams distribute collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{expression is not an integral constant expression}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +// expected-error@+4 {{expression is not an integral constant expression}} +// expected-error@+3 2 {{directive '#pragma omp teams distribute' cannot contain more than one 'collapse' clause}} +// expected-error@+2 2 {{argument to 'collapse' clause must be a strictly positive integer value}} +#pragma omp target +#pragma omp teams distribute collapse (foobool(argc)), collapse (true), collapse (-5) + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +#pragma omp target +#pragma omp teams distribute collapse (S1) // expected-error {{'S1' does not refer to a value}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +// expected-error@+2 {{expression is not an integral constant expression}} +#pragma omp target +#pragma omp teams distribute collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 4; i < 12; i++) + argv[0][i] = argv[0][i] - argv[0][i-4]; + +// expected-error@+4 {{statement after '#pragma omp teams distribute' must be a for loop}} +// expected-note@+2 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}} +#pragma omp target +#pragma omp teams distribute collapse(collapse(tmain<int, char, -1, -2>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}} + foo(); + +#pragma omp target +#pragma omp teams distribute collapse (2) // expected-note {{as specified in 'collapse' clause}} + foo(); // expected-error {{expected 2 for loops after '#pragma omp teams distribute'}} + +// expected-note@+1 {{in instantiation of function template specialization 'tmain<int, char, 1, 0>' requested here}} + return tmain<int, char, 1, 0>(argc, argv); +} + diff --git a/test/OpenMP/teams_distribute_default_messages.cpp b/test/OpenMP/teams_distribute_default_messages.cpp new file mode 100644 index 0000000000..bf62930825 --- /dev/null +++ b/test/OpenMP/teams_distribute_default_messages.cpp @@ -0,0 +1,30 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo(); + +int main(int argc, char **argv) { + #pragma omp target + #pragma omp teams distribute default // expected-error {{expected '(' after 'default'}} + for (int i=0; i<200; i++) foo(); + #pragma omp target + #pragma omp teams distribute default ( // expected-error {{expected 'none' or 'shared' in OpenMP clause 'default'}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i=0; i<200; i++) foo(); + #pragma omp target + #pragma omp teams distribute default () // expected-error {{expected 'none' or 'shared' in OpenMP clause 'default'}} + for (int i=0; i<200; i++) foo(); + #pragma omp target + #pragma omp teams distribute default (none // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i=0; i<200; i++) foo(); + #pragma omp target + #pragma omp teams distribute default (shared), default(shared) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'default' clause}} + for (int i=0; i<200; i++) foo(); + #pragma omp target + #pragma omp teams distribute default (x) // expected-error {{expected 'none' or 'shared' in OpenMP clause 'default'}} + for (int i=0; i<200; i++) foo(); + + #pragma omp target + #pragma omp teams distribute default(none) + for (int i=0; i<200; i++) ++argc; // expected-error {{variable 'argc' must have explicitly specified data sharing attributes}} + + return 0; +} diff --git a/test/OpenMP/teams_distribute_dist_schedule_messages.cpp b/test/OpenMP/teams_distribute_dist_schedule_messages.cpp new file mode 100644 index 0000000000..d86722dd27 --- /dev/null +++ b/test/OpenMP/teams_distribute_dist_schedule_messages.cpp @@ -0,0 +1,104 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note {{declared here}} expected-note {{declared here}} + +template <class T, int N> +T tmain(T argc) { + T b = argc, c, d, e, f, g; + char ** argv; + static T a; +// CHECK: static T a; + +#pragma omp target +#pragma omp teams distribute dist_schedule // expected-error {{expected '(' after 'dist_schedule'}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule ( // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule () // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (argc)) // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, argc > 0 ? argv[1] : argv[2]) // expected-error2 {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static), dist_schedule (static, 1) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'dist_schedule' clause}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, S1) // expected-error {{'S1' does not refer to a value}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error3 {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int i = 0; i < 10; ++i) foo(); + + return T(); +} + +int main(int argc, char **argv) { +#pragma omp target +#pragma omp teams distribute dist_schedule // expected-error {{expected '(' after 'dist_schedule'}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule ( // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule () // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (argc)) // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, argc > 0 ? argv[1] : argv[2]) // expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static), dist_schedule (static, 1) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'dist_schedule' clause}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, S1) // expected-error {{'S1' does not refer to a value}} + for (int i = 0; i < 10; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute dist_schedule (static, argv[1]=2) // expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i = 0; i < 10; ++i) foo(); + + return (tmain<int, 5>(argc) + tmain<char, 1>(argv[0][0])); // expected-note {{in instantiation of function template specialization 'tmain<int, 5>' requested here}} expected-note {{in instantiation of function template specialization 'tmain<char, 1>' requested here}} +} diff --git a/test/OpenMP/teams_distribute_firstprivate_messages.cpp b/test/OpenMP/teams_distribute_firstprivate_messages.cpp new file mode 100644 index 0000000000..a710807743 --- /dev/null +++ b/test/OpenMP/teams_distribute_firstprivate_messages.cpp @@ -0,0 +1,152 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note {{declared here}} expected-note{{forward declaration of 'S1'}} +extern S1 a; +class S2 { + mutable int a; + +public: + S2() : a(0) {} + S2(const S2 &s2) : a(s2.a) {} + static float S2s; + static const float S2sc; +}; +const float S2::S2sc = 0; +const S2 b; +const S2 ba[5]; +class S3 { + int a; + S3 &operator=(const S3 &s3); + +public: + S3() : a(0) {} // expected-note {{candidate constructor not viable: requires 0 arguments, but 1 was provided}} + S3(S3 &s3) : a(s3.a) {} // expected-note {{candidate constructor not viable: 1st argument ('const S3') would lose const qualifier}} +}; +const S3 c; +const S3 ca[5]; +extern const int f; +class S4 { + int a; + S4(); + S4(const S4 &s4); +public: + S4(int v):a(v) { } +}; +class S5 { + int a; + S5():a(0) {} + S5(const S5 &s5):a(s5.a) { } +public: + S5(int v):a(v) { } +}; +class S6 { + int a; +public: + S6() : a(0) { } +}; + +S3 h; +#pragma omp threadprivate(h) // expected-note {{defined as threadprivate or thread local}} + +int main(int argc, char **argv) { + const int d = 5; + const int da[5] = { 0 }; + S4 e(4); + S5 g(5); + S6 p; + int i; + int &j = i; + +#pragma omp target +#pragma omp teams distribute firstprivate // expected-error {{expected '(' after 'firstprivate'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate () // expected-error {{expected expression}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (argc) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (S1) // expected-error {{'S1' does not refer to a value}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (a, b, c, d, f) // expected-error {{firstprivate variable with incomplete type 'S1'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate (argv[1]) // expected-error {{expected variable name}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(ba) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(ca) // expected-error {{no matching constructor for initialization of 'S3'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(da) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(S2::S2s) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(S2::S2sc) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(h) // expected-error {{threadprivate or thread local variable cannot be firstprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute private(i), firstprivate(i) // expected-error {{private variable cannot be firstprivate}} expected-note{{defined as private}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(i) + for (j = 0; j < argc; ++j) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(i) // expected-note {{defined as firstprivate}} + for (i = 0; i < argc; ++i) foo(); // expected-error {{loop iteration variable in the associated loop of 'omp teams distribute' directive may not be firstprivate, predetermined as private}} + +#pragma omp target +#pragma omp teams distribute firstprivate(j) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(argc), firstprivate(argc) // OK + for (i = 0; i < argc; ++i) foo(); + + return 0; +} diff --git a/test/OpenMP/teams_distribute_lastprivate_messages.cpp b/test/OpenMP/teams_distribute_lastprivate_messages.cpp new file mode 100644 index 0000000000..b892141d50 --- /dev/null +++ b/test/OpenMP/teams_distribute_lastprivate_messages.cpp @@ -0,0 +1,272 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note 2 {{declared here}} expected-note 2 {{forward declaration of 'S1'}} +extern S1 a; +class S2 { + mutable int a; + +public: + S2() : a(0) {} + S2(S2 &s2) : a(s2.a) {} + const S2 &operator =(const S2&) const; + S2 &operator =(const S2&); + static float S2s; // expected-note {{static data member is predetermined as shared}} + static const float S2sc; +}; +const float S2::S2sc = 0; // expected-note {{static data member is predetermined as shared}} +const S2 b; +const S2 ba[5]; +class S3 { + int a; + S3 &operator=(const S3 &s3); // expected-note 2 {{implicitly declared private here}} + +public: + S3() : a(0) {} + S3(S3 &s3) : a(s3.a) {} +}; +const S3 c; // expected-note {{global variable is predetermined as shared}} +const S3 ca[5]; // expected-note {{global variable is predetermined as shared}} +extern const int f; // expected-note {{global variable is predetermined as shared}} +class S4 { + int a; + S4(); // expected-note 3 {{implicitly declared private here}} + S4(const S4 &s4); + +public: + S4(int v) : a(v) {} +}; +class S5 { + int a; + S5() : a(0) {} // expected-note {{implicitly declared private here}} + +public: + S5(const S5 &s5) : a(s5.a) {} + S5(int v) : a(v) {} +}; +class S6 { + int a; + S6() : a(0) {} + +public: + S6(const S6 &s6) : a(s6.a) {} + S6(int v) : a(v) {} +}; + +S3 h; +#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}} + +template <class I, class C> +int foomain(int argc, char **argv) { + I e(4); + I g(5); + int i; + int &j = i; +#pragma omp target +#pragma omp teams distribute lastprivate // expected-error {{expected '(' after 'lastprivate'}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate() // expected-error {{expected expression}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(argc) + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(S1) // expected-error {{'S1' does not refer to a value}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(a, b) // expected-error {{lastprivate variable with incomplete type 'S1'}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(argv[1]) // expected-error {{expected variable name}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(e, g) // expected-error 2 {{calling a private constructor of class 'S4'}} + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}} + for (int k = 0; k < argc; ++k) ++k; + + int v = 0; +#pragma omp target +#pragma omp teams distribute lastprivate(i) + for (int k = 0; k < argc; ++k) { + i = k; + v += i; + } + +#pragma omp target +#pragma omp teams distribute lastprivate(j) private(i) + for (int k = 0; k < argc; ++k) ++k; + +#pragma omp target +#pragma omp teams distribute lastprivate(i) + for (int k = 0; k < argc; ++k) ++k; + + return 0; +} + +void bar(S4 a[2]) { +#pragma omp target +#pragma omp teams distribute lastprivate(a) + for (int i = 0; i < 2; ++i) foo(); +} + +namespace A { +double x; +#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}} +} +namespace B { +using A::x; +} + +int main(int argc, char **argv) { + const int d = 5; // expected-note {{constant variable is predetermined as shared}} + const int da[5] = {0}; // expected-note {{constant variable is predetermined as shared}} + S4 e(4); + S5 g(5); + S3 m; + S6 n(2); + int i; + int &j = i; +#pragma omp target +#pragma omp teams distribute lastprivate // expected-error {{expected '(' after 'lastprivate'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate() // expected-error {{expected expression}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(argc) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(S1) // expected-error {{'S1' does not refer to a value}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(a, b, c, d, f) // expected-error {{lastprivate variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(argv[1]) // expected-error {{expected variable name}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(2 * 2) // expected-error {{expected variable name}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(ba) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(da) // expected-error {{shared variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + + int xa; +#pragma omp target +#pragma omp teams distribute lastprivate(xa) // OK + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(e, g) // expected-error {{calling a private constructor of class 'S4'}} expected-error {{calling a private constructor of class 'S5'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(m) // expected-error {{'operator=' is a private member of 'S3'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(h) // expected-error {{threadprivate or thread local variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(B::x) // expected-error {{threadprivate or thread local variable cannot be lastprivate}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute private(xa), lastprivate(xa) // expected-error {{private variable cannot be lastprivate}} expected-note {{defined as private}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(xa) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(j) + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute firstprivate(m) lastprivate(m) // expected-error {{'operator=' is a private member of 'S3'}} + for (i = 0; i < argc; ++i) foo(); + +#pragma omp target +#pragma omp teams distribute lastprivate(n) firstprivate(n) // OK + for (i = 0; i < argc; ++i) foo(); + + static int si; +#pragma omp target +#pragma omp teams distribute lastprivate(si) // OK + for (i = 0; i < argc; ++i) si = i + 1; + + return foomain<S4, S5>(argc, argv); // expected-note {{in instantiation of function template specialization 'foomain<S4, S5>' requested here}} +} diff --git a/test/OpenMP/teams_distribute_loop_messages.cpp b/test/OpenMP/teams_distribute_loop_messages.cpp new file mode 100644 index 0000000000..dbfd9ef03c --- /dev/null +++ b/test/OpenMP/teams_distribute_loop_messages.cpp @@ -0,0 +1,716 @@ +// RUN: %clang_cc1 -fsyntax-only -fopenmp -x c++ -std=c++11 -fexceptions -fcxx-exceptions -verify %s + +class S { + int a; + S() : a(0) {} + +public: + S(int v) : a(v) {} + S(const S &s) : a(s.a) {} +}; + +static int sii; +// expected-note@+1 {{defined as threadprivate or thread local}} +#pragma omp threadprivate(sii) +static int globalii; + +int test_iteration_spaces() { + const int N = 100; + float a[N], b[N], c[N]; + int ii, jj, kk; + float fii; + double dii; +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; i += 1) { + c[i] = a[i] + b[i]; + } +#pragma omp target +#pragma omp teams distribute + for (char i = 0; i < 10; i++) { + c[i] = a[i] + b[i]; + } +#pragma omp target +#pragma omp teams distribute + for (char i = 0; i < 10; i += '\1') { + c[i] = a[i] + b[i]; + } +#pragma omp target +#pragma omp teams distribute + for (long long i = 0; i < 10; i++) { + c[i] = a[i] + b[i]; + } +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{expression must have integral or unscoped enumeration type, not 'double'}} + for (long long i = 0; i < 10; i += 1.5) { + c[i] = a[i] + b[i]; + } +#pragma omp target +#pragma omp teams distribute + for (long long i = 0; i < 'z'; i += 1u) { + c[i] = a[i] + b[i]; + } +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{variable must be of integer or random access iterator type}} + for (float fi = 0; fi < 10.0; fi++) { + c[(int)fi] = a[(int)fi] + b[(int)fi]; + } +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{variable must be of integer or random access iterator type}} + for (double fi = 0; fi < 10.0; fi++) { + c[(int)fi] = a[(int)fi] + b[(int)fi]; + } +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (int &ref = ii; ref < 10; ref++) { + } +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (int i; i < 10; i++) + c[i] = a[i]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (int i = 0, j = 0; i < 10; ++i) + c[i] = a[i]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (; ii < 10; ++ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-warning@+2 {{expression result unused}} +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (ii + 1; ii < 10; ++ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (c[ii] = 0; ii < 10; ++ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// Ok to skip parenthesises. + for (((ii)) = 0; ii < 10; ++ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}} + for (int i = 0; i; i++) + c[i] = a[i]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}} +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'i'}} + for (int i = 0; jj < kk; ii++) + c[i] = a[i]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}} + for (int i = 0; !!i; i++) + c[i] = a[i]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}} + for (int i = 0; i != 1; i++) + c[i] = a[i]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}} + for (int i = 0;; i++) + c[i] = a[i]; + +// Ok. +#pragma omp target +#pragma omp teams distribute + for (int i = 11; i > 10; i--) + c[i] = a[i]; + +// Ok. +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) + c[i] = a[i]; + +// Ok. +#pragma omp target +#pragma omp teams distribute + for (ii = 0; ii < 10; ++ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10; ++jj) + c[ii] = a[jj]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10; ++++ii) + c[ii] = a[ii]; + +// Ok but undefined behavior (in general, cannot check that incr +// is really loop-invariant). +#pragma omp target +#pragma omp teams distribute + for (ii = 0; ii < 10; ii = ii + ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{expression must have integral or unscoped enumeration type, not 'float'}} + for (ii = 0; ii < 10; ii = ii + 1.0f) + c[ii] = a[ii]; + +// Ok - step was converted to integer type. +#pragma omp target +#pragma omp teams distribute + for (ii = 0; ii < 10; ii = ii + (int)1.1f) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10; jj = ii + 2) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-warning@+2 {{relational comparison result unused}} +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii<10; jj> kk + 2) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10;) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-warning@+2 {{expression result unused}} +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10; !ii) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10; ii ? ++ii : ++jj) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'ii'}} + for (ii = 0; ii < 10; ii = ii < 10) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}} + for (ii = 0; ii < 10; ii = ii + 0) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}} + for (ii = 0; ii < 10; ii = ii + (int)(0.8 - 0.45)) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}} + for (ii = 0; (ii) < 10; ii -= 25) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}} + for (ii = 0; (ii < 10); ii -= 0) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to decrease on each iteration of OpenMP for loop}} + for (ii = 0; ii > 10; (ii += 0)) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}} + for (ii = 0; ii < 10; (ii) = (1 - 1) + (ii)) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to decrease on each iteration of OpenMP for loop}} + for ((ii = 0); ii > 10; (ii -= 0)) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'ii' to increase on each iteration of OpenMP for loop}} + for (ii = 0; (ii < 10); (ii -= 0)) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute firstprivate(ii) // expected-note {{defined as firstprivate}} +// expected-error@+1 {{loop iteration variable in the associated loop of 'omp teams distribute' directive may not be firstprivate, predetermined as private}} + for (ii = 0; ii < 10; ii++) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute private(ii) +// OK + for (ii = 0; ii < 10; ii++) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute lastprivate(ii) +// OK + for (ii = 0; ii < 10; ii++) + c[ii] = a[ii]; + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{loop iteration variable in the associated loop of 'omp teams distribute' directive may not be threadprivate or thread local, predetermined as private}} + for (sii = 0; sii < 10; sii++) + c[sii] = a[sii]; + + { +#pragma omp target +#pragma omp teams distribute collapse(2) + for (ii = 0; ii < 10; ii += 1) + for (globalii = 0; globalii < 10; globalii += 1) + c[globalii] += a[globalii] + ii; + } + +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{statement after '#pragma omp teams distribute' must be a for loop}} + for (auto &item : a) { + item = item + 1; + } + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'i' to increase on each iteration of OpenMP for loop}} + for (unsigned i = 9; i < 10; i--) { + c[i] = a[i] + b[i]; + } + + int(*lb)[4] = nullptr; +#pragma omp target +#pragma omp teams distribute + for (int(*p)[4] = lb; p < lb + 8; ++p) { + } + +#pragma omp target +#pragma omp teams distribute +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (int a{0}; a < 10; ++a) { + } + + return 0; +} + +// Iterators allowed in openmp for-loops. +namespace std { +struct random_access_iterator_tag {}; +template <class Iter> +struct iterator_traits { + typedef typename Iter::difference_type difference_type; + typedef typename Iter::iterator_category iterator_category; +}; +template <class Iter> +typename iterator_traits<Iter>::difference_type +distance(Iter first, Iter last) { return first - last; } +} +class Iter0 { +public: + Iter0() {} + Iter0(const Iter0 &) {} + Iter0 operator++() { return *this; } + Iter0 operator--() { return *this; } + bool operator<(Iter0 a) { return true; } +}; +// expected-note@+2 {{candidate function not viable: no known conversion from 'GoodIter' to 'Iter0' for 1st argument}} +// expected-note@+1 2 {{candidate function not viable: no known conversion from 'Iter1' to 'Iter0' for 1st argument}} +int operator-(Iter0 a, Iter0 b) { return 0; } +class Iter1 { +public: + Iter1(float f = 0.0f, double d = 0.0) {} + Iter1(const Iter1 &) {} + Iter1 operator++() { return *this; } + Iter1 operator--() { return *this; } + bool operator<(Iter1 a) { return true; } + bool operator>=(Iter1 a) { return false; } +}; +class GoodIter { +public: + GoodIter() {} + GoodIter(const GoodIter &) {} + GoodIter(int fst, int snd) {} + GoodIter &operator=(const GoodIter &that) { return *this; } + GoodIter &operator=(const Iter0 &that) { return *this; } + GoodIter &operator+=(int x) { return *this; } + explicit GoodIter(void *) {} + GoodIter operator++() { return *this; } + GoodIter operator--() { return *this; } + bool operator!() { return true; } + bool operator<(GoodIter a) { return true; } + bool operator<=(GoodIter a) { return true; } + bool operator>=(GoodIter a) { return false; } + typedef int difference_type; + typedef std::random_access_iterator_tag iterator_category; +}; +// expected-note@+2 {{candidate function not viable: no known conversion from 'const Iter0' to 'GoodIter' for 2nd argument}} +// expected-note@+1 2 {{candidate function not viable: no known conversion from 'Iter1' to 'GoodIter' for 1st argument}} +int operator-(GoodIter a, GoodIter b) { return 0; } +// expected-note@+1 3 {{candidate function not viable: requires single argument 'a', but 2 arguments were provided}} +GoodIter operator-(GoodIter a) { return a; } +// expected-note@+2 {{candidate function not viable: no known conversion from 'const Iter0' to 'int' for 2nd argument}} +// expected-note@+1 2 {{candidate function not viable: no known conversion from 'Iter1' to 'GoodIter' for 1st argument}} +GoodIter operator-(GoodIter a, int v) { return GoodIter(); } +// expected-note@+1 2 {{candidate function not viable: no known conversion from 'Iter0' to 'GoodIter' for 1st argument}} +GoodIter operator+(GoodIter a, int v) { return GoodIter(); } +// expected-note@+2 {{candidate function not viable: no known conversion from 'GoodIter' to 'int' for 1st argument}} +// expected-note@+1 2 {{candidate function not viable: no known conversion from 'Iter1' to 'int' for 1st argument}} +GoodIter operator-(int v, GoodIter a) { return GoodIter(); } +// expected-note@+1 2 {{candidate function not viable: no known conversion from 'Iter0' to 'int' for 1st argument}} +GoodIter operator+(int v, GoodIter a) { return GoodIter(); } + +int test_with_random_access_iterator() { + GoodIter begin, end; + Iter0 begin0, end0; +#pragma omp target +#pragma omp teams distribute + for (GoodIter I = begin; I < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (GoodIter &I = begin; I < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute + for (GoodIter I = begin; I >= end; --I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (GoodIter I(begin); I < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (GoodIter I(nullptr); I < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (GoodIter I(0); I < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (GoodIter I(1, 2); I < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute + for (begin = GoodIter(0); begin < end; ++begin) + ++begin; +#pragma omp target +#pragma omp teams distribute +// expected-error@+2 {{invalid operands to binary expression ('GoodIter' and 'const Iter0')}} +// expected-error@+1 {{could not calculate number of iterations calling 'operator-' with upper and lower loop bounds}} + for (begin = begin0; begin < end; ++begin) + ++begin; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (++begin; begin < end; ++begin) + ++begin; +#pragma omp target +#pragma omp teams distribute + for (begin = end; begin < end; ++begin) + ++begin; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}} + for (GoodIter I = begin; I - I; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}} + for (GoodIter I = begin; begin < end; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'I'}} + for (GoodIter I = begin; !I; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}} + for (GoodIter I = begin; I >= end; I = I + 1) + ++I; +#pragma omp target +#pragma omp teams distribute + for (GoodIter I = begin; I >= end; I = I - 1) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'I'}} + for (GoodIter I = begin; I >= end; I = -I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}} + for (GoodIter I = begin; I >= end; I = 2 + I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{increment clause of OpenMP for loop must perform simple addition or subtraction on loop variable 'I'}} + for (GoodIter I = begin; I >= end; I = 2 - I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+1 {{invalid operands to binary expression ('Iter0' and 'int')}} + for (Iter0 I = begin0; I < end0; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// Initializer is constructor without params. +// expected-error@+2 {{invalid operands to binary expression ('Iter0' and 'int')}} +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (Iter0 I; I < end0; ++I) + ++I; + Iter1 begin1, end1; +#pragma omp target +#pragma omp teams distribute +// expected-error@+2 {{invalid operands to binary expression ('Iter1' and 'Iter1')}} +// expected-error@+1 {{could not calculate number of iterations calling 'operator-' with upper and lower loop bounds}} + for (Iter1 I = begin1; I < end1; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}} + for (Iter1 I = begin1; I >= end1; ++I) + ++I; +#pragma omp target +#pragma omp teams distribute +// expected-error@+4 {{invalid operands to binary expression ('Iter1' and 'float')}} +// expected-error@+3 {{could not calculate number of iterations calling 'operator-' with upper and lower loop bounds}} +// Initializer is constructor with all default params. +// expected-warning@+1 {{initialization clause of OpenMP for loop is not in canonical form ('var = init' or 'T var = init')}} + for (Iter1 I; I < end1; ++I) { + } + return 0; +} + +template <typename IT, int ST> +class TC { +public: + int dotest_lt(IT begin, IT end) { +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'I' to increase on each iteration of OpenMP for loop}} + for (IT I = begin; I < end; I = I + ST) { + ++I; + } +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be positive due to this condition}} +// expected-error@+1 {{increment expression must cause 'I' to increase on each iteration of OpenMP for loop}} + for (IT I = begin; I <= end; I += ST) { + ++I; + } +#pragma omp target +#pragma omp teams distribute + for (IT I = begin; I < end; ++I) { + ++I; + } + } + + static IT step() { + return IT(ST); + } +}; +template <typename IT, int ST = 0> +int dotest_gt(IT begin, IT end) { +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}} + for (IT I = begin; I >= end; I = I + ST) { + ++I; + } +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 2 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}} + for (IT I = begin; I >= end; I += ST) { + ++I; + } + +#pragma omp target +#pragma omp teams distribute +// expected-note@+2 {{loop step is expected to be negative due to this condition}} +// expected-error@+1 {{increment expression must cause 'I' to decrease on each iteration of OpenMP for loop}} + for (IT I = begin; I >= end; ++I) { + ++I; + } + +#pragma omp target +#pragma omp teams distribute + for (IT I = begin; I < end; I += TC<int, ST>::step()) { + ++I; + } +} + +void test_with_template() { + GoodIter begin, end; + TC<GoodIter, 100> t1; + TC<GoodIter, -100> t2; + t1.dotest_lt(begin, end); + t2.dotest_lt(begin, end); // expected-note {{in instantiation of member function 'TC<GoodIter, -100>::dotest_lt' requested here}} + dotest_gt(begin, end); // expected-note {{in instantiation of function template specialization 'dotest_gt<GoodIter, 0>' requested here}} + dotest_gt<unsigned, -10>(0, 100); // expected-note {{in instantiation of function template specialization 'dotest_gt<unsigned int, -10>' requested here}} +} + +void test_loop_break() { + const int N = 100; + float a[N], b[N], c[N]; +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; i++) { + c[i] = a[i] + b[i]; + for (int j = 0; j < 10; ++j) { + if (a[i] > b[j]) + break; // OK in nested loop + } + switch (i) { + case 1: + b[i]++; + break; + default: + break; + } + if (c[i] > 10) + break; // expected-error {{'break' statement cannot be used in OpenMP for loop}} + + if (c[i] > 11) + break; // expected-error {{'break' statement cannot be used in OpenMP for loop}} + } + +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; i++) { + for (int j = 0; j < 10; j++) { + c[i] = a[i] + b[i]; + if (c[i] > 10) { + if (c[i] < 20) { + break; // OK + } + } + } + } +} + +void test_loop_eh() { + const int N = 100; + float a[N], b[N], c[N]; +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; i++) { + c[i] = a[i] + b[i]; + try { // OK + for (int j = 0; j < 10; ++j) { + if (a[i] > b[j]) + throw a[i]; // OK + } + throw a[i]; // OK + } catch (float f) { + if (f > 0.1) + throw a[i]; // OK + return; // expected-error {{cannot return from OpenMP region}} + } + switch (i) { + case 1: + b[i]++; + break; + default: + break; + } + for (int j = 0; j < 10; j++) { + if (c[i] > 10) + throw c[i]; // OK + } + } + if (c[9] > 10) + throw c[9]; // OK + +#pragma omp target +#pragma omp teams distribute + for (int i = 0; i < 10; ++i) { + struct S { + void g() { throw 0; } + }; + } +} + +void test_loop_firstprivate_lastprivate() { + S s(4); +#pragma omp target +#pragma omp teams distribute lastprivate(s) firstprivate(s) + for (int i = 0; i < 16; ++i) + ; +} + +void test_ordered() { +#pragma omp target +#pragma omp teams distribute ordered // expected-error {{unexpected OpenMP clause 'ordered' in directive '#pragma omp teams distribute'}} + for (int i = 0; i < 16; ++i) + ; +} + +void test_nowait() { +#pragma omp target +// expected-error@+1 2 {{unexpected OpenMP clause 'nowait' in directive '#pragma omp teams distribute'}} +#pragma omp teams distribute nowait nowait // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'nowait' clause}} + for (int i = 0; i < 16; ++i) + ; +} + diff --git a/test/OpenMP/teams_distribute_num_teams_messages.cpp b/test/OpenMP/teams_distribute_num_teams_messages.cpp new file mode 100644 index 0000000000..6086abd920 --- /dev/null +++ b/test/OpenMP/teams_distribute_num_teams_messages.cpp @@ -0,0 +1,111 @@ +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 -ferror-limit 100 -o - %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note 2 {{declared here}} + +template <typename T, int C> // expected-note {{declared here}} +T tmain(T argc) { + char **a; +#pragma omp target +#pragma omp teams distribute num_teams(C) + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(T) // expected-error {{'T' does not refer to a value}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams // expected-error {{expected '(' after 'num_teams'}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams() // expected-error {{expected expression}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(argc > 0 ? a[1] : a[2]) // expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(argc + argc) + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(argc), num_teams (argc+1) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'num_teams' clause}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(S1) // expected-error {{'S1' does not refer to a value}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(-2) // expected-error {{argument to 'num_teams' clause must be a strictly positive integer value}} + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(-10u) + for (int i=0; i<100; i++) foo(); +#pragma omp target +#pragma omp teams distribute num_teams(3.14) // expected-error 2 {{expression must have integral or unscoped enumeration type, not 'double'}} + for (int i=0; i<100; i++) foo(); + + return 0; +} + +int main(int argc, char **argv) { +#pragma omp target +#pragma omp teams distribute num_teams // expected-error {{expected '(' after 'num_teams'}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams () // expected-error {{expected expression}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (argc > 0 ? argv[1] : argv[2]) // expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (argc + argc) + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (argc), num_teams (argc+1) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'num_teams' clause}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (S1) // expected-error {{'S1' does not refer to a value}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (-2) // expected-error {{argument to 'num_teams' clause must be a strictly positive integer value}} + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (-10u) + for (int i=0; i<100; i++) foo(); + +#pragma omp target +#pragma omp teams distribute num_teams (3.14) // expected-error {{expression must have integral or unscoped enumeration type, not 'double'}} + for (int i=0; i<100; i++) foo(); + + return tmain<int, 10>(argc); // expected-note {{in instantiation of function template specialization 'tmain<int, 10>' requested here}} +} diff --git a/test/OpenMP/teams_distribute_private_messages.cpp b/test/OpenMP/teams_distribute_private_messages.cpp new file mode 100644 index 0000000000..aff1f53989 --- /dev/null +++ b/test/OpenMP/teams_distribute_private_messages.cpp @@ -0,0 +1,146 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note {{declared here}} expected-note {{forward declaration of 'S1'}} +extern S1 a; +class S2 { + mutable int a; +public: + S2():a(0) { } + static float S2s; // expected-note {{predetermined as shared}} +}; +const S2 b; +const S2 ba[5]; +class S3 { + int a; +public: + S3():a(0) { } +}; +const S3 c; // expected-note {{predetermined as shared}} +const S3 ca[5]; // expected-note {{predetermined as shared}} +extern const int f; // expected-note {{predetermined as shared}} +class S4 { + int a; + S4(); // expected-note {{implicitly declared private here}} +public: + S4(int v):a(v) { } +}; +class S5 { + int a; + S5():a(0) {} // expected-note {{implicitly declared private here}} +public: + S5(int v):a(v) { } +}; + +S3 h; +#pragma omp threadprivate(h) // expected-note {{defined as threadprivate or thread local}} + + +int main(int argc, char **argv) { + const int d = 5; // expected-note {{predetermined as shared}} + const int da[5] = { 0 }; // expected-note {{predetermined as shared}} + S4 e(4); + S5 g(5); + int i; + int &j = i; + + #pragma omp target + #pragma omp teams distribute private // expected-error {{expected '(' after 'private'}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private () // expected-error {{expected expression}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (argc) + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (S1) // expected-error {{'S1' does not refer to a value}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (a, b, c, d, f) // expected-error {{private variable with incomplete type 'S1'}} expected-error 3 {{shared variable cannot be private}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private (argv[1]) // expected-error {{expected variable name}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(ba) + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(ca) // expected-error {{shared variable cannot be private}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(da) // expected-error {{shared variable cannot be private}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(S2::S2s) // expected-error {{shared variable cannot be private}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(e, g) // expected-error {{calling a private constructor of class 'S4'}} expected-error {{calling a private constructor of class 'S5'}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(h) // expected-error {{threadprivate or thread local variable cannot be private}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute shared(i) + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute firstprivate(i), private(i) // expected-error {{firstprivate variable cannot be private}} expected-note {{defined as firstprivate}} + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute private(j) + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp target + #pragma omp teams distribute reduction(+:i) + for (int k = 0; k < argc; ++k) ++k; + + #pragma omp distribute private(i) + for (int k = 0; k < 10; ++k) { + #pragma omp target + #pragma omp teams distribute private(i) + for (int x = 0; x < 10; ++x) foo(); + } + + #pragma omp target + #pragma omp teams distribute firstprivate(i) + for (int k = 0; k < 10; ++k) { + } + + return 0; +} diff --git a/test/OpenMP/teams_distribute_reduction_messages.cpp b/test/OpenMP/teams_distribute_reduction_messages.cpp new file mode 100644 index 0000000000..63023c2844 --- /dev/null +++ b/test/OpenMP/teams_distribute_reduction_messages.cpp @@ -0,0 +1,303 @@ +// RUN: %clang_cc1 -verify -fopenmp %s +// RUN: %clang_cc1 -verify -fopenmp -std=c++98 %s +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note {{declared here}} expected-note 4 {{forward declaration of 'S1'}} +extern S1 a; +class S2 { + mutable int a; + S2 &operator+(const S2 &arg) { return (*this); } // expected-note 3 {{implicitly declared private here}} + +public: + S2() : a(0) {} + S2(S2 &s2) : a(s2.a) {} + static float S2s; // expected-note 2 {{static data member is predetermined as shared}} + static const float S2sc; +}; +const float S2::S2sc = 0; // expected-note 2 {{'S2sc' defined here}} +S2 b; // expected-note 3 {{'b' defined here}} +const S2 ba[5]; // expected-note 2 {{'ba' defined here}} +class S3 { + int a; + +public: + int b; + S3() : a(0) {} + S3(const S3 &s3) : a(s3.a) {} + S3 operator+(const S3 &arg1) { return arg1; } +}; +int operator+(const S3 &arg1, const S3 &arg2) { return 5; } +S3 c; // expected-note 3 {{'c' defined here}} +const S3 ca[5]; // expected-note 2 {{'ca' defined here}} +extern const int f; // expected-note 4 {{'f' declared here}} +class S4 { + int a; + S4(); // expected-note {{implicitly declared private here}} + S4(const S4 &s4); + S4 &operator+(const S4 &arg) { return (*this); } + +public: + S4(int v) : a(v) {} +}; +S4 &operator&=(S4 &arg1, S4 &arg2) { return arg1; } +class S5 { + int a; + S5() : a(0) {} // expected-note {{implicitly declared private here}} + S5(const S5 &s5) : a(s5.a) {} + S5 &operator+(const S5 &arg); + +public: + S5(int v) : a(v) {} +}; +class S6 { // expected-note 3 {{candidate function (the implicit copy assignment operator) not viable: no known conversion from 'int' to 'const S6' for 1st argument}} +#if __cplusplus >= 201103L // C++11 or later +// expected-note@-2 3 {{candidate function (the implicit move assignment operator) not viable}} +#endif + int a; + +public: + S6() : a(6) {} + operator int() { return 6; } +} o; + +S3 h, k; +#pragma omp threadprivate(h) // expected-note 2 {{defined as threadprivate or thread local}} + +template <class T> // expected-note {{declared here}} +T tmain(T argc) { + const T d = T(); // expected-note 4 {{'d' defined here}} + const T da[5] = {T()}; // expected-note 2 {{'da' defined here}} + T qa[5] = {T()}; + T i; + T &j = i; // expected-note 4 {{'j' defined here}} + S3 &p = k; // expected-note 2 {{'p' defined here}} + const T &r = da[(int)i]; // expected-note 2 {{'r' defined here}} + T &q = qa[(int)i]; // expected-note 2 {{'q' defined here}} + T fl; +#pragma omp target +#pragma omp teams distribute reduction // expected-error {{expected '(' after 'reduction'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(& : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{invalid operands to binary expression ('float' and 'float')}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(|| : argc ? i : argc) // expected-error 2 {{expected variable name, array element or array section}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(foo : argc) //expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max' or declare reduction for type 'float'}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max' or declare reduction for type 'int'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(&& : argc) + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(^ : T) // expected-error {{'T' does not refer to a value}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : a, b, c, d, f) // expected-error {{a reduction list item with incomplete type 'S1'}} expected-error 3 {{const-qualified list item cannot be reduction}} expected-error 2 {{'operator+' is a private member of 'S2'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(min : a, b, c, d, f) // expected-error {{a reduction list item with incomplete type 'S1'}} expected-error 4 {{arguments of OpenMP clause 'reduction' for 'min' or 'max' must be of arithmetic type}} expected-error 3 {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(max : h.b) // expected-error {{expected variable name, array element or array section}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : ba) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(* : ca) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(- : da) // expected-error {{const-qualified list item cannot be reduction}} expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(^ : fl) // expected-error {{invalid operands to binary expression ('float' and 'float')}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(&& : S2::S2sc) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : h, k) // expected-error {{threadprivate or thread local variable cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : o) // expected-error 2 {{no viable overloaded '='}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute private(i), reduction(+ : j), reduction(+ : q) // expected-error 4 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}} + for (int j=0; j<100; j++) foo(); +#pragma omp parallel private(k) +#pragma omp target +#pragma omp teams distribute reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : p), reduction(+ : p) // expected-error 2 {{variable can appear only once in OpenMP 'reduction' clause}} expected-note 2 {{previously referenced here}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : r) // expected-error 2 {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp parallel shared(i) +#pragma omp parallel reduction(min : i) +#pragma omp target +#pragma omp teams distribute reduction(max : j) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : fl) + for (int j=0; j<100; j++) foo(); + + return T(); +} + +namespace A { +double x; +#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}} +} +namespace B { +using A::x; +} + +int main(int argc, char **argv) { + const int d = 5; // expected-note 2 {{'d' defined here}} + const int da[5] = {0}; // expected-note {{'da' defined here}} + int qa[5] = {0}; + S4 e(4); + S5 g(5); + int i; + int &j = i; // expected-note 2 {{'j' defined here}} + S3 &p = k; // expected-note 2 {{'p' defined here}} + const int &r = da[i]; // expected-note {{'r' defined here}} + int &q = qa[i]; // expected-note {{'q' defined here}} + float fl; +#pragma omp target +#pragma omp teams distribute reduction // expected-error {{expected '(' after 'reduction'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction( // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(- // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction() // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(*) // expected-warning {{missing ':' after reduction identifier - ignoring}} expected-error {{expected expression}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(\) // expected-error {{expected unqualified-id}} expected-warning {{missing ':' after reduction identifier - ignoring}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(foo : argc // expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{incorrect reduction identifier, expected one of '+', '-', '*', '&', '|', '^', '&&', '||', 'min' or 'max'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(| : argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(|| : argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name, array element or array section}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(~ : argc) // expected-error {{expected unqualified-id}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(&& : argc) + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(^ : S1) // expected-error {{'S1' does not refer to a value}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : a, b, c, d, f) // expected-error {{a reduction list item with incomplete type 'S1'}} expected-error 2 {{const-qualified list item cannot be reduction}} expected-error {{'operator+' is a private member of 'S2'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(min : a, b, c, d, f) // expected-error {{a reduction list item with incomplete type 'S1'}} expected-error 2 {{arguments of OpenMP clause 'reduction' for 'min' or 'max' must be of arithmetic type}} expected-error 2 {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(max : h.b) // expected-error {{expected variable name, array element or array section}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : ba) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(* : ca) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(- : da) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(^ : fl) // expected-error {{invalid operands to binary expression ('float' and 'float')}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(&& : S2::S2s) // expected-error {{shared variable cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(&& : S2::S2sc) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(& : e, g) // expected-error {{calling a private constructor of class 'S4'}} expected-error {{invalid operands to binary expression ('S4' and 'S4')}} expected-error {{calling a private constructor of class 'S5'}} expected-error {{invalid operands to binary expression ('S5' and 'S5')}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : h, k, B::x) // expected-error 2 {{threadprivate or thread local variable cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : o) // expected-error {{no viable overloaded '='}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute private(i), reduction(+ : j), reduction(+ : q) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}} + for (int j=0; j<100; j++) foo(); +#pragma omp parallel private(k) +#pragma omp target +#pragma omp teams distribute reduction(+ : p), reduction(+ : p) // expected-error 2 {{argument of OpenMP clause 'reduction' must reference the same object in all threads}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : p), reduction(+ : p) // expected-error {{variable can appear only once in OpenMP 'reduction' clause}} expected-note {{previously referenced here}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : r) // expected-error {{const-qualified list item cannot be reduction}} + for (int j=0; j<100; j++) foo(); +#pragma omp parallel shared(i) +#pragma omp parallel reduction(min : i) +#pragma omp target +#pragma omp teams distribute reduction(max : j) // expected-error {{argument of OpenMP clause 'reduction' must reference the same object in all threads}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute reduction(+ : fl) + for (int j=0; j<100; j++) foo(); + static int m; +#pragma omp target +#pragma omp teams distribute reduction(+ : m) // OK + for (int j=0; j<100; j++) foo(); + + return tmain(argc) + tmain(fl); // expected-note {{in instantiation of function template specialization 'tmain<int>' requested here}} expected-note {{in instantiation of function template specialization 'tmain<float>' requested here}} +} diff --git a/test/OpenMP/teams_distribute_shared_messages.cpp b/test/OpenMP/teams_distribute_shared_messages.cpp new file mode 100644 index 0000000000..b9e096ce1c --- /dev/null +++ b/test/OpenMP/teams_distribute_shared_messages.cpp @@ -0,0 +1,133 @@ +// RUN: %clang_cc1 -verify -fopenmp %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note {{declared here}} +extern S1 a; +class S2 { + mutable int a; +public: + S2():a(0) { } + S2(S2 &s2):a(s2.a) { } +}; +const S2 b; +const S2 ba[5]; +class S3 { + int a; +public: + S3():a(0) { } + S3(S3 &s3):a(s3.a) { } +}; +const S3 c; +const S3 ca[5]; +extern const int f; +class S4 { + int a; + S4(); + S4(const S4 &s4); +public: + S4(int v):a(v) { } +}; +class S5 { + int a; + S5():a(0) {} + S5(const S5 &s5):a(s5.a) { } +public: + S5(int v):a(v) { } +}; + +S3 h; +#pragma omp threadprivate(h) // expected-note {{defined as threadprivate or thread local}} + +namespace A { +double x; +#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}} +} +namespace B { +using A::x; +} + +int main(int argc, char **argv) { + const int d = 5; + const int da[5] = { 0 }; + S4 e(4); + S5 g(5); + int i; + int &j = i; + #pragma omp target + #pragma omp teams distribute shared // expected-error {{expected '(' after 'shared'}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared () // expected-error {{expected expression}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (argc) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (S1) // expected-error {{'S1' does not refer to a value}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (a, b, c, d, f) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared (argv[1]) // expected-error {{expected variable name}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(ba) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(ca) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(da) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(e, g) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(h, B::x) // expected-error 2 {{threadprivate or thread local variable cannot be shared}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute private(i), shared(i) // expected-error {{private variable cannot be shared}} expected-note {{defined as private}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute firstprivate(i), shared(i) // expected-error {{firstprivate variable cannot be shared}} expected-note {{defined as firstprivate}} + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute private(i) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(i) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(j) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute firstprivate(i) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(i) + for (int j=0; j<100; j++) foo(); + #pragma omp target + #pragma omp teams distribute shared(j) + for (int j=0; j<100; j++) foo(); + + return 0; +} diff --git a/test/OpenMP/teams_distribute_thread_limit_messages.cpp b/test/OpenMP/teams_distribute_thread_limit_messages.cpp new file mode 100644 index 0000000000..ec4ca7a05f --- /dev/null +++ b/test/OpenMP/teams_distribute_thread_limit_messages.cpp @@ -0,0 +1,111 @@ +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 %s + +void foo() { +} + +bool foobool(int argc) { + return argc; +} + +struct S1; // expected-note 2 {{declared here}} + +template <typename T, int C> // expected-note {{declared here}} +T tmain(T argc) { + char **a; +#pragma omp target +#pragma omp teams distribute thread_limit(C) + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(T) // expected-error {{'T' does not refer to a value}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit // expected-error {{expected '(' after 'thread_limit'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit() // expected-error {{expected expression}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(argc > 0 ? a[1] : a[2]) // expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(argc + argc) + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(argc), thread_limit (argc+1) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'thread_limit' clause}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(S1) // expected-error {{'S1' does not refer to a value}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(-2) // expected-error {{argument to 'thread_limit' clause must be a strictly positive integer value}} + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(-10u) + for (int j=0; j<100; j++) foo(); +#pragma omp target +#pragma omp teams distribute thread_limit(3.14) // expected-error 2 {{expression must have integral or unscoped enumeration type, not 'double'}} + for (int j=0; j<100; j++) foo(); + + return 0; +} + +int main(int argc, char **argv) { +#pragma omp target +#pragma omp teams distribute thread_limit // expected-error {{expected '(' after 'thread_limit'}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit () // expected-error {{expected expression}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (argc // expected-error {{expected ')'}} expected-note {{to match this '('}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute' are ignored}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (argc > 0 ? argv[1] : argv[2]) // expected-error {{expression must have integral or unscoped enumeration type, not 'char *'}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (argc + argc) + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (argc), thread_limit (argc+1) // expected-error {{directive '#pragma omp teams distribute' cannot contain more than one 'thread_limit' clause}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (S1) // expected-error {{'S1' does not refer to a value}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (-2) // expected-error {{argument to 'thread_limit' clause must be a strictly positive integer value}} + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (-10u) + for (int j=0; j<100; j++) foo(); + +#pragma omp target +#pragma omp teams distribute thread_limit (3.14) // expected-error {{expression must have integral or unscoped enumeration type, not 'double'}} + for (int j=0; j<100; j++) foo(); + + return tmain<int, 10>(argc); // expected-note {{in instantiation of function template specialization 'tmain<int, 10>' requested here}} +} diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 261df787d2..4a359299bd 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -1977,6 +1977,7 @@ public: void VisitOMPTargetParallelForSimdDirective( const OMPTargetParallelForSimdDirective *D); void VisitOMPTargetSimdDirective(const OMPTargetSimdDirective *D); + void VisitOMPTeamsDistributeDirective(const OMPTeamsDistributeDirective *D); private: void AddDeclarationNameInfo(const Stmt *S); @@ -2761,6 +2762,11 @@ void EnqueueVisitor::VisitOMPTargetSimdDirective( VisitOMPLoopDirective(D); } +void EnqueueVisitor::VisitOMPTeamsDistributeDirective( + const OMPTeamsDistributeDirective *D) { + VisitOMPLoopDirective(D); +} + void CursorVisitor::EnqueueWorkList(VisitorWorkList &WL, const Stmt *S) { EnqueueVisitor(WL, MakeCXCursor(S, StmtParent, TU,RegionOfInterest)).Visit(S); } @@ -4887,6 +4893,8 @@ CXString clang_getCursorKindSpelling(enum CXCursorKind Kind) { return cxstring::createRef("OMPTargetParallelForSimdDirective"); case CXCursor_OMPTargetSimdDirective: return cxstring::createRef("OMPTargetSimdDirective"); + case CXCursor_OMPTeamsDistributeDirective: + return cxstring::createRef("OMPTeamsDistributeDirective"); case CXCursor_OverloadCandidate: return cxstring::createRef("OverloadCandidate"); case CXCursor_TypeAliasTemplateDecl: diff --git a/tools/libclang/CXCursor.cpp b/tools/libclang/CXCursor.cpp index f9fe83199c..047f8220fe 100644 --- a/tools/libclang/CXCursor.cpp +++ b/tools/libclang/CXCursor.cpp @@ -653,6 +653,9 @@ CXCursor cxcursor::MakeCXCursor(const Stmt *S, const Decl *Parent, case Stmt::OMPTargetSimdDirectiveClass: K = CXCursor_OMPTargetSimdDirective; break; + case Stmt::OMPTeamsDistributeDirectiveClass: + K = CXCursor_OMPTeamsDistributeDirective; + break; } CXCursor C = { K, 0, { Parent, S, TU } }; |