Author: plyster
Date: Wed Oct 3 13:07:58 2018
New Revision: 343711
URL: http://llvm.org/viewvc/llvm-project?rev=343711&view=rev
Log:
[OPENMP] Add reverse_offload clause to requires directive
Modified:
cfe/trunk/include/clang/AST/OpenMPClause.h
cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
cfe/trunk/include/clang/Basic/OpenMPKinds.def
cfe/trunk/include/clang/Sema/Sema.h
cfe/trunk/lib/AST/OpenMPClause.cpp
cfe/trunk/lib/AST/StmtPrinter.cpp
cfe/trunk/lib/AST/StmtProfile.cpp
cfe/trunk/lib/Basic/OpenMPKinds.cpp
cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
cfe/trunk/lib/Parse/ParseOpenMP.cpp
cfe/trunk/lib/Sema/SemaOpenMP.cpp
cfe/trunk/lib/Sema/TreeTransform.h
cfe/trunk/lib/Serialization/ASTReader.cpp
cfe/trunk/lib/Serialization/ASTWriter.cpp
cfe/trunk/test/OpenMP/requires_unified_address_ast_print.cpp
cfe/trunk/test/OpenMP/requires_unified_address_messages.cpp
cfe/trunk/tools/libclang/CIndex.cpp
Modified: cfe/trunk/include/clang/AST/OpenMPClause.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/OpenMPClause.h?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/OpenMPClause.h (original)
+++ cfe/trunk/include/clang/AST/OpenMPClause.h Wed Oct 3 13:07:58 2018
@@ -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
Modified: cfe/trunk/include/clang/AST/RecursiveASTVisitor.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/RecursiveASTVisitor.h?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/RecursiveASTVisitor.h (original)
+++ cfe/trunk/include/clang/AST/RecursiveASTVisitor.h Wed Oct 3 13:07:58 2018
@@ -2874,6 +2874,12 @@ bool RecursiveASTVisitor<Derived>::Visit
}
template <typename Derived>
+bool RecursiveASTVisitor<Derived>::VisitOMPReverseOffloadClause(
+ OMPReverseOffloadClause *) {
+ return true;
+}
+
+template <typename Derived>
bool
RecursiveASTVisitor<Derived>::VisitOMPScheduleClause(OMPScheduleClause *C) {
TRY_TO(VisitOMPClauseWithPreInit(C));
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Wed Oct 3 13:07:58 2018
@@ -281,6 +281,7 @@ OPENMP_CLAUSE(task_reduction, OMPTaskRe
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)
Modified: cfe/trunk/include/clang/Sema/Sema.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Sema.h (original)
+++ cfe/trunk/include/clang/Sema/Sema.h Wed Oct 3 13:07:58 2018
@@ -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<Expr *> Vars, Expr *TailExpr,
Modified: cfe/trunk/lib/AST/OpenMPClause.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/OpenMPClause.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/AST/OpenMPClause.cpp (original)
+++ cfe/trunk/lib/AST/OpenMPClause.cpp Wed Oct 3 13:07:58 2018
@@ -108,6 +108,7 @@ const OMPClauseWithPreInit *OMPClauseWit
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 *OMPClause
case OMPC_is_device_ptr:
case OMPC_unified_address:
case OMPC_unified_shared_memory:
+ case OMPC_reverse_offload:
break;
}
Modified: cfe/trunk/lib/AST/StmtPrinter.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtPrinter.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/AST/StmtPrinter.cpp (original)
+++ cfe/trunk/lib/AST/StmtPrinter.cpp Wed Oct 3 13:07:58 2018
@@ -705,6 +705,10 @@ void OMPClausePrinter::VisitOMPUnifiedSh
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) {
Modified: cfe/trunk/lib/AST/StmtProfile.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtProfile.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/AST/StmtProfile.cpp (original)
+++ cfe/trunk/lib/AST/StmtProfile.cpp Wed Oct 3 13:07:58 2018
@@ -473,6 +473,9 @@ void OMPClauseProfiler::VisitOMPUnifiedA
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())
Modified: cfe/trunk/lib/Basic/OpenMPKinds.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/OpenMPKinds.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/OpenMPKinds.cpp (original)
+++ cfe/trunk/lib/Basic/OpenMPKinds.cpp Wed Oct 3 13:07:58 2018
@@ -170,6 +170,7 @@ unsigned clang::getOpenMPSimpleClauseTyp
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::getOpenMPSimpleClause
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");
Modified: cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmtOpenMP.cpp Wed Oct 3 13:07:58 2018
@@ -3900,6 +3900,7 @@ static void emitOMPAtomicExpr(CodeGenFun
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'.");
}
}
Modified: cfe/trunk/lib/Parse/ParseOpenMP.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseOpenMP.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseOpenMP.cpp (original)
+++ cfe/trunk/lib/Parse/ParseOpenMP.cpp Wed Oct 3 13:07:58 2018
@@ -1380,6 +1380,7 @@ OMPClause *Parser::ParseOpenMPClause(Ope
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]
Modified: cfe/trunk/lib/Sema/SemaOpenMP.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaOpenMP.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaOpenMP.cpp (original)
+++ cfe/trunk/lib/Sema/SemaOpenMP.cpp Wed Oct 3 13:07:58 2018
@@ -8012,6 +8012,7 @@ OMPClause *Sema::ActOnOpenMPSingleExprCl
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 getOpenMPCapt
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::ActOnOpenMPSingleExprWi
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(OpenM
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::ActOnOpenMPUnifiedShare
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<Expr *> VarList, Expr *TailExpr,
SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation ColonLoc,
@@ -9392,6 +9404,7 @@ OMPClause *Sema::ActOnOpenMPVarListClaus
case OMPC_uniform:
case OMPC_unified_address:
case OMPC_unified_shared_memory:
+ case OMPC_reverse_offload:
llvm_unreachable("Clause is not allowed.");
}
return Res;
Modified: cfe/trunk/lib/Sema/TreeTransform.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/TreeTransform.h?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/TreeTransform.h (original)
+++ cfe/trunk/lib/Sema/TreeTransform.h Wed Oct 3 13:07:58 2018
@@ -8444,6 +8444,12 @@ OMPClause *TreeTransform<Derived>::Trans
}
template <typename Derived>
+OMPClause *TreeTransform<Derived>::TransformOMPReverseOffloadClause(
+ OMPReverseOffloadClause *C) {
+ llvm_unreachable("reverse_offload clause cannot appear in dependent
context");
+}
+
+template <typename Derived>
OMPClause *
TreeTransform<Derived>::TransformOMPPrivateClause(OMPPrivateClause *C) {
llvm::SmallVector<Expr *, 16> Vars;
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Wed Oct 3 13:07:58 2018
@@ -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::VisitOMPUnifiedAdd
void OMPClauseReader::VisitOMPUnifiedSharedMemoryClause(
OMPUnifiedSharedMemoryClause *) {}
+void OMPClauseReader::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *)
{}
+
void OMPClauseReader::VisitOMPPrivateClause(OMPPrivateClause *C) {
C->setLParenLoc(Record.readSourceLocation());
unsigned NumVars = C->varlist_size();
Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp Wed Oct 3 13:07:58 2018
@@ -6935,3 +6935,5 @@ void OMPClauseWriter::VisitOMPUnifiedAdd
void OMPClauseWriter::VisitOMPUnifiedSharedMemoryClause(
OMPUnifiedSharedMemoryClause *) {}
+
+void OMPClauseWriter::VisitOMPReverseOffloadClause(OMPReverseOffloadClause *)
{}
Modified: cfe/trunk/test/OpenMP/requires_unified_address_ast_print.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/requires_unified_address_ast_print.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/requires_unified_address_ast_print.cpp (original)
+++ cfe/trunk/test/OpenMP/requires_unified_address_ast_print.cpp Wed Oct 3
13:07:58 2018
@@ -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
Modified: cfe/trunk/test/OpenMP/requires_unified_address_messages.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/requires_unified_address_messages.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/requires_unified_address_messages.cpp (original)
+++ cfe/trunk/test/OpenMP/requires_unified_address_messages.cpp Wed Oct 3
13:07:58 2018
@@ -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}}
Modified: cfe/trunk/tools/libclang/CIndex.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=343711&r1=343710&r2=343711&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CIndex.cpp (original)
+++ cfe/trunk/tools/libclang/CIndex.cpp Wed Oct 3 13:07:58 2018
@@ -2213,6 +2213,9 @@ void OMPClauseEnqueue::VisitOMPUnifiedAd
void OMPClauseEnqueue::VisitOMPUnifiedSharedMemoryClause(
const OMPUnifiedSharedMemoryClause *) {}
+void OMPClauseEnqueue::VisitOMPReverseOffloadClause(
+ const OMPReverseOffloadClause *) {}
+
void OMPClauseEnqueue::VisitOMPDeviceClause(const OMPDeviceClause *C) {
Visitor->AddStmt(C->getDevice());
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
