https://github.com/jadhbeika updated
https://github.com/llvm/llvm-project/pull/128742
>From fa3dd1423e4bf2209feb9713f1833e653ec43a74 Mon Sep 17 00:00:00 2001
From: Jad Hbeika <jad.hbe...@intel.com>
Date: Wed, 19 Feb 2025 12:53:11 -0800
Subject: [PATCH 1/4] [Clang] [OpenMP] Support NOWAIT with optional argument
---
clang/include/clang/AST/OpenMPClause.h | 58 ++++++++++++++++---
clang/include/clang/AST/RecursiveASTVisitor.h | 3 +-
clang/include/clang/Sema/SemaOpenMP.h | 6 +-
clang/lib/AST/OpenMPClause.cpp | 11 +++-
clang/lib/AST/StmtProfile.cpp | 5 +-
clang/lib/Parse/ParseOpenMP.cpp | 5 +-
clang/lib/Sema/SemaOpenMP.cpp | 24 +++++++-
clang/lib/Sema/TreeTransform.h | 21 ++++++-
clang/lib/Serialization/ASTReader.cpp | 5 +-
clang/lib/Serialization/ASTWriter.cpp | 5 +-
clang/tools/libclang/CIndex.cpp | 4 +-
llvm/include/llvm/Frontend/OpenMP/OMP.td | 2 +
12 files changed, 127 insertions(+), 22 deletions(-)
diff --git a/clang/include/clang/AST/OpenMPClause.h
b/clang/include/clang/AST/OpenMPClause.h
index 154ecfbaa4418..b29fce9bd9729 100644
--- a/clang/include/clang/AST/OpenMPClause.h
+++ b/clang/include/clang/AST/OpenMPClause.h
@@ -2173,18 +2173,62 @@ class OMPOrderedClause final
/// This represents 'nowait' clause in the '#pragma omp ...' directive.
///
/// \code
-/// #pragma omp for nowait
+/// #pragma omp for nowait (cond)
/// \endcode
-/// In this example directive '#pragma omp for' has 'nowait' clause.
-class OMPNowaitClause final : public OMPNoChildClause<llvm::omp::OMPC_nowait> {
+/// In this example directive '#pragma omp for' has simple 'nowait' clause with
+/// condition 'cond'.
+class OMPNowaitClause final : public OMPClause {
+ friend class OMPClauseReader;
+
+ /// Location of '('.
+ SourceLocation LParenLoc;
+
+ /// Condition of the 'nowait' clause.
+ Stmt *Condition = nullptr;
+
+ /// Set condition.
+ void setCondition(Expr *Cond) { Condition = Cond; }
+
public:
- /// Build 'nowait' clause.
+ /// Build 'nowait' clause with condition \a Cond.
///
+ /// \param Cond Condition of the clause.
/// \param StartLoc Starting location of the clause.
+ /// \param LParenLoc Location of '('.
/// \param EndLoc Ending location of the clause.
- OMPNowaitClause(SourceLocation StartLoc = SourceLocation(),
- SourceLocation EndLoc = SourceLocation())
- : OMPNoChildClause(StartLoc, EndLoc) {}
+ OMPNowaitClause(Expr *Cond, SourceLocation StartLoc, SourceLocation
LParenLoc,
+ SourceLocation EndLoc)
+ : OMPClause(llvm::omp::OMPC_nowait, StartLoc, EndLoc),
+ LParenLoc(LParenLoc), Condition(Cond) {}
+
+ /// Build an empty clause.
+ OMPNowaitClause()
+ : OMPClause(llvm::omp::OMPC_nowait, SourceLocation(), SourceLocation())
{}
+
+ /// Sets the location of '('.
+ void setLParenLoc(SourceLocation Loc) { LParenLoc = Loc; }
+
+ /// Returns the location of '('.
+ SourceLocation getLParenLoc() const { return LParenLoc; }
+
+ /// Returns condition.
+ Expr *getCondition() const { return cast_or_null<Expr>(Condition); }
+
+ child_range children() { return child_range(&Condition, &Condition + 1); }
+
+ const_child_range children() const {
+ return const_child_range(&Condition, &Condition + 1);
+ }
+
+ child_range used_children();
+ const_child_range used_children() const {
+ auto Children = const_cast<OMPNowaitClause *>(this)->used_children();
+ return const_child_range(Children.begin(), Children.end());
+ }
+
+ static bool classof(const OMPClause *T) {
+ return T->getClauseKind() == llvm::omp::OMPC_nowait;
+ }
};
/// This represents 'untied' clause in the '#pragma omp ...' directive.
diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h
b/clang/include/clang/AST/RecursiveASTVisitor.h
index 560de7da9913a..52b940e7f3c0a 100644
--- a/clang/include/clang/AST/RecursiveASTVisitor.h
+++ b/clang/include/clang/AST/RecursiveASTVisitor.h
@@ -3466,7 +3466,8 @@ bool
RecursiveASTVisitor<Derived>::VisitOMPOrderedClause(OMPOrderedClause *C) {
}
template <typename Derived>
-bool RecursiveASTVisitor<Derived>::VisitOMPNowaitClause(OMPNowaitClause *) {
+bool RecursiveASTVisitor<Derived>::VisitOMPNowaitClause(OMPNowaitClause *C) {
+ TRY_TO(TraverseStmt(C->getCondition()));
return true;
}
diff --git a/clang/include/clang/Sema/SemaOpenMP.h
b/clang/include/clang/Sema/SemaOpenMP.h
index 64f0cfa0676af..8af56c087a896 100644
--- a/clang/include/clang/Sema/SemaOpenMP.h
+++ b/clang/include/clang/Sema/SemaOpenMP.h
@@ -1001,8 +1001,10 @@ class SemaOpenMP : public SemaBase {
OMPClause *ActOnOpenMPClause(OpenMPClauseKind Kind, SourceLocation StartLoc,
SourceLocation EndLoc);
/// Called on well-formed 'nowait' clause.
- OMPClause *ActOnOpenMPNowaitClause(SourceLocation StartLoc,
- SourceLocation EndLoc);
+ OMPClause *
+ ActOnOpenMPNowaitClause(SourceLocation StartLoc, SourceLocation EndLoc,
+ SourceLocation LParenLoc = SourceLocation(),
+ Expr *Condition = nullptr);
/// Called on well-formed 'untied' clause.
OMPClause *ActOnOpenMPUntiedClause(SourceLocation StartLoc,
SourceLocation EndLoc);
diff --git a/clang/lib/AST/OpenMPClause.cpp b/clang/lib/AST/OpenMPClause.cpp
index 424cab3a7de35..e8fb64e82b7c1 100644
--- a/clang/lib/AST/OpenMPClause.cpp
+++ b/clang/lib/AST/OpenMPClause.cpp
@@ -303,6 +303,10 @@ OMPClause::child_range OMPIfClause::used_children() {
return child_range(&Condition, &Condition + 1);
}
+OMPClause::child_range OMPNowaitClause::used_children() {
+ return child_range(&Condition, &Condition + 1);
+}
+
OMPClause::child_range OMPGrainsizeClause::used_children() {
if (Stmt **C = getAddrOfExprAsWritten(getPreInitStmt()))
return child_range(C, C + 1);
@@ -1986,8 +1990,13 @@ void
OMPClausePrinter::VisitOMPOrderedClause(OMPOrderedClause *Node) {
}
}
-void OMPClausePrinter::VisitOMPNowaitClause(OMPNowaitClause *) {
+void OMPClausePrinter::VisitOMPNowaitClause(OMPNowaitClause *Node) {
OS << "nowait";
+ if (auto *Cond = Node->getCondition()) {
+ OS << "(";
+ Cond->printPretty(OS, nullptr, Policy, 0);
+ OS << ")";
+ }
}
void OMPClausePrinter::VisitOMPUntiedClause(OMPUntiedClause *) {
diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
index 77ee6611f623f..2f51c69c4e1bc 100644
--- a/clang/lib/AST/StmtProfile.cpp
+++ b/clang/lib/AST/StmtProfile.cpp
@@ -577,7 +577,10 @@ void OMPClauseProfiler::VisitOMPOrderedClause(const
OMPOrderedClause *C) {
Profiler->VisitStmt(Num);
}
-void OMPClauseProfiler::VisitOMPNowaitClause(const OMPNowaitClause *) {}
+void OMPClauseProfiler::VisitOMPNowaitClause(const OMPNowaitClause *C) {
+ if (C->getCondition())
+ Profiler->VisitStmt(C->getCondition());
+}
void OMPClauseProfiler::VisitOMPUntiedClause(const OMPUntiedClause *) {}
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp
index 42e6aac681c1c..8b6d743208774 100644
--- a/clang/lib/Parse/ParseOpenMP.cpp
+++ b/clang/lib/Parse/ParseOpenMP.cpp
@@ -3202,6 +3202,7 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind
DKind,
case OMPC_simdlen:
case OMPC_collapse:
case OMPC_ordered:
+ case OMPC_nowait:
case OMPC_priority:
case OMPC_grainsize:
case OMPC_num_tasks:
@@ -3249,7 +3250,8 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind
DKind,
ErrorFound = true;
}
- if ((CKind == OMPC_ordered || CKind == OMPC_partial) &&
+ if ((CKind == OMPC_ordered || CKind == OMPC_nowait ||
+ CKind == OMPC_partial) &&
PP.LookAhead(/*N=*/0).isNot(tok::l_paren))
Clause = ParseOpenMPClause(CKind, WrongDirective);
else if (CKind == OMPC_grainsize || CKind == OMPC_num_tasks)
@@ -3311,7 +3313,6 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind
DKind,
case OMPC_holds:
Clause = ParseOpenMPSingleExprClause(CKind, WrongDirective);
break;
- case OMPC_nowait:
case OMPC_untied:
case OMPC_mergeable:
case OMPC_read:
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 616296027d811..3cb425becc73a 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -15447,6 +15447,9 @@ OMPClause
*SemaOpenMP::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind,
case OMPC_ordered:
Res = ActOnOpenMPOrderedClause(StartLoc, EndLoc, LParenLoc, Expr);
break;
+ case OMPC_nowait:
+ Res = ActOnOpenMPNowaitClause(StartLoc, EndLoc, LParenLoc, Expr);
+ break;
case OMPC_priority:
Res = ActOnOpenMPPriorityClause(Expr, StartLoc, LParenLoc, EndLoc);
break;
@@ -15501,7 +15504,6 @@ OMPClause
*SemaOpenMP::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind,
case OMPC_aligned:
case OMPC_copyin:
case OMPC_copyprivate:
- case OMPC_nowait:
case OMPC_untied:
case OMPC_mergeable:
case OMPC_threadprivate:
@@ -16954,9 +16956,25 @@ OMPClause
*SemaOpenMP::ActOnOpenMPClause(OpenMPClauseKind Kind,
}
OMPClause *SemaOpenMP::ActOnOpenMPNowaitClause(SourceLocation StartLoc,
- SourceLocation EndLoc) {
+ SourceLocation EndLoc,
+ SourceLocation LParenLoc,
+ Expr *Condition) {
+ Expr *ValExpr = Condition;
+ if (Condition && LParenLoc.isValid()) {
+ if (!Condition->isValueDependent() && !Condition->isTypeDependent() &&
+ !Condition->isInstantiationDependent() &&
+ !Condition->containsUnexpandedParameterPack()) {
+ ExprResult Val = SemaRef.CheckBooleanCondition(StartLoc, Condition);
+ if (Val.isInvalid())
+ return nullptr;
+ ValExpr = Val.get();
+ }
+ } else {
+ ValExpr = nullptr;
+ }
DSAStack->setNowaitRegion();
- return new (getASTContext()) OMPNowaitClause(StartLoc, EndLoc);
+ return new (getASTContext())
+ OMPNowaitClause(ValExpr, StartLoc, LParenLoc, EndLoc);
}
OMPClause *SemaOpenMP::ActOnOpenMPUntiedClause(SourceLocation StartLoc,
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 73e979927b4f3..2f4341d28f05b 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -1856,6 +1856,17 @@ class TreeTransform {
LParenLoc, Num);
}
+ /// Build a new OpenMP 'nowait' clause.
+ ///
+ /// By default, performs semantic analysis to build the new OpenMP clause.
+ /// Subclasses may override this routine to provide different behavior.
+ OMPClause *RebuildOMPNowaitClause(Expr *Condition, SourceLocation StartLoc,
+ SourceLocation LParenLoc,
+ SourceLocation EndLoc) {
+ return getSema().OpenMP().ActOnOpenMPNowaitClause(StartLoc, EndLoc,
+ LParenLoc, Condition);
+ }
+
/// Build a new OpenMP 'private' clause.
///
/// By default, performs semantic analysis to build the new OpenMP clause.
@@ -10549,8 +10560,14 @@
TreeTransform<Derived>::TransformOMPDetachClause(OMPDetachClause *C) {
template <typename Derived>
OMPClause *
TreeTransform<Derived>::TransformOMPNowaitClause(OMPNowaitClause *C) {
- // No need to rebuild this clause, no template-dependent parameters.
- return C;
+ ExprResult Cond;
+ if (auto *Condition = C->getCondition()) {
+ Cond = getDerived().TransformExpr(Condition);
+ if (Cond.isInvalid())
+ return nullptr;
+ }
+ return getDerived().RebuildOMPNowaitClause(Cond.get(), C->getBeginLoc(),
+ C->getLParenLoc(),
C->getEndLoc());
}
template <typename Derived>
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 4a40df6399f64..5e84fd5034cda 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -11442,7 +11442,10 @@ void
OMPClauseReader::VisitOMPDetachClause(OMPDetachClause *C) {
C->setLParenLoc(Record.readSourceLocation());
}
-void OMPClauseReader::VisitOMPNowaitClause(OMPNowaitClause *) {}
+void OMPClauseReader::VisitOMPNowaitClause(OMPNowaitClause *C) {
+ C->setCondition(Record.readSubExpr());
+ C->setLParenLoc(Record.readSourceLocation());
+}
void OMPClauseReader::VisitOMPUntiedClause(OMPUntiedClause *) {}
diff --git a/clang/lib/Serialization/ASTWriter.cpp
b/clang/lib/Serialization/ASTWriter.cpp
index 64791300fe722..d4e9bbdc8a036 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -7818,7 +7818,10 @@ void
OMPClauseWriter::VisitOMPOrderedClause(OMPOrderedClause *C) {
Record.AddSourceLocation(C->getLParenLoc());
}
-void OMPClauseWriter::VisitOMPNowaitClause(OMPNowaitClause *) {}
+void OMPClauseWriter::VisitOMPNowaitClause(OMPNowaitClause *C) {
+ Record.AddStmt(C->getCondition());
+ Record.AddSourceLocation(C->getLParenLoc());
+}
void OMPClauseWriter::VisitOMPUntiedClause(OMPUntiedClause *) {}
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index c710816bd24d0..c71d548a43b1a 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -2437,7 +2437,9 @@ void OMPClauseEnqueue::VisitOMPDetachClause(const
OMPDetachClause *C) {
Visitor->AddStmt(C->getEventHandler());
}
-void OMPClauseEnqueue::VisitOMPNowaitClause(const OMPNowaitClause *) {}
+void OMPClauseEnqueue::VisitOMPNowaitClause(const OMPNowaitClause *C) {
+ Visitor->AddStmt(C->getCondition());
+}
void OMPClauseEnqueue::VisitOMPUntiedClause(const OMPUntiedClause *) {}
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td
b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index 210acbff5af20..9004389e728c0 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -325,6 +325,8 @@ def OMPC_Novariants : Clause<"novariants"> {
}
def OMPC_NoWait : Clause<"nowait"> {
let clangClass = "OMPNowaitClause";
+ let flangClass = "OMPNowaitClause";
+ let isValueOptional = true;
}
def OMP_NUMTASKS_Strict : ClauseVal<"strict", 1, 1> {}
def OMP_NUMTASKS_Unknown : ClauseVal<"unknown", 2, 0> { let isDefault = 1; }
>From 02350294493c17cc74b27efaef9637bf9c1a79a8 Mon Sep 17 00:00:00 2001
From: Jad Hbeika <jad.hbe...@intel.com>
Date: Tue, 25 Feb 2025 08:48:34 -0800
Subject: [PATCH 2/4] Add lit test: nowait_ast_print.cpp
---
clang/test/OpenMP/nowait_ast_print.cpp | 56 ++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 clang/test/OpenMP/nowait_ast_print.cpp
diff --git a/clang/test/OpenMP/nowait_ast_print.cpp
b/clang/test/OpenMP/nowait_ast_print.cpp
new file mode 100644
index 0000000000000..4151a397beb9c
--- /dev/null
+++ b/clang/test/OpenMP/nowait_ast_print.cpp
@@ -0,0 +1,56 @@
+// Check no warnings/errors
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fopenmp -fopenmp-version=60
-fsyntax-only -verify %s
+// expected-no-diagnostics
+
+// Check AST and unparsing
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fopenmp -fopenmp-version=60
-ast-dump %s | FileCheck %s --check-prefix=DUMP
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fopenmp -fopenmp-version=60
-ast-print %s | FileCheck %s --check-prefix=PRINT
+
+// Check same results after serialization round-trip
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fopenmp -fopenmp-version=60
-emit-pch -o %t %s
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fopenmp -fopenmp-version=60
-include-pch %t -ast-dump-all %s | FileCheck %s --check-prefix=DUMP
+// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fopenmp -fopenmp-version=60
-include-pch %t -ast-print %s | FileCheck %s --check-prefix=PRINT
+
+#ifndef HEADER
+#define HEADER
+
+void nowait() {
+ int A=1;
+
+ // DUMP: OMPTargetDirective
+ // DUMP-NEXT: OMPNowaitClause
+ // DUMP-NEXT: <<<NULL>>>
+ // PRINT: #pragma omp target nowait
+ #pragma omp target nowait
+ {
+ }
+
+ // DUMP: OMPTargetDirective
+ // DUMP-NEXT: OMPNowaitClause
+ // DUMP-NEXT: XXBoolLiteralExpr {{.*}} 'bool' false
+ // PRINT: #pragma omp target nowait(false)
+ #pragma omp target nowait(false)
+ {
+ }
+
+ // DUMP: OMPTargetDirective
+ // DUMP-NEXT: OMPNowaitClause
+ // DUMP-NEXT: XXBoolLiteralExpr {{.*}} 'bool' true
+ // PRINT: #pragma omp target nowait(true)
+ #pragma omp target nowait(true)
+ {
+ }
+
+ // DUMP: OMPTargetDirective
+ // DUMP-NEXT: OMPNowaitClause
+ // DUMP-NEXT: BinaryOperator {{.*}} 'bool' '>'
+ // DUMP-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
+ // DUMP-NEXT: DeclRefExpr {{.*}} 'int' lvalue Var {{.*}} 'A' 'int'
+ // DUMP-NEXT: IntegerLiteral {{.*}} 'int' 5
+ // PRINT: #pragma omp target nowait(A > 5)
+ #pragma omp target nowait(A>5)
+ {
+ }
+
+}
+#endif
\ No newline at end of file
>From 84d2eb7bbbccae122728e95114c7cf135f8e53f1 Mon Sep 17 00:00:00 2001
From: Jad Hbeika <jad.hbe...@intel.com>
Date: Sat, 29 Mar 2025 17:40:14 -0700
Subject: [PATCH 3/4] Fixing tests that used old nowait syntax
---
clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 ++
clang/lib/Sema/SemaOpenMP.cpp | 7 +++++++
clang/test/OpenMP/target_enter_data_nowait_messages.cpp | 6 +++---
clang/test/OpenMP/target_exit_data_nowait_messages.cpp | 6 +++---
clang/test/OpenMP/target_nowait_messages.cpp | 4 ++--
clang/test/OpenMP/target_parallel_for_nowait_messages.cpp | 4 ++--
.../OpenMP/target_parallel_for_simd_nowait_messages.cpp | 4 ++--
clang/test/OpenMP/target_parallel_nowait_messages.cpp | 6 +++---
clang/test/OpenMP/target_simd_nowait_messages.cpp | 5 +++--
.../OpenMP/target_teams_distribute_nowait_messages.cpp | 7 +++----
...arget_teams_distribute_parallel_for_nowait_messages.cpp | 4 ++--
..._teams_distribute_parallel_for_simd_nowait_messages.cpp | 4 ++--
.../target_teams_distribute_simd_nowait_messages.cpp | 4 ++--
clang/test/OpenMP/target_teams_nowait_messages.cpp | 6 ++----
clang/test/OpenMP/target_update_nowait_messages.cpp | 6 +++---
15 files changed, 41 insertions(+), 34 deletions(-)
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td
b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 1536a3b8c920a..46cea0e86614e 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -11620,6 +11620,8 @@ def note_omp_nested_teams_construct_here : Note<
"nested teams construct here">;
def note_omp_nested_statement_here : Note<
"%select{statement|directive}0 outside teams construct here">;
+def err_omp_nowait_with_arg_unsupported : Error<
+ "'nowait' clause with a conditional expression requires OpenMP6.0">;
def err_omp_single_copyprivate_with_nowait : Error<
"the 'copyprivate' clause must not be used with the 'nowait' clause">;
def err_omp_nowait_clause_without_depend: Error<
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 0043410b19025..b110d12f10c7c 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -16973,6 +16973,13 @@ OMPClause
*SemaOpenMP::ActOnOpenMPNowaitClause(SourceLocation StartLoc,
ExprResult Val = SemaRef.CheckBooleanCondition(StartLoc, Condition);
if (Val.isInvalid())
return nullptr;
+
+ QualType T = ValExpr->getType();
+ if (T->isFloatingType()) {
+ SemaRef.Diag(ValExpr->getExprLoc(),
diag::err_omp_clause_floating_type_arg)
+ << getOpenMPClauseName(OMPC_nowait);
+ }
+
ValExpr = Val.get();
}
} else {
diff --git a/clang/test/OpenMP/target_enter_data_nowait_messages.cpp
b/clang/test/OpenMP/target_enter_data_nowait_messages.cpp
index ba5eaf1d2214a..88cc92510181c 100644
--- a/clang/test/OpenMP/target_enter_data_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_enter_data_nowait_messages.cpp
@@ -13,15 +13,15 @@ int main(int argc, char **argv) {
{}
#pragma omp target enter nowait data map(to: i) // expected-error {{expected
an OpenMP directive}}
{}
- #pragma omp target enter data nowait() map(to: i) // expected-warning
{{extra tokens at the end of '#pragma omp target enter data' are ignored}}
expected-error {{expected at least one 'map' clause for '#pragma omp target
enter data'}}
+ #pragma omp target enter data nowait() map(to: i) // expected-error
{{expected expression}}
{}
- #pragma omp target enter data map(to: i) nowait( // expected-warning {{extra
tokens at the end of '#pragma omp target enter data' are ignored}}
+ #pragma omp target enter data map(to: i) nowait( // expected-error
{{expected expression}} // expected-error {{expected ')'}} // expected-note
{{to match this '('}}
{}
#pragma omp target enter data map(to: i) nowait (argc)) // expected-warning
{{extra tokens at the end of '#pragma omp target enter data' are ignored}}
{}
#pragma omp target enter data map(to: i) nowait device (-10u)
{}
- #pragma omp target enter data map(to: i) nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target enter data'
are ignored}}
+ #pragma omp target enter data map(to: i) nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
{}
#pragma omp target enter data map(to: i) nowait nowait // expected-error
{{directive '#pragma omp target enter data' cannot contain more than one
'nowait' clause}}
{}
diff --git a/clang/test/OpenMP/target_exit_data_nowait_messages.cpp
b/clang/test/OpenMP/target_exit_data_nowait_messages.cpp
index 307e2c34b27fb..060b80ca9ca95 100644
--- a/clang/test/OpenMP/target_exit_data_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_exit_data_nowait_messages.cpp
@@ -8,11 +8,11 @@ int main(int argc, char **argv) {
#pragma omp nowait target exit data map(from: i) // expected-error
{{expected an OpenMP directive}}
#pragma omp target nowait exit data map(from: i) // expected-warning {{extra
tokens at the end of '#pragma omp target' are ignored}}
#pragma omp target exit nowait data map(from: i) // expected-error
{{expected an OpenMP directive}}
- #pragma omp target exit data nowait() map(from: i) // expected-warning
{{extra tokens at the end of '#pragma omp target exit data' are ignored}}
expected-error {{expected at least one 'map' clause for '#pragma omp target
exit data'}}
- #pragma omp target exit data map(from: i) nowait( // expected-warning
{{extra tokens at the end of '#pragma omp target exit data' are ignored}}
+ #pragma omp target exit data nowait() map(from: i) // expected-error
{{expected expression}}
+ #pragma omp target exit data map(from: i) nowait( // expected-error
{{expected expression}} // expected-error {{expected ')'}} // expected-note
{{to match this '('}}
#pragma omp target exit data map(from: i) nowait (argc)) // expected-warning
{{extra tokens at the end of '#pragma omp target exit data' are ignored}}
#pragma omp target exit data map(from: i) nowait device (-10u)
- #pragma omp target exit data map(from: i) nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target exit data'
are ignored}}
+ #pragma omp target exit data map(from: i) nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
#pragma omp target exit data map(from: i) nowait nowait // expected-error
{{directive '#pragma omp target exit data' cannot contain more than one
'nowait' clause}}
#pragma omp target exit data nowait map(from: i) nowait // expected-error
{{directive '#pragma omp target exit data' cannot contain more than one
'nowait' clause}}
return 0;
diff --git a/clang/test/OpenMP/target_nowait_messages.cpp
b/clang/test/OpenMP/target_nowait_messages.cpp
index 6b8a1f4d0ac47..c51448b65fa94 100644
--- a/clang/test/OpenMP/target_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_nowait_messages.cpp
@@ -6,13 +6,13 @@ void foo() {
}
int main(int argc, char **argv) {
- #pragma omp target nowait( // expected-warning {{extra tokens at the end of
'#pragma omp target' are ignored}}
+ #pragma omp target nowait(// expected-error {{expected expression}} //
expected-error {{expected ')'}} // expected-note {{to match this '('}}
foo();
#pragma omp target nowait (argc)) // expected-warning {{extra tokens at the
end of '#pragma omp target' are ignored}}
foo();
#pragma omp target nowait device (-10u)
foo();
- #pragma omp target nowait (3.14) device (-10u) // expected-warning {{extra
tokens at the end of '#pragma omp target' are ignored}}
+ #pragma omp target nowait (3.14) device (-10u) // expected-error {{arguments
of OpenMP clause 'nowait' with bitwise operators cannot be of floating type}}
foo();
return 0;
diff --git a/clang/test/OpenMP/target_parallel_for_nowait_messages.cpp
b/clang/test/OpenMP/target_parallel_for_nowait_messages.cpp
index 2f88c6581d4f2..c50a9dc94f93f 100644
--- a/clang/test/OpenMP/target_parallel_for_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_parallel_for_nowait_messages.cpp
@@ -7,13 +7,13 @@ void foo() {
int main(int argc, char **argv) {
int i;
- #pragma omp target parallel for nowait( // expected-warning {{extra tokens
at the end of '#pragma omp target parallel for' are ignored}}
+ #pragma omp target parallel for nowait( // expected-error {{expected
expression}} // expected-error {{expected ')'}} // expected-note {{to match
this '('}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target parallel for nowait (argc)) // expected-warning {{extra
tokens at the end of '#pragma omp target parallel for' are ignored}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target parallel for nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
- #pragma omp target parallel for nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target parallel for'
are ignored}}
+ #pragma omp target parallel for nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git a/clang/test/OpenMP/target_parallel_for_simd_nowait_messages.cpp
b/clang/test/OpenMP/target_parallel_for_simd_nowait_messages.cpp
index 4220bfea3ee3f..2186a82ad35d3 100644
--- a/clang/test/OpenMP/target_parallel_for_simd_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_parallel_for_simd_nowait_messages.cpp
@@ -7,13 +7,13 @@ void foo() {
int main(int argc, char **argv) {
int i;
- #pragma omp target parallel for simd nowait( // expected-warning {{extra
tokens at the end of '#pragma omp target parallel for simd' are ignored}}
+ #pragma omp target parallel for simd nowait( // expected-error {{expected
expression}} // expected-error {{expected ')'}} // expected-note {{to match
this '('}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target parallel for simd nowait (argc)) // expected-warning
{{extra tokens at the end of '#pragma omp target parallel for simd' are
ignored}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target parallel for simd nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
- #pragma omp target parallel for simd nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target parallel for
simd' are ignored}}
+ #pragma omp target parallel for simd nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git a/clang/test/OpenMP/target_parallel_nowait_messages.cpp
b/clang/test/OpenMP/target_parallel_nowait_messages.cpp
index 3e285fca3aee1..62b7189948b1d 100644
--- a/clang/test/OpenMP/target_parallel_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_parallel_nowait_messages.cpp
@@ -6,13 +6,13 @@ void foo() {
}
int main(int argc, char **argv) {
- #pragma omp target parallel nowait( // expected-warning {{extra tokens at
the end of '#pragma omp target parallel' are ignored}}
- foo();
+ #pragma omp target parallel nowait( // expected-error {{expected
expression}} // expected-error {{expected ')'}} // expected-note {{to match
this '('}}
+ foo();
#pragma omp target parallel nowait (argc)) // expected-warning {{extra
tokens at the end of '#pragma omp target parallel' are ignored}}
foo();
#pragma omp target parallel nowait device (-10u)
foo();
- #pragma omp target parallel nowait (3.14) device (-10u) // expected-warning
{{extra tokens at the end of '#pragma omp target parallel' are ignored}}
+ #pragma omp target parallel nowait (3.14) device (-10u) // expected-error
{{arguments of OpenMP clause 'nowait' with bitwise operators cannot be of
floating type}}
foo();
return 0;
diff --git a/clang/test/OpenMP/target_simd_nowait_messages.cpp
b/clang/test/OpenMP/target_simd_nowait_messages.cpp
index 1aee110969489..f2b9433dd25b1 100644
--- a/clang/test/OpenMP/target_simd_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_simd_nowait_messages.cpp
@@ -7,13 +7,14 @@ void foo() {
int main(int argc, char **argv) {
int i;
- #pragma omp target simd nowait( // expected-warning {{extra tokens at the
end of '#pragma omp target simd' are ignored}}
+ #pragma omp target simd nowait( // expected-error {{expected expression}}
// expected-error {{expected ')'}} // expected-note {{to match this '('}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target simd nowait (argc)) // expected-warning {{extra tokens at
the end of '#pragma omp target simd' are ignored}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target simd nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
- #pragma omp target simd nowait (3.14) device (-10u) // expected-warning
{{extra tokens at the end of '#pragma omp target simd' are ignored}}
+ #pragma omp target simd nowait (3.14) device (-10u) // expected-error
{{arguments of OpenMP clause 'nowait' with bitwise operators cannot be of
floating type}}
+
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git a/clang/test/OpenMP/target_teams_distribute_nowait_messages.cpp
b/clang/test/OpenMP/target_teams_distribute_nowait_messages.cpp
index 75bab8001bfb7..5bc1ed359ed58 100644
--- a/clang/test/OpenMP/target_teams_distribute_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_teams_distribute_nowait_messages.cpp
@@ -7,13 +7,12 @@ void foo() {
int main(int argc, char **argv) {
int i;
-#pragma omp target teams distribute nowait( // expected-warning {{extra tokens
at the end of '#pragma omp target teams distribute' are ignored}}
- for (i = 0; i < argc; ++i) foo();
-#pragma omp target teams distribute nowait (argc)) // expected-warning {{extra
tokens at the end of '#pragma omp target teams distribute' are ignored}}
+#pragma omp target teams distribute nowait( // expected-error {{expected
expression}} // expected-error {{expected ')'}} // expected-note {{to match
this '('}}
+#pragma omp target teams distribute nowait (argc)) // expected-warning {{extra
tokens at the end of '#pragma omp target teams distribute' are ignored}}
//expected-error {{region cannot be nested inside 'target teams distribute'
region}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
-#pragma omp target teams distribute nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target teams
distribute' are ignored}}
+#pragma omp target teams distribute nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git
a/clang/test/OpenMP/target_teams_distribute_parallel_for_nowait_messages.cpp
b/clang/test/OpenMP/target_teams_distribute_parallel_for_nowait_messages.cpp
index f6b6061dd42b7..b2a97012542c8 100644
--- a/clang/test/OpenMP/target_teams_distribute_parallel_for_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_teams_distribute_parallel_for_nowait_messages.cpp
@@ -7,13 +7,13 @@ void foo() {
int main(int argc, char **argv) {
int i;
-#pragma omp target teams distribute parallel for nowait( // expected-warning
{{extra tokens at the end of '#pragma omp target teams distribute parallel for'
are ignored}}
+#pragma omp target teams distribute parallel for nowait( // expected-error
{{expected expression}} // expected-error {{expected ')'}} // expected-note
{{to match this '('}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute parallel for nowait (argc)) //
expected-warning {{extra tokens at the end of '#pragma omp target teams
distribute parallel for' are ignored}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute parallel for nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
-#pragma omp target teams distribute parallel for nowait (3.14) device (-10u)
// expected-warning {{extra tokens at the end of '#pragma omp target teams
distribute parallel for' are ignored}}
+#pragma omp target teams distribute parallel for nowait (3.14) device (-10u)
// expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git
a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_nowait_messages.cpp
b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_nowait_messages.cpp
index 0f13d35c06717..ecb7d35e9eb60 100644
---
a/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_nowait_messages.cpp
+++
b/clang/test/OpenMP/target_teams_distribute_parallel_for_simd_nowait_messages.cpp
@@ -7,13 +7,13 @@ void foo() {
int main(int argc, char **argv) {
int i;
-#pragma omp target teams distribute parallel for simd nowait( //
expected-warning {{extra tokens at the end of '#pragma omp target teams
distribute parallel for simd' are ignored}}
+#pragma omp target teams distribute parallel for simd nowait( //
expected-error {{expected expression}} // expected-error {{expected ')'}} //
expected-note {{to match this '('}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute parallel for simd nowait (argc)) //
expected-warning {{extra tokens at the end of '#pragma omp target teams
distribute parallel for simd' are ignored}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute parallel for simd nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
-#pragma omp target teams distribute parallel for simd nowait (3.14) device
(-10u) // expected-warning {{extra tokens at the end of '#pragma omp target
teams distribute parallel for simd' are ignored}}
+#pragma omp target teams distribute parallel for simd nowait (3.14) device
(-10u) // expected-error {{arguments of OpenMP clause 'nowait' with bitwise
operators cannot be of floating type}}
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git a/clang/test/OpenMP/target_teams_distribute_simd_nowait_messages.cpp
b/clang/test/OpenMP/target_teams_distribute_simd_nowait_messages.cpp
index 1a9d0b5a51625..3018ee3637765 100644
--- a/clang/test/OpenMP/target_teams_distribute_simd_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_teams_distribute_simd_nowait_messages.cpp
@@ -7,13 +7,13 @@ void foo() {
int main(int argc, char **argv) {
int i;
-#pragma omp target teams distribute simd nowait( // expected-warning {{extra
tokens at the end of '#pragma omp target teams distribute simd' are ignored}}
+#pragma omp target teams distribute simd nowait( // expected-error
{{expected expression}} // expected-error {{expected ')'}} // expected-note
{{to match this '('}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute simd nowait (argc)) // expected-warning
{{extra tokens at the end of '#pragma omp target teams distribute simd' are
ignored}}
for (i = 0; i < argc; ++i) foo();
#pragma omp target teams distribute simd nowait device (-10u)
for (i = 0; i < argc; ++i) foo();
-#pragma omp target teams distribute simd nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target teams
distribute simd' are ignored}}
+#pragma omp target teams distribute simd nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
for (i = 0; i < argc; ++i) foo();
return 0;
diff --git a/clang/test/OpenMP/target_teams_nowait_messages.cpp
b/clang/test/OpenMP/target_teams_nowait_messages.cpp
index bed2f979891e9..3920618ef9d70 100644
--- a/clang/test/OpenMP/target_teams_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_teams_nowait_messages.cpp
@@ -6,13 +6,11 @@ void foo() {
}
int main(int argc, char **argv) {
-#pragma omp target teams nowait( // expected-warning {{extra tokens at the end
of '#pragma omp target teams' are ignored}}
- foo();
-#pragma omp target teams nowait (argc)) // expected-warning {{extra tokens at
the end of '#pragma omp target teams' are ignored}}
+#pragma omp target teams nowait( // expected-error {{expected expression}} //
expected-error {{expected ')'}} //expected-note {{to match this '('}}
foo();
#pragma omp target teams nowait device (-10u)
foo();
-#pragma omp target teams nowait (3.14) device (-10u) // expected-warning
{{extra tokens at the end of '#pragma omp target teams' are ignored}}
+#pragma omp target teams nowait (3.14) device (-10u) // expected-error
{{arguments of OpenMP clause 'nowait' with bitwise operators cannot be of
floating type}}
foo();
return 0;
diff --git a/clang/test/OpenMP/target_update_nowait_messages.cpp
b/clang/test/OpenMP/target_update_nowait_messages.cpp
index fc0314a31874f..ce85da62b9f0b 100644
--- a/clang/test/OpenMP/target_update_nowait_messages.cpp
+++ b/clang/test/OpenMP/target_update_nowait_messages.cpp
@@ -8,11 +8,11 @@ int main(int argc, char **argv) {
#pragma omp nowait target update to(i) // expected-error {{expected an
OpenMP directive}}
#pragma omp target nowait update to(i) // expected-error {{unexpected OpenMP
clause 'update' in directive '#pragma omp target'}} expected-error {{unexpected
OpenMP clause 'to' in directive '#pragma omp target'}}
{}
- #pragma omp target update nowait() to(i) // expected-warning {{extra tokens
at the end of '#pragma omp target update' are ignored}} expected-error
{{expected at least one 'to' clause or 'from' clause specified to '#pragma omp
target update'}}
- #pragma omp target update to(i) nowait( // expected-warning {{extra tokens
at the end of '#pragma omp target update' are ignored}}
+ #pragma omp target update nowait() to(i) // expected-error {{expected
expression}}
+ #pragma omp target update to(i) nowait( // expected-error {{expected
expression}} // expected-error {{expected ')'}} // expected-note {{to match
this '('}}
#pragma omp target update to(i) nowait (argc)) // expected-warning {{extra
tokens at the end of '#pragma omp target update' are ignored}}
#pragma omp target update to(i) nowait device (-10u)
- #pragma omp target update to(i) nowait (3.14) device (-10u) //
expected-warning {{extra tokens at the end of '#pragma omp target update' are
ignored}}
+ #pragma omp target update to(i) nowait (3.14) device (-10u) //
expected-error {{arguments of OpenMP clause 'nowait' with bitwise operators
cannot be of floating type}}
#pragma omp target update to(i) nowait nowait // expected-error {{directive
'#pragma omp target update' cannot contain more than one 'nowait' clause}}
#pragma omp target update nowait to(i) nowait // expected-error {{directive
'#pragma omp target update' cannot contain more than one 'nowait' clause}}
return 0;
>From 6c874832014283d87cfc1c9dfbf7fef6dcfde1d1 Mon Sep 17 00:00:00 2001
From: Jad Hbeika <jad.hbe...@intel.com>
Date: Sat, 29 Mar 2025 18:32:59 -0700
Subject: [PATCH 4/4] Starting OMP6.0 Nowait can appear on Target Data
---
llvm/include/llvm/Frontend/OpenMP/OMP.td | 1 +
1 file changed, 1 insertion(+)
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td
b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index 42d971846e66e..d75e98f5f9c18 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -1083,6 +1083,7 @@ def OMP_TargetData : Directive<"target data"> {
let allowedOnceClauses = [
VersionedClause<OMPC_Device>,
VersionedClause<OMPC_If>,
+ VersionedClause<OMPC_NoWait, 60>,
];
let requiredClauses = [
VersionedClause<OMPC_Map>,
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
