r274530 - [OpenMP] Sema and parse for 'distribute parallel for simd'
Richard Smith via cfe-commits
cfe-commits at lists.llvm.org
Mon Oct 17 10:02:21 PDT 2016
On Mon, Jul 4, 2016 at 10:00 PM, Kelvin Li via cfe-commits <
cfe-commits at lists.llvm.org> wrote:
> Author: kli
> Date: Tue Jul 5 00:00:15 2016
> New Revision: 274530
>
> URL: http://llvm.org/viewvc/llvm-project?rev=274530&view=rev
> Log:
> [OpenMP] Sema and parse for 'distribute parallel for simd'
>
> Summary: This patch is an implementation of sema and parsing for the
> OpenMP composite pragma 'distribute parallel for simd'.
>
> Differential Revision: http://reviews.llvm.org/D21977
>
>
> Added:
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> aligned_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_ast_print.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> collapse_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_copyin_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> default_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> dist_schedule_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> firstprivate_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_if_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> lastprivate_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_linear_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> num_threads_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> private_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> proc_bind_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> reduction_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> safelen_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> schedule_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_shared_messages.cpp
> cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> simdlen_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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang-c/Index.h (original)
> +++ cfe/trunk/include/clang-c/Index.h Tue Jul 5 00:00:15 2016
> @@ -326,7 +326,7 @@ clang_isFileMultipleIncludeGuarded(CXTra
> *
> * \param tu the translation unit
> *
> - * \param file_name the name of the file.
> +* \param file_name the name of the file.
> *
> * \returns the file handle for the named file in the translation unit \p
> tu,
> * or a NULL file handle if the file was not a part of this translation
> unit.
> @@ -2309,7 +2309,11 @@ enum CXCursorKind {
> */
> CXCursor_OMPDistributeParallelForDirective = 266,
>
> - CXCursor_LastStmt = CXCursor_
> OMPDistributeParallelForDirective,
> + /** \brief OpenMP distribute parallel for simd directive.
> + */
> + CXCursor_OMPDistributeParallelForSimdDirective = 267,
> +
> + CXCursor_LastStmt = CXCursor_OMPDistributeParallelForSimdDirective,
>
> /**
> * \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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)
> +++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Tue Jul 5 00:00:15
> 2016
> @@ -2518,6 +2518,9 @@ DEF_TRAVERSE_STMT(OMPDistributeDirective
> DEF_TRAVERSE_STMT(OMPDistributeParallelForDirective,
> { TRY_TO(TraverseOMPExecutableDirective(S)); })
>
> +DEF_TRAVERSE_STMT(OMPDistributeParallelForSimdDirective,
> + { 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang/AST/StmtOpenMP.h (original)
> +++ cfe/trunk/include/clang/AST/StmtOpenMP.h Tue Jul 5 00:00:15 2016
> @@ -770,7 +770,8 @@ public:
> T->getStmtClass() == OMPTaskLoopSimdDirectiveClass ||
> T->getStmtClass() == OMPDistributeDirectiveClass ||
> T->getStmtClass() == OMPTargetParallelForDirectiveClass ||
> - T->getStmtClass() == OMPDistributeParallelForDirectiveClass;
> + T->getStmtClass() == OMPDistributeParallelForDirectiveClass ||
> + T->getStmtClass() == OMPDistributeParallelForSimdDi
> rectiveClass;
> }
> };
>
> @@ -2881,6 +2882,77 @@ public:
> return T->getStmtClass() == OMPDistributeParallelForDirectiveClass;
> }
> };
> +
> +/// This represents '#pragma omp distribute parallel for simd' composite
> +/// directive.
> +///
> +/// \code
> +/// #pragma omp distribute parallel for simd private(x)
> +/// \endcode
> +/// In this example directive '#pragma omp distribute parallel for simd'
> has
> +/// clause 'private' with the variables 'x'
> +///
> +class OMPDistributeParallelForSimdDirective 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.
> + ///
> + OMPDistributeParallelForSimdDirective(SourceLocation StartLoc,
> + SourceLocation EndLoc,
> + unsigned CollapsedNum,
> + unsigned NumClauses)
> + : OMPLoopDirective(this, OMPDistributeParallelForSimdDi
> rectiveClass,
> + OMPD_distribute_parallel_for_simd, StartLoc,
> + EndLoc, CollapsedNum, NumClauses) {}
> +
> + /// Build an empty directive.
> + ///
> + /// \param CollapsedNum Number of collapsed nested loops.
> + /// \param NumClauses Number of clauses.
> + ///
> + explicit OMPDistributeParallelForSimdDirective(unsigned CollapsedNum,
> + unsigned NumClauses)
> + : OMPLoopDirective(this, OMPDistributeParallelForSimdDi
> rectiveClass,
> + OMPD_distribute_parallel_for_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 OMPDistributeParallelForSimdDirective *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 OMPDistributeParallelForSimdDirective *CreateEmpty(
> + const ASTContext &C, unsigned NumClauses, unsigned CollapsedNum,
> + EmptyShell);
> +
> + static bool classof(const Stmt *T) {
> + return T->getStmtClass() == OMPDistributeParallelForSimdDi
> rectiveClass;
> + }
> +};
> +
> } // 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)
> +++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Tue Jul 5 00:00:15 2016
> @@ -129,6 +129,9 @@
> #ifndef OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE
> #define OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(Name)
> #endif
> +#ifndef OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE
> +#define OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(Name)
> +#endif
>
> // OpenMP directives.
> OPENMP_DIRECTIVE(threadprivate)
> @@ -170,6 +173,7 @@ OPENMP_DIRECTIVE(distribute)
> OPENMP_DIRECTIVE_EXT(declare_target, "declare target")
> OPENMP_DIRECTIVE_EXT(end_declare_target, "end declare target")
> OPENMP_DIRECTIVE_EXT(distribute_parallel_for, "distribute parallel for")
> +OPENMP_DIRECTIVE_EXT(distribute_parallel_for_simd, "distribute parallel
> for simd")
>
> // OpenMP clauses.
> OPENMP_CLAUSE(if, OMPIfClause)
> @@ -550,6 +554,25 @@ OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(re
> OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(copyin)
> OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(schedule)
>
> +// Clauses allowed for OpenMP directive 'distribute parallel for simd'
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(firstprivate)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(lastprivate)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(collapse)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(dist_schedule)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(if)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(num_threads)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(default)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(proc_bind)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(private)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(shared)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(reduction)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(copyin)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(schedule)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(linear)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(aligned)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(safelen)
> +OPENMP_DISTRIBUTE_PARALLEL_FOR_SIMD_CLAUSE(simdlen)
> +
> #undef OPENMP_TASKLOOP_SIMD_CLAUSE
> #undef OPENMP_TASKLOOP_CLAUSE
> #undef OPENMP_LINEAR_KIND
> @@ -589,3 +612,4 @@ OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE(sc
> #undef OPENMP_DEFAULTMAP_MODIFIER
> #undef OPENMP_TARGET_UPDATE_CLAUSE
> #undef OPENMP_DISTRIBUTE_PARALLEL_FOR_CLAUSE
> +#undef OPENMP_DISTRIBUTE_PARALLEL_FOR_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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang/Basic/StmtNodes.td (original)
> +++ cfe/trunk/include/clang/Basic/StmtNodes.td Tue Jul 5 00:00:15 2016
> @@ -229,3 +229,4 @@ def OMPTaskLoopDirective : DStmt<OMPLoop
> def OMPTaskLoopSimdDirective : DStmt<OMPLoopDirective>;
> def OMPDistributeDirective : DStmt<OMPLoopDirective>;
> def OMPDistributeParallelForDirective : DStmt<OMPLoopDirective>;
> +def OMPDistributeParallelForSimdDirective : 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang/Sema/Sema.h (original)
> +++ cfe/trunk/include/clang/Sema/Sema.h Tue Jul 5 00:00:15 2016
> @@ -8206,6 +8206,12 @@ public:
> ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
> SourceLocation EndLoc,
> llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA);
> + /// \brief Called on well-formed '\#pragma omp distribute parallel for
> simd'
> + /// after parsing of the associated statement.
> + StmtResult ActOnOpenMPDistributeParallelForSimdDirective(
> + 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/include/clang/Serialization/ASTBitCodes.h (original)
> +++ cfe/trunk/include/clang/Serialization/ASTBitCodes.h Tue Jul 5
> 00:00:15 2016
> @@ -1476,6 +1476,7 @@ namespace clang {
> STMT_OMP_DISTRIBUTE_DIRECTIVE,
> STMT_OMP_TARGET_UPDATE_DIRECTIVE,
> STMT_OMP_DISTRIBUTE_PARALLEL_FOR_DIRECTIVE,
> + STMT_OMP_DISTRIBUTE_PARALLEL_FOR_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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/AST/StmtOpenMP.cpp (original)
> +++ cfe/trunk/lib/AST/StmtOpenMP.cpp Tue Jul 5 00:00:15 2016
> @@ -1105,3 +1105,60 @@ OMPDistributeParallelForDirective::Creat
> numLoopChildren(CollapsedNum, OMPD_distribute_parallel_for));
> return new (Mem) OMPDistributeParallelForDirective(CollapsedNum,
> NumClauses);
> }
> +
> +OMPDistributeParallelForSimdDirective *
> +OMPDistributeParallelForSimdDirective::Create(
> + const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc,
> + unsigned CollapsedNum, ArrayRef<OMPClause *> Clauses, Stmt
> *AssociatedStmt,
> + const HelperExprs &Exprs) {
> + unsigned Size = llvm::alignTo(sizeof(OMPDistributeParallelForSimdDi
> rective),
> + llvm::alignOf<OMPClause *>());
> + void *Mem = C.Allocate(
> + Size + sizeof(OMPClause *) * Clauses.size() +
> + sizeof(Stmt *) *
> + numLoopChildren(CollapsedNum, OMPD_distribute_parallel_for_
> simd));
> + OMPDistributeParallelForSimdDirective *Dir = new (Mem)
> + OMPDistributeParallelForSimdDirective(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;
> +}
> +
> +OMPDistributeParallelForSimdDirective *
> +OMPDistributeParallelForSimdDirective::CreateEmpty(const ASTContext &C,
> + unsigned NumClauses,
> + unsigned CollapsedNum,
> + EmptyShell) {
> + unsigned Size = llvm::alignTo(sizeof(OMPDistributeParallelForSimdDi
> rective),
> + llvm::alignOf<OMPClause *>());
> + void *Mem = C.Allocate(
> + Size + sizeof(OMPClause *) * NumClauses +
> + sizeof(Stmt *) *
> + numLoopChildren(CollapsedNum, OMPD_distribute_parallel_for_
> simd));
> + return new (Mem)
> + OMPDistributeParallelForSimdDirective(CollapsedNum, NumClauses);
> +}
>
> Modified: cfe/trunk/lib/AST/StmtPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/
> StmtPrinter.cpp?rev=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/AST/StmtPrinter.cpp (original)
> +++ cfe/trunk/lib/AST/StmtPrinter.cpp Tue Jul 5 00:00:15 2016
> @@ -1159,6 +1159,12 @@ void StmtPrinter::VisitOMPDistributePara
> PrintOMPExecutableDirective(Node);
> }
>
> +void StmtPrinter::VisitOMPDistributeParallelForSimdDirective(
> + OMPDistributeParallelForSimdDirective *Node) {
> + Indent() << "#pragma omp distribute parallel for 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/AST/StmtProfile.cpp (original)
> +++ cfe/trunk/lib/AST/StmtProfile.cpp Tue Jul 5 00:00:15 2016
> @@ -704,6 +704,11 @@ void StmtProfiler::VisitOMPDistributePar
> VisitOMPLoopDirective(S);
> }
>
> +void StmtProfiler::VisitOMPDistributeParallelForSimdDirective(
> + const OMPDistributeParallelForSimdDirective *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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)
> +++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Tue Jul 5 00:00:15 2016
> @@ -576,6 +576,16 @@ bool clang::isAllowedClauseForDirective(
> break;
> }
> break;
> + case OMPD_distribute_parallel_for_simd:
> + switch (CKind) {
> +#define OPENMP_DISTRIBUTE_PARALLEL_FOR_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:
> @@ -598,7 +608,9 @@ bool clang::isOpenMPLoopDirective(OpenMP
> DKind == OMPD_parallel_for || DKind == OMPD_parallel_for_simd ||
> DKind == OMPD_taskloop || DKind == OMPD_taskloop_simd ||
> DKind == OMPD_distribute || DKind == OMPD_target_parallel_for ||
> - DKind == OMPD_distribute_parallel_for; // TODO add next
> directives.
> + DKind == OMPD_distribute_parallel_for ||
> + DKind == OMPD_distribute_parallel_for_simd;
> + // TODO add next directives.
> }
>
> bool clang::isOpenMPWorksharingDirective(OpenMPDirectiveKind DKind) {
> @@ -607,7 +619,9 @@ bool clang::isOpenMPWorksharingDirective
> DKind == OMPD_single || DKind == OMPD_parallel_for ||
> DKind == OMPD_parallel_for_simd || DKind ==
> OMPD_parallel_sections ||
> DKind == OMPD_target_parallel_for ||
> - DKind == OMPD_distribute_parallel_for; // TODO add next
> directives.
> + DKind == OMPD_distribute_parallel_for ||
> + DKind == OMPD_distribute_parallel_for_simd;
> + // TODO add next directives.
> }
>
> bool clang::isOpenMPTaskLoopDirective(OpenMPDirectiveKind DKind) {
> @@ -618,7 +632,8 @@ bool clang::isOpenMPParallelDirective(Op
> return DKind == OMPD_parallel || DKind == OMPD_parallel_for ||
> DKind == OMPD_parallel_for_simd || DKind ==
> OMPD_parallel_sections ||
> DKind == OMPD_target_parallel || DKind ==
> OMPD_target_parallel_for ||
> - DKind == OMPD_distribute_parallel_for;
> + DKind == OMPD_distribute_parallel_for ||
> + DKind == OMPD_distribute_parallel_for_simd;
> // TODO add next directives.
> }
>
> @@ -640,13 +655,15 @@ bool clang::isOpenMPTeamsDirective(OpenM
>
> bool clang::isOpenMPSimdDirective(OpenMPDirectiveKind DKind) {
> return DKind == OMPD_simd || DKind == OMPD_for_simd ||
> - DKind == OMPD_parallel_for_simd ||
> - DKind == OMPD_taskloop_simd; // TODO add next directives.
> + DKind == OMPD_parallel_for_simd || DKind == OMPD_taskloop_simd ||
> + DKind == OMPD_distribute_parallel_for_simd;
> + // TODO add next directives.
> }
>
> bool clang::isOpenMPDistributeDirective(OpenMPDirectiveKind Kind) {
> - return Kind == OMPD_distribute ||
> - Kind == OMPD_distribute_parallel_for; // TODO add next
> directives.
> + return Kind == OMPD_distribute || Kind == OMPD_distribute_parallel_for
> ||
> + Kind == OMPD_distribute_parallel_for_simd;
> + // TODO add next directives.
> }
>
> bool clang::isOpenMPPrivate(OpenMPClauseKind Kind) {
> @@ -664,5 +681,6 @@ bool clang::isOpenMPTaskingDirective(Ope
> }
>
> bool clang::isOpenMPLoopBoundSharingDirective(OpenMPDirectiveKind Kind) {
> - return Kind == OMPD_distribute_parallel_for;
> + return Kind == OMPD_distribute_parallel_for ||
> + Kind == OMPD_distribute_parallel_for_simd;
> }
>
> Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/
> CGStmt.cpp?rev=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGStmt.cpp Tue Jul 5 00:00:15 2016
> @@ -284,6 +284,10 @@ void CodeGenFunction::EmitStmt(const Stm
> EmitOMPDistributeParallelForDirective(
> cast<OMPDistributeParallelForDirective>(*S));
> break;
> + case Stmt::OMPDistributeParallelForSimdDirectiveClass:
> + EmitOMPDistributeParallelForSimdDirective(
> + cast<OMPDistributeParallelForSimdDirective>(*S));
> + break;
> }
> }
>
>
> Modified: cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/
> CGStmtOpenMP.cpp?rev=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Tue Jul 5 00:00:15 2016
> @@ -1877,6 +1877,17 @@ void CodeGenFunction::EmitOMPDistributeP
> });
> }
>
> +void CodeGenFunction::EmitOMPDistributeParallelForSimdDirective(
> + const OMPDistributeParallelForSimdDirective &S) {
> + OMPLexicalScope Scope(*this, S, /*AsInlined=*/true);
> + CGM.getOpenMPRuntime().emitInlinedDirective(
> + *this, OMPD_distribute_parallel_for_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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
> +++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Tue Jul 5 00:00:15 2016
> @@ -2499,6 +2499,8 @@ public:
> void EmitOMPDistributeLoop(const OMPDistributeDirective &S);
> void EmitOMPDistributeParallelForDirective(
> const OMPDistributeParallelForDirective &S);
> + void EmitOMPDistributeParallelForSimdDirective(
> + const OMPDistributeParallelForSimdDirective &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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)
> +++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Tue Jul 5 00:00:15 2016
> @@ -90,6 +90,8 @@ static OpenMPDirectiveKind ParseOpenMPDi
> { OMPD_declare, OMPD_target, OMPD_declare_target },
> { OMPD_distribute, OMPD_parallel, OMPD_distribute_parallel },
> { OMPD_distribute_parallel, OMPD_for, OMPD_distribute_parallel_for },
> + { OMPD_distribute_parallel_for, OMPD_simd,
> + OMPD_distribute_parallel_for_simd },
> { OMPD_end, OMPD_declare, OMPD_end_declare },
> { OMPD_end_declare, OMPD_target, OMPD_end_declare_target },
> { OMPD_target, OMPD_data, OMPD_target_data },
> @@ -734,6 +736,7 @@ Parser::DeclGroupPtrTy Parser::ParseOpen
> case OMPD_end_declare_target:
> case OMPD_target_update:
> case OMPD_distribute_parallel_for:
> + case OMPD_distribute_parallel_for_simd:
> Diag(Tok, diag::err_omp_unexpected_directive)
> << getOpenMPDirectiveName(DKind);
> break;
> @@ -765,7 +768,8 @@ Parser::DeclGroupPtrTy Parser::ParseOpen
> /// 'taskgroup' | 'teams' | 'taskloop' | 'taskloop simd' |
> /// 'distribute' | 'target enter data' | 'target exit data' |
> /// 'target parallel' | 'target parallel for' |
> -/// 'target update' | 'distribute parallel for' {clause}
> +/// 'target update' | 'distribute parallel for' |
> +/// 'distribute paralle for simd' {clause}
> /// annot_pragma_openmp_end
> ///
> StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective(
> @@ -870,7 +874,8 @@ StmtResult Parser::ParseOpenMPDeclarativ
> case OMPD_taskloop:
> case OMPD_taskloop_simd:
> case OMPD_distribute:
> - case OMPD_distribute_parallel_for: {
> + case OMPD_distribute_parallel_for:
> + case OMPD_distribute_parallel_for_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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Tue Jul 5 00:00:15 2016
> @@ -1814,6 +1814,7 @@ void Sema::ActOnOpenMPRegionStart(OpenMP
> Params);
> break;
> }
> + case OMPD_distribute_parallel_for_simd:
> case OMPD_distribute_parallel_for: {
> QualType KmpInt32Ty = Context.getIntTypeForBitwidth(32, 1);
> QualType KmpInt32PtrTy =
> @@ -2038,6 +2039,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel | distribute | +
> |
> // | parallel | distribute | +
> |
> // | | parallel for |
> |
> + // | parallel | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | for | parallel | *
> |
> // | for | for | +
> |
> @@ -2076,6 +2079,8 @@ static bool CheckNestingOfRegions(Sema &
> // | for | distribute | +
> |
> // | for | distribute | +
> |
> // | | parallel for |
> |
> + // | for | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | master | parallel | *
> |
> // | master | for | +
> |
> @@ -2114,6 +2119,8 @@ static bool CheckNestingOfRegions(Sema &
> // | master | distribute | +
> |
> // | master | distribute | +
> |
> // | | parallel for |
> |
> + // | master | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | critical | parallel | *
> |
> // | critical | for | +
> |
> @@ -2151,6 +2158,8 @@ static bool CheckNestingOfRegions(Sema &
> // | critical | distribute | +
> |
> // | critical | distribute | +
> |
> // | | parallel for |
> |
> + // | critical | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | simd | parallel |
> |
> // | simd | for |
> |
> @@ -2189,6 +2198,8 @@ static bool CheckNestingOfRegions(Sema &
> // | simd | distribute |
> |
> // | simd | distribute |
> |
> // | | parallel for |
> |
> + // | simd | distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | for simd | parallel |
> |
> // | for simd | for |
> |
> @@ -2227,6 +2238,8 @@ static bool CheckNestingOfRegions(Sema &
> // | for simd | distribute |
> |
> // | for simd | distribute |
> |
> // | | parallel for |
> |
> + // | for simd | distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | parallel for simd| parallel |
> |
> // | parallel for simd| for |
> |
> @@ -2265,6 +2278,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel for simd| distribute |
> |
> // | parallel for simd| distribute |
> |
> // | | parallel for |
> |
> + // | parallel for simd| distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | sections | parallel | *
> |
> // | sections | for | +
> |
> @@ -2303,6 +2318,8 @@ static bool CheckNestingOfRegions(Sema &
> // | sections | distribute | +
> |
> // | sections | distribute | +
> |
> // | | parallel for |
> |
> + // | sections | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | section | parallel | *
> |
> // | section | for | +
> |
> @@ -2341,6 +2358,8 @@ static bool CheckNestingOfRegions(Sema &
> // | section | distribute | +
> |
> // | section | distribute | +
> |
> // | | parallel for |
> |
> + // | section | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | single | parallel | *
> |
> // | single | for | +
> |
> @@ -2379,6 +2398,8 @@ static bool CheckNestingOfRegions(Sema &
> // | single | distribute | +
> |
> // | single | distribute | +
> |
> // | | parallel for |
> |
> + // | single | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | parallel for | parallel | *
> |
> // | parallel for | for | +
> |
> @@ -2417,6 +2438,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel for | distribute | +
> |
> // | parallel for | distribute | +
> |
> // | | parallel for |
> |
> + // | parallel for | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | parallel sections| parallel | *
> |
> // | parallel sections| for | +
> |
> @@ -2455,6 +2478,8 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel sections| distribute | +
> |
> // | parallel sections| distribute | +
> |
> // | | parallel for |
> |
> + // | parallel sections| distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | task | parallel | *
> |
> // | task | for | +
> |
> @@ -2493,6 +2518,8 @@ static bool CheckNestingOfRegions(Sema &
> // | task | distribute | +
> |
> // | task | distribute | +
> |
> // | | parallel for |
> |
> + // | task | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | ordered | parallel | *
> |
> // | ordered | for | +
> |
> @@ -2531,6 +2558,8 @@ static bool CheckNestingOfRegions(Sema &
> // | ordered | distribute | +
> |
> // | ordered | distribute | +
> |
> // | | parallel for |
> |
> + // | ordered | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | atomic | parallel |
> |
> // | atomic | for |
> |
> @@ -2569,6 +2598,8 @@ static bool CheckNestingOfRegions(Sema &
> // | atomic | distribute |
> |
> // | atomic | distribute |
> |
> // | | parallel for |
> |
> + // | atomic | distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | target | parallel | *
> |
> // | target | for | *
> |
> @@ -2607,6 +2638,8 @@ static bool CheckNestingOfRegions(Sema &
> // | target | distribute | +
> |
> // | target | distribute | +
> |
> // | | parallel for |
> |
> + // | target | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | target parallel | parallel | *
> |
> // | target parallel | for | *
> |
> @@ -2645,6 +2678,8 @@ static bool CheckNestingOfRegions(Sema &
> // | target parallel | distribute |
> |
> // | target parallel | distribute |
> |
> // | | parallel for |
> |
> + // | target parallel | distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | target parallel | parallel | *
> |
> // | for | |
> |
> @@ -2710,6 +2745,8 @@ static bool CheckNestingOfRegions(Sema &
> // | for | |
> |
> // | parallel | distribute |
> |
> // | for | parallel for |
> |
> + // | parallel | distribute |
> |
> + // | for |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | teams | parallel | *
> |
> // | teams | for | +
> |
> @@ -2748,6 +2785,8 @@ static bool CheckNestingOfRegions(Sema &
> // | teams | distribute | !
> |
> // | teams | distribute | !
> |
> // | | parallel for |
> |
> + // | teams | distribute | !
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | taskloop | parallel | *
> |
> // | taskloop | for | +
> |
> @@ -2785,6 +2824,8 @@ static bool CheckNestingOfRegions(Sema &
> // | taskloop | distribute | +
> |
> // | taskloop | distribute | +
> |
> // | | parallel for |
> |
> + // | taskloop | distribute | +
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | taskloop simd | parallel |
> |
> // | taskloop simd | for |
> |
> @@ -2823,6 +2864,8 @@ static bool CheckNestingOfRegions(Sema &
> // | taskloop simd | distribute |
> |
> // | taskloop simd | distribute |
> |
> // | | parallel for |
> |
> + // | taskloop simd | distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | distribute | parallel | *
> |
> // | distribute | for | *
> |
> @@ -2861,6 +2904,8 @@ static bool CheckNestingOfRegions(Sema &
> // | distribute | distribute |
> |
> // | distribute | distribute |
> |
> // | | parallel for |
> |
> + // | distribute | distribute |
> |
> + // | |parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> // | distribute | parallel | *
> |
> // | parallel for | |
> |
> @@ -2927,6 +2972,75 @@ static bool CheckNestingOfRegions(Sema &
> // | parallel for | |
> |
> // | distribute | distribute |
> |
> // | parallel for | parallel for |
> |
> + // | distribute | distribute |
> |
> + // | parallel for |parallel for simd|
> |
> + // +------------------+-----------------+----------------------
> --------------+
> + // | distribute | parallel | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | for | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | for simd | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | master | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | critical | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | simd | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | sections | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | section | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | single | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | parallel for | *
> |
> + // | parallel for simd| |
> |
> + // | distribute |parallel for simd| *
> |
> + // | parallel for simd| |
> |
> + // | distribute |parallel sections| *
> |
> + // | parallel for simd| |
> |
> + // | distribute | task | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | taskyield | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | barrier | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | taskwait | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | taskgroup | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | flush | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | ordered | +
> |
> + // | parallel for simd| |
> |
> + // | distribute | atomic | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | target |
> |
> + // | parallel for simd| |
> |
> + // | distribute | target parallel |
> |
> + // | parallel for simd| |
> |
> + // | distribute | target parallel |
> |
> + // | parallel for simd| for |
> |
> + // | distribute | target enter |
> |
> + // | parallel for simd| data |
> |
> + // | distribute | target exit |
> |
> + // | parallel for simd| data |
> |
> + // | distribute | teams |
> |
> + // | parallel for simd| |
> |
> + // | distribute | cancellation | +
> |
> + // | parallel for simd| point |
> |
> + // | distribute | cancel | +
> |
> + // | parallel for simd| |
> |
> + // | distribute | taskloop | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | taskloop simd | *
> |
> + // | parallel for simd| |
> |
> + // | distribute | distribute |
> |
> + // | parallel for simd| |
> |
> + // | distribute | distribute | *
> |
> + // | parallel for simd| parallel for |
> |
> + // | distribute | distribute | *
> |
> + // | parallel for simd|parallel for simd|
> |
> // +------------------+-----------------+----------------------
> --------------+
> if (Stack->getCurScope()) {
> auto ParentRegion = Stack->getParentDirective();
> @@ -3417,6 +3531,11 @@ StmtResult Sema::ActOnOpenMPExecutableDi
> ClausesWithImplicit, AStmt, StartLoc, EndLoc,
> VarsWithInheritedDSA);
> AllowedNameModifiers.push_back(OMPD_parallel);
> break;
> + case OMPD_distribute_parallel_for_simd:
> + Res = ActOnOpenMPDistributeParallelForSimdDirective(
> + ClausesWithImplicit, AStmt, StartLoc, EndLoc,
> VarsWithInheritedDSA);
> + AllowedNameModifiers.push_back(OMPD_parallel);
> + break;
> case OMPD_declare_target:
> case OMPD_end_declare_target:
> case OMPD_threadprivate:
> @@ -6929,6 +7048,39 @@ StmtResult Sema::ActOnOpenMPDistributePa
> Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B);
> }
>
> +StmtResult Sema::ActOnOpenMPDistributeParallelForSimdDirective(
> + 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_distribute_parallel_for_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 for loop exprs were not built");
> +
> + getCurFunction()->setHasBranchProtectedScope();
> + return OMPDistributeParallelForSimdDirective::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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/Sema/TreeTransform.h (original)
> +++ cfe/trunk/lib/Sema/TreeTransform.h Tue Jul 5 00:00:15 2016
> @@ -7548,6 +7548,18 @@ StmtResult TreeTransform<Derived>::Trans
> return Res;
> }
>
> +template <typename Derived>
> +StmtResult
> +TreeTransform<Derived>::TransformOMPDistributeParallelForSimdDirective(
> + OMPDistributeParallelForSimdDirective *D) {
> + DeclarationNameInfo DirName;
> + getDerived().getSema().StartOpenMPDSABlock(
> + OMPD_distribute_parallel_for_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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/Serialization/ASTReaderStmt.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTReaderStmt.cpp Tue Jul 5 00:00:15 2016
> @@ -2720,6 +2720,11 @@ void ASTStmtReader::VisitOMPDistributePa
> VisitOMPLoopDirective(D);
> }
>
> +void ASTStmtReader::VisitOMPDistributeParallelForSimdDirective(
> + OMPDistributeParallelForSimdDirective *D) {
> + VisitOMPLoopDirective(D);
> +}
> +
> //===-------------------------------------------------------
> ---------------===//
> // ASTReader Implementation
> //===-------------------------------------------------------
> ---------------===//
> @@ -3403,6 +3408,15 @@ Stmt *ASTReader::ReadStmtFromStream(Modu
> break;
> }
>
> + case STMT_OMP_DISTRIBUTE_PARALLEL_FOR_SIMD_DIRECTIVE: {
> + unsigned NumClauses = Record[ASTStmtReader::NumStmtFields];
> + unsigned CollapsedNum = Record[ASTStmtReader::NumStmtFields + 1];
> + S = OMPDistributeParallelForSimdDirective::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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/Serialization/ASTWriterStmt.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTWriterStmt.cpp Tue Jul 5 00:00:15 2016
> @@ -2436,6 +2436,12 @@ void ASTStmtWriter::VisitOMPDistributePa
> Code = serialization::STMT_OMP_DISTRIBUTE_PARALLEL_FOR_DIRECTIVE;
> }
>
> +void ASTStmtWriter::VisitOMPDistributeParallelForSimdDirective(
> + OMPDistributeParallelForSimdDirective *D) {
> + VisitOMPLoopDirective(D);
> + Code = serialization::STMT_OMP_DISTRIBUTE_PARALLEL_FOR_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=274530&r1=
> 274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original)
> +++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Tue Jul 5 00:00:15
> 2016
> @@ -844,6 +844,7 @@ void ExprEngine::Visit(const Stmt *S, Ex
> case Stmt::OMPTaskLoopSimdDirectiveClass:
> case Stmt::OMPDistributeDirectiveClass:
> case Stmt::OMPDistributeParallelForDirectiveClass:
> + case Stmt::OMPDistributeParallelForSimdDirectiveClass:
> llvm_unreachable("Stmt should not be in analyzer evaluation loop");
>
> case Stmt::ObjCSubscriptRefExprClass:
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> aligned_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_aligned_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_aligned_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,306 @@
> +// 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
> +#pragma omp distribute parallel for simd aligned(B:bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned(B:B::bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned(B:B::bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned(::z)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp distribute parallel for simd aligned(B::bfoo()) //
> expected-error {{expected variable name}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned // expected-error
> {{expected '(' after 'aligned'}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned () // expected-error
> {{expected expression}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned (argc, // 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned (argv[1]) //
> expected-error {{expected variable name}}
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd aligned(e, g)
> + for (I k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> + #pragma omp distribute parallel for simd aligned(v:16)
> + for (I k = 0; k < argc; ++k) { i = k; v += 2; }
> + }
> + float *f;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd aligned(f)
> + for (I k = 0; k < argc; ++k) ++k;
> +
> + int v = 0;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned // expected-error
> {{expected '(' after 'aligned'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned () // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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 parallel for 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 parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd aligned (argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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);
>
Did you really mean to instantiate 'foomain' with 'int*' as the type of
argc? This makes most of the code within the function be complete nonsense:
for (int *k = 0; k < argc; ++k)
> + return 0;
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_ast_print.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_ast_print.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_ast_print.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_ast_print.cpp Tue
> Jul 5 00:00:15 2016
> @@ -0,0 +1,152 @@
> +// 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
> +
> +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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> + for (int k = 0; k < s.a.a; ++k)
> + ++s.a.a;
> + return *this;
> + }
> +};
> +
> +// CHECK: #pragma omp distribute parallel for simd private(this->a)
> private(this->a) private(this->S::a)
> +// CHECK: #pragma omp distribute parallel for simd private(this->a)
> private(this->a) private(T::a)
> +// CHECK: #pragma omp distribute parallel for simd private(this->a)
> private(this->a)
> +
> +class S8 : public S7<S> {
> + S8() {}
> +
> +public:
> + S8(int v) : S7<S>(v){
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> + for (int k = 0; k < s.a.a; ++k)
> + ++s.a.a;
> + return *this;
> + }
> +};
> +
> +// CHECK: #pragma omp distribute parallel for simd private(this->a)
> private(this->a) private(this->S7<S>::a)
> +// CHECK: #pragma omp distribute parallel for simd private(this->a)
> private(this->a)
> +
> +template <class T, int N>
> +T tmain(T argc) {
> + T b = argc, c, d, e, f, h;
> + static T a;
> +// CHECK: static T a;
> + static T g;
> +#pragma omp threadprivate(g)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd dist_schedule(static, a)
> schedule(dynamic) default(none) copyin(g) firstprivate(a)
> + // CHECK: #pragma omp distribute parallel for simd
> dist_schedule(static, a) schedule(dynamic) default(none) copyin(g)
> + for (int i = 0; i < 2; ++i)
> + a = 2;
> +// CHECK-NEXT: for (int i = 0; i < 2; ++i)
> +// CHECK-NEXT: a = 2;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(argc, b),
> firstprivate(c, d), lastprivate(d, f) collapse(N) schedule(static, N) if
> (parallel :argc) num_threads(N) default(shared) shared(e) reduction(+ : h)
> dist_schedule(static,N)
> + for (int i = 0; i < 2; ++i)
> + for (int j = 0; j < 2; ++j)
> + for (int j = 0; j < 2; ++j)
> + for (int j = 0; j < 2; ++j)
> + for (int j = 0; j < 2; ++j)
> + for (int i = 0; i < 2; ++i)
> + for (int j = 0; j < 2; ++j)
> + for (int j = 0; j < 2; ++j)
> + for (int j = 0; j < 2; ++j)
> + for (int j = 0; j < 2; ++j)
> + a++;
> + // CHECK: #pragma omp distribute parallel for simd private(argc,b)
> firstprivate(c,d) lastprivate(d,f) collapse(N) schedule(static, N)
> if(parallel: argc) num_threads(N) default(shared) shared(e) reduction(+: h)
> dist_schedule(static, N)
> + // CHECK-NEXT: for (int i = 0; i < 2; ++i)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int i = 0; i < 2; ++i)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: for (int j = 0; j < 2; ++j)
> + // CHECK-NEXT: a++;
> + return T();
> +}
> +
> +int main(int argc, char **argv) {
> + int b = argc, c, d, e, f, h;
> + int x[200];
> + static int a;
> +// CHECK: static int a;
> + static float g;
> +#pragma omp threadprivate(g)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule(guided, argc)
> default(none) copyin(g) dist_schedule(static, a) private(a)
> + // CHECK: #pragma omp distribute parallel for simd schedule(guided,
> argc) default(none) copyin(g) dist_schedule(static, a) private(a)
> + for (int i = 0; i < 2; ++i)
> + a = 2;
> +// CHECK-NEXT: for (int i = 0; i < 2; ++i)
> +// CHECK-NEXT: a = 2;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(argc, b),
> firstprivate(argv, c), lastprivate(d, f) collapse(2) schedule(auto) if
> (argc) num_threads(a) default(shared) shared(e) reduction(+ : h)
> dist_schedule(static, b)
> + for (int i = 0; i < 10; ++i)
> + for (int j = 0; j < 10; ++j)
> + a++;
> + // CHECK: #pragma omp distribute parallel for simd private(argc,b)
> firstprivate(argv,c) lastprivate(d,f) collapse(2) schedule(auto) if(argc)
> num_threads(a) default(shared) shared(e) reduction(+: h)
> dist_schedule(static, b)
> + // CHECK-NEXT: for (int i = 0; i < 10; ++i)
> + // CHECK-NEXT: for (int j = 0; j < 10; ++j)
> + // CHECK-NEXT: a++;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd aligned(x:8) linear(h:2)
> safelen(8) simdlen(8)
> + for (int i = 0; i < 100; i++)
> + for (int j = 0; j < 200; j++)
> + a += h + x[j];
> + // CHECK: #pragma omp distribute parallel for simd aligned(x: 8)
> linear(h: 2) safelen(8) simdlen(8)
> + // CHECK-NEXT: for (int i = 0; i < 100; i++)
> + // CHECK-NEXT: for (int j = 0; j < 200; j++)
> + // CHECK-NEXT: a += h + x[j];
> +
> + return (tmain<int, 5>(argc) + tmain<char, 1>(argv[0][0]));
> +}
> +
> +#endif
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> collapse_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_collapse_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_collapse_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_collapse_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,154 @@
> +// 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd collapse () // 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
> + // expected-error at +3 {{expected ')'}} expected-note at +3 {{to match this
> '('}}
> + // expected-error at +2 2 {{expression is not an integral constant
> expression}}
> + // expected-note at +1 2 {{read of non-const variable 'argc' is not
> allowed in a constant expression}}
> +#pragma omp distribute parallel for simd collapse (argc
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> +#pragma omp target
> +#pragma omp teams
> + // expected-error at +1 2 {{argument to 'collapse' clause must be a
> strictly positive integer value}}
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd collapse (1)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for 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
> +#pragma omp distribute parallel for 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 distribute
> parallel for simd', but found only 1}}
> + // expected-error at +8 2 {{directive '#pragma omp distribute parallel
> for simd' cannot contain more than one 'collapse' clause}}
> + // expected-error at +7 2 {{argument to 'collapse' clause must be a
> strictly positive integer value}}
> + // expected-error at +6 2 {{expression is not an integral constant
> expression}}
> +#if __cplusplus >= 201103L
> + // expected-note at +4 2 {{non-constexpr function 'foobool' cannot be
> used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd 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];
> +#if __cplusplus <= 199711L
> + // expected-error at +6 2 {{expression is not an integral constant
> expression}}
> +#else
> + // expected-error at +4 2 {{integral constant expression must have
> integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd collapse (2) // expected-note
> {{as specified in 'collapse' clause}}
> + foo(); // expected-error {{expected 2 for loops after '#pragma omp
> distribute parallel for simd'}}
> + return argc;
> +}
> +
> +int main(int argc, char **argv) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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 distribute
> parallel for simd', but found only 1}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd collapse (2+2)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for 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 distribute
> parallel for simd', but found only 1}}
> + // expected-error at +6 {{expression is not an integral constant
> expression}}
> +#if __cplusplus >= 201103L
> + // expected-note at +4 {{non-constexpr function 'foobool' cannot be used
> in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd collapse (foobool(1) > 0 ? 1 : 2)
> + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
> + // expected-error at +8 {{expression is not an integral constant
> expression}}
> +#if __cplusplus >= 201103L
> + // expected-note at +6{{non-constexpr function 'foobool' cannot be used
> in a constant expression}}
> +#endif
> + // expected-error at +4 2 {{directive '#pragma omp distribute parallel
> for simd' cannot contain more than one 'collapse' clause}}
> + // expected-error at +3 2 {{argument to 'collapse' clause must be a
> strictly positive integer value}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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];
> +#if __cplusplus <= 199711L
> + // expected-error at +6 {{expression is not an integral constant
> expression}}
> +#else
> + // expected-error at +4 {{integral constant expression must have integral
> or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 +5 {{statement after '#pragma omp distribute
> parallel for simd' must be a for loop}}
> + // expected-note at +3 {{in instantiation of function template
> specialization 'tmain<int, char, -1, -2>' requested here}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd collapse (2) // expected-note
> {{as specified in 'collapse' clause}}
> + foo(); // expected-error {{expected 2 for loops after '#pragma omp
> distribute parallel for 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/distribute_parallel_for_simd_
> copyin_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_copyin_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_copyin_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_copyin_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,190 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
> +
> +void foo() {
> +}
> +
> +bool foobool(int argc) {
> + return argc;
> +}
> +
> +struct S1; // expected-note 2 {{declared here}}
> +class S2 {
> + mutable int a;
> +
> +public:
> + S2() : a(0) {}
> + S2 &operator=(S2 &s2) { return *this; }
> +};
> +class S3 {
> + int a;
> +
> +public:
> + S3() : a(0) {}
> + S3 &operator=(S3 &s3) { return *this; }
> +};
> +class S4 {
> + int a;
> + S4();
> + S4 &operator=(const S4 &s4); // expected-note 3 {{implicitly declared
> private here}}
> +
> +public:
> + S4(int v) : a(v) {}
> +};
> +class S5 {
> + int a;
> + S5() : a(0) {}
> + S5 &operator=(const S5 &s5) { return *this; } // expected-note 3
> {{implicitly declared private here}}
> +
> +public:
> + S5(int v) : a(v) {}
> +};
> +template <class T>
> +class ST {
> +public:
> + static T s;
> +};
> +
> +S2 k;
> +S3 h;
> +S4 l(3);
> +S5 m(4);
> +#pragma omp threadprivate(h, k, l, m)
> +
> +namespace A {
> +double x;
> +#pragma omp threadprivate(x)
> +}
> +namespace B {
> +using A::x;
> +}
> +
> +template <class T, typename S, int N>
> +T tmain(T argc, S **argv) {
> + T i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin // expected-error
> {{expected '(' after 'copyin'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin( // 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
> +#pragma omp distribute parallel for simd copyin() // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(k // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(h, // 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
> +#pragma omp distribute parallel for simd copyin(argc > 0 ? argv[1] :
> argv[2]) // expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(l) // expected-error 2
> {{'operator=' is a private member of 'S4'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(S1) // expected-error
> {{'S1' does not refer to a value}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(argv[1]) //
> expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(i) // expected-error
> {{copyin variable must be threadprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(m) // expected-error 2
> {{'operator=' is a private member of 'S5'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(ST<int>::s, B::x) //
> expected-error {{copyin variable must be threadprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +}
> +
> +int main(int argc, char **argv) {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin // expected-error
> {{expected '(' after 'copyin'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin( // 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
> +#pragma omp distribute parallel for simd copyin() // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(k // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(h, // 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
> +#pragma omp distribute parallel for simd copyin(argc > 0 ? argv[1] :
> argv[2]) // expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(l) // expected-error
> {{'operator=' is a private member of 'S4'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(S1) // expected-error
> {{'S1' does not refer to a value}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(argv[1]) //
> expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(i) // expected-error
> {{copyin variable must be threadprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(m) // expected-error
> {{'operator=' is a private member of 'S5'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd copyin(ST<int>::s, B::x) //
> expected-error {{copyin variable must be threadprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> + return tmain<int, char, 3>(argc, argv); // expected-note {{in
> instantiation of function template specialization 'tmain<int, char, 3>'
> requested here}}
> +}
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> default_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_default_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_default_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_default_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,100 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
> +
> +void foo();
> +
> +template <class T, int N>
> +T tmain(T argc) {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default // expected-error
> {{expected '(' after 'default'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default( // expected-error
> {{expected 'none' or 'shared' in OpenMP clause 'default'}} expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default() // expected-error
> {{expected 'none' or 'shared' in OpenMP clause 'default'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(none // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) // expected-error 2 {{variable 'argc' must
> have explicitly specified data sharing attributes}}
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(shared), default(shared)
> // expected-error {{directive '#pragma omp distribute parallel for simd'
> cannot contain more than one 'default' clause}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(x) // expected-error
> {{expected 'none' or 'shared' in OpenMP clause 'default'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(none)
> + for (i = 0; i < argc; ++i) // expected-error 2 {{variable 'argc' must
> have explicitly specified data sharing attributes}}
> + foo();
> +
> +#pragma omp parallel default(none)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(shared)
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> + return T();
> +}
> +
> +int main(int argc, char **argv) {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default // expected-error
> {{expected '(' after 'default'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default( // expected-error
> {{expected 'none' or 'shared' in OpenMP clause 'default'}} expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default() // expected-error
> {{expected 'none' or 'shared' in OpenMP clause 'default'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(none // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) // expected-error {{variable 'argc' must
> have explicitly specified data sharing attributes}}
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(shared), default(shared)
> // expected-error {{directive '#pragma omp distribute parallel for simd'
> cannot contain more than one 'default' clause}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(x) // expected-error
> {{expected 'none' or 'shared' in OpenMP clause 'default'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(none)
> + for (i = 0; i < argc; ++i) // expected-error {{variable 'argc' must
> have explicitly specified data sharing attributes}}
> + foo();
> +
> +#pragma omp parallel default(none)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd default(shared)
> + for (i = 0; i < argc; ++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/distribute_parallel_for_simd_
> dist_schedule_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_dist_schedule_messages.cpp?
> rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_dist_schedule_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_dist_schedule_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,103 @@
> +// RUN: %clang_cc1 -triple x86_64-apple-macos10.7.0 -verify -fopenmp
> -ferror-limit 100 -o - %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
> +#pragma omp distribute parallel for simd dist_schedule // expected-error
> {{expected '(' after 'dist_schedule'}}
> + for (int i = 0; i < 10; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd dist_schedule (argc)) //
> expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}}
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for simd' are ignored}}
> + for (int i = 0; i < 10; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd dist_schedule (static),
> dist_schedule (static, 1) // expected-error {{directive '#pragma omp
> distribute parallel for simd' cannot contain more than one 'dist_schedule'
> clause}}
> + for (int i = 0; i < 10; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd dist_schedule // expected-error
> {{expected '(' after 'dist_schedule'}}
> + for (int i = 0; i < 10; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd dist_schedule (argc)) //
> expected-error {{expected 'static' in OpenMP clause 'dist_schedule'}}
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for simd' are ignored}}
> + for (int i = 0; i < 10; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd dist_schedule (static),
> dist_schedule (static, 1) // expected-error {{directive '#pragma omp
> distribute parallel for simd' cannot contain more than one 'dist_schedule'
> clause}}
> + for (int i = 0; i < 10; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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/distribute_parallel_for_simd_
> firstprivate_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_firstprivate_messages.cpp?rev=
> 274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_firstprivate_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_firstprivate_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,359 @@
> +// 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(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) {}
> + S3(const 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); // expected-note 2 {{implicitly declared private
> here}}
> +
> +public:
> + S4(int v) : a(v) {}
> +};
> +class S5 {
> + int a;
> + S5(const S5 &s5) : a(s5.a) {} // expected-note 4 {{implicitly declared
> private here}}
> +
> +public:
> + S5() : a(0) {}
> + 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);
> + C g(5);
> + int i;
> + int &j = i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate // expected-error
> {{expected '(' after 'firstprivate'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate( // 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
> +#pragma omp distribute parallel for simd firstprivate() // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(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
> +#pragma omp distribute parallel for simd firstprivate(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 parallel for simd firstprivate(argc)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(S1) //
> expected-error {{'S1' does not refer to a value}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(a, b) //
> expected-error {{firstprivate variable with incomplete type 'S1'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(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
> +#pragma omp distribute parallel for simd firstprivate(h) //
> expected-error {{threadprivate or thread local variable cannot be
> firstprivate}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp parallel
> + {
> + int v = 0;
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i)
> + for (int k = 0; k < argc; ++k) {
> + i = k;
> + v += i;
> + }
> + }
> +#pragma omp parallel shared(i)
> +#pragma omp parallel private(i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(j)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(g) firstprivate(g)
> // expected-error {{calling a private constructor of class 'S5'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp parallel private(i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i) // expected-note
> {{defined as firstprivate}}
> + for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable
> in the associated loop of 'omp distribute parallel for simd' directive may
> not be firstprivate, predetermined as linear}}
> + foo();
> +#pragma omp parallel reduction(+ : i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i) // expected-note
> {{defined as firstprivate}}
> + for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable
> in the associated loop of 'omp distribute parallel for simd' directive may
> not be firstprivate, predetermined as linear}}
> + foo();
> + return 0;
> +}
> +
> +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);
> + S3 m;
> + S6 n(2);
> + int i;
> + int &j = i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate // expected-error
> {{expected '(' after 'firstprivate'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd firstprivate() // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd firstprivate(argc)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd firstprivate(argv[1]) //
> expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(2 * 2) //
> expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(ba) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(ca) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(da) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> + int xa;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(xa) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(S2::S2s) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(S2::S2sc) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd safelen(5) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(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
> +#pragma omp distribute parallel for simd firstprivate(m) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(h, B::x) //
> expected-error 2 {{threadprivate or thread local variable cannot be
> firstprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(xa), firstprivate(xa) //
> expected-error {{private variable cannot be firstprivate}} expected-note
> {{defined as private}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i) // expected-note
> {{defined as firstprivate}}
> + for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable
> in the associated loop of 'omp distribute parallel for simd' directive may
> not be firstprivate, predetermined as linear}}
> + foo();
> +#pragma omp parallel shared(xa)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(xa) // OK: may be
> firstprivate
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(j)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(g) firstprivate(g)
> // expected-error {{calling a private constructor of class 'S5'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(n) firstprivate(n)
> // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp parallel
> + {
> + int v = 0;
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i)
> + for (int k = 0; k < argc; ++k) {
> + i = k;
> + v += i;
> + }
> + }
> +#pragma omp parallel private(i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i) // expected-note
> {{defined as firstprivate}}
> + for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable
> in the associated loop of 'omp distribute parallel for simd' directive may
> not be firstprivate, predetermined as linear}}
> + foo();
> +#pragma omp parallel reduction(+ : i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i) // expected-note
> {{defined as firstprivate}}
> + for (i = 0; i < argc; ++i) // expected-error {{loop iteration variable
> in the associated loop of 'omp distribute parallel for simd' directive may
> not be firstprivate, predetermined as linear}}
> + foo();
> + static int si;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(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/distribute_parallel_for_simd_if_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_if_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_if_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_if_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,179 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
> +
> +void foo() {
> +}
> +
> +bool foobool(int argc) {
> + return argc;
> +}
> +
> +struct S1; // expected-note {{declared here}}
> +
> +template <class T, class S> // expected-note {{declared here}}
> +int tmain(T argc, S **argv) {
> + T i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if // expected-error {{expected
> '(' after 'if'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if ( // 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
> +#pragma omp distribute parallel for simd if () // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc)) // expected-warning
> {{extra tokens at the end of '#pragma omp distribute parallel for simd' are
> ignored}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc > 0 ? argv[1] : argv[2])
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (foobool(argc)), if (true) //
> expected-error {{directive '#pragma omp distribute parallel for simd'
> cannot contain more than one 'if' clause}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (S) // expected-error {{'S'
> does not refer to a value}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argv[1]=2) // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc argc) // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(argc)
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel // expected-warning
> {{missing ':' after directive name modifier - ignoring}} 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
> +#pragma omp distribute parallel for simd if(parallel : // 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
> +#pragma omp distribute parallel for simd if(parallel : argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc)
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc) if
> (for:argc) // expected-error {{directive name modifier 'for' is not allowed
> for '#pragma omp distribute parallel for simd'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc) if
> (parallel:argc) // expected-error {{directive '#pragma omp distribute
> parallel for simd' cannot contain more than one 'if' clause with 'parallel'
> name modifier}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc) if (argc) //
> expected-error {{no more 'if' clause is allowed}} expected-note {{previous
> clause with directive name modifier specified here}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(distribute : argc) //
> expected-error {{directive name modifier 'distribute' is not allowed for
> '#pragma omp distribute parallel for simd'}}
> + for (i = 0; i < argc; ++i) foo();
> +
> + return 0;
> +}
> +
> +int main(int argc, char **argv) {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if // expected-error {{expected
> '(' after 'if'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if ( // 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
> +#pragma omp distribute parallel for simd if () // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc)) // expected-warning
> {{extra tokens at the end of '#pragma omp distribute parallel for simd' are
> ignored}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc > 0 ? argv[1] : argv[2])
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (foobool(argc)), if (true) //
> expected-error {{directive '#pragma omp distribute parallel for simd'
> cannot contain more than one 'if' clause}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (S1) // expected-error {{'S1'
> does not refer to a value}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argv[1]=2) // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (argc argc) // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if (1 0) // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(if(tmain(argc, argv) //
> 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
> +#pragma omp distribute parallel for simd if(parallel // expected-warning
> {{missing ':' after directive name modifier - ignoring}} 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
> +#pragma omp distribute parallel for simd if(parallel : // 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
> +#pragma omp distribute parallel for simd if(parallel : argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc)
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc) if
> (for:argc) // expected-error {{directive name modifier 'for' is not allowed
> for '#pragma omp distribute parallel for simd'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc) if
> (parallel:argc) // expected-error {{directive '#pragma omp distribute
> parallel for simd' cannot contain more than one 'if' clause with 'parallel'
> name modifier}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(parallel : argc) if (argc) //
> expected-error {{no more 'if' clause is allowed}} expected-note {{previous
> clause with directive name modifier specified here}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd if(distribute : argc) //
> expected-error {{directive name modifier 'distribute' is not allowed for
> '#pragma omp distribute parallel for simd'}}
> + for (i = 0; i < argc; ++i) foo();
> +
> + return tmain(argc, argv);
> +}
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> lastprivate_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_lastprivate_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_lastprivate_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_lastprivate_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,333 @@
> +// 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
> +#pragma omp distribute parallel for simd lastprivate // expected-error
> {{expected '(' after 'lastprivate'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate() // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(argc)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> + {
> +#pragma omp distribute parallel for simd lastprivate(i)
> + for (int k = 0; k < argc; ++k) {
> + i = k;
> + v += i;
> + }
> + }
> +#pragma omp target
> +#pragma omp teams private(i)
> +#pragma omp distribute parallel for simd lastprivate(j)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(i)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> + return 0;
> +}
> +
> +void bar(S4 a[2]) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate // expected-error
> {{expected '(' after 'lastprivate'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate() // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(argc)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(argv[1]) //
> expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(2 * 2) //
> expected-error {{expected variable name}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(ba)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(ca) //
> expected-error {{shared variable cannot be lastprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(xa) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(S2::S2s) //
> expected-error {{shared variable cannot be lastprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(S2::S2sc) //
> expected-error {{shared variable cannot be lastprivate}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd safelen(5) // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(i) // expected-note
> {{defined as lastprivate}}
> + for (i = 0; i < argc; ++i) // expected-error{{loop iteration variable
> in the associated loop of 'omp distribute parallel for simd' directive may
> not be lastprivate, predetermined as linear}}
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(xa)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(xa)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd lastprivate(j)
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd lastprivate(n) firstprivate(n)
> // OK
> + for (i = 0; i < argc; ++i)
> + foo();
> + static int si;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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/distribute_parallel_for_simd_
> linear_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_linear_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_linear_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_linear_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,338 @@
> +// 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
> +#pragma omp distribute parallel for simd linear(B:bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear(B:B::bfoo())
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(X::x : ::z)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(B,::z, X::x)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(::z)
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(B::bfoo()) //
> expected-error {{expected variable name}}
> + for (int i = 0; i < 10; ++i) ;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> + #pragma omp parallel for 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
> +#pragma omp distribute parallel for simd linear // expected-error
> {{expected '(' after 'linear'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear () // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear (argc : 5)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear (argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(e, g)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> + #pragma omp distribute parallel for simd linear(v:i)
> + for (int k = 0; k < argc; ++k) { i = k; v += i; }
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp parallel for simd linear(j)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + int v = 0;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(v:j)
> + for (int k = 0; k < argc; ++k) { ++k; v += j; }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear // expected-error
> {{expected '(' after 'linear'}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear () // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear (argc)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd linear (argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> + #pragma omp distribute parallel for simd linear(i)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> + #pragma omp target
> + #pragma omp teams
> + #pragma omp distribute parallel for simd linear(i : 4)
> + for (int k = 0; k < argc; ++k) { ++k; i += 4; }
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd linear(j)
> + for (int k = 0; k < argc; ++k) ++k;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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/distribute_parallel_for_simd_
> num_threads_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_num_threads_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_num_threads_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_num_threads_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,107 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
> +
> +void foo() {
> +}
> +
> +bool foobool(int argc) {
> + return argc;
> +}
> +
> +struct S1; // expected-note {{declared here}}
> +
> +template <class T, typename S, int N> // expected-note {{declared here}}
> +T tmain(T argc, S **argv) {
> + T i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads // expected-error
> {{expected '(' after 'num_threads'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads ( // 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
> +#pragma omp distribute parallel for simd num_threads () // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argc)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for simd' are ignored}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads ((argc > 0) ?
> argv[1] : argv[2]) // expected-error 2 {{expression must have integral or
> unscoped enumeration type, not 'char *'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (foobool(argc)),
> num_threads (true), num_threads (-5) // expected-error 2 {{directive
> '#pragma omp distribute parallel for simd' cannot contain more than one
> 'num_threads' clause}} expected-error {{argument to 'num_threads' clause
> must be a strictly positive integer value}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (S) //
> expected-error {{'S' does not refer to a value}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argv[1]=2) //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> expected-error 2 {{expression must have integral or unscoped enumeration
> type, not 'char *'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argc)
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (N) //
> expected-error {{argument to 'num_threads' clause must be a strictly
> positive integer value}}
> + for (i = 0; i < argc; ++i) foo();
> +
> + return argc;
> +}
> +
> +int main(int argc, char **argv) {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads // expected-error
> {{expected '(' after 'num_threads'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads ( // 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
> +#pragma omp distribute parallel for simd num_threads () // expected-error
> {{expected expression}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argc)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for simd' are ignored}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argc > 0 ? argv[1]
> : argv[2]) // expected-error {{integral }}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (foobool(argc)),
> num_threads (true), num_threads (-5) // expected-error 2 {{directive
> '#pragma omp distribute parallel for simd' cannot contain more than one
> 'num_threads' clause}} expected-error {{argument to 'num_threads' clause
> must be a strictly positive integer value}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (S1) //
> expected-error {{'S1' does not refer to a value}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads (argv[1]=2) //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> expected-error {{expression must have integral or unscoped enumeration
> type, not 'char *'}}
> + for (i = 0; i < argc; ++i) foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd num_threads
> (num_threads(tmain<int, char, -1>(argc, argv) // expected-error 2
> {{expected ')'}} expected-note 2 {{to match this '('}} expected-note {{in
> instantiation of function template specialization 'tmain<int, char, -1>'
> requested here}}
> + for (i = 0; i < argc; ++i) foo();
> +
> + return tmain<int, char, 3>(argc, argv); // expected-note {{in
> instantiation of function template specialization 'tmain<int, char, 3>'
> requested here}}
> +}
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> private_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_private_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_private_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_private_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,315 @@
> +// 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) {}
> +};
> +const S2 b;
> +const S2 ba[5];
> +class S3 {
> + int a;
> +
> +public:
> + S3() : a(0) {}
> +};
> +const S3 ca[5];
> +class S4 {
> + int a;
> + S4(); // expected-note {{implicitly declared private here}}
> +
> +public:
> + S4(int v) : a(v) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> + for (int k = 0; k < v; ++k)
> + ++this->a;
> + }
> +};
> +class S5 {
> + int a;
> + S5() : a(0) {} // expected-note {{implicitly declared private here}}
> +
> +public:
> + S5(int v) : a(v) {}
> + S5 &operator=(S5 &s) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> private(s.a) // expected-error {{expected variable name or data member of
> current class}}
> + for (int k = 0; k < s.a; ++k)
> + ++s.a;
> + return *this;
> + }
> +};
> +
> +template <typename T>
> +class S6 {
> +public:
> + T a;
> +
> + S6() : a(0) {}
> + S6(T v) : a(v) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> + for (int k = 0; k < v; ++k)
> + ++this->a;
> + }
> + S6 &operator=(S6 &s) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> private(s.a) // expected-error {{expected variable name or data member of
> current class}}
> + for (int k = 0; k < s.a; ++k)
> + ++s.a;
> + return *this;
> + }
> +};
> +
> +template <typename T>
> +class S7 : public T {
> + T a;
> + S7() : a(0) {}
> +
> +public:
> + S7(T v) : a(v) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(a) private(this->a)
> private(s.a) private(s.T::a) // expected-error 2 {{expected variable name
> or data member of current class}}
> + for (int k = 0; k < s.a.a; ++k)
> + ++s.a.a;
> + return *this;
> + }
> +};
> +
> +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
> +#pragma omp distribute parallel for simd private // expected-error
> {{expected '(' after 'private'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private() // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(argc)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(a, b) // expected-error
> {{private variable with incomplete type 'S1'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(e, g)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd nowait // expected-error
> {{unexpected OpenMP clause 'nowait' in directive '#pragma omp distribute
> parallel for simd'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp parallel
> + {
> + int v = 0;
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i)
> + for (int k = 0; k < argc; ++k) {
> + i = k;
> + v += i;
> + }
> + }
> +#pragma omp parallel shared(i)
> +#pragma omp parallel private(i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(j)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(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 B {
> +using A::x;
> +}
> +
> +int main(int argc, char **argv) {
> + S4 e(4);
> + S5 g(5);
> + S6<float> s6(0.0) , s6_0(1.0);
> + S7<S6<float> > s7(0.0) , s7_0(1.0);
> + int i;
> + int &j = i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private // expected-error
> {{expected '(' after 'private'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private() // expected-error
> {{expected expression}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(argc)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(a, b) // expected-error
> {{private variable with incomplete type 'S1'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(argv[1]) //
> expected-error {{expected variable name}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd private(h, B::x) //
> expected-error 2 {{threadprivate or thread local variable cannot be
> private}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd nowait // expected-error
> {{unexpected OpenMP clause 'nowait' in directive '#pragma omp distribute
> parallel for simd'}}
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp parallel
> + {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> + }
> +#pragma omp parallel shared(i)
> +#pragma omp parallel private(i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(j)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i)
> + for (int k = 0; k < argc; ++k)
> + ++k;
> + static int m;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(m)
> + for (int k = 0; k < argc; ++k)
> + m = k + 2;
> +
> + s6 = s6_0; // expected-note {{in instantiation of member function
> 'S6<float>::operator=' requested here}}
> + s7 = s7_0; // expected-note {{in instantiation of member function
> 'S7<S6<float> >::operator=' requested here}}
> + return foomain(argc, argv); // expected-note {{in instantiation of
> function template specialization 'foomain<int, char>' requested here}}
> +}
> +
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> proc_bind_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_proc_bind_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_proc_bind_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_proc_bind_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,101 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 -o - %s
> +
> +void foo();
> +
> +template <class T, typename S, int N>
> +T tmain(T argc, S **argv) {
> + T i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind // expected-error
> {{expected '(' after 'proc_bind'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind( // expected-error
> {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind() // expected-error
> {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(master //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(close),
> proc_bind(spread) // expected-error {{directive '#pragma omp distribute
> parallel for simd' cannot contain more than one 'proc_bind' clause}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(x) // expected-error
> {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(master)
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> +#pragma omp parallel proc_bind(close)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(spread)
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> + return T();
> +}
> +
> +int main(int argc, char **argv) {
> + int i;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind // expected-error
> {{expected '(' after 'proc_bind'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind( // expected-error
> {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind() // expected-error
> {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(master //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(close),
> proc_bind(spread) // expected-error {{directive '#pragma omp distribute
> parallel for simd' cannot contain more than one 'proc_bind' clause}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(x) // expected-error
> {{expected 'master', 'close' or 'spread' in OpenMP clause 'proc_bind'}}
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(master)
> + for (i = 0; i < argc; ++i)
> + foo();
> +
> +#pragma omp parallel proc_bind(close)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd proc_bind(spread)
> + for (i = 0; i < argc; ++i)
> + foo();
> + return tmain<int, char, 3>(argc, argv);
> +}
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> reduction_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_reduction_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_reduction_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_reduction_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,441 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 150 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -std=c++98 -ferror-limit 150 -o - %s
> +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 -ferror-limit 150 -o - %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
> +#pragma omp distribute parallel for simd reduction // expected-error
> {{expected '(' after 'reduction'}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction + // expected-error
> {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the
> end of '#pragma omp distribute parallel for simd' are ignored}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction( // expected-error
> {{expected unqualified-id}} expected-warning {{missing ':' after reduction
> identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to
> match this '('}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(- // expected-warning
> {{missing ':' after reduction identifier - ignoring}} 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
> +#pragma omp distribute parallel for simd reduction() // expected-error
> {{expected unqualified-id}} expected-warning {{missing ':' after reduction
> identifier - ignoring}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(*) // expected-warning
> {{missing ':' after reduction identifier - ignoring}} expected-error
> {{expected expression}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(\) // expected-error
> {{expected unqualified-id}} expected-warning {{missing ':' after reduction
> identifier - ignoring}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(& : argc //
> expected-error {{expected ')'}} expected-note {{to match this '('}}
> expected-error {{invalid operands to binary expression ('float' and
> 'float')}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(|| : argc ? i : argc)
> // expected-error 2 {{expected variable name, array element or array
> section}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(&& : argc)
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(^ : T) //
> expected-error {{'T' does not refer to a value}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(max : h.b) //
> expected-error {{expected variable name, array element or array section}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : ba) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(* : ca) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(- : da) //
> expected-error {{const-qualified list item cannot be reduction}}
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(^ : fl) //
> expected-error {{invalid operands to binary expression ('float' and
> 'float')}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(&& : S2::S2s) //
> expected-error {{shared variable cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(&& : S2::S2sc) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : h, k) //
> expected-error {{threadprivate or thread local variable cannot be
> reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : o) //
> expected-error 2 {{no viable overloaded '='}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel private(k)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : p), reduction(+ :
> p) // expected-error 2 {{argument of OpenMP clause 'reduction' must
> reference the same object in all threads}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : r) //
> expected-error 2 {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel shared(i)
> +#pragma omp parallel reduction(min : i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(max : j) //
> expected-error 2 {{argument of OpenMP clause 'reduction' must reference the
> same object in all threads}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel private(fl)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : fl)
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel reduction(* : fl)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : fl)
> + for (int i = 0; i < 10; ++i)
> + 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
> +#pragma omp distribute parallel for simd reduction // expected-error
> {{expected '(' after 'reduction'}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction + // expected-error
> {{expected '(' after 'reduction'}} expected-warning {{extra tokens at the
> end of '#pragma omp distribute parallel for simd' are ignored}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction( // expected-error
> {{expected unqualified-id}} expected-warning {{missing ':' after reduction
> identifier - ignoring}} expected-error {{expected ')'}} expected-note {{to
> match this '('}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(- // expected-warning
> {{missing ':' after reduction identifier - ignoring}} 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
> +#pragma omp distribute parallel for simd reduction() // expected-error
> {{expected unqualified-id}} expected-warning {{missing ':' after reduction
> identifier - ignoring}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(*) // expected-warning
> {{missing ':' after reduction identifier - ignoring}} expected-error
> {{expected expression}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(\) // expected-error
> {{expected unqualified-id}} expected-warning {{missing ':' after reduction
> identifier - ignoring}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(| : argc, //
> 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
> +#pragma omp distribute parallel for simd reduction(|| : argc > 0 ?
> argv[1] : argv[2]) // expected-error {{expected variable name, array
> element or array section}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(~ : argc) //
> expected-error {{expected unqualified-id}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(&& : argc)
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(^ : S1) //
> expected-error {{'S1' does not refer to a value}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(max : h.b) //
> expected-error {{expected variable name, array element or array section}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : ba) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(* : ca) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(- : da) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(^ : fl) //
> expected-error {{invalid operands to binary expression ('float' and
> 'float')}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(&& : S2::S2s) //
> expected-error {{shared variable cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(&& : S2::S2sc) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : h, k, B::x) //
> expected-error 2 {{threadprivate or thread local variable cannot be
> reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : o) //
> expected-error {{no viable overloaded '='}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel private(k)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : p), reduction(+ :
> p) // expected-error 2 {{argument of OpenMP clause 'reduction' must
> reference the same object in all threads}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : p), reduction(+ :
> p) // expected-error {{variable can appear only once in OpenMP 'reduction'
> clause}} expected-note {{previously referenced here}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : r) //
> expected-error {{const-qualified list item cannot be reduction}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel shared(i)
> +#pragma omp parallel reduction(min : i)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(max : j) //
> expected-error {{argument of OpenMP clause 'reduction' must reference the
> same object in all threads}}
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel private(fl)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : fl)
> + for (int i = 0; i < 10; ++i)
> + foo();
> +#pragma omp parallel reduction(* : fl)
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : fl)
> + for (int i = 0; i < 10; ++i)
> + foo();
> + static int m;
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd reduction(+ : m) // OK
> + for (int i = 0; i < 10; ++i)
> + m++;
> +
> + 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/distribute_parallel_for_simd_
> safelen_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_safelen_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_safelen_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_safelen_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,177 @@
> +// 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd safelen (1)) // expected-warning
> {{extra tokens at the end of '#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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 +4 2 {{non-constexpr function 'foobool' cannot be
> used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd safelen (foobool(argc)), safelen
> (true), safelen (-5) // expected-error 2 {{directive '#pragma omp
> distribute parallel for 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
> +#pragma omp distribute parallel for 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 +6 2 {{expression is not an integral constant
> expression}}
> +#else
> + // expected-error at +4 2 {{integral constant expression must have
> integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp parallel for 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
> +#pragma omp parallel for 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
> +#pragma omp parallel for 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
> +#pragma omp parallel for 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
> +#pragma omp parallel for simd safelen (2+2)) // expected-warning {{extra
> tokens at the end of '#pragma omp parallel for 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 +4 {{non-constexpr function 'foobool' cannot be used
> in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp parallel for 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 +4 {{non-constexpr function 'foobool' cannot be used
> in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp parallel for 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
> parallel for 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
> +#pragma omp parallel for 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 +6 {{expression is not an integral constant
> expression}}
> +#else
> + // expected-error at +4 {{integral constant expression must have integral
> or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 +3 {{in instantiation of function template
> specialization 'tmain<int, char, -1, -2>' requested here}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 distribute
> parallel for 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/distribute_parallel_for_simd_
> schedule_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_schedule_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_schedule_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_schedule_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,151 @@
> +// 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) {
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule // expected-error
> {{expected '(' after 'schedule'}}
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule ( // expected-error
> {{expected 'static', 'dynamic', 'guided', 'auto', 'runtime', 'monotonic',
> 'nonmonotonic' or 'simd' in OpenMP clause 'schedule'}} 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
> +#pragma omp distribute parallel for simd schedule () // expected-error
> {{expected 'static', 'dynamic', 'guided', 'auto', 'runtime', 'monotonic',
> 'nonmonotonic' or 'simd' in OpenMP clause 'schedule'}}
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (auto // 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
> +#pragma omp distribute parallel for simd schedule (auto_dynamic //
> expected-error {{expected 'static', 'dynamic', 'guided', 'auto', 'runtime',
> 'monotonic', 'nonmonotonic' or 'simd' in OpenMP clause 'schedule'}}
> 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
> +#pragma omp distribute parallel for simd schedule (auto, //
> 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
> +#pragma omp distribute parallel for simd schedule (runtime, 3) //
> 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];
> + // expected-error at +3 {{expected ')'}} expected-note at +3 {{to match this
> '('}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (guided argc
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> + // expected-error at +3 2 {{argument to 'schedule' clause must be a
> strictly positive integer value}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (static, 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
> +#pragma omp distribute parallel for simd schedule (dynamic, 1)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for 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
> +#pragma omp distribute parallel for simd schedule (guided, (ST > 0) ? 1 +
> ST : 2)
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> + // expected-error at +4 2 {{directive '#pragma omp distribute parallel
> for simd' cannot contain more than one 'schedule' clause}}
> + // expected-error at +3 {{argument to 'schedule' clause must be a
> strictly positive integer value}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (static,
> foobool(argc)), schedule (dynamic, true), schedule (guided, -5)
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (static, 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 +3 2 {{expression must have integral or unscoped
> enumeration type, not 'char *'}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (guided, 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
> +#pragma omp distribute parallel for simd schedule (dynamic, 1)
> + for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (static, N) //
> expected-error {{argument to 'schedule' 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
> +#pragma omp distribute parallel for simd schedule // expected-error
> {{expected '(' after 'schedule'}}
> + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule ( // expected-error
> {{expected 'static', 'dynamic', 'guided', 'auto', 'runtime', 'monotonic',
> 'nonmonotonic' or 'simd' in OpenMP clause 'schedule'}} 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
> +#pragma omp distribute parallel for simd schedule () // expected-error
> {{expected 'static', 'dynamic', 'guided', 'auto', 'runtime', 'monotonic',
> 'nonmonotonic' or 'simd' in OpenMP clause 'schedule'}}
> + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (auto // 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
> +#pragma omp distribute parallel for simd schedule (auto_dynamic //
> expected-error {{expected 'static', 'dynamic', 'guided', 'auto', 'runtime',
> 'monotonic', 'nonmonotonic' or 'simd' in OpenMP clause 'schedule'}}
> 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
> +#pragma omp distribute parallel for simd schedule (auto, //
> 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
> +#pragma omp distribute parallel for simd schedule (runtime, 3) //
> 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
> +#pragma omp distribute parallel for simd schedule (guided, 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
> +#pragma omp distribute parallel for simd schedule (static, 2+2)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for simd' are ignored}}
> + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (dynamic, foobool(1) >
> 0 ? 1 : 2)
> + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
> + // expected-error at +4 2 {{directive '#pragma omp distribute parallel
> for simd' cannot contain more than one 'schedule' clause}}
> + // expected-error at +3 {{argument to 'schedule' clause must be a
> strictly positive integer value}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (guided,
> foobool(argc)), schedule (static, true), schedule (dynamic, -5)
> + for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4];
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (guided, 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 +3 {{expression must have integral or unscoped
> enumeration type, not 'char *'}}
> + #pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule (static, 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 +5 {{statement after '#pragma omp distribute
> parallel for simd' must be a for loop}}
> + // expected-note at +3 {{in instantiation of function template
> specialization 'tmain<int, char, -1, -2>' requested here}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd schedule(dynamic,
> schedule(tmain<int, char, -1, -2>(argc, argv) // expected-error 2
> {{expected ')'}} expected-note 2 {{to match this '('}}
> + foo();
> + // 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/distribute_parallel_for_simd_
> shared_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_shared_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_shared_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_shared_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,396 @@
> +// RUN: %clang_cc1 -verify -fopenmp -ferror-limit 100 %s
> +
> +
> +struct S1; // expected-note 2 {{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 2 {{defined as
> threadprivate or thread local}}
> +
> +namespace A {
> +double x;
> +#pragma omp threadprivate(x) // expected-note 2 {{defined as
> threadprivate or thread local}}
> +}
> +namespace B {
> +using A::x;
> +}
> +
> +template <class T, typename S, int N>
> +T tmain(T argc, S **argv) {
> + const int d = 5;
> + const int da[5] = { 0 };
> + S4 e(4);
> + S5 g(5);
> + int i;
> + int &j = i;
> + int acc = 0;
> + int n = 1000;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared // expected-error
> {{expected '(' after 'shared'}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared ( // expected-error
> {{expected expression}} expected-error {{expected ')'}} expected-note {{to
> match this '('}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared () // expected-error
> {{expected expression}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc, // expected-error
> {{expected expression}} expected-error {{expected ')'}} expected-note {{to
> match this '('}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc > 0 ? argv[1] :
> argv[2]) // expected-error {{expected variable name}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (S1) // expected-error
> {{'S1' does not refer to a value}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (a, b, c, d, f)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argv[1]) //
> expected-error {{expected variable name}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(ba)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(ca)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(da)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(e, g)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(h, B::x) //
> expected-error 2 {{threadprivate or thread local variable cannot be shared}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i), shared(i) //
> expected-error {{private variable cannot be shared}} expected-note
> {{defined as private}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i), shared(i) //
> expected-error {{firstprivate variable cannot be shared}} expected-note
> {{defined as firstprivate}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(j)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(j)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +return T();
> +}
> +
> +
> +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;
> + int acc = 0;
> + int n = argc;
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared // expected-error
> {{expected '(' after 'shared'}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared ( // expected-error
> {{expected expression}} expected-error {{expected ')'}} expected-note {{to
> match this '('}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared () // expected-error
> {{expected expression}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc // expected-error
> {{expected ')'}} expected-note {{to match this '('}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc, // expected-error
> {{expected expression}} expected-error {{expected ')'}} expected-note {{to
> match this '('}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc > 0 ? argv[1] :
> argv[2]) // expected-error {{expected variable name}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argc)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (S1) // expected-error
> {{'S1' does not refer to a value}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (a, b, c, d, f)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared (argv[1]) //
> expected-error {{expected variable name}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(ba)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(ca)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(da)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(e, g)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(h, B::x) //
> expected-error 2 {{threadprivate or thread local variable cannot be shared}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i), shared(i) //
> expected-error {{private variable cannot be shared}} expected-note
> {{defined as private}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i), shared(i) //
> expected-error {{firstprivate variable cannot be shared}} expected-note
> {{defined as firstprivate}}
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd private(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(j)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd firstprivate(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(i)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd shared(j)
> + for(int k = 0 ; k < n ; k++) {
> + acc++;
> + }
> +
> +return tmain<int, char, 1000>(argc, argv); // expected-note {{in
> instantiation of function template specialization 'tmain<int, char, 1000>'
> requested here}}
> +}
>
> Added: cfe/trunk/test/OpenMP/distribute_parallel_for_simd_
> simdlen_messages.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/
> distribute_parallel_for_simd_simdlen_messages.cpp?rev=274530&view=auto
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/distribute_parallel_for_simd_simdlen_messages.cpp
> (added)
> +++ cfe/trunk/test/OpenMP/distribute_parallel_for_simd_simdlen_messages.cpp
> Tue Jul 5 00:00:15 2016
> @@ -0,0 +1,181 @@
> +// 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
> +#pragma omp distribute parallel for simd simdlen // expected-error
> {{expected '(' after 'simdlen'}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen ( // 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
> +#pragma omp distribute parallel for simd simdlen () // expected-error
> {{expected expression}}
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +// expected-error at +5 {{expected ')'}} expected-note at +5 {{to match this
> '('}}
> +// expected-error at +4 2 {{expression is not an integral constant
> expression}}
> +// expected-note at +3 2 {{read of non-const variable 'argc' is not allowed
> in a constant expression}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (argc
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +// expected-error at +3 {{argument to 'simdlen' clause must be a strictly
> positive integer value}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (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
> +#pragma omp distribute parallel for simd simdlen (1)) // expected-warning
> {{extra tokens at the end of '#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd simdlen ((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 +4 2 {{non-constexpr function 'foobool' cannot be
> used in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (foobool(argc)), simdlen
> (true), simdlen (-5) // expected-error 2 {{directive '#pragma omp
> distribute parallel for simd' cannot contain more than one 'simdlen'
> clause}} expected-error 2 {{argument to 'simdlen' 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
> +#pragma omp distribute parallel for simd simdlen (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 +6 2 {{expression is not an integral constant
> expression}}
> +#else
> + // expected-error at +4 2 {{integral constant expression must have
> integral or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (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
> +#pragma omp distribute parallel for simd simdlen (4)
> + for (int i = ST; i < N; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-ST];
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (N) // expected-error
> {{argument to 'simdlen' 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
> +#pragma omp distribute parallel for simd simdlen // expected-error
> {{expected '(' after 'simdlen'}}
> + for (int i = 4; i < 12; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-4];
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen ( // 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
> +#pragma omp distribute parallel for simd simdlen () // 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
> +#pragma omp distribute parallel for simd simdlen (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
> +#pragma omp distribute parallel for simd simdlen (2+2)) //
> expected-warning {{extra tokens at the end of '#pragma omp distribute
> parallel for 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 +4 {{non-constexpr function 'foobool' cannot be used
> in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (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 +4 {{non-constexpr function 'foobool' cannot be used
> in a constant expression}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (foobool(argc)), simdlen
> (true), simdlen (-5) // expected-error {{expression is not an integral
> constant expression}} expected-error 2 {{directive '#pragma omp distribute
> parallel for simd' cannot contain more than one 'simdlen' clause}}
> expected-error 2 {{argument to 'simdlen' clause must be a strictly positive
> integer value}}
> + for (int i = 4; i < 12; i++)
> + argv[0][i] = argv[0][i] - argv[0][i-4];
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (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 +6 {{expression is not an integral constant
> expression}}
> +#else
> + // expected-error at +4 {{integral constant expression must have integral
> or unscoped enumeration type, not 'char *'}}
> +#endif
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen (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];
> +
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for simd simdlen(simdlen(tmain<int, char,
> -1, -2>(argc, argv) // expected-error 2 {{expected ')'}} expected-note 2
> {{to match this '('}} expected-note {{in instantiation of function template
> specialization 'tmain<int, char, -1, -2>' requested here}}
> + foo(); // expected-error {{statement after '#pragma omp distribute
> parallel for 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);
> +}
> +
>
> 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/OpenMP/nesting_of_regions.cpp (original)
> +++ cfe/trunk/test/OpenMP/nesting_of_regions.cpp Tue Jul 5 00:00:15 2016
> @@ -143,6 +143,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp parallel
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'parallel' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // SIMD DIRECTIVE
> #pragma omp simd
> @@ -323,6 +329,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp 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 j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR DIRECTIVE
> #pragma omp for
> @@ -516,6 +528,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'for' region; perhaps you forget to enclose
> 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR SIMD DIRECTIVE
> #pragma omp for simd
> @@ -697,6 +715,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp for 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 j = 0; j < 10; ++j)
> + ;
> + }
>
> // SECTIONS DIRECTIVE
> #pragma omp sections
> @@ -895,6 +919,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'sections' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams 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}}
> @@ -1148,6 +1178,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp section
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'section' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // SINGLE DIRECTIVE
> #pragma omp single
> @@ -1332,6 +1369,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp single
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'single' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // MASTER DIRECTIVE
> #pragma omp master
> @@ -1516,6 +1559,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp master
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'master' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // CRITICAL DIRECTIVE
> #pragma omp critical
> @@ -1714,6 +1763,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp critical
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'critical' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // PARALLEL FOR DIRECTIVE
> #pragma omp parallel for
> @@ -1912,6 +1967,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp parallel for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'parallel for' region; perhaps you forget
> to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // PARALLEL FOR SIMD DIRECTIVE
> #pragma omp parallel for simd
> @@ -2111,6 +2172,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp parallel for 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 j = 0; j < 10; ++j)
> + ;
> + }
>
> // PARALLEL SECTIONS DIRECTIVE
> #pragma omp parallel sections
> @@ -2298,6 +2365,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp parallel sections
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'parallel sections' region; perhaps you
> forget to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TASK DIRECTIVE
> #pragma omp task
> @@ -2432,6 +2505,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp task
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'task' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // ORDERED DIRECTIVE
> #pragma omp ordered
> @@ -2637,6 +2716,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp ordered
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'ordered' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // ATOMIC DIRECTIVE
> #pragma omp atomic
> @@ -2866,6 +2951,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 distribute parallel for 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
> @@ -3016,6 +3109,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'target' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL DIRECTIVE
> #pragma omp target parallel
> @@ -3160,6 +3259,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target parallel
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'target parallel' region; perhaps you
> forget to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL FOR DIRECTIVE
> #pragma omp target parallel for
> @@ -3358,6 +3463,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp target parallel for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'target parallel for' region; perhaps you
> forget to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // TEAMS DIRECTIVE
> #pragma omp target
> @@ -3536,6 +3647,17 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp target
> +#pragma omp teams
> + {
> +#pragma omp distribute parallel for simd
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp distribute parallel for simd
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
> +
> // TASKLOOP DIRECTIVE
> #pragma omp taskloop
> for (int i = 0; i < 10; ++i) {
> @@ -3724,7 +3846,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ++a;
> }
> -
> +#pragma omp taskloop
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'taskloop' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int j = 0; j < 10; ++j)
> + ++a;
> + }
>
> // DISTRIBUTE DIRECTIVE
> #pragma omp target
> @@ -4183,162 +4310,401 @@ void foo() {
> #pragma omp target update to(a) // expected-error {{region cannot be
> nested inside 'target' region}}
> ++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();
> - }
> -#pragma omp parallel
> - {
> -#pragma omp atomic
> - ++a;
> - }
> -#pragma omp parallel
> - {
> +// DISTRIBUTE PARALLEL FOR SIMD DIRECTIVE
> #pragma omp target
> - ++a;
> - }
> -#pragma omp parallel
> - {
> -#pragma omp target parallel
> - ++a;
> - }
> -#pragma omp parallel
> -#pragma omp target parallel for
> - for (int i = 0; i < 10; ++i)
> - ;
> -#pragma omp parallel
> - {
> -#pragma omp target enter data map(to: a)
> - ++a;
> - }
> -#pragma omp parallel
> - {
> -#pragma omp target exit data map(from: a)
> - ++a;
> - }
> -#pragma omp parallel
> - {
> -#pragma omp teams // expected-error {{region cannot be closely nested
> inside 'parallel' region; perhaps you forget to enclose 'omp teams'
> directive into a target region?}}
> - ++a;
> - }
> -#pragma omp parallel
> - {
> -#pragma omp taskloop
> - for (int i = 0; i < 10; ++i)
> - ++a;
> - }
> -#pragma omp parallel
> - {
> -#pragma omp distribute // expected-error {{region cannot be closely
> nested inside 'parallel' region; perhaps you forget to enclose 'omp
> distribute' directive into a teams region?}}
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 parallel
> - {
> -#pragma omp target update to(a)
> - a++;
> - }
> -#pragma omp parallel
> - {
> -#pragma omp distribute parallel for // expected-error {{region cannot be
> closely nested inside 'parallel' region; perhaps you forget to enclose 'omp
> distribute parallel for' directive into a teams region?}}
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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)
> ;
> }
> -
> -// SIMD DIRECTIVE
> -#pragma omp simd
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 simd
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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 simd
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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;
> + }
> +}
> +
> +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();
> + }
> +#pragma omp parallel
> + {
> +#pragma omp atomic
> + ++a;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp target
> + ++a;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp target parallel
> + ++a;
> + }
> +#pragma omp parallel
> +#pragma omp target parallel for
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp parallel
> + {
> +#pragma omp target enter data map(to: a)
> + ++a;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp target exit data map(from: a)
> + ++a;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp teams // expected-error {{region cannot be closely nested
> inside 'parallel' region; perhaps you forget to enclose 'omp teams'
> directive into a target region?}}
> + ++a;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp taskloop
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp distribute // expected-error {{region cannot be closely
> nested inside 'parallel' 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 target update to(a)
> + a++;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp distribute parallel for // expected-error {{region cannot be
> closely nested inside 'parallel' region; perhaps you forget to enclose 'omp
> distribute parallel for' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp parallel
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'parallel' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +
> +// SIMD DIRECTIVE
> +#pragma omp 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 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 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)
> @@ -4488,6 +4854,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp 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 j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR DIRECTIVE
> #pragma omp for
> @@ -4672,6 +5044,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'for' region; perhaps you forget to enclose
> 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // FOR SIMD DIRECTIVE
> #pragma omp for simd
> @@ -4836,6 +5214,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp for 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 j = 0; j < 10; ++j)
> + ;
> + }
>
> // SECTIONS DIRECTIVE
> #pragma omp sections
> @@ -5009,6 +5393,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'sections' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams 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}}
> @@ -5272,6 +5662,13 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp sections
> + {
> +#pragma omp section
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'section' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // SINGLE DIRECTIVE
> #pragma omp single
> @@ -5446,6 +5843,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp single
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'single' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // MASTER DIRECTIVE
> #pragma omp master
> @@ -5630,6 +6033,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp master
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'master' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // CRITICAL DIRECTIVE
> #pragma omp critical
> @@ -5833,6 +6242,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp critical
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'critical' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // PARALLEL FOR DIRECTIVE
> #pragma omp parallel for
> @@ -6032,6 +6447,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp parallel for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'parallel for' region; perhaps you forget
> to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // PARALLEL FOR SIMD DIRECTIVE
> #pragma omp parallel for simd
> @@ -6231,6 +6652,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp parallel for 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 j = 0; j < 10; ++j)
> + ;
> + }
>
> // PARALLEL SECTIONS DIRECTIVE
> #pragma omp parallel sections
> @@ -6410,7 +6837,13 @@ void foo() {
> }
> #pragma omp parallel sections
> {
> -#pragma omp distribute parallel for // expected-error {{region cannot be
> closely nested inside 'parallel sections' region; perhaps you forget to
> enclose 'omp distribute parallel for' directive into a teams region?}}
> +#pragma omp distribute parallel for // expected-error {{region cannot be
> closely nested inside 'parallel sections' region; perhaps you forget to
> enclose 'omp distribute parallel for' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
> +#pragma omp parallel sections
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'parallel sections' region; perhaps you
> forget to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> for (int i = 0; i < 10; ++i)
> ;
> }
> @@ -6547,6 +6980,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp task
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'task' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // ATOMIC DIRECTIVE
> #pragma omp atomic
> @@ -6775,6 +7214,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 distribute parallel for 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
> @@ -6922,6 +7369,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp target
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'target' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL DIRECTIVE
> #pragma omp target parallel
> @@ -7066,7 +7519,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> -
> +#pragma omp target parallel
> + {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'target parallel' region; perhaps you
> forget to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // TARGET PARALLEL FOR DIRECTIVE
> #pragma omp target parallel for
> @@ -7266,6 +7724,12 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp target parallel for
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'target parallel for' region; perhaps you
> forget to enclose 'omp distribute parallel for simd' directive into a teams
> region?}}
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
>
> // TEAMS DIRECTIVE
> #pragma omp target
> @@ -7448,6 +7912,17 @@ void foo() {
> for (int j = 0; j < 10; ++j)
> ;
> }
> +#pragma omp target
> +#pragma omp teams
> + {
> +#pragma omp distribute parallel for simd
> + for (int i = 0; i < 10; ++i)
> + ;
> +#pragma omp distribute parallel for simd
> + for (int j = 0; j < 10; ++j)
> + ;
> + }
> +
> // TASKLOOP DIRECTIVE
> #pragma omp taskloop
> for (int i = 0; i < 10; ++i) {
> @@ -7636,6 +8111,12 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ;
> }
> +#pragma omp taskloop
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'taskloop' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ;
> + }
>
> // DISTRIBUTE DIRECTIVE
> #pragma omp target
> @@ -7870,6 +8351,14 @@ void foo() {
> for (int i = 0; i < 10; ++i)
> ++a;
> }
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp distribute parallel for simd // expected-error {{region
> cannot be closely nested inside 'distribute' region; perhaps you forget to
> enclose 'omp distribute parallel for simd' directive into a teams region?}}
> + for (int i = 0; i < 10; ++i)
> + ++a;
> + }
>
> // DISTRIBUTE PARALLEL FOR DIRECTIVE
> #pragma omp target
> @@ -8105,4 +8594,239 @@ void foo() {
> #pragma omp target update to(a) // expected-error {{region cannot be
> nested inside 'target' region}}
> ++a;
> }
> +
> +// DISTRIBUTE PARALLEL FOR SIMD DIRECTIVE
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for simd
> + for (int i = 0; i < 10; ++i) {
> +#pragma omp teams // expected-error {{OpenMP constructs may not be nested
> inside a simd region}}
> + ++a;
> + }
> + return foo<int>();
> +#pragma omp target
> +#pragma omp teams
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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
> +#pragma omp distribute parallel for 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;
> + }
> }
>
> Modified: cfe/trunk/tools/libclang/CIndex.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/
> libclang/CIndex.cpp?rev=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/tools/libclang/CIndex.cpp (original)
> +++ cfe/trunk/tools/libclang/CIndex.cpp Tue Jul 5 00:00:15 2016
> @@ -1971,6 +1971,8 @@ public:
> void VisitOMPDistributeDirective(const OMPDistributeDirective *D);
> void VisitOMPDistributeParallelForDirective(
> const OMPDistributeParallelForDirective *D);
> + void VisitOMPDistributeParallelForSimdDirective(
> + const OMPDistributeParallelForSimdDirective *D);
>
> private:
> void AddDeclarationNameInfo(const Stmt *S);
> @@ -2729,6 +2731,11 @@ void EnqueueVisitor::VisitOMPDistributeP
> VisitOMPLoopDirective(D);
> }
>
> +void EnqueueVisitor::VisitOMPDistributeParallelForSimdDirective(
> + const OMPDistributeParallelForSimdDirective *D) {
> + VisitOMPLoopDirective(D);
> +}
> +
> void CursorVisitor::EnqueueWorkList(VisitorWorkList &WL, const Stmt *S) {
> EnqueueVisitor(WL, MakeCXCursor(S, StmtParent,
> TU,RegionOfInterest)).Visit(S);
> }
> @@ -4847,6 +4854,8 @@ CXString clang_getCursorKindSpelling(enu
> return cxstring::createRef("OMPDistributeDirective");
> case CXCursor_OMPDistributeParallelForDirective:
> return cxstring::createRef("OMPDistributeParallelForDirective");
> + case CXCursor_OMPDistributeParallelForSimdDirective:
> + return cxstring::createRef("OMPDistributeParallelForSimdDirective");
> 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=274530&r1=274529&r2=274530&view=diff
> ============================================================
> ==================
> --- cfe/trunk/tools/libclang/CXCursor.cpp (original)
> +++ cfe/trunk/tools/libclang/CXCursor.cpp Tue Jul 5 00:00:15 2016
> @@ -637,6 +637,9 @@ CXCursor cxcursor::MakeCXCursor(const St
> case Stmt::OMPDistributeParallelForDirectiveClass:
> K = CXCursor_OMPDistributeParallelForDirective;
> break;
> + case Stmt::OMPDistributeParallelForSimdDirectiveClass:
> + K = CXCursor_OMPDistributeParallelForSimdDirective;
> + 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20161017/d1de8cc1/attachment-0001.html>
More information about the cfe-commits
mailing list