https://github.com/ddpagan updated
https://github.com/llvm/llvm-project/pull/125933
>From 86069865d3ae356593c7a28f99cc1a4ec53f3120 Mon Sep 17 00:00:00 2001
From: Dave Pagan <dave.pa...@amd.com>
Date: Thu, 30 Jan 2025 10:53:30 -0600
Subject: [PATCH 1/2] [clang][OpenMP] New OpenMP 6.0 assumption clause,
'no_openmp_constructs'.
Add initial parsing/sema support for new assumption clause so clause can
be specified. For now, it's ignored, just like the others.
Added support for 'no_openmp_construct' to release notes.
Testing
- Updated appropriate LIT tests.
- Testing: check-all
---
clang/docs/ReleaseNotes.rst | 1 +
clang/include/clang/AST/OpenMPClause.h | 22 ++++++++++
clang/include/clang/AST/RecursiveASTVisitor.h | 6 +++
clang/include/clang/Basic/AttrDocs.td | 1 +
clang/lib/AST/OpenMPClause.cpp | 5 +++
clang/lib/AST/StmtProfile.cpp | 3 ++
clang/lib/Parse/ParseOpenMP.cpp | 2 +
clang/lib/Sema/SemaOpenMP.cpp | 2 +
clang/lib/Sema/TreeTransform.h | 5 +++
clang/lib/Serialization/ASTReader.cpp | 6 +++
clang/lib/Serialization/ASTWriter.cpp | 3 ++
clang/test/OpenMP/assume_lambda.cpp | 8 +++-
clang/test/OpenMP/assume_nesting_tmpl.cpp | 10 ++++-
clang/test/OpenMP/assume_template.cpp | 12 +++--
clang/test/OpenMP/assumes_codegen.cpp | 18 ++++----
clang/test/OpenMP/assumes_messages.c | 44 +++++++++----------
clang/test/OpenMP/assumes_messages_attr.c | 28 ++++++------
clang/test/OpenMP/assumes_print.cpp | 19 ++++----
clang/test/OpenMP/attr-assume.cpp | 3 +-
clang/tools/libclang/CIndex.cpp | 3 ++
llvm/include/llvm/Frontend/OpenMP/OMP.td | 4 ++
.../include/llvm/Frontend/OpenMP/OMPKinds.def | 1 +
llvm/lib/IR/Assumptions.cpp | 13 +++---
llvm/lib/Transforms/IPO/OpenMPOpt.cpp | 3 +-
llvm/test/Transforms/OpenMP/icv_tracking.ll | 2 +
25 files changed, 157 insertions(+), 67 deletions(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 21c1ff25d2862ba..d45e46cab3f923a 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -262,6 +262,7 @@ Python Binding Changes
OpenMP Support
--------------
+- Added support 'no_openmp_constructs' assumption clause.
Improvements
^^^^^^^^^^^^
diff --git a/clang/include/clang/AST/OpenMPClause.h
b/clang/include/clang/AST/OpenMPClause.h
index abdf9333e7125c4..154ecfbaa441820 100644
--- a/clang/include/clang/AST/OpenMPClause.h
+++ b/clang/include/clang/AST/OpenMPClause.h
@@ -2423,6 +2423,28 @@ class OMPNoOpenMPRoutinesClause final
OMPNoOpenMPRoutinesClause() : OMPNoChildClause() {}
};
+/// This represents the 'no_openmp_constructs' clause in the
+//// '#pragma omp assume' directive.
+///
+/// \code
+/// #pragma omp assume no_openmp_constructs
+/// \endcode
+/// In this example directive '#pragma omp assume' has a 'no_openmp_constructs'
+/// clause.
+class OMPNoOpenMPConstructsClause final
+ : public OMPNoChildClause<llvm::omp::OMPC_no_openmp_constructs> {
+public:
+ /// Build 'no_openmp_constructs' clause.
+ ///
+ /// \param StartLoc Starting location of the clause.
+ /// \param EndLoc Ending location of the clause.
+ OMPNoOpenMPConstructsClause(SourceLocation StartLoc, SourceLocation EndLoc)
+ : OMPNoChildClause(StartLoc, EndLoc) {}
+
+ /// Build an empty clause.
+ OMPNoOpenMPConstructsClause() : OMPNoChildClause() {}
+};
+
/// This represents the 'no_parallelism' clause in the '#pragma omp assume'
/// directive.
///
diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h
b/clang/include/clang/AST/RecursiveASTVisitor.h
index 55505794e70542c..06c762c080de09d 100644
--- a/clang/include/clang/AST/RecursiveASTVisitor.h
+++ b/clang/include/clang/AST/RecursiveASTVisitor.h
@@ -3544,6 +3544,12 @@ bool
RecursiveASTVisitor<Derived>::VisitOMPNoOpenMPRoutinesClause(
return true;
}
+template <typename Derived>
+bool RecursiveASTVisitor<Derived>::VisitOMPNoOpenMPConstructsClause(
+ OMPNoOpenMPConstructsClause *) {
+ return true;
+}
+
template <typename Derived>
bool RecursiveASTVisitor<Derived>::VisitOMPNoParallelismClause(
OMPNoParallelismClause *) {
diff --git a/clang/include/clang/Basic/AttrDocs.td
b/clang/include/clang/Basic/AttrDocs.td
index a8b588169725a2c..0ad4c958d098303 100644
--- a/clang/include/clang/Basic/AttrDocs.td
+++ b/clang/include/clang/Basic/AttrDocs.td
@@ -5274,6 +5274,7 @@ optimization passes are aware of the following
assumptions:
"omp_no_openmp"
"omp_no_openmp_routines"
"omp_no_parallelism"
+ "omp_no_openmp_constructs"
The OpenMP standard defines the meaning of OpenMP assumptions ("omp_XYZ" is
spelled "XYZ" in the `OpenMP 5.1 Standard`_).
diff --git a/clang/lib/AST/OpenMPClause.cpp b/clang/lib/AST/OpenMPClause.cpp
index bbf7a4d95654837..424cab3a7de35cb 100644
--- a/clang/lib/AST/OpenMPClause.cpp
+++ b/clang/lib/AST/OpenMPClause.cpp
@@ -2073,6 +2073,11 @@ void OMPClausePrinter::VisitOMPNoOpenMPRoutinesClause(
OS << "no_openmp_routines";
}
+void OMPClausePrinter::VisitOMPNoOpenMPConstructsClause(
+ OMPNoOpenMPConstructsClause *) {
+ OS << "no_openmp_constructs";
+}
+
void OMPClausePrinter::VisitOMPNoParallelismClause(OMPNoParallelismClause *) {
OS << "no_parallelism";
}
diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
index 36d231e21fa9509..8b4b8ba19f75b66 100644
--- a/clang/lib/AST/StmtProfile.cpp
+++ b/clang/lib/AST/StmtProfile.cpp
@@ -606,6 +606,9 @@ void OMPClauseProfiler::VisitOMPNoOpenMPClause(const
OMPNoOpenMPClause *) {}
void OMPClauseProfiler::VisitOMPNoOpenMPRoutinesClause(
const OMPNoOpenMPRoutinesClause *) {}
+void OMPClauseProfiler::VisitOMPNoOpenMPConstructsClause(
+ const OMPNoOpenMPConstructsClause *) {}
+
void OMPClauseProfiler::VisitOMPNoParallelismClause(
const OMPNoParallelismClause *) {}
diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp
index 77a3695f06cbab0..a455659ca8f2c32 100644
--- a/clang/lib/Parse/ParseOpenMP.cpp
+++ b/clang/lib/Parse/ParseOpenMP.cpp
@@ -1693,6 +1693,7 @@ void Parser::ParseOpenMPClauses(OpenMPDirectiveKind DKind,
/// 'holds' '(' scalar-expression ')'
/// 'no_openmp'
/// 'no_openmp_routines'
+/// 'no_openmp_constructs' (OpenMP 6.0)
/// 'no_parallelism'
///
void Parser::ParseOpenMPAssumesDirective(OpenMPDirectiveKind DKind,
@@ -3474,6 +3475,7 @@ OMPClause *Parser::ParseOpenMPClause(OpenMPDirectiveKind
DKind,
}
case OMPC_no_openmp:
case OMPC_no_openmp_routines:
+ case OMPC_no_openmp_constructs:
case OMPC_no_parallelism: {
if (!FirstClause) {
Diag(Tok, diag::err_omp_more_one_clause)
diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp
index 7e366019e33cbe3..b060039d188a1bc 100644
--- a/clang/lib/Sema/SemaOpenMP.cpp
+++ b/clang/lib/Sema/SemaOpenMP.cpp
@@ -23763,6 +23763,8 @@ OMPClause
*SemaOpenMP::ActOnOpenMPNullaryAssumptionClause(OpenMPClauseKind CK,
return new (getASTContext()) OMPNoOpenMPRoutinesClause(Loc, RLoc);
case OMPC_no_parallelism:
return new (getASTContext()) OMPNoParallelismClause(Loc, RLoc);
+ case OMPC_no_openmp_constructs:
+ return new (getASTContext()) OMPNoOpenMPConstructsClause(Loc, RLoc);
default:
llvm_unreachable("Unexpected OpenMP clause");
}
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 60100d77c22a734..813b172c4d89eba 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -10627,6 +10627,11 @@ OMPClause
*TreeTransform<Derived>::TransformOMPNoOpenMPRoutinesClause(
return C;
}
template <typename Derived>
+OMPClause *TreeTransform<Derived>::TransformOMPNoOpenMPConstructsClause(
+ OMPNoOpenMPConstructsClause *C) {
+ return C;
+}
+template <typename Derived>
OMPClause *TreeTransform<Derived>::TransformOMPNoParallelismClause(
OMPNoParallelismClause *C) {
return C;
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 24acd6e297e7125..b74bd586e74d7a9 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -11059,6 +11059,9 @@ OMPClause *OMPClauseReader::readClause() {
case llvm::omp::OMPC_no_openmp_routines:
C = new (Context) OMPNoOpenMPRoutinesClause();
break;
+ case llvm::omp::OMPC_no_openmp_constructs:
+ C = new (Context) OMPNoOpenMPConstructsClause();
+ break;
case llvm::omp::OMPC_no_parallelism:
C = new (Context) OMPNoParallelismClause();
break;
@@ -11500,6 +11503,9 @@ void
OMPClauseReader::VisitOMPNoOpenMPClause(OMPNoOpenMPClause *) {}
void OMPClauseReader::VisitOMPNoOpenMPRoutinesClause(
OMPNoOpenMPRoutinesClause *) {}
+void OMPClauseReader::VisitOMPNoOpenMPConstructsClause(
+ OMPNoOpenMPConstructsClause *) {}
+
void OMPClauseReader::VisitOMPNoParallelismClause(OMPNoParallelismClause *) {}
void OMPClauseReader::VisitOMPSeqCstClause(OMPSeqCstClause *) {}
diff --git a/clang/lib/Serialization/ASTWriter.cpp
b/clang/lib/Serialization/ASTWriter.cpp
index ef8ee5bc94d0ec6..903a165ee75c6bb 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -7886,6 +7886,9 @@ void
OMPClauseWriter::VisitOMPNoOpenMPClause(OMPNoOpenMPClause *) {}
void OMPClauseWriter::VisitOMPNoOpenMPRoutinesClause(
OMPNoOpenMPRoutinesClause *) {}
+void OMPClauseWriter::VisitOMPNoOpenMPConstructsClause(
+ OMPNoOpenMPConstructsClause *) {}
+
void OMPClauseWriter::VisitOMPNoParallelismClause(OMPNoParallelismClause *) {}
void OMPClauseWriter::VisitOMPAcquireClause(OMPAcquireClause *) {}
diff --git a/clang/test/OpenMP/assume_lambda.cpp
b/clang/test/OpenMP/assume_lambda.cpp
index 4000dc1600b238d..fa0d9ac2c327c50 100644
--- a/clang/test/OpenMP/assume_lambda.cpp
+++ b/clang/test/OpenMP/assume_lambda.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -ast-print %s | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -std=c++11 -ast-print
%s | FileCheck %s
// expected-no-diagnostics
extern int bar(int);
@@ -11,6 +11,12 @@ int foo(int arg)
// CHECK: auto fn = [](int x) {
return fn(5);
}
+ #pragma omp assume no_openmp_constructs
+ {
+ auto fn = [](int x) { return bar(x); };
+// CHECK: auto fn = [](int x) {
+ return fn(6);
+ }
}
class C {
diff --git a/clang/test/OpenMP/assume_nesting_tmpl.cpp
b/clang/test/OpenMP/assume_nesting_tmpl.cpp
index 59ef603f5874dc3..b0f50b0ddddf7c9 100644
--- a/clang/test/OpenMP/assume_nesting_tmpl.cpp
+++ b/clang/test/OpenMP/assume_nesting_tmpl.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -ast-print %s | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -std=c++11 -ast-print
%s | FileCheck %s
// expected-no-diagnostics
extern void bar();
@@ -14,6 +14,14 @@ void foo()
{}
}
+ #pragma omp assume no_openmp_constructs
+ // CHECK: omp assume no_openmp_constructs
+ {
+ #pragma omp assume no_parallelism
+ // CHECK: omp assume no_parallelism
+ {}
+ }
+
#pragma omp target
// CHECK: omp target
{
diff --git a/clang/test/OpenMP/assume_template.cpp
b/clang/test/OpenMP/assume_template.cpp
index 20d1c5d43714580..2bf7567f675e997 100644
--- a/clang/test/OpenMP/assume_template.cpp
+++ b/clang/test/OpenMP/assume_template.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -verify %s -ast-print |
FileCheck %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -ast-print %s |
FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -std=c++11 -emit-pch -o
%t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -std=c++11 -include-pch %t
-verify %s -ast-print | FileCheck %s
// expected-no-diagnostics
#ifndef HEADER
@@ -17,6 +17,12 @@ int foo(T arg)
// CHECK: auto fn = [](int x) {
return fn(5);
}
+ #pragma omp assume no_openmp_constructs
+ {
+ auto fn = [](int x) { return qux(x); };
+// CHECK: auto fn = [](int x) {
+ return fn(6);
+ }
}
template<typename T>
diff --git a/clang/test/OpenMP/assumes_codegen.cpp
b/clang/test/OpenMP/assumes_codegen.cpp
index 4206e5a9caab750..a52ea956af245d7 100644
--- a/clang/test/OpenMP/assumes_codegen.cpp
+++ b/clang/test/OpenMP/assumes_codegen.cpp
@@ -1,11 +1,11 @@
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -emit-llvm %s -fexceptions
-fcxx-exceptions -triple x86_64-unknown-unknown -o - | FileCheck %s
-// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
--check-prefix=AST
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown
-fexceptions -fcxx-exceptions -emit-pch -verify -o %t %s
-// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown -fexceptions
-fcxx-exceptions -std=c++11 -include-pch %t -verify=pch %s -emit-llvm -o - |
FileCheck %s
-// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp -fexceptions
-fcxx-exceptions -debug-info-kind=line-tables-only -x c++ -emit-llvm %s -o - |
FileCheck %s
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-enable-irbuilder -x c++
-emit-llvm %s -fexceptions -fcxx-exceptions -triple x86_64-unknown-unknown -o -
| FileCheck %s
-// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c++ -std=c++11
-triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -verify
-o %t %s
-// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c++ -triple
x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t
-verify=pch %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -emit-llvm %s
-fexceptions -fcxx-exceptions -triple x86_64-unknown-unknown -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -ast-print %s |
FileCheck %s --check-prefix=AST
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -std=c++11 -triple
x86_64-unknown-unknown -fexceptions -fcxx-exceptions -emit-pch -verify -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -triple
x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11 -include-pch %t
-verify=pch %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-apple-darwin10 -fopenmp
-fopenmp-version=60 -fexceptions -fcxx-exceptions
-debug-info-kind=line-tables-only -x c++ -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60
-fopenmp-enable-irbuilder -x c++ -emit-llvm %s -fexceptions -fcxx-exceptions
-triple x86_64-unknown-unknown -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -fopenmp-enable-irbuilder -x
c++ -std=c++11 -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions
-emit-pch -verify -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -fopenmp-enable-irbuilder -x
c++ -triple x86_64-unknown-unknown -fexceptions -fcxx-exceptions -std=c++11
-include-pch %t -verify=pch %s -emit-llvm -o - | FileCheck %s
// pch-no-diagnostics
@@ -15,7 +15,7 @@
void foo() {
}
-#pragma omp assumes no_openmp_routines warning ext_another_warning(1)
ext_after_invalid_clauses // expected-warning {{valid assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}} expected-warning
{{'ext_another_warning' clause should not be followed by arguments; tokens will
be ignored}} expected-note {{the ignored tokens spans until here}}
+#pragma omp assumes no_openmp_routines warning ext_another_warning(1)
ext_after_invalid_clauses // expected-warning {{valid assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
expected-warning {{'ext_another_warning' clause should not be followed by
arguments; tokens will be ignored}} expected-note {{the ignored tokens spans
until here}}
#pragma omp assumes no_openmp
diff --git a/clang/test/OpenMP/assumes_messages.c
b/clang/test/OpenMP/assumes_messages.c
index 99bbe93dc1fc2b8..9bbedf59b77fc62 100644
--- a/clang/test/OpenMP/assumes_messages.c
+++ b/clang/test/OpenMP/assumes_messages.c
@@ -1,46 +1,46 @@
-// RUN: %clang_cc1 -triple=x86_64-pc-win32 -verify -fopenmp -x c -std=c99
-fms-extensions -Wno-pragma-pack %s
+// RUN: %clang_cc1 -triple=x86_64-pc-win32 -verify -fopenmp
-fopenmp-version=60 -x c -std=c99 -fms-extensions -Wno-pragma-pack %s
-// RUN: %clang_cc1 -triple=x86_64-pc-win32 -verify -fopenmp-simd -x c -std=c99
-fms-extensions -Wno-pragma-pack %s
+// RUN: %clang_cc1 -triple=x86_64-pc-win32 -verify -fopenmp-simd
-fopenmp-version=60 -x c -std=c99 -fms-extensions -Wno-pragma-pack %s
-#pragma omp assumes // expected-error {{expected at least one 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism' clause for '#pragma omp assumes'}}
+#pragma omp assumes // expected-error {{expected at least one 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism' clause for '#pragma omp assumes'}}
#pragma omp begin // expected-error {{expected an OpenMP directive}}
-#pragma omp begin assumes // expected-error {{expected at least one 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism' clause for '#pragma omp begin assumes'}}
+#pragma omp begin assumes // expected-error {{expected at least one 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism' clause for '#pragma omp begin
assumes'}}
#pragma omp end assumes
-#pragma omp assumes foobar // expected-warning {{valid assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}}
-#pragma omp begin assumes foobar // expected-warning {{valid begin assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
+#pragma omp assumes foobar // expected-warning {{valid assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
+#pragma omp begin assumes foobar // expected-warning {{valid begin assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
#pragma omp end assumes
-#pragma omp begin assumes foobar(foo 2 no_openmp // expected-error {{expected
')'}} expected-warning {{valid begin assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-note {{to match this '('}}
-#pragma omp assumes foobar(foo 2 no_openmp // expected-error {{expected ')'}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism';
tokens will be ignored}} expected-note {{to match this '('}}
+#pragma omp begin assumes foobar(foo 2 no_openmp // expected-error {{expected
')'}} expected-warning {{valid begin assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; tokens will be ignored}}
expected-note {{to match this '('}}
+#pragma omp assumes foobar(foo 2 no_openmp // expected-error {{expected ')'}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-note {{to match this '('}}
#pragma omp end assumes
-#pragma omp begin assumes foobar(foo 2 baz) // expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; tokens will be ignored}} expected-note
{{the ignored tokens spans until here}}
-#pragma omp assumes foobar(foo 2 baz) // expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; tokens will be ignored}} expected-note
{{the ignored tokens spans until here}}
+#pragma omp begin assumes foobar(foo 2 baz) // expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}}
+#pragma omp assumes foobar(foo 2 baz) // expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}}
#pragma omp end assumes
-#pragma omp begin assumes foobar foo 2 baz) bar // expected-warning {{valid
begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}} expected-warning {{valid begin assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}} expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}} expected-warning {{valid begin assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}}
-#pragma omp assumes foobar foo 2 baz) bar // expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}} expected-warning {{valid assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}} expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}} expected-warning {{valid assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}}
+#pragma omp begin assumes foobar foo 2 baz) bar // expected-warning {{valid
begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
token will be ignored}} expected-warning {{valid begin assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}} expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}} expected-warning {{valid begin assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}}
+#pragma omp assumes foobar foo 2 baz) bar // expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}} expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}} expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}} expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}} expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}} expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}}
#pragma omp end assumes
#pragma omp assumes no_openmp(1) // expected-warning {{'no_openmp' clause
should not be followed by arguments; tokens will be ignored}} expected-note
{{the ignored tokens spans until here}}
#pragma omp begin assumes no_openmp(1 2 3) // expected-warning {{'no_openmp'
clause should not be followed by arguments; tokens will be ignored}}
expected-note {{the ignored tokens spans until here}}
#pragma omp end assumes no_openmp(1)
-#pragma omp assumes foobar no_openmp bazbaz // expected-warning {{valid
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}}
-#pragma omp begin assumes foobar no_openmp bazbaz // expected-warning {{valid
begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}}
+#pragma omp assumes foobar no_openmp bazbaz // expected-warning {{valid
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}} expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}}
+#pragma omp begin assumes foobar no_openmp bazbaz // expected-warning {{valid
begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
token will be ignored}} expected-warning {{valid begin assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
#pragma omp end assumes
-#pragma omp begin assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2 baz) //
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism';
tokens will be ignored}} expected-warning {{valid begin assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-note {{the ignored tokens
spans until here}} expected-note {{the ignored tokens spans until here}}
-#pragma omp assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2 baz) //
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism';
tokens will be ignored}} expected-warning {{valid assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-note {{the ignored tokens
spans until here}} expected-note {{the ignored tokens spans until here}}
+#pragma omp begin assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2 baz) //
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}} expected-note
{{the ignored tokens spans until here}}
+#pragma omp assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2 baz) //
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}} expected-note
{{the ignored tokens spans until here}}
#pragma omp end assumes
-#pragma omp begin assumes foobar(foo (2) baz) no_openmp bazbaz(foo (2)) baz)
// expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism';
tokens will be ignored}} expected-warning {{valid begin assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}} expected-note {{the ignored tokens spans until here}}
expected-note {{the ignored tokens spans until here}}
-#pragma omp assumes foobar(foo () baz) no_openmp bazbaz(foo ((2) baz) //
expected-error {{expected ')'}} expected-warning {{valid assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; tokens will be ignored}} expected-note
{{the ignored tokens spans until here}} expected-note {{to match this '('}}
+#pragma omp begin assumes foobar(foo (2) baz) no_openmp bazbaz(foo (2)) baz)
// expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-warning {{valid begin assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}} expected-note {{the ignored tokens
spans until here}} expected-note {{the ignored tokens spans until here}}
+#pragma omp assumes foobar(foo () baz) no_openmp bazbaz(foo ((2) baz) //
expected-error {{expected ')'}} expected-warning {{valid assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; tokens will be ignored}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-note {{the ignored tokens
spans until here}} expected-note {{to match this '('}}
#pragma omp end assumes
-#pragma omp assumes no_openmp foobar no_openmp // expected-warning {{valid
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
-#pragma omp begin assumes no_openmp foobar no_openmp // expected-warning
{{valid begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; token will be ignored}}
+#pragma omp assumes no_openmp foobar no_openmp // expected-warning {{valid
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
+#pragma omp begin assumes no_openmp foobar no_openmp // expected-warning
{{valid begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
token will be ignored}}
#pragma omp end assumes
#pragma omp assumes holds(1, 2 3)
@@ -55,8 +55,8 @@
#pragma omp begin assumes contains(1, 2 3)
#pragma omp end assumes
-#pragma omp assumes ext // expected-warning {{valid assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; token will be ignored}}
-#pragma omp begin assumes ext // expected-warning {{valid begin assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
+#pragma omp assumes ext // expected-warning {{valid assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
+#pragma omp begin assumes ext // expected-warning {{valid begin assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
#pragma omp end assumes
#pragma omp assumes ext_123(not allowed) // expected-warning {{'ext_123'
clause should not be followed by arguments; tokens will be ignored}}
expected-note {{the ignored tokens spans until here}}
diff --git a/clang/test/OpenMP/assumes_messages_attr.c
b/clang/test/OpenMP/assumes_messages_attr.c
index c9fc68ce65d35d2..d68767493a51284 100644
--- a/clang/test/OpenMP/assumes_messages_attr.c
+++ b/clang/test/OpenMP/assumes_messages_attr.c
@@ -1,33 +1,33 @@
// RUN: %clang_cc1 -triple=x86_64-pc-win32 -verify -fopenmp -std=c99
-fms-extensions -Wno-pragma-pack %s
// RUN: %clang_cc1 -triple=x86_64-pc-win32 -verify -fopenmp-simd -std=c99
-fms-extensions -Wno-pragma-pack %s
-[[omp::directive(assumes)]]; // expected-error {{expected at least one 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism' clause for '#pragma omp assumes'}}
+[[omp::directive(assumes)]]; // expected-error {{expected at least one 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism' clause for '#pragma omp assumes'}}
[[omp::directive(begin)]]; // expected-error {{expected an OpenMP directive}}
-[[omp::directive(begin assumes)]]; // expected-error {{expected at least one
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism' clause for '#pragma omp begin assumes'}}
+[[omp::directive(begin assumes)]]; // expected-error {{expected at least one
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism' clause for '#pragma omp begin
assumes'}}
[[omp::directive(end assumes)]];
-[[omp::directive(assumes foobar)]]; // expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
-[[omp::directive(begin assumes foobar)]]; // expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
+[[omp::directive(assumes foobar)]]; // expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
+[[omp::directive(begin assumes foobar)]]; // expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
[[omp::directive(end assumes)]];
-[[omp::directive(begin assumes foobar(foo 2 baz))]]; // expected-warning
{{valid begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; tokens will be ignored}}
expected-note {{the ignored tokens spans until here}}
-[[omp::directive(assumes foobar(foo 2 baz))]]; // expected-warning {{valid
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; tokens will be ignored}} expected-note
{{the ignored tokens spans until here}}
+[[omp::directive(begin assumes foobar(foo 2 baz))]]; // expected-warning
{{valid begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
tokens will be ignored}} expected-note {{the ignored tokens spans until here}}
+[[omp::directive(assumes foobar(foo 2 baz))]]; // expected-warning {{valid
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}}
[[omp::directive(end assumes)]];
[[omp::directive(assumes no_openmp(1))]]; // expected-warning {{'no_openmp'
clause should not be followed by arguments; tokens will be ignored}}
expected-note {{the ignored tokens spans until here}}
[[omp::directive(begin assumes no_openmp(1 2 3))]]; // expected-warning
{{'no_openmp' clause should not be followed by arguments; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}}
[[omp::directive(end assumes no_openmp(1))]];
-[[omp::directive(assumes foobar no_openmp bazbaz)]]; // expected-warning
{{valid assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}}
-[[omp::directive(begin assumes foobar no_openmp bazbaz)]]; // expected-warning
{{valid begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; token will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}}
+[[omp::directive(assumes foobar no_openmp bazbaz)]]; // expected-warning
{{valid assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
token will be ignored}} expected-warning {{valid assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
+[[omp::directive(begin assumes foobar no_openmp bazbaz)]]; // expected-warning
{{valid begin assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
token will be ignored}} expected-warning {{valid begin assumes clauses start
with 'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; token will be ignored}}
[[omp::directive(end assumes)]];
-[[omp::directive(begin assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2
baz))]]; // expected-warning {{valid begin assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; tokens will be ignored}} expected-note
{{the ignored tokens spans until here}} expected-note {{the ignored tokens
spans until here}}
-[[omp::directive(assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2 baz))]]; //
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism';
tokens will be ignored}} expected-warning {{valid assumes clauses start with
'ext_', 'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_parallelism'; tokens will be ignored}} expected-note {{the ignored tokens
spans until here}} expected-note {{the ignored tokens spans until here}}
+[[omp::directive(begin assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2
baz))]]; // expected-warning {{valid begin assumes clauses start with 'ext_',
'absent', 'contains', 'holds', 'no_openmp', 'no_openmp_routines',
'no_openmp_constructs', 'no_parallelism'; tokens will be ignored}}
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-note {{the ignored tokens
spans until here}} expected-note {{the ignored tokens spans until here}}
+[[omp::directive(assumes foobar(foo 2 baz) no_openmp bazbaz(foo 2 baz))]]; //
expected-warning {{valid assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; tokens will be ignored}} expected-warning {{valid assumes
clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}} expected-note
{{the ignored tokens spans until here}}
[[omp::directive(end assumes)]];
-[[omp::directive(assumes no_openmp foobar no_openmp)]]; // expected-warning
{{valid assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_parallelism'; token will be ignored}}
-[[omp::directive(begin assumes no_openmp foobar no_openmp)]]; //
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_parallelism'; token
will be ignored}}
+[[omp::directive(assumes no_openmp foobar no_openmp)]]; // expected-warning
{{valid assumes clauses start with 'ext_', 'absent', 'contains', 'holds',
'no_openmp', 'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism';
token will be ignored}}
+[[omp::directive(begin assumes no_openmp foobar no_openmp)]]; //
expected-warning {{valid begin assumes clauses start with 'ext_', 'absent',
'contains', 'holds', 'no_openmp', 'no_openmp_routines', 'no_openmp_constructs',
'no_parallelism'; token will be ignored}}
[[omp::directive(end assumes)]];
[[omp::directive(assumes holds(1, 2 3))]];
@@ -42,8 +42,8 @@
[[omp::directive(begin assumes contains(1, 2 3))]];
[[omp::directive(end assumes)]];
-[[omp::directive(assumes ext)]]; // expected-warning {{valid assumes clauses
start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
-[[omp::directive(begin assumes ext)]]; // expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_parallelism'; token will be ignored}}
+[[omp::directive(assumes ext)]]; // expected-warning {{valid assumes clauses
start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
+[[omp::directive(begin assumes ext)]]; // expected-warning {{valid begin
assumes clauses start with 'ext_', 'absent', 'contains', 'holds', 'no_openmp',
'no_openmp_routines', 'no_openmp_constructs', 'no_parallelism'; token will be
ignored}}
[[omp::directive(end assumes)]];
[[omp::directive(assumes ext_123(not allowed))]]; // expected-warning
{{'ext_123' clause should not be followed by arguments; tokens will be
ignored}} expected-note {{the ignored tokens spans until here}}
diff --git a/clang/test/OpenMP/assumes_print.cpp
b/clang/test/OpenMP/assumes_print.cpp
index 9254c29ab8335d3..25796ae8afcf52f 100644
--- a/clang/test/OpenMP/assumes_print.cpp
+++ b/clang/test/OpenMP/assumes_print.cpp
@@ -1,10 +1,10 @@
-// RUN: %clang_cc1 -verify -fopenmp -ast-print %s | FileCheck %s
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp -std=c++11 -include-pch %t -verify %s -ast-print |
FileCheck %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -ast-print %s |
FileCheck %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -std=c++11 -emit-pch -o
%t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -std=c++11 -include-pch %t
-verify %s -ast-print | FileCheck %s
-// RUN: %clang_cc1 -verify -fopenmp-simd -ast-print %s | FileCheck %s
-// RUN: %clang_cc1 -fopenmp-simd -x c++ -std=c++11 -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp-simd -std=c++11 -include-pch %t -verify %s
-ast-print | FileCheck %s
+// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=60 -ast-print %s |
FileCheck %s
+// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=60 -x c++ -std=c++11
-emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp-simd -fopenmp-version=60 -std=c++11 -include-pch
%t -verify %s -ast-print | FileCheck %s
// expected-no-diagnostics
#ifndef HEADER
@@ -14,6 +14,7 @@ void foo() {
}
#pragma omp assumes no_openmp_routines
+#pragma omp assumes no_openmp_constructs
namespace inner {
#pragma omp assumes no_openmp
@@ -37,8 +38,8 @@ void baz() {
}
#pragma omp end assumes
-// CHECK{LITERAL}: void foo() [[omp::assume("omp_no_openmp_routines")]]
[[omp::assume("omp_no_openmp")]]
-// CHECK{LITERAL}: [[omp::assume("ompx_range_bar_only")]]
[[omp::assume("ompx_range_bar_only_2")]]
[[omp::assume("omp_no_openmp_routines")]] [[omp::assume("omp_no_openmp")]] void
bar()
-// CHECK{LITERAL}: [[omp::assume("ompx_1234")]]
[[omp::assume("omp_no_openmp_routines")]] [[omp::assume("omp_no_openmp")]] void
baz()
+// CHECK{LITERAL}: void foo() [[omp::assume("omp_no_openmp_routines")]]
[[omp::assume("omp_no_openmp_constructs")]] [[omp::assume("omp_no_openmp")]]
+// CHECK{LITERAL}: [[omp::assume("ompx_range_bar_only")]]
[[omp::assume("ompx_range_bar_only_2")]]
[[omp::assume("omp_no_openmp_routines")]]
[[omp::assume("omp_no_openmp_constructs")]] [[omp::assume("omp_no_openmp")]]
void bar()
+// CHECK{LITERAL}: [[omp::assume("ompx_1234")]]
[[omp::assume("omp_no_openmp_routines")]]
[[omp::assume("omp_no_openmp_constructs")]] [[omp::assume("omp_no_openmp")]]
void baz()
#endif
diff --git a/clang/test/OpenMP/attr-assume.cpp
b/clang/test/OpenMP/attr-assume.cpp
index 09c22f98d1e299a..2d807d9a00b0d7d 100644
--- a/clang/test/OpenMP/attr-assume.cpp
+++ b/clang/test/OpenMP/attr-assume.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -fopenmp -verify %s
+// RUN: %clang_cc1 -fsyntax-only -fopenmp -fopenmp-version=60 -verify %s
[[omp::assume(3)]] void f1(); // expected-error {{expected string literal as
argument of 'assume' attribute}}
[[omp::assume(int)]] void f2(); // expected-error {{expected string literal as
argument of 'assume' attribute}}
[[omp::assume(for)]] void f3(); // expected-error {{expected string literal as
argument of 'assume' attribute}}
@@ -8,6 +8,7 @@
[[omp::assume("omp_no_openmp_routine")]] void f7(); // expected-warning
{{unknown assumption string 'omp_no_openmp_routine' may be misspelled;
attribute is potentially ignored, did you mean 'omp_no_openmp_routines'?}}
[[omp::assume("omp_no_openmp1")]] void f8(); // expected-warning {{unknown
assumption string 'omp_no_openmp1' may be misspelled; attribute is potentially
ignored, did you mean 'omp_no_openmp'?}}
[[omp::assume("omp_no_openmp", "omp_no_openmp")]] void f9(); // expected-error
{{'assume' attribute takes one argument}}
+[[omp::assume("omp_no_openmp_construct")]] void f10(); // expected-warning
{{unknown assumption string 'omp_no_openmp_construct' may be misspelled;
attribute is potentially ignored, did you mean 'omp_no_openmp_constructs'?}}
[[omp::assume(3)]] int g1; // expected-error {{expected string literal as
argument of 'assume' attribute}}
[[omp::assume("omp_no_openmp")]] int g2; // expected-warning {{'assume'
attribute only applies to functions and Objective-C methods}}
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 6f0e9f2a9688c6c..285ac314200077d 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -2465,6 +2465,9 @@ void OMPClauseEnqueue::VisitOMPNoOpenMPClause(const
OMPNoOpenMPClause *) {}
void OMPClauseEnqueue::VisitOMPNoOpenMPRoutinesClause(
const OMPNoOpenMPRoutinesClause *) {}
+void OMPClauseEnqueue::VisitOMPNoOpenMPConstructsClause(
+ const OMPNoOpenMPConstructsClause *) {}
+
void OMPClauseEnqueue::VisitOMPNoParallelismClause(
const OMPNoParallelismClause *) {}
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td
b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index 1f2389987e18bc2..37b92f2339df99f 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -299,6 +299,9 @@ def OMPC_NoOpenMP : Clause<"no_openmp"> {
def OMPC_NoOpenMPRoutines : Clause<"no_openmp_routines"> {
let clangClass = "OMPNoOpenMPRoutinesClause";
}
+def OMPC_NoOpenMPConstructs : Clause<"no_openmp_constructs"> {
+ let clangClass = "OMPNoOpenMPConstructsClause";
+}
def OMPC_NoParallelism : Clause<"no_parallelism"> {
let clangClass = "OMPNoParallelismClause";
}
@@ -574,6 +577,7 @@ def OMP_Assume : Directive<"assume"> {
VersionedClause<OMPC_NoOpenMP, 51>,
VersionedClause<OMPC_NoOpenMPRoutines, 51>,
VersionedClause<OMPC_NoParallelism, 51>,
+ VersionedClause<OMPC_NoOpenMPConstructs, 60>,
];
}
def OMP_Atomic : Directive<"atomic"> {
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
index 8ea3af101cc9425..44a9a37c705974a 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPKinds.def
@@ -1410,6 +1410,7 @@ __OMP_ASSUME_CLAUSE(llvm::StringLiteral("contains"),
false, true, false)
__OMP_ASSUME_CLAUSE(llvm::StringLiteral("holds"), false, false, true)
__OMP_ASSUME_CLAUSE(llvm::StringLiteral("no_openmp"), false, false, false)
__OMP_ASSUME_CLAUSE(llvm::StringLiteral("no_openmp_routines"), false, false,
false)
+__OMP_ASSUME_CLAUSE(llvm::StringLiteral("no_openmp_constructs"), false, false,
false)
__OMP_ASSUME_CLAUSE(llvm::StringLiteral("no_parallelism"), false, false, false)
#undef __OMP_ASSUME_CLAUSE
diff --git a/llvm/lib/IR/Assumptions.cpp b/llvm/lib/IR/Assumptions.cpp
index d1f8bcde53b264f..ad874485fb3a059 100644
--- a/llvm/lib/IR/Assumptions.cpp
+++ b/llvm/lib/IR/Assumptions.cpp
@@ -103,10 +103,11 @@ bool llvm::addAssumptions(CallBase &CB,
}
StringSet<> llvm::KnownAssumptionStrings({
- "omp_no_openmp", // OpenMP 5.1
- "omp_no_openmp_routines", // OpenMP 5.1
- "omp_no_parallelism", // OpenMP 5.1
- "ompx_spmd_amenable", // OpenMPOpt extension
- "ompx_no_call_asm", // OpenMPOpt extension
- "ompx_aligned_barrier", // OpenMPOpt extension
+ "omp_no_openmp", // OpenMP 5.1
+ "omp_no_openmp_routines", // OpenMP 5.1
+ "omp_no_parallelism", // OpenMP 5.1
+ "omp_no_openmp_constructs", // OpenMP 6.0
+ "ompx_spmd_amenable", // OpenMPOpt extension
+ "ompx_no_call_asm", // OpenMPOpt extension
+ "ompx_aligned_barrier", // OpenMPOpt extension
});
diff --git a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
index 70ae9327d75dd0b..1074f5f23ffa17f 100644
--- a/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
+++ b/llvm/lib/Transforms/IPO/OpenMPOpt.cpp
@@ -2369,7 +2369,8 @@ struct AAICVTrackerFunction : public AAICVTracker {
const auto *CB = dyn_cast<CallBase>(&I);
if (!CB || CB->hasFnAttr("no_openmp") ||
- CB->hasFnAttr("no_openmp_routines"))
+ CB->hasFnAttr("no_openmp_routines") ||
+ CB->hasFnAttr("no_openmp_constructs"))
return std::nullopt;
auto &OMPInfoCache = static_cast<OMPInformationCache &>(A.getInfoCache());
diff --git a/llvm/test/Transforms/OpenMP/icv_tracking.ll
b/llvm/test/Transforms/OpenMP/icv_tracking.ll
index 7adab7a191220b1..47256ea599fdd6f 100644
--- a/llvm/test/Transforms/OpenMP/icv_tracking.ll
+++ b/llvm/test/Transforms/OpenMP/icv_tracking.ll
@@ -34,12 +34,14 @@ define i32 @ok_use_assume(i32 %0) {
; CHECK-SAME: (i32 [[TMP0:%.*]]) {
; CHECK-NEXT: call void @use(i32 [[TMP0]]) #[[ATTR1:[0-9]+]]
; CHECK-NEXT: call void @use(i32 [[TMP0]]) #[[ATTR2:[0-9]+]]
+; CHECK-NEXT: call void @use(i32 [[TMP0]]) #[[ATTR2:[0-9]+]]
; CHECK-NEXT: call void @no_openmp_use(i32 [[TMP0]])
; CHECK-NEXT: [[TMP2:%.*]] = add nsw i32 [[TMP0]], 1
; CHECK-NEXT: ret i32 [[TMP2]]
;
call void @use(i32 %0) "no_openmp"
call void @use(i32 %0) "no_openmp_routines"
+ call void @use(i32 %0) "no_openmp_constructs"
call void @no_openmp_use(i32 %0)
%2 = add nsw i32 %0, 1
ret i32 %2
>From d0fed4f54e57a30abe208bc27bf571479efb564d Mon Sep 17 00:00:00 2001
From: Dave Pagan <dave.pa...@amd.com>
Date: Thu, 6 Feb 2025 12:51:51 -0600
Subject: [PATCH 2/2] OpenMP features table: added 'no_openmp_constructs'
assumption clause as completed feature in OpenMP 6.0 Implementation Details.
---
clang/docs/OpenMPSupport.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/docs/OpenMPSupport.rst b/clang/docs/OpenMPSupport.rst
index 673c34bf08a4a40..14865f048e8e941 100644
--- a/clang/docs/OpenMPSupport.rst
+++ b/clang/docs/OpenMPSupport.rst
@@ -410,7 +410,7 @@ implementation.
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
| Extensions to interop construct |
:none:`unclaimed` | :none:`unclaimed` |
|
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
-| no_openmp_constructs |
:none:`unclaimed` | :none:`unclaimed` |
|
+| no_openmp_constructs | :good:`done`
| :none:`unclaimed` |
https://github.com/llvm/llvm-project/pull/125933 |
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
| safe_sync and progress with identifier and API |
:none:`unclaimed` | :none:`unclaimed` |
|
+-------------------------------------------------------------+---------------------------+---------------------------+--------------------------------------------------------------------------+
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
