From 738204ee9cf5636aa74a1d851eff7471078eb0c0 Mon Sep 17 00:00:00 2001 From: Alexey Bataev Date: Thu, 17 Jul 2014 12:19:31 +0000 Subject: [PATCH] [OPENMP] Initial support for parsing and sema analysis of 'untied' clause. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213257 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/DataRecursiveASTVisitor.h | 5 ++++ include/clang/AST/OpenMPClause.h | 29 +++++++++++++++++++++ include/clang/AST/RecursiveASTVisitor.h | 5 ++++ include/clang/Basic/OpenMPKinds.def | 2 ++ include/clang/Sema/Sema.h | 3 +++ lib/AST/StmtPrinter.cpp | 4 +++ lib/AST/StmtProfile.cpp | 2 ++ lib/Basic/OpenMPKinds.cpp | 2 ++ lib/Parse/ParseOpenMP.cpp | 6 ++++- lib/Sema/SemaOpenMP.cpp | 12 +++++++++ lib/Sema/TreeTransform.h | 7 +++++ lib/Serialization/ASTReaderStmt.cpp | 5 ++++ lib/Serialization/ASTWriterStmt.cpp | 2 ++ test/OpenMP/task_ast_print.cpp | 12 ++++----- test/OpenMP/task_messages.cpp | 6 +++++ tools/libclang/CIndex.cpp | 2 ++ 16 files changed, 97 insertions(+), 7 deletions(-) diff --git a/include/clang/AST/DataRecursiveASTVisitor.h b/include/clang/AST/DataRecursiveASTVisitor.h index e47e99b496..541886c0c1 100644 --- a/include/clang/AST/DataRecursiveASTVisitor.h +++ b/include/clang/AST/DataRecursiveASTVisitor.h @@ -2386,6 +2386,11 @@ bool RecursiveASTVisitor::VisitOMPNowaitClause(OMPNowaitClause *) { return true; } +template +bool RecursiveASTVisitor::VisitOMPUntiedClause(OMPUntiedClause *) { + return true; +} + template template bool RecursiveASTVisitor::VisitOMPClauseList(T *Node) { diff --git a/include/clang/AST/OpenMPClause.h b/include/clang/AST/OpenMPClause.h index 35431753f4..4173e91d78 100644 --- a/include/clang/AST/OpenMPClause.h +++ b/include/clang/AST/OpenMPClause.h @@ -711,6 +711,35 @@ public: StmtRange children() { return StmtRange(); } }; +/// \brief This represents 'untied' clause in the '#pragma omp ...' directive. +/// +/// \code +/// #pragma omp task untied +/// \endcode +/// In this example directive '#pragma omp task' has 'untied' clause. +/// +class OMPUntiedClause : public OMPClause { +public: + /// \brief Build 'untied' clause. + /// + /// \param StartLoc Starting location of the clause. + /// \param EndLoc Ending location of the clause. + /// + OMPUntiedClause(SourceLocation StartLoc, SourceLocation EndLoc) + : OMPClause(OMPC_untied, StartLoc, EndLoc) {} + + /// \brief Build an empty clause. + /// + OMPUntiedClause() + : OMPClause(OMPC_untied, SourceLocation(), SourceLocation()) {} + + static bool classof(const OMPClause *T) { + return T->getClauseKind() == OMPC_untied; + } + + StmtRange children() { return StmtRange(); } +}; + /// \brief This represents clause 'private' in the '#pragma omp ...' directives. /// /// \code diff --git a/include/clang/AST/RecursiveASTVisitor.h b/include/clang/AST/RecursiveASTVisitor.h index 208d0f509d..9178f67aa1 100644 --- a/include/clang/AST/RecursiveASTVisitor.h +++ b/include/clang/AST/RecursiveASTVisitor.h @@ -2408,6 +2408,11 @@ bool RecursiveASTVisitor::VisitOMPNowaitClause(OMPNowaitClause *) { return true; } +template +bool RecursiveASTVisitor::VisitOMPUntiedClause(OMPUntiedClause *) { + return true; +} + template template bool RecursiveASTVisitor::VisitOMPClauseList(T *Node) { diff --git a/include/clang/Basic/OpenMPKinds.def b/include/clang/Basic/OpenMPKinds.def index 61d23d4658..6da343e05f 100644 --- a/include/clang/Basic/OpenMPKinds.def +++ b/include/clang/Basic/OpenMPKinds.def @@ -88,6 +88,7 @@ OPENMP_CLAUSE(proc_bind, OMPProcBindClause) OPENMP_CLAUSE(schedule, OMPScheduleClause) OPENMP_CLAUSE(ordered, OMPOrderedClause) OPENMP_CLAUSE(nowait, OMPNowaitClause) +OPENMP_CLAUSE(untied, OMPUntiedClause) // Clauses allowed for OpenMP directive 'parallel'. OPENMP_PARALLEL_CLAUSE(if) @@ -182,6 +183,7 @@ OPENMP_TASK_CLAUSE(default) OPENMP_TASK_CLAUSE(private) OPENMP_TASK_CLAUSE(firstprivate) OPENMP_TASK_CLAUSE(shared) +OPENMP_TASK_CLAUSE(untied) #undef OPENMP_SCHEDULE_KIND #undef OPENMP_PROC_BIND_KIND diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index f647920888..283dfb6acd 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -7440,6 +7440,9 @@ public: /// \brief Called on well-formed 'nowait' clause. OMPClause *ActOnOpenMPNowaitClause(SourceLocation StartLoc, SourceLocation EndLoc); + /// \brief Called on well-formed 'untied' clause. + OMPClause *ActOnOpenMPUntiedClause(SourceLocation StartLoc, + SourceLocation EndLoc); OMPClause * ActOnOpenMPVarListClause(OpenMPClauseKind Kind, ArrayRef Vars, diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp index fd511ef465..29d958bacf 100644 --- a/lib/AST/StmtPrinter.cpp +++ b/lib/AST/StmtPrinter.cpp @@ -657,6 +657,10 @@ void OMPClausePrinter::VisitOMPNowaitClause(OMPNowaitClause *) { OS << "nowait"; } +void OMPClausePrinter::VisitOMPUntiedClause(OMPUntiedClause *) { + OS << "untied"; +} + template void OMPClausePrinter::VisitOMPClauseList(T *Node, char StartSym) { for (typename T::varlist_iterator I = Node->varlist_begin(), diff --git a/lib/AST/StmtProfile.cpp b/lib/AST/StmtProfile.cpp index c45281f13f..b17551cd40 100644 --- a/lib/AST/StmtProfile.cpp +++ b/lib/AST/StmtProfile.cpp @@ -306,6 +306,8 @@ void OMPClauseProfiler::VisitOMPOrderedClause(const OMPOrderedClause *) {} void OMPClauseProfiler::VisitOMPNowaitClause(const OMPNowaitClause *) {} +void OMPClauseProfiler::VisitOMPUntiedClause(const OMPUntiedClause *) {} + template void OMPClauseProfiler::VisitOMPClauseList(T *Node) { for (auto *I : Node->varlists()) diff --git a/lib/Basic/OpenMPKinds.cpp b/lib/Basic/OpenMPKinds.cpp index 31b571cac8..d8af63f1d0 100644 --- a/lib/Basic/OpenMPKinds.cpp +++ b/lib/Basic/OpenMPKinds.cpp @@ -103,6 +103,7 @@ unsigned clang::getOpenMPSimpleClauseType(OpenMPClauseKind Kind, case OMPC_copyprivate: case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: break; } llvm_unreachable("Invalid OpenMP simple clause kind"); @@ -159,6 +160,7 @@ const char *clang::getOpenMPSimpleClauseTypeName(OpenMPClauseKind Kind, case OMPC_copyprivate: case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: break; } llvm_unreachable("Invalid OpenMP simple clause kind"); diff --git a/lib/Parse/ParseOpenMP.cpp b/lib/Parse/ParseOpenMP.cpp index 172aef8cf3..9f1fa0af15 100644 --- a/lib/Parse/ParseOpenMP.cpp +++ b/lib/Parse/ParseOpenMP.cpp @@ -292,7 +292,7 @@ bool Parser::ParseOpenMPSimpleVarList(OpenMPDirectiveKind Kind, /// default-clause | private-clause | firstprivate-clause | shared-clause /// | linear-clause | aligned-clause | collapse-clause | /// lastprivate-clause | reduction-clause | proc_bind-clause | -/// schedule-clause | copyin-clause | copyprivate-clause +/// schedule-clause | copyin-clause | copyprivate-clause | untied-clause /// OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind DKind, OpenMPClauseKind CKind, bool FirstClause) { @@ -353,6 +353,7 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind DKind, break; case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: // OpenMP [2.7.1, Restrictions, p. 9] // Only one ordered clause can appear on a loop directive. // OpenMP [2.7.1, Restrictions, C/C++, p. 4] @@ -468,6 +469,9 @@ OMPClause *Parser::ParseOpenMPSimpleClause(OpenMPClauseKind Kind) { /// nowait-clause: /// 'nowait' /// +/// untied-clause: +/// 'untied' +/// OMPClause *Parser::ParseOpenMPClause(OpenMPClauseKind Kind) { SourceLocation Loc = Tok.getLocation(); ConsumeAnyToken(); diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp index ef36e7e901..85a9ccffd8 100644 --- a/lib/Sema/SemaOpenMP.cpp +++ b/lib/Sema/SemaOpenMP.cpp @@ -2068,6 +2068,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr, case OMPC_copyprivate: case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: case OMPC_threadprivate: case OMPC_unknown: llvm_unreachable("Clause is not allowed."); @@ -2268,6 +2269,7 @@ OMPClause *Sema::ActOnOpenMPSimpleClause( case OMPC_copyprivate: case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: case OMPC_threadprivate: case OMPC_unknown: llvm_unreachable("Clause is not allowed."); @@ -2380,6 +2382,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprWithArgClause( case OMPC_copyprivate: case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: case OMPC_threadprivate: case OMPC_unknown: llvm_unreachable("Clause is not allowed."); @@ -2454,6 +2457,9 @@ OMPClause *Sema::ActOnOpenMPClause(OpenMPClauseKind Kind, case OMPC_nowait: Res = ActOnOpenMPNowaitClause(StartLoc, EndLoc); break; + case OMPC_untied: + Res = ActOnOpenMPUntiedClause(StartLoc, EndLoc); + break; case OMPC_if: case OMPC_final: case OMPC_num_threads: @@ -2488,6 +2494,11 @@ OMPClause *Sema::ActOnOpenMPNowaitClause(SourceLocation StartLoc, return new (Context) OMPNowaitClause(StartLoc, EndLoc); } +OMPClause *Sema::ActOnOpenMPUntiedClause(SourceLocation StartLoc, + SourceLocation EndLoc) { + return new (Context) OMPUntiedClause(StartLoc, EndLoc); +} + OMPClause *Sema::ActOnOpenMPVarListClause( OpenMPClauseKind Kind, ArrayRef VarList, Expr *TailExpr, SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation ColonLoc, @@ -2535,6 +2546,7 @@ OMPClause *Sema::ActOnOpenMPVarListClause( case OMPC_schedule: case OMPC_ordered: case OMPC_nowait: + case OMPC_untied: case OMPC_threadprivate: case OMPC_unknown: llvm_unreachable("Clause is not allowed."); diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index 6eb18e8ac7..4a9cd78bb6 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -6644,6 +6644,13 @@ TreeTransform::TransformOMPNowaitClause(OMPNowaitClause *C) { return C; } +template +OMPClause * +TreeTransform::TransformOMPUntiedClause(OMPUntiedClause *C) { + // No need to rebuild this clause, no template-dependent parameters. + return C; +} + template OMPClause * TreeTransform::TransformOMPPrivateClause(OMPPrivateClause *C) { diff --git a/lib/Serialization/ASTReaderStmt.cpp b/lib/Serialization/ASTReaderStmt.cpp index e6c71b45a1..4986e2e47e 100644 --- a/lib/Serialization/ASTReaderStmt.cpp +++ b/lib/Serialization/ASTReaderStmt.cpp @@ -1709,6 +1709,9 @@ OMPClause *OMPClauseReader::readClause() { case OMPC_nowait: C = new (Context) OMPNowaitClause(); break; + case OMPC_untied: + C = new (Context) OMPUntiedClause(); + break; case OMPC_private: C = OMPPrivateClause::CreateEmpty(Context, Record[Idx++]); break; @@ -1796,6 +1799,8 @@ void OMPClauseReader::VisitOMPOrderedClause(OMPOrderedClause *) {} void OMPClauseReader::VisitOMPNowaitClause(OMPNowaitClause *) {} +void OMPClauseReader::VisitOMPUntiedClause(OMPUntiedClause *) {} + void OMPClauseReader::VisitOMPPrivateClause(OMPPrivateClause *C) { C->setLParenLoc(Reader->ReadSourceLocation(Record, Idx)); unsigned NumVars = C->varlist_size(); diff --git a/lib/Serialization/ASTWriterStmt.cpp b/lib/Serialization/ASTWriterStmt.cpp index e8027e733c..6edad3ddf5 100644 --- a/lib/Serialization/ASTWriterStmt.cpp +++ b/lib/Serialization/ASTWriterStmt.cpp @@ -1731,6 +1731,8 @@ void OMPClauseWriter::VisitOMPOrderedClause(OMPOrderedClause *) {} void OMPClauseWriter::VisitOMPNowaitClause(OMPNowaitClause *) {} +void OMPClauseWriter::VisitOMPUntiedClause(OMPUntiedClause *) {} + void OMPClauseWriter::VisitOMPPrivateClause(OMPPrivateClause *C) { Record.push_back(C->varlist_size()); Writer->Writer.AddSourceLocation(C->getLParenLoc(), Record); diff --git a/test/OpenMP/task_ast_print.cpp b/test/OpenMP/task_ast_print.cpp index c868e74977..f29b5b3fe7 100644 --- a/test/OpenMP/task_ast_print.cpp +++ b/test/OpenMP/task_ast_print.cpp @@ -33,7 +33,7 @@ T tmain(T argc, T *argv) { T b = argc, c, d, e, f, g; static T a; S s; -#pragma omp task +#pragma omp task untied a = 2; #pragma omp task default(none), private(argc, b) firstprivate(argv) shared(d) if (argc > 0) final(S::TS > 0) foo(); @@ -46,7 +46,7 @@ T tmain(T argc, T *argv) { // CHECK-NEXT: int b = argc, c, d, e, f, g; // CHECK-NEXT: static int a; // CHECK-NEXT: S s; -// CHECK-NEXT: #pragma omp task +// CHECK-NEXT: #pragma omp task untied // CHECK-NEXT: a = 2; // CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S::TS > 0) // CHECK-NEXT: foo() @@ -56,7 +56,7 @@ T tmain(T argc, T *argv) { // CHECK-NEXT: long b = argc, c, d, e, f, g; // CHECK-NEXT: static long a; // CHECK-NEXT: S s; -// CHECK-NEXT: #pragma omp task +// CHECK-NEXT: #pragma omp task untied // CHECK-NEXT: a = 2; // CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S::TS > 0) // CHECK-NEXT: foo() @@ -66,7 +66,7 @@ T tmain(T argc, T *argv) { // CHECK-NEXT: T b = argc, c, d, e, f, g; // CHECK-NEXT: static T a; // CHECK-NEXT: S s; -// CHECK-NEXT: #pragma omp task +// CHECK-NEXT: #pragma omp task untied // CHECK-NEXT: a = 2; // CHECK-NEXT: #pragma omp task default(none) private(argc,b) firstprivate(argv) shared(d) if(argc > 0) final(S::TS > 0) // CHECK-NEXT: foo() @@ -82,8 +82,8 @@ int main(int argc, char **argv) { #pragma omp threadprivate(a) Enum ee; // CHECK: Enum ee; -#pragma omp task - // CHECK-NEXT: #pragma omp task +#pragma omp task untied + // CHECK-NEXT: #pragma omp task untied a = 2; // CHECK-NEXT: a = 2; #pragma omp task default(none), private(argc, b) firstprivate(argv) if (argc > 0) final(a > 0) diff --git a/test/OpenMP/task_messages.cpp b/test/OpenMP/task_messages.cpp index 3c8968299c..7491c23b73 100644 --- a/test/OpenMP/task_messages.cpp +++ b/test/OpenMP/task_messages.cpp @@ -97,6 +97,9 @@ int foo() { // expected-error@+1 {{region cannot be closely nested inside 'task' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}} #pragma omp for reduction(+ : r) ++r; +// expected-error@+1 {{directive '#pragma omp task' cannot contain more than one 'untied' clause}} +#pragma omp task untied untied + ++r; return a + b; } @@ -256,6 +259,9 @@ L2: // expected-error@+1 {{region cannot be closely nested inside 'task' region; perhaps you forget to enclose 'omp for' directive into a parallel region?}} #pragma omp for reduction(+ : r) ++r; +// expected-error@+1 {{directive '#pragma omp task' cannot contain more than one 'untied' clause}} +#pragma omp task untied untied + ++r; // expected-note@+2 {{in instantiation of function template specialization 'foo' requested here}} // expected-note@+1 {{in instantiation of function template specialization 'foo' requested here}} return foo() + foo(); diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 75438e20ea..e83a659b1f 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -1968,6 +1968,8 @@ void OMPClauseEnqueue::VisitOMPOrderedClause(const OMPOrderedClause *) {} void OMPClauseEnqueue::VisitOMPNowaitClause(const OMPNowaitClause *) {} +void OMPClauseEnqueue::VisitOMPUntiedClause(const OMPUntiedClause *) {} + template void OMPClauseEnqueue::VisitOMPClauseList(T *Node) { for (const auto *I : Node->varlists()) -- 2.40.0