Index: clang/include/clang/AST/OpenMPClause.h =================================================================== --- clang/include/clang/AST/OpenMPClause.h +++ clang/include/clang/AST/OpenMPClause.h @@ -796,6 +796,37 @@ } }; +/// 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 Index: clang/include/clang/AST/RecursiveASTVisitor.h =================================================================== --- clang/include/clang/AST/RecursiveASTVisitor.h +++ clang/include/clang/AST/RecursiveASTVisitor.h @@ -2874,6 +2874,12 @@ } template +bool RecursiveASTVisitor::VisitOMPReverseOffloadClause( + OMPReverseOffloadClause *) { + return true; +} + +template bool RecursiveASTVisitor::VisitOMPScheduleClause(OMPScheduleClause *C) { TRY_TO(VisitOMPClauseWithPreInit(C)); Index: clang/include/clang/Basic/OpenMPKinds.def =================================================================== --- clang/include/clang/Basic/OpenMPKinds.def +++ clang/include/clang/Basic/OpenMPKinds.def @@ -281,6 +281,7 @@ 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 @@ // 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) Index: clang/include/clang/Sema/Sema.h =================================================================== --- clang/include/clang/Sema/Sema.h +++ clang/include/clang/Sema/Sema.h @@ -9171,6 +9171,10 @@ /// 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, Index: clang/lib/AST/OpenMPClause.cpp =================================================================== --- clang/lib/AST/OpenMPClause.cpp +++ clang/lib/AST/OpenMPClause.cpp @@ -108,6 +108,7 @@ case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: break; } @@ -179,6 +180,7 @@ case OMPC_is_device_ptr: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: break; } Index: clang/lib/AST/StmtPrinter.cpp =================================================================== --- clang/lib/AST/StmtPrinter.cpp +++ clang/lib/AST/StmtPrinter.cpp @@ -705,6 +705,10 @@ 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) { Index: clang/lib/AST/StmtProfile.cpp =================================================================== --- clang/lib/AST/StmtProfile.cpp +++ clang/lib/AST/StmtProfile.cpp @@ -473,6 +473,9 @@ 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()) Index: clang/lib/Basic/OpenMPKinds.cpp =================================================================== --- clang/lib/Basic/OpenMPKinds.cpp +++ clang/lib/Basic/OpenMPKinds.cpp @@ -170,6 +170,7 @@ 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 @@ 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"); Index: clang/lib/CodeGen/CGStmtOpenMP.cpp =================================================================== --- clang/lib/CodeGen/CGStmtOpenMP.cpp +++ clang/lib/CodeGen/CGStmtOpenMP.cpp @@ -3913,6 +3913,7 @@ 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'."); } } Index: clang/lib/Parse/ParseOpenMP.cpp =================================================================== --- clang/lib/Parse/ParseOpenMP.cpp +++ clang/lib/Parse/ParseOpenMP.cpp @@ -1380,6 +1380,7 @@ 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] Index: clang/lib/Sema/SemaOpenMP.cpp =================================================================== --- clang/lib/Sema/SemaOpenMP.cpp +++ clang/lib/Sema/SemaOpenMP.cpp @@ -8012,6 +8012,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ case OMPC_uniform: case OMPC_unified_address: case OMPC_unified_shared_memory: + case OMPC_reverse_offload: llvm_unreachable("Clause is not allowed."); } return Res; Index: clang/lib/Sema/TreeTransform.h =================================================================== --- clang/lib/Sema/TreeTransform.h +++ clang/lib/Sema/TreeTransform.h @@ -8444,6 +8444,12 @@ } template +OMPClause *TreeTransform::TransformOMPReverseOffloadClause( + OMPReverseOffloadClause *C) { + llvm_unreachable("reverse_offload clause cannot appear in dependent context"); +} + +template OMPClause * TreeTransform::TransformOMPPrivateClause(OMPPrivateClause *C) { llvm::SmallVector Vars; Index: clang/lib/Serialization/ASTReader.cpp =================================================================== --- clang/lib/Serialization/ASTReader.cpp +++ clang/lib/Serialization/ASTReader.cpp @@ -11726,6 +11726,9 @@ 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::VisitOMPUnifiedSharedMemoryClause( OMPUnifiedSharedMemoryClause *) {} +void OMPClauseReader::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *) {} + void OMPClauseReader::VisitOMPPrivateClause(OMPPrivateClause *C) { C->setLParenLoc(Record.readSourceLocation()); unsigned NumVars = C->varlist_size(); Index: clang/lib/Serialization/ASTWriter.cpp =================================================================== --- clang/lib/Serialization/ASTWriter.cpp +++ clang/lib/Serialization/ASTWriter.cpp @@ -6935,3 +6935,5 @@ void OMPClauseWriter::VisitOMPUnifiedSharedMemoryClause( OMPUnifiedSharedMemoryClause *) {} + +void OMPClauseWriter::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *) {} Index: clang/test/OpenMP/requires_unified_address_ast_print.cpp =================================================================== --- clang/test/OpenMP/requires_unified_address_ast_print.cpp +++ clang/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 Index: clang/test/OpenMP/requires_unified_address_messages.cpp =================================================================== --- clang/test/OpenMP/requires_unified_address_messages.cpp +++ clang/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}} Index: clang/tools/libclang/CIndex.cpp =================================================================== --- clang/tools/libclang/CIndex.cpp +++ clang/tools/libclang/CIndex.cpp @@ -2213,6 +2213,9 @@ void OMPClauseEnqueue::VisitOMPUnifiedSharedMemoryClause( const OMPUnifiedSharedMemoryClause *) {} +void OMPClauseEnqueue::VisitOMPReverseOffloadClause( + const OMPReverseOffloadClause *) {} + void OMPClauseEnqueue::VisitOMPDeviceClause(const OMPDeviceClause *C) { Visitor->AddStmt(C->getDevice()); }