diff options
Diffstat (limited to 'clang/include/clang')
| -rw-r--r-- | clang/include/clang/AST/RecursiveASTVisitor.h | 3 | ||||
| -rw-r--r-- | clang/include/clang/AST/StmtOpenMP.h | 70 | ||||
| -rw-r--r-- | clang/include/clang/Basic/OpenMPKinds.def | 21 | ||||
| -rw-r--r-- | clang/include/clang/Basic/StmtNodes.td | 1 | ||||
| -rw-r--r-- | clang/include/clang/Sema/Sema.h | 6 | ||||
| -rw-r--r-- | clang/include/clang/Serialization/ASTBitCodes.h | 1 |
6 files changed, 0 insertions, 102 deletions
diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h b/clang/include/clang/AST/RecursiveASTVisitor.h index cd6a8114ad3..84abbb762d6 100644 --- a/clang/include/clang/AST/RecursiveASTVisitor.h +++ b/clang/include/clang/AST/RecursiveASTVisitor.h @@ -2598,9 +2598,6 @@ DEF_TRAVERSE_STMT(OMPTargetSimdDirective, DEF_TRAVERSE_STMT(OMPTeamsDistributeDirective, { TRY_TO(TraverseOMPExecutableDirective(S)); }) -DEF_TRAVERSE_STMT(OMPTeamsDistributeSimdDirective, - { TRY_TO(TraverseOMPExecutableDirective(S)); }) - // OpenMP clauses. template <typename Derived> bool RecursiveASTVisitor<Derived>::TraverseOMPClause(OMPClause *C) { diff --git a/clang/include/clang/AST/StmtOpenMP.h b/clang/include/clang/AST/StmtOpenMP.h index bf97430f677..de603f489fb 100644 --- a/clang/include/clang/AST/StmtOpenMP.h +++ b/clang/include/clang/AST/StmtOpenMP.h @@ -3226,76 +3226,6 @@ public: } }; -/// This represents '#pragma omp teams distribute simd' -/// combined directive. -/// -/// \code -/// #pragma omp teams distribute simd private(a,b) -/// \endcode -/// In this example directive '#pragma omp teams distribute simd' -/// has clause 'private' with the variables 'a' and 'b' -/// -class OMPTeamsDistributeSimdDirective final : public OMPLoopDirective { - friend class ASTStmtReader; - - /// Build directive with the given start and end location. - /// - /// \param StartLoc Starting location of the directive kind. - /// \param EndLoc Ending location of the directive. - /// \param CollapsedNum Number of collapsed nested loops. - /// \param NumClauses Number of clauses. - /// - OMPTeamsDistributeSimdDirective(SourceLocation StartLoc, - SourceLocation EndLoc, unsigned CollapsedNum, - unsigned NumClauses) - : OMPLoopDirective(this, OMPTeamsDistributeSimdDirectiveClass, - OMPD_teams_distribute_simd, StartLoc, EndLoc, - CollapsedNum, NumClauses) {} - - /// Build an empty directive. - /// - /// \param CollapsedNum Number of collapsed nested loops. - /// \param NumClauses Number of clauses. - /// - explicit OMPTeamsDistributeSimdDirective(unsigned CollapsedNum, - unsigned NumClauses) - : OMPLoopDirective(this, OMPTeamsDistributeSimdDirectiveClass, - OMPD_teams_distribute_simd, SourceLocation(), - SourceLocation(), CollapsedNum, NumClauses) {} - -public: - /// Creates directive with a list of \a Clauses. - /// - /// \param C AST context. - /// \param StartLoc Starting location of the directive kind. - /// \param EndLoc Ending Location of the directive. - /// \param CollapsedNum Number of collapsed loops. - /// \param Clauses List of clauses. - /// \param AssociatedStmt Statement, associated with the directive. - /// \param Exprs Helper expressions for CodeGen. - /// - static OMPTeamsDistributeSimdDirective * - Create(const ASTContext &C, SourceLocation StartLoc, SourceLocation EndLoc, - unsigned CollapsedNum, ArrayRef<OMPClause *> Clauses, - Stmt *AssociatedStmt, const HelperExprs &Exprs); - - /// Creates an empty directive with the place - /// for \a NumClauses clauses. - /// - /// \param C AST context. - /// \param CollapsedNum Number of collapsed nested loops. - /// \param NumClauses Number of clauses. - /// - static OMPTeamsDistributeSimdDirective *CreateEmpty(const ASTContext &C, - unsigned NumClauses, - unsigned CollapsedNum, - EmptyShell); - - static bool classof(const Stmt *T) { - return T->getStmtClass() == OMPTeamsDistributeSimdDirectiveClass; - } -}; - } // end namespace clang #endif diff --git a/clang/include/clang/Basic/OpenMPKinds.def b/clang/include/clang/Basic/OpenMPKinds.def index c95062d9ef9..0d0cc1c07eb 100644 --- a/clang/include/clang/Basic/OpenMPKinds.def +++ b/clang/include/clang/Basic/OpenMPKinds.def @@ -144,9 +144,6 @@ #ifndef OPENMP_TEAMS_DISTRIBUTE_CLAUSE #define OPENMP_TEAMS_DISTRIBUTE_CLAUSE(Name) #endif -#ifndef OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE -#define OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(Name) -#endif // OpenMP directives. OPENMP_DIRECTIVE(threadprivate) @@ -193,7 +190,6 @@ OPENMP_DIRECTIVE_EXT(distribute_simd, "distribute simd") OPENMP_DIRECTIVE_EXT(target_parallel_for_simd, "target parallel for simd") OPENMP_DIRECTIVE_EXT(target_simd, "target simd") OPENMP_DIRECTIVE_EXT(teams_distribute, "teams distribute") -OPENMP_DIRECTIVE_EXT(teams_distribute_simd, "teams distribute simd") // OpenMP clauses. OPENMP_CLAUSE(if, OMPIfClause) @@ -662,22 +658,6 @@ OPENMP_TEAMS_DISTRIBUTE_CLAUSE(lastprivate) OPENMP_TEAMS_DISTRIBUTE_CLAUSE(collapse) OPENMP_TEAMS_DISTRIBUTE_CLAUSE(dist_schedule) -// Clauses allowed for OpenMP directive 'teams distribute simd' -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(default) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(private) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(firstprivate) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(shared) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(reduction) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(num_teams) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(thread_limit) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(lastprivate) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(collapse) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(dist_schedule) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(linear) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(aligned) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(safelen) -OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(simdlen) - #undef OPENMP_TASKLOOP_SIMD_CLAUSE #undef OPENMP_TASKLOOP_CLAUSE #undef OPENMP_LINEAR_KIND @@ -722,4 +702,3 @@ OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE(simdlen) #undef OPENMP_TARGET_PARALLEL_FOR_SIMD_CLAUSE #undef OPENMP_TARGET_SIMD_CLAUSE #undef OPENMP_TEAMS_DISTRIBUTE_CLAUSE -#undef OPENMP_TEAMS_DISTRIBUTE_SIMD_CLAUSE diff --git a/clang/include/clang/Basic/StmtNodes.td b/clang/include/clang/Basic/StmtNodes.td index 9686ff68ea0..554f19ff08f 100644 --- a/clang/include/clang/Basic/StmtNodes.td +++ b/clang/include/clang/Basic/StmtNodes.td @@ -235,4 +235,3 @@ def OMPDistributeSimdDirective : DStmt<OMPLoopDirective>; def OMPTargetParallelForSimdDirective : DStmt<OMPLoopDirective>; def OMPTargetSimdDirective : DStmt<OMPLoopDirective>; def OMPTeamsDistributeDirective : DStmt<OMPLoopDirective>; -def OMPTeamsDistributeSimdDirective : DStmt<OMPLoopDirective>; diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index cf4b26503cf..7cf84c39952 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -8281,12 +8281,6 @@ public: ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, SourceLocation EndLoc, llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA); - /// Called on well-formed '\#pragma omp teams distribute simd' after parsing - /// of the associated statement. - StmtResult ActOnOpenMPTeamsDistributeSimdDirective( - ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, - SourceLocation EndLoc, - llvm::DenseMap<ValueDecl *, Expr *> &VarsWithImplicitDSA); /// Checks correctness of linear modifiers. bool CheckOpenMPLinearModifier(OpenMPLinearClauseKind LinKind, diff --git a/clang/include/clang/Serialization/ASTBitCodes.h b/clang/include/clang/Serialization/ASTBitCodes.h index c84aa2d6f87..47678a1637f 100644 --- a/clang/include/clang/Serialization/ASTBitCodes.h +++ b/clang/include/clang/Serialization/ASTBitCodes.h @@ -1490,7 +1490,6 @@ namespace clang { STMT_OMP_TARGET_PARALLEL_FOR_SIMD_DIRECTIVE, STMT_OMP_TARGET_SIMD_DIRECTIVE, STMT_OMP_TEAMS_DISTRIBUTE_DIRECTIVE, - STMT_OMP_TEAMS_DISTRIBUTE_SIMD_DIRECTIVE, EXPR_OMP_ARRAY_SECTION, // ARC |

