r285066 - Re-apply patch r279045.
Mehdi Amini via cfe-commits
cfe-commits at lists.llvm.org
Mon Oct 31 18:28:06 PDT 2016
Hi Kelvin,
> On Oct 25, 2016, at 5:50 AM, Kelvin Li via cfe-commits <cfe-commits at lists.llvm.org> wrote:
>
> Author: kli
> Date: Tue Oct 25 07:50:55 2016
> New Revision: 285066
>
> URL: http://llvm.org/viewvc/llvm-project?rev=285066&view=rev
> Log:
> Re-apply patch r279045.
I’ll be nice to provide a bit more info in the commit message (repeat the original title, and why it is reapplied). It may help as we’re bisecting through failures.
Thanks!
—
Mehdi
>
> Added:
> cfe/trunk/test/OpenMP/teams_distribute_simd_aligned_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_ast_print.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_default_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_dist_schedule_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_firstprivate_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_lastprivate_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_linear_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_loop_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_num_teams_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_private_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_reduction_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_safelen_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_shared_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp
> cfe/trunk/test/OpenMP/teams_distribute_simd_thread_limit_messages.cpp
> Modified:
> cfe/trunk/include/clang-c/Index.h
> cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
> cfe/trunk/include/clang/AST/StmtOpenMP.h
> cfe/trunk/include/clang/Basic/OpenMPKinds.def
> cfe/trunk/include/clang/Basic/StmtNodes.td
> cfe/trunk/include/clang/Sema/Sema.h
> cfe/trunk/include/clang/Serialization/ASTBitCodes.h
> cfe/trunk/lib/AST/StmtOpenMP.cpp
> cfe/trunk/lib/AST/StmtPrinter.cpp
> cfe/trunk/lib/AST/StmtProfile.cpp
> cfe/trunk/lib/Basic/OpenMPKinds.cpp
> cfe/trunk/lib/CodeGen/CGStmt.cpp
> cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
> cfe/trunk/lib/CodeGen/CodeGenFunction.h
> cfe/trunk/lib/Parse/ParseOpenMP.cpp
> cfe/trunk/lib/Sema/SemaOpenMP.cpp
> cfe/trunk/lib/Sema/TreeTransform.h
> cfe/trunk/lib/Serialization/ASTReaderStmt.cpp
> cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
> cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp
> cfe/trunk/test/OpenMP/nesting_of_regions.cpp
> cfe/trunk/tools/libclang/CIndex.cpp
> cfe/trunk/tools/libclang/CXCursor.cpp
>
> Modified: cfe/trunk/include/clang-c/Index.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang-c/Index.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang-c/Index.h (original)
> +++ cfe/trunk/include/clang-c/Index.h Tue Oct 25 07:50:55 2016
> @@ -2342,7 +2342,11 @@ enum CXCursorKind {
> */
> CXCursor_OMPTeamsDistributeDirective = 271,
>
> - CXCursor_LastStmt = CXCursor_OMPTeamsDistributeDirective,
> + /** \brief OpenMP teams distribute simd directive.
> + */
> + CXCursor_OMPTeamsDistributeSimdDirective = 272,
> +
> + CXCursor_LastStmt = CXCursor_OMPTeamsDistributeSimdDirective,
>
> /**
> * \brief Cursor that represents the translation unit itself.
>
> Modified: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)
> +++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Tue Oct 25 07:50:55 2016
> @@ -2624,6 +2624,9 @@ DEF_TRAVERSE_STMT(OMPTargetSimdDirective
> DEF_TRAVERSE_STMT(OMPTeamsDistributeDirective,
> { TRY_TO(TraverseOMPExecutableDirective(S)); })
>
> +DEF_TRAVERSE_STMT(OMPTeamsDistributeSimdDirective,
> + { TRY_TO(TraverseOMPExecutableDirective(S)); })
> +
> // OpenMP clauses.
> template <typename Derived>
> bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) {
>
> Modified: cfe/trunk/include/clang/AST/StmtOpenMP.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/StmtOpenMP.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/AST/StmtOpenMP.h (original)
> +++ cfe/trunk/include/clang/AST/StmtOpenMP.h Tue Oct 25 07:50:55 2016
> @@ -775,7 +775,8 @@ public:
> T->getStmtClass() == OMPDistributeSimdDirectiveClass ||
> T->getStmtClass() == OMPTargetParallelForSimdDirectiveClass ||
> T->getStmtClass() == OMPTargetSimdDirectiveClass ||
> - T->getStmtClass() == OMPTeamsDistributeDirectiveClass;
> + T->getStmtClass() == OMPTeamsDistributeDirectiveClass ||
> + T->getStmtClass() == OMPTeamsDistributeSimdDirectiveClass;
> }
> };
>
> @@ -3226,6 +3227,76 @@ public:
> }
> };
>
> +/// This represents '#pragma omp teams distribute simd'
> +/// combined directive.
> +///
> +/// \code
> +/// #pragma omp teams distribute simd private(a,b)
> +/// \endcode
> +/// In this example directive '#pragma omp teams distribute simd'
> +/// has clause 'private' with the variables 'a' and 'b'
> +///
> +class OMPTeamsDistributeSimdDirective 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.
> + ///
> + OMPTeamsDistributeSimdDirective(SourceLocation StartLoc,
> + SourceLocation EndLoc, unsigned CollapsedNum,
> + unsigned NumClauses)
> + : OMPLoopDirective(this, OMPTeamsDistributeSimdDirectiveClass,
> + OMPD_teams_distribute_simd, StartLoc, EndLoc,
> + CollapsedNum, NumClauses) {}
> +
> + /// Build an empty directive.
> + ///
> + /// \param CollapsedNum Number of collapsed nested loops.
> + /// \param NumClauses Number of clauses.
> + ///
> + explicit OMPTeamsDistributeSimdDirective(unsigned CollapsedNum,
> + unsigned NumClauses)
> + : OMPLoopDirective(this, OMPTeamsDistributeSimdDirectiveClass,
> + OMPD_teams_distribute_simd, 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 OMPTeamsDistributeSimdDirective *
> + 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 OMPTeamsDistributeSimdDirective *CreateEmpty(const ASTContext &C,
> + unsigned NumClauses,
> + unsigned CollapsedNum,
> + EmptyShell);
> +
> + static bool classof(const Stmt *T) {
> + return T->getStmtClass() == OMPTeamsDistributeSimdDirectiveClass;
> + }
> +};
> +
> } // end namespace clang
>
> #endif
>
> Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)
> +++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Tue Oct 25 07:50:55 2016
> @@ -144,6 +144,9 @@
> #ifndef OPENMP_TEAMS_DISTRIBUTE_CLAUSE
> #define OPENMP_TEAMS_DISTRIBUTE_CLAUSE(Name)
> #endif
> +#ifndef OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE
> +#define OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(Name)
> +#endif
>
> // OpenMP directives.
> OPENMP_DIRECTIVE(threadprivate)
> @@ -190,6 +193,7 @@ OPENMP_DIRECTIVE_EXT(distribute_simd, "d
> 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_DIRECTIVE_EXT(teams_distribute_simd, "teams distribute simd")
>
> // OpenMP clauses.
> OPENMP_CLAUSE(if, OMPIfClause)
> @@ -658,6 +662,22 @@ OPENMP_TEAMS_DISTRIBUTE_CLAUSE(lastpriva
> OPENMP_TEAMS_DISTRIBUTE_CLAUSE(collapse)
> OPENMP_TEAMS_DISTRIBUTE_CLAUSE(dist_schedule)
>
> +// Clauses allowed for OpenMP directive 'teams distribute simd'
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(default)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(private)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(firstprivate)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(shared)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(reduction)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(num_teams)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(thread_limit)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(lastprivate)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(collapse)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(dist_schedule)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(linear)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(aligned)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(safelen)
> +OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(simdlen)
> +
> #undef OPENMP_TASKLOOP_SIMD_CLAUSE
> #undef OPENMP_TASKLOOP_CLAUSE
> #undef OPENMP_LINEAR_KIND
> @@ -702,3 +722,4 @@ OPENMP_TEAMS_DISTRIBUTE_CLAUSE(dist_sche
> #undef OPENMP_TARGET_PARALLEL_FOR_SIMD_CLAUSE
> #undef OPENMP_TARGET_SIMD_CLAUSE
> #undef OPENMP_TEAMS_DISTRIBUTE_CLAUSE
> +#undef OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE
>
> Modified: cfe/trunk/include/clang/Basic/StmtNodes.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/StmtNodes.td?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/StmtNodes.td (original)
> +++ cfe/trunk/include/clang/Basic/StmtNodes.td Tue Oct 25 07:50:55 2016
> @@ -235,3 +235,4 @@ def OMPDistributeSimdDirective : DStmt<O
> def OMPTargetParallelForSimdDirective : DStmt<OMPLoopDirective>;
> def OMPTargetSimdDirective : DStmt<OMPLoopDirective>;
> def OMPTeamsDistributeDirective : DStmt<OMPLoopDirective>;
> +def OMPTeamsDistributeSimdDirective : DStmt<OMPLoopDirective>;
>
> Modified: cfe/trunk/include/clang/Sema/Sema.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Sema/Sema.h (original)
> +++ cfe/trunk/include/clang/Sema/Sema.h Tue Oct 25 07:50:55 2016
> @@ -8365,6 +8365,12 @@ public:
> ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
> SourceLocation EndLoc,
> llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA);
> + /// Called on well-formed '\#pragma omp teams distribute simd' after parsing
> + /// of the associated statement.
> + StmtResult ActOnOpenMPTeamsDistributeSimdDirective(
> + ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
> + SourceLocation EndLoc,
> + llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA);
>
> /// Checks correctness of linear modifiers.
> bool CheckOpenMPLinearModifier(OpenMPLinearClauseKind LinKind,
>
> Modified: cfe/trunk/include/clang/Serialization/ASTBitCodes.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Serialization/ASTBitCodes.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Serialization/ASTBitCodes.h (original)
> +++ cfe/trunk/include/clang/Serialization/ASTBitCodes.h Tue Oct 25 07:50:55 2016
> @@ -1498,6 +1498,7 @@ namespace clang {
> STMT_OMP_TARGET_PARALLEL_FOR_SIMD_DIRECTIVE,
> STMT_OMP_TARGET_SIMD_DIRECTIVE,
> STMT_OMP_TEAMS_DISTRIBUTE_DIRECTIVE,
> + STMT_OMP_TEAMS_DISTRIBUTE_SIMD_DIRECTIVE,
> EXPR_OMP_ARRAY_SECTION,
>
> // ARC
>
> Modified: cfe/trunk/lib/AST/StmtOpenMP.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtOpenMP.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/AST/StmtOpenMP.cpp (original)
> +++ cfe/trunk/lib/AST/StmtOpenMP.cpp Tue Oct 25 07:50:55 2016
> @@ -1350,3 +1350,56 @@ OMPTeamsDistributeDirective::CreateEmpty
> sizeof(Stmt *) * numLoopChildren(CollapsedNum, OMPD_teams_distribute));
> return new (Mem) OMPTeamsDistributeDirective(CollapsedNum, NumClauses);
> }
> +
> +OMPTeamsDistributeSimdDirective *OMPTeamsDistributeSimdDirective::Create(
> + const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,
> + unsigned CollapsedNum, ArrayRef<OMPClause *> Clauses, Stmt *AssociatedStmt,
> + const HelperExprs &Exprs) {
> + unsigned Size = llvm::alignTo(sizeof(OMPTeamsDistributeSimdDirective),
> + alignof(OMPClause *));
> + void *Mem =
> + C.Allocate(Size + sizeof(OMPClause *) * Clauses.size() +
> + sizeof(Stmt *) *
> + numLoopChildren(CollapsedNum, OMPD_teams_distribute_simd));
> + OMPTeamsDistributeSimdDirective *Dir =
> + new (Mem) OMPTeamsDistributeSimdDirective(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;
> +}
> +
> +OMPTeamsDistributeSimdDirective *OMPTeamsDistributeSimdDirective::CreateEmpty(
> + const ASTContext &C, unsigned NumClauses, unsigned CollapsedNum,
> + EmptyShell) {
> + unsigned Size = llvm::alignTo(sizeof(OMPTeamsDistributeSimdDirective),
> + alignof(OMPClause *));
> + void *Mem =
> + C.Allocate(Size + sizeof(OMPClause *) * NumClauses +
> + sizeof(Stmt *) *
> + numLoopChildren(CollapsedNum, OMPD_teams_distribute_simd));
> + return new (Mem) OMPTeamsDistributeSimdDirective(CollapsedNum, NumClauses);
> +}
>
> Modified: cfe/trunk/lib/AST/StmtPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/AST/StmtPrinter.cpp (original)
> +++ cfe/trunk/lib/AST/StmtPrinter.cpp Tue Oct 25 07:50:55 2016
> @@ -1209,6 +1209,12 @@ void StmtPrinter::VisitOMPTeamsDistribut
> PrintOMPExecutableDirective(Node);
> }
>
> +void StmtPrinter::VisitOMPTeamsDistributeSimdDirective(
> + OMPTeamsDistributeSimdDirective *Node) {
> + Indent() << "#pragma omp teams distribute simd ";
> + PrintOMPExecutableDirective(Node);
> +}
> +
> //===----------------------------------------------------------------------===//
> // Expr printing methods.
> //===----------------------------------------------------------------------===//
>
> Modified: cfe/trunk/lib/AST/StmtProfile.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/AST/StmtProfile.cpp (original)
> +++ cfe/trunk/lib/AST/StmtProfile.cpp Tue Oct 25 07:50:55 2016
> @@ -733,6 +733,11 @@ void StmtProfiler::VisitOMPTeamsDistribu
> VisitOMPLoopDirective(S);
> }
>
> +void StmtProfiler::VisitOMPTeamsDistributeSimdDirective(
> + const OMPTeamsDistributeSimdDirective *S) {
> + VisitOMPLoopDirective(S);
> +}
> +
> void StmtProfiler::VisitExpr(const Expr *S) {
> VisitStmt(S);
> }
>
> Modified: cfe/trunk/lib/Basic/OpenMPKinds.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)
> +++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Tue Oct 25 07:50:55 2016
> @@ -630,6 +630,16 @@ bool clang::isAllowedClauseForDirective(
> break;
> }
> break;
> + case OMPD_teams_distribute_simd:
> + switch (CKind) {
> +#define OPENMP_TEAMS_DISTRIBUTE_SIMD_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:
> @@ -656,7 +666,7 @@ bool clang::isOpenMPLoopDirective(OpenMP
> DKind == OMPD_distribute_parallel_for_simd ||
> DKind == OMPD_distribute_simd ||
> DKind == OMPD_target_parallel_for_simd || DKind == OMPD_target_simd ||
> - DKind == OMPD_teams_distribute;
> + DKind == OMPD_teams_distribute || DKind == OMPD_teams_distribute_simd;
> // TODO add next directives.
> }
>
> @@ -699,7 +709,8 @@ bool clang::isOpenMPTargetDataManagement
> }
>
> bool clang::isOpenMPTeamsDirective(OpenMPDirectiveKind DKind) {
> - return DKind == OMPD_teams || DKind == OMPD_teams_distribute;
> + return DKind == OMPD_teams || DKind == OMPD_teams_distribute ||
> + DKind == OMPD_teams_distribute_simd;
> // TODO add next directives.
> }
>
> @@ -707,7 +718,8 @@ bool clang::isOpenMPSimdDirective(OpenMP
> return DKind == OMPD_simd || DKind == OMPD_for_simd ||
> DKind == OMPD_parallel_for_simd || DKind == OMPD_taskloop_simd ||
> DKind == OMPD_distribute_parallel_for_simd ||
> - DKind == OMPD_distribute_simd || DKind == OMPD_target_simd;
> + DKind == OMPD_distribute_simd || DKind == OMPD_target_simd ||
> + DKind == OMPD_teams_distribute_simd;
> // TODO add next directives.
> }
>
> @@ -720,7 +732,7 @@ bool clang::isOpenMPNestingDistributeDir
>
> bool clang::isOpenMPDistributeDirective(OpenMPDirectiveKind Kind) {
> return isOpenMPNestingDistributeDirective(Kind) ||
> - Kind == OMPD_teams_distribute;
> + Kind == OMPD_teams_distribute || Kind == OMPD_teams_distribute_simd;
> // TODO add next directives.
> }
>
> @@ -741,5 +753,6 @@ bool clang::isOpenMPTaskingDirective(Ope
> bool clang::isOpenMPLoopBoundSharingDirective(OpenMPDirectiveKind Kind) {
> return Kind == OMPD_distribute_parallel_for ||
> Kind == OMPD_distribute_parallel_for_simd ||
> - Kind == OMPD_distribute_simd || Kind == OMPD_teams_distribute;
> + Kind == OMPD_distribute_simd || Kind == OMPD_teams_distribute ||
> + Kind == OMPD_teams_distribute_simd;
> }
>
> Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGStmt.cpp Tue Oct 25 07:50:55 2016
> @@ -301,6 +301,10 @@ void CodeGenFunction::EmitStmt(const Stm
> case Stmt::OMPTeamsDistributeDirectiveClass:
> EmitOMPTeamsDistributeDirective(cast<OMPTeamsDistributeDirective>(*S));
> break;
> + case Stmt::OMPTeamsDistributeSimdDirectiveClass:
> + EmitOMPTeamsDistributeSimdDirective(
> + cast<OMPTeamsDistributeSimdDirective>(*S));
> + break;
> }
> }
>
>
> Modified: cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Tue Oct 25 07:50:55 2016
> @@ -1959,6 +1959,19 @@ void CodeGenFunction::EmitOMPTeamsDistri
> });
> }
>
> +void CodeGenFunction::EmitOMPTeamsDistributeSimdDirective(
> + const OMPTeamsDistributeSimdDirective &S) {
> + OMPLexicalScope Scope(*this, S, /*AsInlined=*/true);
> + CGM.getOpenMPRuntime().emitInlinedDirective(
> + *this, OMPD_teams_distribute_simd,
> + [&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) {
>
> Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
> +++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Tue Oct 25 07:50:55 2016
> @@ -2526,6 +2526,8 @@ public:
> const OMPTargetParallelForSimdDirective &S);
> void EmitOMPTargetSimdDirective(const OMPTargetSimdDirective &S);
> void EmitOMPTeamsDistributeDirective(const OMPTeamsDistributeDirective &S);
> + void
> + EmitOMPTeamsDistributeSimdDirective(const OMPTeamsDistributeSimdDirective &S);
>
> /// Emit outlined function for the target directive.
> static std::pair<llvm::Function * /*OutlinedFn*/,
>
> Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Tue Oct 25 07:50:55 2016
> @@ -109,7 +109,8 @@ static OpenMPDirectiveKind ParseOpenMPDi
> { 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_teams, OMPD_distribute, OMPD_teams_distribute }
> + { OMPD_teams, OMPD_distribute, OMPD_teams_distribute },
> + { OMPD_teams_distribute, OMPD_simd, OMPD_teams_distribute_simd }
> };
> enum { CancellationPoint = 0, DeclareReduction = 1, TargetData = 2 };
> auto Tok = P.getCurToken();
> @@ -742,6 +743,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen
> case OMPD_target_parallel_for_simd:
> case OMPD_target_simd:
> case OMPD_teams_distribute:
> + case OMPD_teams_distribute_simd:
> Diag(Tok, diag::err_omp_unexpected_directive)
> << getOpenMPDirectiveName(DKind);
> break;
> @@ -776,7 +778,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen
> /// 'target update' | 'distribute parallel for' |
> /// 'distribute paralle for simd' | 'distribute simd' |
> /// 'target parallel for simd' | 'target simd' |
> -/// 'teams distribute' {clause}
> +/// 'teams distribute' | 'teams distribute simd' {clause}
> /// annot_pragma_openmp_end
> ///
> StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective(
> @@ -886,7 +888,8 @@ StmtResult Parser::ParseOpenMPDeclarativ
> case OMPD_distribute_simd:
> case OMPD_target_parallel_for_simd:
> case OMPD_target_simd:
> - case OMPD_teams_distribute: {
> + case OMPD_teams_distribute:
> + case OMPD_teams_distribute_simd: {
> ConsumeToken();
> // Parse directive name of the 'critical' directive if any.
> if (DKind == OMPD_critical) {
>
> Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Tue Oct 25 07:50:55 2016
> @@ -1693,7 +1693,8 @@ void Sema::ActOnOpenMPRegionStart(OpenMP
> case OMPD_distribute_parallel_for_simd:
> case OMPD_distribute_simd:
> case OMPD_distribute_parallel_for:
> - case OMPD_teams_distribute: {
> + case OMPD_teams_distribute:
> + case OMPD_teams_distribute_simd: {
> QualType KmpInt32Ty = Context.getIntTypeForBitwidth(32, 1);
> QualType KmpInt32PtrTy =
> Context.getPointerType(KmpInt32Ty).withConst().withRestrict();
> @@ -1922,6 +1923,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel | distribute simd | + |
> // | parallel | target simd | * |
> // | parallel | teams distribute| + |
> + // | parallel | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | for | parallel | * |
> // | for | for | + |
> @@ -1967,6 +1970,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | for | target simd | * |
> // | for | teams distribute| + |
> + // | for | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | master | parallel | * |
> // | master | for | + |
> @@ -2012,6 +2017,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | master | target simd | * |
> // | master | teams distribute| + |
> + // | master | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | critical | parallel | * |
> // | critical | for | + |
> @@ -2056,6 +2063,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | critical | target simd | * |
> // | critical | teams distribute| + |
> + // | critical | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | simd | parallel | |
> // | simd | for | |
> @@ -2101,6 +2110,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | simd | target simd | |
> // | simd | teams distribute| |
> + // | simd | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | for simd | parallel | |
> // | for simd | for | |
> @@ -2146,6 +2157,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | for simd | target simd | |
> // | for simd | teams distribute| |
> + // | for simd | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | parallel for simd| parallel | |
> // | parallel for simd| for | |
> @@ -2190,6 +2203,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | parallel for simd| target simd | |
> // | parallel for simd| teams distribute| |
> + // | parallel for simd| teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | sections | parallel | * |
> // | sections | for | + |
> @@ -2234,6 +2249,8 @@ static bool CheckNestingOfRegions(Sema &
> // | sections | target parallel | + |
> // | | for simd | |
> // | sections | target simd | * |
> + // | sections | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | section | parallel | * |
> // | section | for | + |
> @@ -2279,6 +2296,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | section | target simd | * |
> // | section | teams distrubte | + |
> + // | section | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | single | parallel | * |
> // | single | for | + |
> @@ -2324,6 +2343,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | single | target simd | * |
> // | single | teams distrubte | + |
> + // | single | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | parallel for | parallel | * |
> // | parallel for | for | + |
> @@ -2369,6 +2390,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | parallel for | target simd | * |
> // | parallel for | teams distribute| + |
> + // | parallel for | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | parallel sections| parallel | * |
> // | parallel sections| for | + |
> @@ -2414,6 +2437,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | parallel sections| target simd | * |
> // | parallel sections| teams distribute| + |
> + // | parallel sections| teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | task | parallel | * |
> // | task | for | + |
> @@ -2459,6 +2484,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | task | target simd | * |
> // | task | teams distribute| + |
> + // | task | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | ordered | parallel | * |
> // | ordered | for | + |
> @@ -2504,6 +2531,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | ordered | target simd | * |
> // | ordered | teams distribute| + |
> + // | ordered | teams distribute| |
> + // | | simd | + |
> // +------------------+-----------------+------------------------------------+
> // | atomic | parallel | |
> // | atomic | for | |
> @@ -2549,6 +2578,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | atomic | target simd | |
> // | atomic | teams distribute| |
> + // | atomic | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | target | parallel | * |
> // | target | for | * |
> @@ -2594,6 +2625,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | target | target simd | |
> // | target | teams distribute| |
> + // | target | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | target parallel | parallel | * |
> // | target parallel | for | * |
> @@ -2639,6 +2672,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | target parallel | target simd | |
> // | target parallel | teams distribute| + |
> + // | target parallel | teams distribute| + |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | target parallel | parallel | * |
> // | for | | |
> @@ -2714,6 +2749,8 @@ static bool CheckNestingOfRegions(Sema &
> // | for | | |
> // | target parallel | teams distribute| |
> // | for | | |
> + // | target parallel | teams distribute| |
> + // | for | simd | |
> // +------------------+-----------------+------------------------------------+
> // | teams | parallel | * |
> // | teams | for | + |
> @@ -2759,6 +2796,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | teams | target simd | + |
> // | teams | teams distribute| + |
> + // | teams | teams distribute| + |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | taskloop | parallel | * |
> // | taskloop | for | + |
> @@ -2803,6 +2842,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | taskloop | target simd | * |
> // | taskloop | teams distribute| + |
> + // | taskloop | teams distribute| + |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | taskloop simd | parallel | |
> // | taskloop simd | for | |
> @@ -2848,6 +2889,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | taskloop simd | target simd | |
> // | taskloop simd | teams distribute| |
> + // | taskloop simd | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | distribute | parallel | * |
> // | distribute | for | * |
> @@ -2893,6 +2936,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | distribute | target simd | |
> // | distribute | teams distribute| |
> + // | distribute | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | distribute | parallel | * |
> // | parallel for | | |
> @@ -2969,6 +3014,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel for | | |
> // | distribute | teams distribute| |
> // | parallel for | | |
> + // | distribute | teams distribute| |
> + // | parallel for | simd | |
> // +------------------+-----------------+------------------------------------+
> // | distribute | parallel | * |
> // | parallel for simd| | |
> @@ -3044,6 +3091,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel for simd| | |
> // | distribute | teams distribute| |
> // | parallel for simd| | |
> + // | distribute | teams distribute| |
> + // | parallel for simd| simd | |
> // +------------------+-----------------+------------------------------------+
> // | distribute simd | parallel | * |
> // | distribute simd | for | * |
> @@ -3089,6 +3138,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | distribute simd | target simd | * |
> // | distribute simd | teams distribute| * |
> + // | distribute simd | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | target parallel | parallel | * |
> // | for simd | | |
> @@ -3164,6 +3215,8 @@ static bool CheckNestingOfRegions(Sema &
> // | for simd | | |
> // | target parallel | teams distribute| * |
> // | for simd | | |
> + // | target parallel | teams distribute| |
> + // | for simd | simd | |
> // +------------------+-----------------+------------------------------------+
> // | target simd | parallel | |
> // | target simd | for | |
> @@ -3209,6 +3262,8 @@ static bool CheckNestingOfRegions(Sema &
> // | | for simd | |
> // | target simd | target simd | |
> // | target simd | teams distribute| |
> + // | target simd | teams distribute| |
> + // | | simd | |
> // +------------------+-----------------+------------------------------------+
> // | teams distribute | parallel | |
> // | teams distribute | for | |
> @@ -3253,6 +3308,83 @@ static bool CheckNestingOfRegions(Sema &
> // | teams distribute | target parallel | |
> // | | for simd | |
> // | teams distribute | teams distribute| |
> + // | teams distribute | teams distribute| |
> + // | | simd | |
> + // +------------------+-----------------+------------------------------------+
> + // | teams distribute | parallel | |
> + // | simd | | |
> + // | teams distribute | for | |
> + // | simd | | |
> + // | teams distribute | for simd | |
> + // | simd | | |
> + // | teams distribute | master | |
> + // | simd | | |
> + // | teams distribute | critical | |
> + // | simd | | |
> + // | teams distribute | simd | |
> + // | simd | | |
> + // | teams distribute | sections | |
> + // | simd | | |
> + // | teams distribute | section | |
> + // | simd | | |
> + // | teams distribute | single | |
> + // | simd | | |
> + // | teams distribute | parallel for | |
> + // | simd | | |
> + // | teams distribute |parallel for simd| |
> + // | simd | | |
> + // | teams distribute |parallel sections| |
> + // | simd | | |
> + // | teams distribute | task | |
> + // | simd | | |
> + // | teams distribute | taskyield | |
> + // | simd | | |
> + // | teams distribute | barrier | |
> + // | simd | | |
> + // | teams distribute | taskwait | |
> + // | simd | | |
> + // | teams distribute | taskgroup | |
> + // | simd | | |
> + // | teams distribute | flush | |
> + // | simd | | |
> + // | teams distribute | ordered | + (with simd clause) |
> + // | simd | | |
> + // | teams distribute | atomic | |
> + // | simd | | |
> + // | teams distribute | target | |
> + // | simd | | |
> + // | teams distribute | target parallel | |
> + // | simd | | |
> + // | teams distribute | target parallel | |
> + // | simd | for | |
> + // | teams distribute | target enter | |
> + // | simd | data | |
> + // | teams distribute | target exit | |
> + // | simd | data | |
> + // | teams distribute | teams | |
> + // | simd | | |
> + // | teams distribute | cancellation | |
> + // | simd | point | |
> + // | teams distribute | cancel | |
> + // | simd | | |
> + // | teams distribute | taskloop | |
> + // | simd | | |
> + // | teams distribute | taskloop simd | |
> + // | simd | | |
> + // | teams distribute | distribute | |
> + // | simd | | |
> + // | teams distribute | distribute | |
> + // | simd | parallel for | |
> + // | teams distribute | distribute | |
> + // | simd |parallel for simd| |
> + // | teams distribute | distribute simd | |
> + // | simd | | |
> + // | teams distribute | target parallel | |
> + // | simd | for simd | |
> + // | teams distribute | teams distribute| |
> + // | simd | | |
> + // | teams distribute | teams distribute| |
> + // | simd | simd | |
> // +------------------+-----------------+------------------------------------+
> if (Stack->getCurScope()) {
> auto ParentRegion = Stack->getParentDirective();
> @@ -3773,6 +3905,10 @@ StmtResult Sema::ActOnOpenMPExecutableDi
> Res = ActOnOpenMPTeamsDistributeDirective(
> ClausesWithImplicit, AStmt, StartLoc, EndLoc, VarsWithInheritedDSA);
> break;
> + case OMPD_teams_distribute_simd:
> + Res = ActOnOpenMPTeamsDistributeSimdDirective(
> + ClausesWithImplicit, AStmt, StartLoc, EndLoc, VarsWithInheritedDSA);
> + break;
> case OMPD_declare_target:
> case OMPD_end_declare_target:
> case OMPD_threadprivate:
> @@ -7465,6 +7601,55 @@ StmtResult Sema::ActOnOpenMPTeamsDistrib
> Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B);
> }
>
> +StmtResult Sema::ActOnOpenMPTeamsDistributeSimdDirective(
> + 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_simd,
> + 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 simd loop exprs were not built");
> +
> + if (!CurContext->isDependentContext()) {
> + // Finalize the clauses that need pre-built expressions for CodeGen.
> + for (auto C : Clauses) {
> + if (auto *LC = dyn_cast<OMPLinearClause>(C))
> + if (FinishOpenMPLinearClause(*LC, cast<DeclRefExpr>(B.IterationVarRef),
> + B.NumIterations, *this, CurScope,
> + DSAStack))
> + return StmtError();
> + }
> + }
> +
> + if (checkSimdlenSafelenSpecified(*this, Clauses))
> + return StmtError();
> +
> + getCurFunction()->setHasBranchProtectedScope();
> + return OMPTeamsDistributeSimdDirective::Create(
> + Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B);
> +}
> +
> OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr,
> SourceLocation StartLoc,
> SourceLocation LParenLoc,
>
> Modified: cfe/trunk/lib/Sema/TreeTransform.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/TreeTransform.h (original)
> +++ cfe/trunk/lib/Sema/TreeTransform.h Tue Oct 25 07:50:55 2016
> @@ -7683,6 +7683,17 @@ StmtResult TreeTransform<Derived>::Trans
> return Res;
> }
>
> +template <typename Derived>
> +StmtResult TreeTransform<Derived>::TransformOMPTeamsDistributeSimdDirective(
> + OMPTeamsDistributeSimdDirective *D) {
> + DeclarationNameInfo DirName;
> + getDerived().getSema().StartOpenMPDSABlock(
> + OMPD_teams_distribute_simd, DirName, nullptr, D->getLocStart());
> + StmtResult Res = getDerived().TransformOMPExecutableDirective(D);
> + getDerived().getSema().EndOpenMPDSABlock(Res.get());
> + return Res;
> +}
> +
> //===----------------------------------------------------------------------===//
> // OpenMP clause transformation
> //===----------------------------------------------------------------------===//
>
> Modified: cfe/trunk/lib/Serialization/ASTReaderStmt.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderStmt.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Tue Oct 25 07:50:55 2016
> @@ -2871,6 +2871,11 @@ void ASTStmtReader::VisitOMPTeamsDistrib
> VisitOMPLoopDirective(D);
> }
>
> +void ASTStmtReader::VisitOMPTeamsDistributeSimdDirective(
> + OMPTeamsDistributeSimdDirective *D) {
> + VisitOMPLoopDirective(D);
> +}
> +
> //===----------------------------------------------------------------------===//
> // ASTReader Implementation
> //===----------------------------------------------------------------------===//
> @@ -3598,6 +3603,14 @@ Stmt *ASTReader::ReadStmtFromStream(Modu
> break;
> }
>
> + case STMT_OMP_TEAMS_DISTRIBUTE_SIMD_DIRECTIVE: {
> + unsigned NumClauses = Record[ASTStmtReader::NumStmtFields];
> + unsigned CollapsedNum = Record[ASTStmtReader::NumStmtFields + 1];
> + S = OMPTeamsDistributeSimdDirective::CreateEmpty(Context, NumClauses,
> + CollapsedNum, Empty);
> + break;
> + }
> +
> case EXPR_CXX_OPERATOR_CALL:
> S = new (Context) CXXOperatorCallExpr(Context, Empty);
> break;
>
> Modified: cfe/trunk/lib/Serialization/ASTWriterStmt.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriterStmt.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Tue Oct 25 07:50:55 2016
> @@ -2520,6 +2520,12 @@ void ASTStmtWriter::VisitOMPTeamsDistrib
> Code = serialization::STMT_OMP_TEAMS_DISTRIBUTE_DIRECTIVE;
> }
>
> +void ASTStmtWriter::VisitOMPTeamsDistributeSimdDirective(
> + OMPTeamsDistributeSimdDirective *D) {
> + VisitOMPLoopDirective(D);
> + Code = serialization::STMT_OMP_TEAMS_DISTRIBUTE_SIMD_DIRECTIVE;
> +}
> +
> //===----------------------------------------------------------------------===//
> // ASTWriter Implementation
> //===----------------------------------------------------------------------===//
>
> Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original)
> +++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Tue Oct 25 07:50:55 2016
> @@ -848,6 +848,7 @@ void ExprEngine::Visit(const Stmt *S, Ex
> case Stmt::OMPTargetParallelForSimdDirectiveClass:
> case Stmt::OMPTargetSimdDirectiveClass:
> case Stmt::OMPTeamsDistributeDirectiveClass:
> + case Stmt::OMPTeamsDistributeSimdDirectiveClass:
> llvm_unreachable("Stmt should not be in analyzer evaluation loop");
>
> case Stmt::ObjCSubscriptRefExprClass:
>
> Modified: cfe/trunk/test/OpenMP/nesting_of_regions.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/nesting_of_regions.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/test/OpenMP/nesting_of_regions.cpp (original)
> +++ cfe/trunk/test/OpenMP/nesting_of_regions.cpp Tue Oct 25 07:50:55 2016
> @@ -167,7 +167,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> -
> +#pragma omp parallel
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'parallel' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +
> // SIMD DIRECTIVE
> #pragma omp simd
> for (int i = 0; i < 10; ++i) {
> @@ -371,6 +377,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR DIRECTIVE
> #pragma omp for
> @@ -588,6 +600,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR SIMD DIRECTIVE
> #pragma omp for simd
> @@ -793,6 +811,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 simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // SECTIONS DIRECTIVE
> #pragma omp sections
> @@ -1015,6 +1039,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp teams distribute simd' 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}}
> @@ -1296,6 +1326,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp section
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'section' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // SINGLE DIRECTIVE
> #pragma omp single
> @@ -1504,6 +1541,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp single
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'single' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // MASTER DIRECTIVE
> #pragma omp master
> @@ -1712,6 +1755,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp master
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'master' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // CRITICAL DIRECTIVE
> #pragma omp critical
> @@ -1934,6 +1983,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp critical
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'critical' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // PARALLEL FOR DIRECTIVE
> #pragma omp parallel for
> @@ -2156,6 +2211,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 simd // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // PARALLEL FOR SIMD DIRECTIVE
> #pragma omp parallel for simd
> @@ -2379,6 +2440,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 simd // 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
> @@ -2590,6 +2657,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp parallel sections
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'parallel sections' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TASK DIRECTIVE
> #pragma omp task
> @@ -2748,6 +2821,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp task
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'task' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // ORDERED DIRECTIVE
> #pragma omp ordered
> @@ -2977,6 +3056,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp ordered
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'ordered' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // ATOMIC DIRECTIVE
> #pragma omp atomic
> @@ -3238,6 +3323,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp ordered
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'ordered' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET DIRECTIVE
> #pragma omp target
> @@ -3412,6 +3503,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target
> + {
> +#pragma omp teams distribute simd // OK
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL DIRECTIVE
> #pragma omp target parallel
> @@ -3580,6 +3677,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target parallel
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'target parallel' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL FOR DIRECTIVE
> #pragma omp target parallel for
> @@ -3802,6 +3905,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 simd // expected-error {{region cannot be closely nested inside 'target parallel for' region; perhaps you forget to enclose 'omp teams distribute simd' 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?}}
> @@ -4016,6 +4125,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target
> +#pragma omp teams
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'teams' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TASKLOOP DIRECTIVE
> #pragma omp taskloop
> @@ -4229,6 +4345,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 simd // expected-error {{region cannot be closely nested inside 'taskloop' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ++a;
> + }
>
> // DISTRIBUTE DIRECTIVE
> #pragma omp target
> @@ -4470,6 +4592,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 simd // expected-error {{region cannot be closely nested inside 'distribute' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // DISTRIBUTE PARALLEL FOR DIRECTIVE
> #pragma omp target
> @@ -4719,6 +4849,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 simd // expected-error {{region cannot be closely nested inside 'distribute parallel for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // DISTRIBUTE PARALLEL FOR SIMD DIRECTIVE
> #pragma omp target
> @@ -4976,6 +5114,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 simd // 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
> @@ -5169,8 +5315,14 @@ 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 simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
>
> -// TEAMS DISTRIBUTE DIRECTIVE
> + // 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)
> ;
> @@ -5397,86 +5549,563 @@ void foo() {
> 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 simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
>
> -void foo() {
> - int a = 0;
> -// PARALLEL DIRECTIVE
> -#pragma omp parallel
> -#pragma omp for
> - for (int i = 0; i < 10; ++i)
> - ;
> -#pragma omp parallel
> -#pragma omp simd
> - for (int i = 0; i < 10; ++i)
> - ;
> -#pragma omp parallel
> -#pragma omp for simd
> + // 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 parallel
> -#pragma omp sections
> - {
> - bar();
> - }
> -#pragma omp parallel
> -#pragma omp section // expected-error {{'omp section' directive must be closely nested to a sections region, not a parallel region}}
> - {
> - bar();
> +#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 parallel
> -#pragma omp sections
> - {
> - bar();
> +#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 parallel
> -#pragma omp single
> - bar();
> -#pragma omp parallel
> -#pragma omp master
> - bar();
> -#pragma omp parallel
> -#pragma omp critical
> - bar();
> -#pragma omp parallel
> -#pragma omp parallel for
> - for (int i = 0; i < 10; ++i)
> - ;
> -#pragma omp parallel
> -#pragma omp parallel for simd
> - for (int i = 0; i < 10; ++i)
> - ;
> -#pragma omp parallel
> -#pragma omp parallel sections
> - {
> - bar();
> +#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 parallel
> -#pragma omp task
> - {
> - bar();
> +#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 parallel
> - {
> -#pragma omp taskyield
> - bar();
> +#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 parallel
> - {
> -#pragma omp barrier
> - bar();
> +#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 parallel
> - {
> -#pragma omp taskwait
> - bar();
> +#pragma omp target
> +#pragma omp teams distribute
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp sections // OK
> + {
> + bar();
> + }
> }
> -#pragma omp parallel
> - {
> -#pragma omp flush
> - 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 parallel
> +#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;
> + }
> +#pragma omp target
> +#pragma omp teams distribute
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +
> +// TEAMS DISTRIBUTE SIMD DIRECTIVE
> +#pragma omp teams distribute simd // expected-error {{orphaned 'omp teams distribute simd' 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 simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp for // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp simd // expected-warning {{OpenMP only allows an ordered construct with the simd clause nested in a simd construct}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp for simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp sections // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp section // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp single // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp master // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp critical // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> +#pragma omp single
> + {
> + bar();
> + }
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel for // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel for simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel sections // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp task // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp taskyield // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp barrier // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp taskwait // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp flush // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp ordered // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp atomic // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target parallel for // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target enter data map(to: a) // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target exit data map(from: a) // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target update to(a) // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams 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)
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +}
> +
> +void foo() {
> + int a = 0;
> +// PARALLEL DIRECTIVE
> +#pragma omp parallel
> +#pragma omp for
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp parallel
> +#pragma omp simd
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp parallel
> +#pragma omp for simd
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp parallel
> +#pragma omp sections
> + {
> + bar();
> + }
> +#pragma omp parallel
> +#pragma omp section // expected-error {{'omp section' directive must be closely nested to a sections region, not a parallel region}}
> + {
> + bar();
> + }
> +#pragma omp parallel
> +#pragma omp sections
> + {
> + bar();
> + }
> +#pragma omp parallel
> +#pragma omp single
> + bar();
> +#pragma omp parallel
> +#pragma omp master
> + bar();
> +#pragma omp parallel
> +#pragma omp critical
> + bar();
> +#pragma omp parallel
> +#pragma omp parallel for
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp parallel
> +#pragma omp parallel for simd
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp parallel
> +#pragma omp parallel sections
> + {
> + bar();
> + }
> +#pragma omp parallel
> +#pragma omp task
> + {
> + bar();
> + }
> +#pragma omp parallel
> + {
> +#pragma omp taskyield
> + bar();
> + }
> +#pragma omp parallel
> + {
> +#pragma omp barrier
> + bar();
> + }
> +#pragma omp parallel
> + {
> +#pragma omp taskwait
> + bar();
> + }
> +#pragma omp parallel
> + {
> +#pragma omp flush
> + bar();
> + }
> +#pragma omp parallel
> {
> #pragma omp ordered // expected-error {{region cannot be closely nested inside 'parallel' region; perhaps you forget to enclose 'omp ordered' directive into a for or a parallel for region with 'ordered' clause?}}
> bar();
> @@ -5562,6 +6191,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp parallel
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'parallel' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // SIMD DIRECTIVE
> #pragma omp simd
> @@ -5750,6 +6385,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR DIRECTIVE
> #pragma omp for
> @@ -5958,6 +6599,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR SIMD DIRECTIVE
> #pragma omp for simd
> @@ -6146,6 +6793,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 simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // SECTIONS DIRECTIVE
> #pragma omp sections
> @@ -6343,6 +6996,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'sections' region; perhaps you forget to enclose 'omp teams distribute simd' 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}}
> @@ -6634,6 +7293,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp section
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'section' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // SINGLE DIRECTIVE
> #pragma omp single
> @@ -6832,6 +7498,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp single
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'single' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // MASTER DIRECTIVE
> #pragma omp master
> @@ -7040,6 +7712,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp master
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'master' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // CRITICAL DIRECTIVE
> #pragma omp critical
> @@ -7267,6 +7945,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp critical
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'critical' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // PARALLEL FOR DIRECTIVE
> #pragma omp parallel for
> @@ -7490,6 +8174,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 simd // expected-error {{region cannot be closely nested inside 'parallel for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // PARALLEL FOR SIMD DIRECTIVE
> #pragma omp parallel for simd
> @@ -7713,6 +8403,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 simd // 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
> @@ -7920,6 +8616,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp parallel sections
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'parallel sections' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TASK DIRECTIVE
> #pragma omp task
> @@ -8077,6 +8779,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp task
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'task' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // ATOMIC DIRECTIVE
> #pragma omp atomic
> @@ -8337,6 +9045,14 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp atomic
> + // expected-error at +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 at +1 {{expected an expression statement}}
> + {
> +#pragma omp teams distribute simd // expected-error {{OpenMP constructs may not be nested inside an atomic region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET DIRECTIVE
> #pragma omp target
> @@ -8498,13 +9214,19 @@ void foo() {
> }
> #pragma omp target
> {
> -#pragma omp target simd // expected-error {{region cannot be nested inside 'target' region}}
> +#pragma omp target simd // expected-error {{region cannot be nested inside 'target' region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> + {
> +#pragma omp teams distribute // OK
> for (int i = 0; i < 10; ++i)
> ;
> }
> #pragma omp target
> {
> -#pragma omp teams distribute // OK
> +#pragma omp teams distribute simd // OK
> for (int i = 0; i < 10; ++i)
> ;
> }
> @@ -8676,6 +9398,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target parallel
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'target parallel' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL FOR DIRECTIVE
> #pragma omp target parallel for
> @@ -8899,6 +9627,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 simd // expected-error {{region cannot be closely nested inside 'target parallel for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // TEAMS DIRECTIVE
> #pragma omp target
> @@ -9115,6 +9849,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target
> +#pragma omp teams
> + {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'teams' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TASKLOOP DIRECTIVE
> #pragma omp taskloop
> @@ -9328,6 +10069,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp taskloop
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{region cannot be closely nested inside 'taskloop' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // DISTRIBUTE DIRECTIVE
> #pragma omp target
> @@ -9845,6 +10592,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 simd // expected-error {{region cannot be closely nested inside 'distribute parallel for' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
>
> // DISTRIBUTE PARALLEL FOR SIMD DIRECTIVE
> #pragma omp target
> @@ -10095,6 +10850,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 simd // 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
> @@ -10345,6 +11108,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 simd // 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
> @@ -10532,6 +11303,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // 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?}}
> @@ -10760,5 +11537,247 @@ void foo() {
> 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 simd // expected-error {{region cannot be closely nested inside 'teams distribute' region; perhaps you forget to enclose 'omp teams distribute simd' directive into a target region?}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +
> +// TEAMS DISTRIBUTE SIMD DIRECTIVE
> +#pragma omp teams distribute simd // expected-error {{orphaned 'omp teams distribute simd' 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 simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp for // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp simd // expected-warning {{OpenMP only allows an ordered construct with the simd clause nested in a simd construct}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp for simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp sections // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp section // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp single // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp master // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp critical // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> +#pragma omp single
> + {
> + bar();
> + }
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel for // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel for simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp parallel sections // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp task // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + {
> + bar();
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp taskyield // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp barrier // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp taskwait // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp flush // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp ordered // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + bar();
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp atomic // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target parallel // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target parallel for // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target enter data map(to: a) // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target exit data map(from: a) // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target update to(a) // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp target simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams 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)
> + ++a;
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams distribute simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> return foo<int>();
> }
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_aligned_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_aligned_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_aligned_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_aligned_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,271 @@
> +// RUN: %clang_cc1 -x c++ -std=c++11 -verify -fopenmp %s
> +
> +struct B {
> + static int ib[20]; // expected-note 0 {{'B::ib' declared here}}
> + static constexpr int bfoo() { return 8; }
> +};
> +namespace X {
> + B x; // expected-note {{'x' defined here}}
> +};
> +constexpr int bfoo() { return 4; }
> +
> +int **z;
> +const int C1 = 1;
> +const int C2 = 2;
> +void test_aligned_colons(int *&rp)
> +{
> + int *B = 0;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B:bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B::ib:B:bfoo()) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B:B::bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(z:B:bfoo()) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'?}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B:B::bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(X::x : ::z) // expected-error {{integral constant expression must have integral or unscoped enumeration type, not 'int **'}} expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'B'}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B,rp,::z: X::x) // expected-error {{integral constant expression must have integral or unscoped enumeration type, not 'B'}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(::z)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B::bfoo()) // expected-error {{expected variable name}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(B::ib,B:C1+C2) // expected-warning {{aligned clause will be ignored because the requested alignment is not a power of 2}}
> + for (int i = 0; i < 10; ++i) ;
> +}
> +
> +// expected-note at +1 {{'num' defined here}}
> +template<int L, class T, class N> T test_template(T* arr, N num) {
> + N i;
> + T sum = (T)0;
> + T ind2 = - num * L;
> + // Negative number is passed as L.
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(arr:L) // expected-error {{argument to 'aligned' clause must be a strictly positive integer value}}
> + for (i = 0; i < num; ++i) {
> + T cur = arr[(int)ind2];
> + ind2 += L;
> + sum += cur;
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(num:4) // expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
> + for (i = 0; i < num; ++i);
> +
> + return T();
> +}
> +
> +template<int LEN> int test_warn() {
> + int *ind2 = 0;
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(ind2:LEN) // expected-error {{argument to 'aligned' clause must be a strictly positive integer value}}
> + for (int i = 0; i < 100; i++) {
> + ind2 += LEN;
> + }
> + return 0;
> +}
> +
> +struct S1; // expected-note 2 {{declared here}}
> +extern S1 a; // expected-note {{'a' declared here}}
> +class S2 {
> + mutable int a;
> +public:
> + S2():a(0) { }
> +};
> +const S2 b; // expected-note 1 {{'b' defined here}}
> +const S2 ba[5];
> +class S3 {
> + int a;
> +public:
> + S3():a(0) { }
> +};
> +const S3 ca[5];
> +class S4 {
> + int a;
> + S4();
> +public:
> + S4(int v):a(v) { }
> +};
> +class S5 {
> + int a;
> + S5():a(0) {}
> +public:
> + S5(int v):a(v) { }
> +};
> +
> +S3 h; // expected-note 2 {{'h' defined here}}
> +#pragma omp threadprivate(h)
> +
> +template<class I, class C> int foomain(I argc, C **argv) {
> + I e(argc);
> + I g(argc);
> + int i; // expected-note {{declared here}} expected-note {{'i' defined here}}
> + // expected-note at +2 {{declared here}}
> + // expected-note at +1 {{reference to 'i' is not a constant expression}}
> + int &j = i;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned // expected-error {{expected '(' after 'aligned'}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned ( // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned () // expected-error {{expected expression}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +// FIXME: Should argc really be a pointer?
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (*argc > 0 ? argv[1] : argv[2]) // expected-error {{expected variable name}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argc : 5) // expected-warning {{aligned clause will be ignored because the requested alignment is not a power of 2}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (S1) // expected-error {{'S1' does not refer to a value}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argv[1]) // expected-error {{expected variable name}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(e, g)
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(h) // expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'S3'}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(i) // expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp parallel
> + {
> + int *v = 0;
> + I i;
> + #pragma omp target
> + #pragma omp teams distribute simd aligned(v:16)
> + for (I k = 0; k < argc; ++k) { i = k; v += 2; }
> + }
> + float *f;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(f)
> + for (I k = 0; k < argc; ++k) ++k;
> +
> + int v = 0;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(f:j) // expected-note {{initializer of 'j' is not a constant expression}} expected-error {{expression is not an integral constant expression}}
> +
> + for (I k = 0; k < argc; ++k) { ++k; v += j; }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(f)
> + for (I k = 0; k < argc; ++k) ++k;
> +
> + return 0;
> +}
> +
> +// expected-note at +1 2 {{'argc' defined here}}
> +int main(int argc, char **argv) {
> + double darr[100];
> + // expected-note at +1 {{in instantiation of function template specialization 'test_template<-4, double, int>' requested here}}
> + test_template<-4>(darr, 4);
> + test_warn<4>(); // ok
> + // expected-note at +1 {{in instantiation of function template specialization 'test_warn<0>' requested here}}
> + test_warn<0>();
> +
> + int i;
> + int &j = i;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned // expected-error {{expected '(' after 'aligned'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned ( // 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 simd aligned () // expected-error {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argv // expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argc, // expected-error {{expected expression}} expected-error {{expected ')'}} expected-note {{to match this '('}} expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute simd aligned (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
> +#pragma omp distribute simd aligned (argc) // expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'int'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (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 simd aligned (a, b) // expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'S1'}} expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'S2'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned (argv[1]) // expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd aligned(h) // expected-error {{argument of aligned clause should be array, pointer, reference to array or reference to pointer, not 'S3'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + int *pargc = &argc;
> + // expected-note at +1 {{in instantiation of function template specialization 'foomain<int *, char>' requested here}}
> + foomain<int*,char>(pargc,argv);
> + return 0;
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_ast_print.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_ast_print.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_ast_print.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_ast_print.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,239 @@
> +// 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 simd 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 simd 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 simd 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;
> + }
> + void bar() {
> + int arr[10];
> + const int alen = 16;
> + const int slen1 = 8;
> + const int slen2 = 8;
> +#pragma omp target
> +#pragma omp teams distribute simd simdlen(slen1) safelen(slen2) aligned(arr:alen)
> + for (int k = 0; k < a.a; ++k)
> + ++a.a;
> + }
> +};
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd private(this->a) private(this->a) private(this->S::a)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd private(this->a) private(this->a) private(T::a)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd private(this->a) private(this->a)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd default(none) private(b) firstprivate(argv) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd simdlen(slen1) safelen(slen2) aligned(arr: alen)
> +
> +class S8 : public S7<S> {
> + S8() {}
> +
> +public:
> + S8(int v) : S7<S>(v){
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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;
> + }
> + void foo() {
> + const int alen = 16;
> + const int slen1 = 8;
> + const int slen2 = 8;
> + int arr[10];
> +#pragma omp target
> +#pragma omp teams distribute simd simdlen(slen1) safelen(slen2) aligned(arr:alen)
> + for (int k = 0; k < a.a; ++k)
> + ++a.a;
> + }
> +};
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd private(this->a) private(this->a) private(this->S7<S>::a)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd private(this->a) private(this->a)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd default(none) private(b) firstprivate(argv) shared(d) reduction(+: c) reduction(max: e) num_teams(f) thread_limit(d)
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd simdlen(slen1) safelen(slen2) aligned(arr: alen)
> +
> +template <class T, int N>
> +T tmain(T argc) {
> + T b = argc, c, d, e, f, g;
> + static T a;
> +// CHECK: static T a;
> + const T clen = 5;
> + const T alen = 16;
> + int arr[10];
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i=0; i < 2; ++i)
> + a = 2;
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd
> +// CHECK-NEXT: for (int i = 0; i < 2; ++i)
> +// CHECK-NEXT: a = 2;
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd
> + for (int i = 0; i < 10; ++i)
> + foo();
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd
> +// CHECK-NEXT: for (int i = 0; i < 10; ++i)
> +// CHECK-NEXT: foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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;
> +#pragma omp target
> +#pragma omp teams distribute simd simdlen(clen-1) linear(d)
> + for (int k = 0; k < 10; ++k)
> + e += d + argc;
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd simdlen(clen - 1) linear(d)
> +// CHECK-NEXT: for (int k = 0; k < 10; ++k)
> +// CHECK-NEXT: e += d + argc;
> +#pragma omp target
> +#pragma omp teams distribute simd safelen(clen-1) aligned(arr:alen)
> + for (int k = 0; k < 10; ++k)
> + e += d + argc + arr[k];
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd safelen(clen - 1) aligned(arr: alen)
> +// CHECK-NEXT: for (int k = 0; k < 10; ++k)
> +// CHECK-NEXT: e += d + argc + arr[k];
> + return T();
> +}
> +
> +int main (int argc, char **argv) {
> + int b = argc, c, d, e, f, g;
> + static int a;
> +// CHECK: static int a;
> + const int clen = 5;
> + const int N = 10;
> + int arr[10];
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i=0; i < 2; ++i)
> + a = 2;
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd
> +// CHECK-NEXT: for (int i = 0; i < 2; ++i)
> +// CHECK-NEXT: a = 2;
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd
> + for (int i = 0; i < 10; ++i)foo();
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd
> +// CHECK-NEXT: for (int i = 0; i < 10; ++i)
> +// CHECK-NEXT: foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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;
> +#pragma omp target
> +#pragma omp teams distribute simd simdlen(clen-1) linear(d)
> + for (int k = 0; k < 10; ++k)
> + e += d + argc;
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd simdlen(clen - 1) linear(d)
> +// CHECK-NEXT: for (int k = 0; k < 10; ++k)
> +// CHECK-NEXT: e += d + argc;
> +#pragma omp target
> +#pragma omp teams distribute simd safelen(clen-1) aligned(arr:N+6)
> + for (int k = 0; k < 10; ++k)
> + e += d + argc + arr[k];
> +// CHECK: #pragma omp target
> +// CHECK-NEXT: #pragma omp teams distribute simd safelen(clen - 1) aligned(arr: N + 6)
> +// CHECK-NEXT: for (int k = 0; k < 10; ++k)
> +// CHECK-NEXT: e += d + argc + arr[k];
> + return (0);
> +}
> +
> +#endif
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd 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 simd 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 simd collapse () // expected-error {{expected expression}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +// expected-error at +4 {{expected ')'}} expected-note at +4 {{to match this '('}}
> +// expected-error at +3 2 {{expression is not an integral constant expression}}
> +// expected-note at +2 2 {{read of non-const variable 'argc' is not allowed in a constant expression}}
> +#pragma omp target
> +#pragma omp teams distribute simd collapse (argc
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +// expected-error at +2 2 {{argument to 'collapse' clause must be a strictly positive integer value}}
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd collapse (1)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' 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 simd 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 simd', but found only 1}}
> +
> +// expected-error at +4 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}}
> +// expected-error at +3 2 {{argument to 'collapse' clause must be a strictly positive integer value}}
> +// expected-error at +2 2 {{expression is not an integral constant expression}}
> +#pragma omp target
> +#pragma omp teams distribute simd 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 at +2 2 {{expression is not an integral constant expression}}
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd collapse (2) // expected-note {{as specified in 'collapse' clause}}
> + foo(); // expected-error {{expected 2 for loops after '#pragma omp teams distribute simd'}}
> + return argc;
> +}
> +
> +int main(int argc, char **argv) {
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd', but found only 1}}
> +
> +#pragma omp target
> +#pragma omp teams distribute simd collapse (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' 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 simd', but found only 1}}
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 at +4 {{expression is not an integral constant expression}}
> +// expected-error at +3 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}}
> +// expected-error at +2 2 {{argument to 'collapse' clause must be a strictly positive integer value}}
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 at +2 {{expression is not an integral constant expression}}
> +#pragma omp target
> +#pragma omp teams distribute simd 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 at +4 {{statement after '#pragma omp teams distribute simd' must be a for loop}}
> +// expected-note at +2 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}}
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd collapse (2) // expected-note {{as specified in 'collapse' clause}}
> + foo(); // expected-error {{expected 2 for loops after '#pragma omp teams distribute simd'}}
> +
> +// expected-note at +1 {{in instantiation of function template specialization 'tmain<int, char, 1, 0>' requested here}}
> + return tmain<int, char, 1, 0>(argc, argv);
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_default_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_default_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_default_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_default_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd default // expected-error {{expected '(' after 'default'}}
> + for (int i=0; i<200; i++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd 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 simd 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 simd default (shared), default(shared) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'default' clause}}
> + for (int i=0; i<200; i++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd default(none)
> + for (int i=0; i<200; i++) ++argc; // expected-error {{variable 'argc' must have explicitly specified data sharing attributes}}
> +
> + return 0;
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_dist_schedule_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_dist_schedule_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_dist_schedule_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_dist_schedule_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd dist_schedule // expected-error {{expected '(' after 'dist_schedule'}}
> + for (int i = 0; i < 10; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd dist_schedule (argc)) // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < 10; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd dist_schedule (static), dist_schedule (static, 1) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'dist_schedule' clause}}
> + for (int i = 0; i < 10; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd dist_schedule // expected-error {{expected '(' after 'dist_schedule'}}
> + for (int i = 0; i < 10; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd dist_schedule (argc)) // expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < 10; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd dist_schedule (static), dist_schedule (static, 1) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'dist_schedule' clause}}
> + for (int i = 0; i < 10; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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}}
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_firstprivate_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_firstprivate_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_firstprivate_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_firstprivate_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd firstprivate // expected-error {{expected '(' after 'firstprivate'}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd firstprivate () // expected-error {{expected expression}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd firstprivate (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd firstprivate (argc)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd firstprivate (argv[1]) // expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd firstprivate(ba)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd firstprivate(da)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd firstprivate(S2::S2s)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd firstprivate(S2::S2sc)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd private(i), firstprivate(i) // expected-error {{private variable cannot be firstprivate}} expected-note 2 {{defined as private}}
> + for (i = 0; i < argc; ++i) foo(); // expected-error {{loop iteration variable in the associated loop of 'omp teams distribute simd' directive may not be private, predetermined as linear}}
> +
> +#pragma omp target
> +#pragma omp teams distribute simd firstprivate(i)
> + for (j = 0; j < argc; ++j) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd' directive may not be firstprivate, predetermined as linear}}
> +
> +#pragma omp target
> +#pragma omp teams distribute simd firstprivate(j)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(argc), firstprivate(argc) // OK
> + for (i = 0; i < argc; ++i) foo();
> +
> + return 0;
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_lastprivate_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_lastprivate_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_lastprivate_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_lastprivate_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd lastprivate // expected-error {{expected '(' after 'lastprivate'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd lastprivate() // expected-error {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd lastprivate(argc)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd lastprivate(argv[1]) // expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd lastprivate(i)
> + for (int k = 0; k < argc; ++k) {
> + i = k;
> + v += i;
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(j) private(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + return 0;
> +}
> +
> +void bar(S4 a[2]) {
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd lastprivate // expected-error {{expected '(' after 'lastprivate'}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd lastprivate() // expected-error {{expected expression}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd lastprivate(argc)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd lastprivate(argv[1]) // expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(2 * 2) // expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(ba)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(ca) // expected-error {{shared variable cannot be lastprivate}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd lastprivate(xa) // OK
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(S2::S2s) // expected-error {{shared variable cannot be lastprivate}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(S2::S2sc) // expected-error {{shared variable cannot be lastprivate}}
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd lastprivate(xa)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(j)
> + for (i = 0; i < argc; ++i) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd lastprivate(n) firstprivate(n) // OK
> + for (i = 0; i < argc; ++i) foo();
> +
> + static int si;
> +#pragma omp target
> +#pragma omp teams distribute simd 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}}
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_linear_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_linear_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_linear_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_linear_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,293 @@
> +// RUN: %clang_cc1 -verify -fopenmp %s
> +
> +namespace X {
> + int x;
> +};
> +
> +struct B {
> + static int ib; // expected-note {{'B::ib' declared here}}
> + static int bfoo() { return 8; }
> +};
> +
> +int bfoo() { return 4; }
> +
> +int z;
> +const int C1 = 1;
> +const int C2 = 2;
> +void test_linear_colons()
> +{
> + int B = 0;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B:bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B::ib:B:bfoo()) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B:ib) // expected-error {{use of undeclared identifier 'ib'; did you mean 'B::ib'}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(z:B:ib) // expected-error {{unexpected ':' in nested name specifier; did you mean '::'?}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B:B::bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(X::x : ::z)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B,::z, X::x)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(::z)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B::bfoo()) // expected-error {{expected variable name}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(B::ib,B:C1+C2)
> + for (int i = 0; i < 10; ++i) ;
> +}
> +
> +template<int L, class T, class N> T test_template(T* arr, N num) {
> + N i;
> + T sum = (T)0;
> + T ind2 = - num * L; // expected-note {{'ind2' defined here}}
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(ind2:L) // expected-error {{argument of a linear clause should be of integral or pointer type}}
> + for (i = 0; i < num; ++i) {
> + T cur = arr[(int)ind2];
> + ind2 += L;
> + sum += cur;
> + }
> + return T();
> +}
> +
> +template<int LEN> int test_warn() {
> + int ind2 = 0;
> + #pragma omp target
> + #pragma omp teams distribute simd linear(ind2:LEN) // expected-warning {{zero linear step (ind2 should probably be const)}}
> + for (int i = 0; i < 100; i++) {
> + ind2 += LEN;
> + }
> + return ind2;
> +}
> +
> +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) { }
> +};
> +const S2 b; // expected-note 2 {{'b' defined here}}
> +const S2 ba[5];
> +class S3 {
> + int a;
> +public:
> + S3():a(0) { }
> +};
> +const S3 ca[5];
> +class S4 {
> + int a;
> + S4();
> +public:
> + S4(int v):a(v) { }
> +};
> +class S5 {
> + int a;
> + S5():a(0) {}
> +public:
> + S5(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(I argc, C **argv) {
> + I e(4);
> + I g(5);
> + int i;
> + int &j = i;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear // expected-error {{expected '(' after 'linear'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear ( // 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 simd linear () // expected-error {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (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 simd linear (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 simd linear (argc : 5)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (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 simd linear (a, b:B::ib) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (argv[1]) // expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(e, g)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(h) // expected-error {{threadprivate or thread local variable cannot be linear}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp parallel
> + {
> + int v = 0;
> + int i;
> + #pragma omp target
> + #pragma omp teams distribute simd linear(v:i)
> + for (int k = 0; k < argc; ++k) { i = k; v += i; }
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(j)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + int v = 0;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(v:j)
> + for (int k = 0; k < argc; ++k) { ++k; v += j; }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(i)
> + for (int k = 0; k < argc; ++k) ++k;
> + return 0;
> +}
> +
> +namespace A {
> +double x;
> +#pragma omp threadprivate(x) // expected-note {{defined as threadprivate or thread local}}
> +}
> +namespace C {
> +using A::x;
> +}
> +
> +int main(int argc, char **argv) {
> + double darr[100];
> + // expected-note at +1 {{in instantiation of function template specialization 'test_template<-4, double, int>' requested here}}
> + test_template<-4>(darr, 4);
> + // expected-note at +1 {{in instantiation of function template specialization 'test_warn<0>' requested here}}
> + test_warn<0>();
> +
> + S4 e(4); // expected-note {{'e' defined here}}
> + S5 g(5); // expected-note {{'g' defined here}}
> + int i;
> + int &j = i;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear // expected-error {{expected '(' after 'linear'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear ( // 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 simd linear () // expected-error {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (argc // expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (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 simd linear (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 simd linear (argc)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (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 simd linear (a, b) // expected-error {{linear variable with incomplete type 'S1'}} expected-error {{const-qualified variable cannot be linear}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear (argv[1]) // expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(e, g) // expected-error {{argument of a linear clause should be of integral or pointer type, not 'S4'}} expected-error {{argument of a linear clause should be of integral or pointer type, not 'S5'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(h, C::x) // expected-error 2 {{threadprivate or thread local variable cannot be linear}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp parallel
> + {
> + int i;
> + #pragma omp target
> + #pragma omp teams distribute simd linear(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd linear(i : 4)
> + for (int k = 0; k < argc; ++k) { ++k; i += 4; }
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(j)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams distribute simd linear(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + foomain<int,char>(argc,argv); // expected-note {{in instantiation of function template specialization 'foomain<int, char>' requested here}}
> + return 0;
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_loop_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_loop_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_loop_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_loop_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 at +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 simd
> + for (int i = 0; i < 10; i += 1) {
> + c[i] = a[i] + b[i];
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (char i = 0; i < 10; i++) {
> + c[i] = a[i] + b[i];
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (char i = 0; i < 10; i += '\1') {
> + c[i] = a[i] + b[i];
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (long long i = 0; i < 10; i++) {
> + c[i] = a[i] + b[i];
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> + for (long long i = 0; i < 'z'; i += 1u) {
> + c[i] = a[i] + b[i];
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-warning at +2 {{expression result unused}}
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// Ok to skip parenthesises.
> + for (((ii)) = 0; ii < 10; ++ii)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> +// expected-error at +2 {{condition of OpenMP for loop must be a relational comparison ('<', '<=', '>', or '>=') of loop variable 'i'}}
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> + for (int i = 11; i > 10; i--)
> + c[i] = a[i];
> +
> +// Ok.
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < 10; ++i)
> + c[i] = a[i];
> +
> +// Ok.
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (ii = 0; ii < 10; ++ii)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> + for (ii = 0; ii < 10; ii = ii + ii)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> + for (ii = 0; ii < 10; ii = ii + (int)1.1f)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> +// expected-warning at +2 {{relational comparison result unused}}
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-warning at +2 {{expression result unused}}
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd firstprivate(ii) // expected-note {{defined as firstprivate}}
> +// expected-error at +1 {{loop iteration variable in the associated loop of 'omp teams distribute simd' directive may not be firstprivate, predetermined as linear}}
> + for (ii = 0; ii < 10; ii++)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd private(ii) // expected-note {{defined as private}}
> +// expected-error at +1 {{loop iteration variable in the associated loop of 'omp teams distribute simd' directive may not be private, predetermined as linear}}
> + for (ii = 0; ii < 10; ii++)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd lastprivate(ii) // expected-note {{defined as lastprivate}}
> +// expected-error at +1 {{loop iteration variable in the associated loop of 'omp teams distribute simd' directive may not be lastprivate, predetermined as linear}}
> + for (ii = 0; ii < 10; ii++)
> + c[ii] = a[ii];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +1 {{loop iteration variable in the associated loop of 'omp teams distribute simd' directive may not be threadprivate or thread local, predetermined as linear}}
> + for (sii = 0; sii < 10; sii++)
> + c[sii] = a[sii];
> +
> + {
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd
> +// expected-error at +1 {{statement after '#pragma omp teams distribute simd' must be a for loop}}
> + for (auto &item : a) {
> + item = item + 1;
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> + for (int(*p)[4] = lb; p < lb + 8; ++p) {
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-warning at +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 at +2 {{candidate function not viable: no known conversion from 'GoodIter' to 'Iter0' for 1st argument}}
> +// expected-note at +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 at +2 {{candidate function not viable: no known conversion from 'const Iter0' to 'GoodIter' for 2nd argument}}
> +// expected-note at +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 at +1 3 {{candidate function not viable: requires single argument 'a', but 2 arguments were provided}}
> +GoodIter operator-(GoodIter a) { return a; }
> +// expected-note at +2 {{candidate function not viable: no known conversion from 'const Iter0' to 'int' for 2nd argument}}
> +// expected-note at +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 at +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 at +2 {{candidate function not viable: no known conversion from 'GoodIter' to 'int' for 1st argument}}
> +// expected-note at +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 at +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 simd
> + for (GoodIter I = begin; I < end; ++I)
> + ++I;
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> + for (GoodIter I = begin; I >= end; --I)
> + ++I;
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-warning at +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 simd
> +// expected-warning at +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 simd
> +// expected-warning at +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 simd
> +// expected-warning at +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 simd
> + for (begin = GoodIter(0); begin < end; ++begin)
> + ++begin;
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +2 {{invalid operands to binary expression ('GoodIter' and 'const Iter0')}}
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> + for (begin = end; begin < end; ++begin)
> + ++begin;
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> + for (GoodIter I = begin; I >= end; I = I - 1)
> + ++I;
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> +// expected-error at +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 simd
> +// expected-error at +1 {{invalid operands to binary expression ('Iter0' and 'int')}}
> + for (Iter0 I = begin0; I < end0; ++I)
> + ++I;
> +#pragma omp target
> +#pragma omp teams distribute simd
> +// Initializer is constructor without params.
> +// expected-error at +2 {{invalid operands to binary expression ('Iter0' and 'int')}}
> +// expected-warning at +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 simd
> +// expected-error at +2 {{invalid operands to binary expression ('Iter1' and 'Iter1')}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> +// expected-error at +4 {{invalid operands to binary expression ('Iter1' and 'float')}}
> +// expected-error at +3 {{could not calculate number of iterations calling 'operator-' with upper and lower loop bounds}}
> +// Initializer is constructor with all default params.
> +// expected-warning at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be positive due to this condition}}
> +// expected-error at +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 simd
> + 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 simd
> +// expected-note at +2 2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> +// expected-note at +2 {{loop step is expected to be negative due to this condition}}
> +// expected-error at +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 simd
> + 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 simd
> + 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 simd
> + 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 simd
> + for (int i = 0; i < 10; i++) {
> + c[i] = a[i] + b[i];
> + try { // expected-error {{'try' statement cannot be used in OpenMP simd region}}
> + for (int j = 0; j < 10; ++j) {
> + if (a[i] > b[j])
> + throw a[i]; // expected-error {{throw' statement cannot be used in OpenMP simd region}}
> + }
> + throw a[i]; // expected-error {{throw' statement cannot be used in OpenMP simd region}}
> + } catch (float f) {
> + if (f > 0.1)
> + throw a[i]; // expected-error {{throw' statement cannot be used in OpenMP simd region}}
> + 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]; // expected-error {{throw' statement cannot be used in OpenMP simd region}}
> + }
> + }
> + if (c[9] > 10)
> + throw c[9]; // OK
> +
> +#pragma omp target
> +#pragma omp teams distribute simd
> + 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 simd lastprivate(s) firstprivate(s)
> + for (int i = 0; i < 16; ++i)
> + ;
> +}
> +
> +void test_ordered() {
> +#pragma omp target
> +#pragma omp teams distribute simd ordered // expected-error {{unexpected OpenMP clause 'ordered' in directive '#pragma omp teams distribute simd'}}
> + for (int i = 0; i < 16; ++i)
> + ;
> +}
> +
> +void test_nowait() {
> +#pragma omp target
> +// expected-error at +1 2 {{unexpected OpenMP clause 'nowait' in directive '#pragma omp teams distribute simd'}}
> +#pragma omp teams distribute simd nowait nowait // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'nowait' clause}}
> + for (int i = 0; i < 16; ++i)
> + ;
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,109 @@
> +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 %s
> +
> +void foo() {
> +}
> +
> +static int pvt;
> +#pragma omp threadprivate(pvt)
> +
> +#pragma omp teams distribute simd // expected-error {{unexpected OpenMP directive '#pragma omp teams distribute simd'}}
> +
> +int main(int argc, char **argv) {
> +#pragma omp target
> +#pragma omp teams distribute simd { // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd ( // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd[ // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd] // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd } // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < argc; ++i)
> + foo();
> +// expected-warning at +2 {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> +#pragma omp target
> +#pragma omp teams distribute simd unknown()
> + for (int i = 0; i < argc; ++i)
> + foo();
> +L1:
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < argc; ++i) {
> + goto L1; // expected-error {{use of undeclared label 'L1'}}
> + argc++;
> + }
> +
> + for (int i = 0; i < 10; ++i) {
> + switch (argc) {
> + case (0):
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < argc; ++i) {
> + foo();
> + break; // expected-error {{'break' statement cannot be used in OpenMP for loop}}
> + continue;
> + }
> + default:
> + break;
> + }
> + }
> +#pragma omp target
> +#pragma omp teams distribute simd default(none)
> + for (int i = 0; i < 10; ++i)
> + ++argc; // expected-error {{ariable 'argc' must have explicitly specified data sharing attributes}}
> +
> + goto L2; // expected-error {{use of undeclared label 'L2'}}
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < argc; ++i)
> + L2:
> + foo();
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int i = 0; i < argc; ++i) {
> + return 1; // expected-error {{cannot return from OpenMP region}}
> + }
> +
> + [[]] // expected-error {{an attribute list cannot appear here}}
> +#pragma omp target
> +#pragma omp teams distribute simd
> + for (int n = 0; n < 100; ++n) {
> + }
> +
> +#pragma omp target
> +#pragma omp teams distribute simd copyin(pvt) // expected-error {{unexpected OpenMP clause 'copyin' in directive '#pragma omp teams distribute simd'}}
> + for (int n = 0; n < 100; ++n) {}
> +
> + return 0;
> +}
> +
> +void test_ordered() {
> +#pragma omp target
> +#pragma omp teams distribute simd ordered // expected-error {{unexpected OpenMP clause 'ordered' in directive '#pragma omp teams distribute simd'}}
> + for (int i = 0; i < 16; ++i)
> + ;
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_num_teams_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_num_teams_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_num_teams_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_num_teams_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd num_teams(C)
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams // expected-error {{expected '(' after 'num_teams'}}
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams() // expected-error {{expected expression}}
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams(argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams(argc + argc)
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd num_teams(argc), num_teams (argc+1) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'num_teams' clause}}
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd num_teams(-10u)
> + for (int i=0; i<100; i++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams // expected-error {{expected '(' after 'num_teams'}}
> + for (int i=0; i<100; i++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams () // expected-error {{expected expression}}
> + for (int i=0; i<100; i++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams (argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i=0; i<100; i++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd num_teams (argc + argc)
> + for (int i=0; i<100; i++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd num_teams (argc), num_teams (argc+1) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'num_teams' clause}}
> + for (int i=0; i<100; i++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd num_teams (-10u)
> + for (int i=0; i<100; i++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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}}
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_private_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_private_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_private_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_private_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd private // expected-error {{expected '(' after 'private'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd private () // expected-error {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd 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 simd 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 simd private (argc)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd 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 simd private (argv[1]) // expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd private(ba)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd private(ca) // expected-error {{shared variable cannot be private}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd private(da) // expected-error {{shared variable cannot be private}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd 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 simd 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 simd shared(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd private(j)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd private(i)
> + for (int x = 0; x < 10; ++x) foo();
> + }
> +
> + #pragma omp target
> + #pragma omp teams distribute simd firstprivate(i)
> + for (int k = 0; k < 10; ++k) {
> + }
> +
> + return 0;
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_reduction_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_reduction_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_reduction_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_reduction_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 at -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 simd reduction // expected-error {{expected '(' after 'reduction'}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd reduction(&& : argc)
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd reduction(+ : o) // expected-error 2 {{no viable overloaded '='}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd reduction // expected-error {{expected '(' after 'reduction'}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd reduction + // expected-error {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd reduction(~ : argc) // expected-error {{expected unqualified-id}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd reduction(&& : argc)
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd 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 simd reduction(+ : o) // expected-error {{no viable overloaded '='}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd 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 simd 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 simd 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 simd reduction(+ : fl)
> + for (int j=0; j<100; j++) foo();
> + static int m;
> +#pragma omp target
> +#pragma omp teams distribute simd 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}}
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_safelen_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_safelen_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_safelen_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_safelen_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,155 @@
> +// 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() {
> +}
> +
> +#if __cplusplus >= 201103L
> +// expected-note at +2 4 {{declared here}}
> +#endif
> +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 simd safelen // expected-error {{expected '(' after 'safelen'}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen ( // 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 simd safelen () // expected-error {{expected expression}}
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{expression is not an integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (ST // expected-error {{argument to 'safelen' clause must be a strictly positive integer value}} 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 simd safelen (1)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' 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 simd safelen ((ST > 0) ? 1 + ST : 2)
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#if __cplusplus >= 201103L
> + // expected-note at +3 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) // expected-error 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} expected-error 2 {{argument to 'safelen' clause must be a strictly positive integer value}} expected-error 2 {{expression is not an integral constant expression}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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];
> +
> +#if __cplusplus <= 199711L
> + // expected-error at +5 2 {{expression is not an integral constant expression}}
> +#else
> + // expected-error at +3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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 simd safelen (4)
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (N) // expected-error {{argument to 'safelen' 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];
> +
> + return argc;
> +}
> +
> +int main(int argc, char **argv) {
> +#pragma omp target
> +#pragma omp teams distribute simd safelen // expected-error {{expected '(' after 'safelen'}}
> + for (int i = 4; i < 12; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-4];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen ( // 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 simd safelen () // 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 simd safelen (4 // 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 simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 4; i < 12; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-4];
> +
> +#if __cplusplus >= 201103L
> + // expected-note at +3 {{non-constexpr function 'foobool' cannot be used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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];
> +
> +#if __cplusplus >= 201103L
> + // expected-note at +3 {{non-constexpr function 'foobool' cannot be used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) // expected-error 2 {{argument to 'safelen' clause must be a strictly positive integer value}} expected-error 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} 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];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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];
> +
> +#if __cplusplus <= 199711L
> + // expected-error at +5 {{expression is not an integral constant expression}}
> +#else
> + // expected-error at +3 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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-note at +2 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}}
> +#pragma omp target
> +#pragma omp teams distribute simd safelen(safelen(tmain<int, char, -1, -2>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
> + foo(); // expected-error {{statement after '#pragma omp teams distribute simd' must be a for loop}}
> +
> + // expected-note at +1 {{in instantiation of function template specialization 'tmain<int, char, 12, 4>' requested here}}
> + return tmain<int, char, 12, 4>(argc, argv);
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_shared_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_shared_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_shared_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_shared_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,127 @@
> +// 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 simd shared // expected-error {{expected '(' after 'shared'}}
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd shared () // expected-error {{expected expression}}
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd 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 simd 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 simd shared (argc)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd shared (a, b, c, d, f)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared (argv[1]) // expected-error {{expected variable name}}
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared(ba)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared(ca)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared(da)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared(e, g)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd 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 simd 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 simd 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 simd private(i)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared(i)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd shared(j)
> + for (int j=0; j<100; j++) foo();
> + #pragma omp target
> + #pragma omp teams distribute simd firstprivate(i)
> + for (int j=0; j<100; j++) foo();
> +
> + return 0;
> +}
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_simdlen_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -0,0 +1,155 @@
> +// 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() {
> +}
> +
> +#if __cplusplus >= 201103L
> +// expected-note at +2 4 {{declared here}}
> +#endif
> +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 simd safelen // expected-error {{expected '(' after 'safelen'}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen ( // 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 simd safelen () // expected-error {{expected expression}}
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (argc // expected-note {{to match this '('}} expected-error 2 {{expression is not an integral constant expression}} expected-note 2 {{read of non-const variable 'argc' is not allowed in a constant expression}} expected-error {{expected ')'}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (ST // expected-error {{argument to 'safelen' clause must be a strictly positive integer value}} 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 simd safelen (1)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' 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 simd safelen ((ST > 0) ? 1 + ST : 2)
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#if __cplusplus >= 201103L
> + // expected-note at +3 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) // expected-error 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} expected-error 2 {{argument to 'safelen' clause must be a strictly positive integer value}} expected-error 2 {{expression is not an integral constant expression}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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];
> +
> +#if __cplusplus <= 199711L
> + // expected-error at +5 2 {{expression is not an integral constant expression}}
> +#else
> + // expected-error at +3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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 simd safelen (4)
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (N) // expected-error {{argument to 'safelen' 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];
> +
> + return argc;
> +}
> +
> +int main(int argc, char **argv) {
> +#pragma omp target
> +#pragma omp teams distribute simd safelen // expected-error {{expected '(' after 'safelen'}}
> + for (int i = 4; i < 12; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-4];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen ( // 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 simd safelen () // 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 simd safelen (4 // 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 simd safelen (2+2)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int i = 4; i < 12; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-4];
> +
> +#if __cplusplus >= 201103L
> + // expected-note at +3 {{non-constexpr function 'foobool' cannot be used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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];
> +
> +#if __cplusplus >= 201103L
> + // expected-note at +3 {{non-constexpr function 'foobool' cannot be used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (foobool(argc)), safelen (true), safelen (-5) // expected-error 2 {{argument to 'safelen' clause must be a strictly positive integer value}} expected-error 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'safelen' clause}} 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];
> +
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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];
> +
> +#if __cplusplus <= 199711L
> + // expected-error at +5 {{expression is not an integral constant expression}}
> +#else
> + // expected-error at +3 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams distribute simd safelen (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-note at +2 {{in instantiation of function template specialization 'tmain<int, char, -1, -2>' requested here}}
> +#pragma omp target
> +#pragma omp teams distribute simd safelen(safelen(tmain<int, char, -1, -2>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2 {{to match this '('}}
> + foo(); // expected-error {{statement after '#pragma omp teams distribute simd' must be a for loop}}
> +
> + // expected-note at +1 {{in instantiation of function template specialization 'tmain<int, char, 12, 4>' requested here}}
> + return tmain<int, char, 12, 4>(argc, argv);
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/teams_distribute_simd_thread_limit_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_thread_limit_messages.cpp?rev=285066&view=auto
> ==============================================================================
> --- cfe/trunk/test/OpenMP/teams_distribute_simd_thread_limit_messages.cpp (added)
> +++ cfe/trunk/test/OpenMP/teams_distribute_simd_thread_limit_messages.cpp Tue Oct 25 07:50:55 2016
> @@ -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 simd thread_limit(C)
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit // expected-error {{expected '(' after 'thread_limit'}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit() // expected-error {{expected expression}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit(argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit(argc + argc)
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd thread_limit(argc), thread_limit (argc+1) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'thread_limit' clause}}
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd thread_limit(-10u)
> + for (int j=0; j<100; j++) foo();
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit // expected-error {{expected '(' after 'thread_limit'}}
> + for (int j=0; j<100; j++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit () // expected-error {{expected expression}}
> + for (int j=0; j<100; j++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit (argc)) // expected-warning {{extra tokens at the end of '#pragma omp teams distribute simd' are ignored}}
> + for (int j=0; j<100; j++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd thread_limit (argc + argc)
> + for (int j=0; j<100; j++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd thread_limit (argc), thread_limit (argc+1) // expected-error {{directive '#pragma omp teams distribute simd' cannot contain more than one 'thread_limit' clause}}
> + for (int j=0; j<100; j++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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 simd 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 simd thread_limit (-10u)
> + for (int j=0; j<100; j++) foo();
> +
> +#pragma omp target
> +#pragma omp teams distribute simd 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}}
> +}
>
> Modified: cfe/trunk/tools/libclang/CIndex.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/tools/libclang/CIndex.cpp (original)
> +++ cfe/trunk/tools/libclang/CIndex.cpp Tue Oct 25 07:50:55 2016
> @@ -1991,6 +1991,8 @@ public:
> const OMPTargetParallelForSimdDirective *D);
> void VisitOMPTargetSimdDirective(const OMPTargetSimdDirective *D);
> void VisitOMPTeamsDistributeDirective(const OMPTeamsDistributeDirective *D);
> + void VisitOMPTeamsDistributeSimdDirective(
> + const OMPTeamsDistributeSimdDirective *D);
>
> private:
> void AddDeclarationNameInfo(const Stmt *S);
> @@ -2780,6 +2782,11 @@ void EnqueueVisitor::VisitOMPTeamsDistri
> VisitOMPLoopDirective(D);
> }
>
> +void EnqueueVisitor::VisitOMPTeamsDistributeSimdDirective(
> + const OMPTeamsDistributeSimdDirective *D) {
> + VisitOMPLoopDirective(D);
> +}
> +
> void CursorVisitor::EnqueueWorkList(VisitorWorkList &WL, const Stmt *S) {
> EnqueueVisitor(WL, MakeCXCursor(S, StmtParent, TU,RegionOfInterest)).Visit(S);
> }
> @@ -4908,6 +4915,8 @@ CXString clang_getCursorKindSpelling(enu
> return cxstring::createRef("OMPTargetSimdDirective");
> case CXCursor_OMPTeamsDistributeDirective:
> return cxstring::createRef("OMPTeamsDistributeDirective");
> + case CXCursor_OMPTeamsDistributeSimdDirective:
> + return cxstring::createRef("OMPTeamsDistributeSimdDirective");
> case CXCursor_OverloadCandidate:
> return cxstring::createRef("OverloadCandidate");
> case CXCursor_TypeAliasTemplateDecl:
>
> Modified: cfe/trunk/tools/libclang/CXCursor.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCursor.cpp?rev=285066&r1=285065&r2=285066&view=diff
> ==============================================================================
> --- cfe/trunk/tools/libclang/CXCursor.cpp (original)
> +++ cfe/trunk/tools/libclang/CXCursor.cpp Tue Oct 25 07:50:55 2016
> @@ -656,6 +656,9 @@ CXCursor cxcursor::MakeCXCursor(const St
> case Stmt::OMPTeamsDistributeDirectiveClass:
> K = CXCursor_OMPTeamsDistributeDirective;
> break;
> + case Stmt::OMPTeamsDistributeSimdDirectiveClass:
> + K = CXCursor_OMPTeamsDistributeSimdDirective;
> + break;
> }
>
> CXCursor C = { K, 0, { Parent, S, TU } };
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list