From: Patrick Lyster Date: Wed, 3 Oct 2018 20:07:58 +0000 (+0000) Subject: [OPENMP] Add reverse_offload clause to requires directive X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21352e1ac84011834d3e378c5c0940033c66e19b;p=clang [OPENMP] Add reverse_offload clause to requires directive git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@343711 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/OpenMPClause.h b/include/clang/AST/OpenMPClause.h index 41846f088f..98b19862e5 100644 --- a/include/clang/AST/OpenMPClause.h +++ b/include/clang/AST/OpenMPClause.h @@ -796,6 +796,37 @@ public: } }; +/// This represents 'reverse_offload' clause in the '#pragma omp requires' +/// directive. +/// +/// \code +/// #pragma omp requires reverse_offload +/// \endcode +/// In this example directive '#pragma omp requires' has 'reverse_offload' +/// clause. +class OMPReverseOffloadClause final : public OMPClause { +public: + friend class OMPClauseReader; + /// Build 'reverse_offload' clause. + /// + /// \param StartLoc Starting location of the clause. + /// \param EndLoc Ending location of the clause. + OMPReverseOffloadClause(SourceLocation StartLoc, SourceLocation EndLoc) + : OMPClause(OMPC_reverse_offload, StartLoc, EndLoc) {} + + /// Build an empty clause. + OMPReverseOffloadClause() + : OMPClause(OMPC_reverse_offload, SourceLocation(), SourceLocation()) {} + + child_range children() { + return child_range(child_iterator(), child_iterator()); + } + + static bool classof(const OMPClause *T) { + return T->getClauseKind() == OMPC_reverse_offload; + } +}; + /// This represents 'schedule' clause in the '#pragma omp ...' directive. /// /// \code diff --git a/include/clang/AST/RecursiveASTVisitor.h b/include/clang/AST/RecursiveASTVisitor.h index 6e2b4f183f..5933c88a48 100644 --- a/include/clang/AST/RecursiveASTVisitor.h +++ b/include/clang/AST/RecursiveASTVisitor.h @@ -2873,6 +2873,12 @@ bool RecursiveASTVisitor::VisitOMPUnifiedSharedMemoryClause( return true; } +template +bool RecursiveASTVisitor::VisitOMPReverseOffloadClause( + OMPReverseOffloadClause *) { + return true; +} + template bool RecursiveASTVisitor::VisitOMPScheduleClause(OMPScheduleClause *C) { diff --git a/include/clang/Basic/OpenMPKinds.def b/include/clang/Basic/OpenMPKinds.def index 5f7c6efc1b..375eddf8c9 100644 --- a/include/clang/Basic/OpenMPKinds.def +++ b/include/clang/Basic/OpenMPKinds.def @@ -281,6 +281,7 @@ OPENMP_CLAUSE(task_reduction, OMPTaskReductionClause) OPENMP_CLAUSE(in_reduction, OMPInReductionClause) OPENMP_CLAUSE(unified_address, OMPUnifiedAddressClause) OPENMP_CLAUSE(unified_shared_memory, OMPUnifiedSharedMemoryClause) +OPENMP_CLAUSE(reverse_offload, OMPReverseOffloadClause) // Clauses allowed for OpenMP directive 'parallel'. OPENMP_PARALLEL_CLAUSE(if) @@ -465,6 +466,7 @@ OPENMP_TARGET_CLAUSE(reduction) // Clauses allowed for OpenMP directive 'requires'. OPENMP_REQUIRES_CLAUSE(unified_address) OPENMP_REQUIRES_CLAUSE(unified_shared_memory) +OPENMP_REQUIRES_CLAUSE(reverse_offload) // Clauses allowed for OpenMP directive 'target data'. OPENMP_TARGET_DATA_CLAUSE(if) diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 1d39ddf398..e1e6dae3ad 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -9171,6 +9171,10 @@ public: /// Called on well-formed 'unified_address' clause. OMPClause *ActOnOpenMPUnifiedSharedMemoryClause(SourceLocation StartLoc, SourceLocation EndLoc); + + /// Called on well-formed 'reverse_offload' clause. + OMPClause *ActOnOpenMPReverseOffloadClause(SourceLocation StartLoc, + SourceLocation EndLoc); OMPClause *ActOnOpenMPVarListClause( OpenMPClauseKind Kind, ArrayRef Vars, Expr *TailExpr, diff --git a/lib/AST/OpenMPClause.cpp b/lib/AST/OpenMPClause.cpp index 79c49f206d..5642294f09 100644 --- a/lib/AST/OpenMPClause.cpp +++ b/lib/AST/OpenMPClause.cpp @@ -108,6 +108,7 @@ const OMPClauseWithPreInit *OMPClauseWithPreInit::get(const OMPClause *C) { case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: break; } @@ -179,6 +180,7 @@ const OMPClauseWithPostUpdate *OMPClauseWithPostUpdate::get(const OMPClause *C) case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: break; } diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp index 93981bdcde..fc12ce9a5f 100644 --- a/lib/AST/StmtPrinter.cpp +++ b/lib/AST/StmtPrinter.cpp @@ -705,6 +705,10 @@ void OMPClausePrinter::VisitOMPUnifiedSharedMemoryClause( OS << "unified_shared_memory"; } +void OMPClausePrinter::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *) { + OS << "reverse_offload"; +} + void OMPClausePrinter::VisitOMPScheduleClause(OMPScheduleClause *Node) { OS << "schedule("; if (Node->getFirstScheduleModifier() != OMPC_SCHEDULE_MODIFIER_unknown) { diff --git a/lib/AST/StmtProfile.cpp b/lib/AST/StmtProfile.cpp index f3db8f7e04..10b10254dd 100644 --- a/lib/AST/StmtProfile.cpp +++ b/lib/AST/StmtProfile.cpp @@ -473,6 +473,9 @@ void OMPClauseProfiler::VisitOMPUnifiedAddressClause( void OMPClauseProfiler::VisitOMPUnifiedSharedMemoryClause( const OMPUnifiedSharedMemoryClause *C) {} +void OMPClauseProfiler::VisitOMPReverseOffloadClause( + const OMPReverseOffloadClause *C) {} + void OMPClauseProfiler::VisitOMPScheduleClause(const OMPScheduleClause *C) { VistOMPClauseWithPreInit(C); if (auto *S = C->getChunkSize()) diff --git a/lib/Basic/OpenMPKinds.cpp b/lib/Basic/OpenMPKinds.cpp index aaaf04f6aa..fa3c3dfd51 100644 --- a/lib/Basic/OpenMPKinds.cpp +++ b/lib/Basic/OpenMPKinds.cpp @@ -170,6 +170,7 @@ unsigned clang::getOpenMPSimpleClauseType(OpenMPClauseKind Kind, case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: break; } llvm_unreachable("Invalid OpenMP simple clause kind"); @@ -313,6 +314,7 @@ const char *clang::getOpenMPSimpleClauseTypeName(OpenMPClauseKind Kind, case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: break; } llvm_unreachable("Invalid OpenMP simple clause kind"); diff --git a/lib/CodeGen/CGStmtOpenMP.cpp b/lib/CodeGen/CGStmtOpenMP.cpp index 1f64e887bf..7872a805cc 100644 --- a/lib/CodeGen/CGStmtOpenMP.cpp +++ b/lib/CodeGen/CGStmtOpenMP.cpp @@ -3900,6 +3900,7 @@ static void emitOMPAtomicExpr(CodeGenFunction &CGF, OpenMPClauseKind Kind, case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Clause is not allowed in 'omp atomic'."); } } diff --git a/lib/Parse/ParseOpenMP.cpp b/lib/Parse/ParseOpenMP.cpp index 209b87e1b8..94eabf4797 100644 --- a/lib/Parse/ParseOpenMP.cpp +++ b/lib/Parse/ParseOpenMP.cpp @@ -1380,6 +1380,7 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind DKind, case OMPC_nogroup: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: // 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] diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp index fec8f8b10b..de78a1a520 100644 --- a/lib/Sema/SemaOpenMP.cpp +++ b/lib/Sema/SemaOpenMP.cpp @@ -8012,6 +8012,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr, case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Clause is not allowed."); } return Res; @@ -8535,6 +8536,7 @@ static OpenMPDirectiveKind getOpenMPCaptureRegionForClause( case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Unexpected OpenMP clause."); } return CaptureRegion; @@ -8854,6 +8856,7 @@ OMPClause *Sema::ActOnOpenMPSimpleClause( case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Clause is not allowed."); } return Res; @@ -9012,6 +9015,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprWithArgClause( case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Clause is not allowed."); } return Res; @@ -9173,6 +9177,9 @@ OMPClause *Sema::ActOnOpenMPClause(OpenMPClauseKind Kind, case OMPC_unified_shared_memory: Res = ActOnOpenMPUnifiedSharedMemoryClause(StartLoc, EndLoc); break; + case OMPC_reverse_offload: + Res = ActOnOpenMPReverseOffloadClause(StartLoc, EndLoc); + break; case OMPC_if: case OMPC_final: case OMPC_num_threads: @@ -9283,6 +9290,11 @@ OMPClause *Sema::ActOnOpenMPUnifiedSharedMemoryClause(SourceLocation StartLoc, return new (Context) OMPUnifiedSharedMemoryClause(StartLoc, EndLoc); } +OMPClause *Sema::ActOnOpenMPReverseOffloadClause(SourceLocation StartLoc, + SourceLocation EndLoc) { + return new (Context) OMPReverseOffloadClause(StartLoc, EndLoc); +} + OMPClause *Sema::ActOnOpenMPVarListClause( OpenMPClauseKind Kind, ArrayRef VarList, Expr *TailExpr, SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation ColonLoc, @@ -9392,6 +9404,7 @@ OMPClause *Sema::ActOnOpenMPVarListClause( case OMPC_uniform: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Clause is not allowed."); } return Res; diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index b9a5494ecd..5d600b735a 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -8443,6 +8443,12 @@ OMPClause *TreeTransform::TransformOMPUnifiedSharedMemoryClause( "unified_shared_memory clause cannot appear in dependent context"); } +template +OMPClause *TreeTransform::TransformOMPReverseOffloadClause( + OMPReverseOffloadClause *C) { + llvm_unreachable("reverse_offload clause cannot appear in dependent context"); +} + template OMPClause * TreeTransform::TransformOMPPrivateClause(OMPPrivateClause *C) { diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index cb4f491e17..7cf78175fb 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -11726,6 +11726,9 @@ OMPClause *OMPClauseReader::readClause() { case OMPC_unified_shared_memory: C = new (Context) OMPUnifiedSharedMemoryClause(); break; + case OMPC_reverse_offload: + C = new (Context) OMPReverseOffloadClause(); + break; case OMPC_private: C = OMPPrivateClause::CreateEmpty(Context, Record.readInt()); break; @@ -11959,6 +11962,8 @@ void OMPClauseReader::VisitOMPUnifiedAddressClause(OMPUnifiedAddressClause *) {} void OMPClauseReader::VisitOMPUnifiedSharedMemoryClause( OMPUnifiedSharedMemoryClause *) {} +void OMPClauseReader::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *) {} + void OMPClauseReader::VisitOMPPrivateClause(OMPPrivateClause *C) { C->setLParenLoc(Record.readSourceLocation()); unsigned NumVars = C->varlist_size(); diff --git a/lib/Serialization/ASTWriter.cpp b/lib/Serialization/ASTWriter.cpp index 08cfa6bce7..81ef885779 100644 --- a/lib/Serialization/ASTWriter.cpp +++ b/lib/Serialization/ASTWriter.cpp @@ -6935,3 +6935,5 @@ void OMPClauseWriter::VisitOMPUnifiedAddressClause(OMPUnifiedAddressClause *) {} void OMPClauseWriter::VisitOMPUnifiedSharedMemoryClause( OMPUnifiedSharedMemoryClause *) {} + +void OMPClauseWriter::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *) {} diff --git a/test/OpenMP/requires_unified_address_ast_print.cpp b/test/OpenMP/requires_unified_address_ast_print.cpp index 69b6905481..7a8a97050f 100644 --- a/test/OpenMP/requires_unified_address_ast_print.cpp +++ b/test/OpenMP/requires_unified_address_ast_print.cpp @@ -16,4 +16,7 @@ #pragma omp requires unified_shared_memory // CHECK:#pragma omp requires unified_shared_memory +#pragma omp requires reverse_offload +// CHECK:#pragma omp requires reverse_offload + #endif diff --git a/test/OpenMP/requires_unified_address_messages.cpp b/test/OpenMP/requires_unified_address_messages.cpp index 8f1904de31..916140f24e 100644 --- a/test/OpenMP/requires_unified_address_messages.cpp +++ b/test/OpenMP/requires_unified_address_messages.cpp @@ -10,6 +10,10 @@ #pragma omp requires unified_address, unified_address // expected-error {{Only one unified_address clause can appear on a requires directive in a single translation unit}} expected-error {{directive '#pragma omp requires' cannot contain more than one 'unified_address' clause}} +#pragma omp requires reverse_offload // expected-note {{reverse_offload clause previously used here}} expected-note {{reverse_offload clause previously used here}} + +#pragma omp requires reverse_offload, reverse_offload // expected-error {{Only one reverse_offload clause can appear on a requires directive in a single translation unit}} expected-error {{directive '#pragma omp requires' cannot contain more than one 'reverse_offload' clause}} + #pragma omp requires // expected-error {{expected at least one clause on '#pragma omp requires' directive}} #pragma omp requires invalid_clause // expected-warning {{extra tokens at the end of '#pragma omp requires' are ignored}} expected-error {{expected at least one clause on '#pragma omp requires' directive}} @@ -20,7 +24,7 @@ #pragma omp requires invalid_clause unified_address // expected-warning {{extra tokens at the end of '#pragma omp requires' are ignored}} expected-error {{expected at least one clause on '#pragma omp requires' directive}} -#pragma omp requires unified_shared_memory, unified_address // expected-error {{Only one unified_shared_memory clause can appear on a requires directive in a single translation unit}} expected-error{{Only one unified_address clause can appear on a requires directive in a single translation unit}} +#pragma omp requires unified_shared_memory, unified_address, reverse_offload // expected-error {{Only one unified_shared_memory clause can appear on a requires directive in a single translation unit}} expected-error{{Only one unified_address clause can appear on a requires directive in a single translation unit}} expected-error{{Only one reverse_offload clause can appear on a requires directive in a single translation unit}} namespace A { #pragma omp requires unified_address // expected-error {{Only one unified_address clause can appear on a requires directive in a single translation unit}} diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 3826be5cf7..ce653db8c9 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2213,6 +2213,9 @@ void OMPClauseEnqueue::VisitOMPUnifiedAddressClause( void OMPClauseEnqueue::VisitOMPUnifiedSharedMemoryClause( const OMPUnifiedSharedMemoryClause *) {} +void OMPClauseEnqueue::VisitOMPReverseOffloadClause( + const OMPReverseOffloadClause *) {} + void OMPClauseEnqueue::VisitOMPDeviceClause(const OMPDeviceClause *C) { Visitor->AddStmt(C->getDevice()); }