[OpenMP] Add directive spellings introduced in spec v6.0 #141772
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-flang-openmp Author: Krzysztof Parzyszek (kparzysz) ChangesFor background information see Full diff: https://github.com/llvm/llvm-project/pull/141772.diff 1 Files Affected:
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index 027692275b63b..04433ffd72b7b 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -677,7 +677,8 @@ def OMP_Cancel : Directive<[Spelling<"cancel">]> {
let association = AS_None;
let category = CA_Executable;
}
-def OMP_CancellationPoint : Directive<[Spelling<"cancellation point">]> {
+def OMP_CancellationPoint : Directive<[Spelling<"cancellation point", 1, 52>,
+ Spelling<"cancellation_point", 60>]> {
let allowedOnceClauses = [
VersionedClause<OMPC_CancellationConstructType>,
];
@@ -691,21 +692,24 @@ def OMP_Critical : Directive<[Spelling<"critical">]> {
let association = AS_Block;
let category = CA_Executable;
}
-def OMP_DeclareMapper : Directive<[Spelling<"declare mapper">]> {
+def OMP_DeclareMapper : Directive<[Spelling<"declare mapper", 1, 52>,
+ Spelling<"declare_mapper", 60>]> {
let requiredClauses = [
VersionedClause<OMPC_Map, 45>,
];
let association = AS_None;
let category = CA_Declarative;
}
-def OMP_DeclareReduction : Directive<[Spelling<"declare reduction">]> {
+def OMP_DeclareReduction : Directive<[Spelling<"declare reduction", 1, 52>,
+ Spelling<"declare_reduction", 60>]> {
let allowedOnceClauses = [
VersionedClause<OMPC_Initializer>,
];
let association = AS_None;
let category = CA_Declarative;
}
-def OMP_DeclareSimd : Directive<[Spelling<"declare simd">]> {
+def OMP_DeclareSimd : Directive<[Spelling<"declare simd", 1, 52>,
+ Spelling<"declare_simd", 60>]> {
let allowedClauses = [
VersionedClause<OMPC_Aligned>,
VersionedClause<OMPC_Linear>,
@@ -721,7 +725,8 @@ def OMP_DeclareSimd : Directive<[Spelling<"declare simd">]> {
let association = AS_Declaration;
let category = CA_Declarative;
}
-def OMP_DeclareTarget : Directive<[Spelling<"declare target">]> {
+def OMP_DeclareTarget : Directive<[Spelling<"declare target", 1, 52>,
+ Spelling<"declare_target", 60>]> {
let allowedClauses = [
VersionedClause<OMPC_Enter, 52>,
VersionedClause<OMPC_Indirect>,
@@ -734,7 +739,8 @@ def OMP_DeclareTarget : Directive<[Spelling<"declare target">]> {
let association = AS_None;
let category = CA_Declarative;
}
-def OMP_DeclareVariant : Directive<[Spelling<"declare variant">]> {
+def OMP_DeclareVariant : Directive<[Spelling<"declare variant", 1, 52>,
+ Spelling<"declare_variant", 60>]> {
let allowedClauses = [
VersionedClause<OMPC_AdjustArgs, 51>,
];
@@ -1093,7 +1099,8 @@ def OMP_Target : Directive<[Spelling<"target">]> {
let association = AS_Block;
let category = CA_Executable;
}
-def OMP_TargetData : Directive<[Spelling<"target data">]> {
+def OMP_TargetData : Directive<[Spelling<"target data", 1, 52>,
+ Spelling<"target_data", 60>]> {
let allowedOnceClauses = [
VersionedClause<OMPC_Device>,
VersionedClause<OMPC_If>,
@@ -1106,7 +1113,8 @@ def OMP_TargetData : Directive<[Spelling<"target data">]> {
let association = AS_Block;
let category = CA_Executable;
}
-def OMP_TargetEnterData : Directive<[Spelling<"target enter data">]> {
+def OMP_TargetEnterData : Directive<[Spelling<"target enter data", 1, 52>,
+ Spelling<"target_enter_data", 60>]> {
let allowedClauses = [
VersionedClause<OMPC_Depend>,
];
@@ -1121,7 +1129,8 @@ def OMP_TargetEnterData : Directive<[Spelling<"target enter data">]> {
let association = AS_None;
let category = CA_Executable;
}
-def OMP_TargetExitData : Directive<[Spelling<"target exit data">]> {
+def OMP_TargetExitData : Directive<[Spelling<"target exit data", 1, 52>,
+ Spelling<"target_exit_data", 60>]> {
let allowedClauses = [
VersionedClause<OMPC_Depend>,
];
@@ -1136,7 +1145,8 @@ def OMP_TargetExitData : Directive<[Spelling<"target exit data">]> {
let association = AS_None;
let category = CA_Executable;
}
-def OMP_TargetUpdate : Directive<[Spelling<"target update">]> {
+def OMP_TargetUpdate : Directive<[Spelling<"target update", 1, 52>,
+ Spelling<"target_update", 60>]> {
let allowedClauses = [
VersionedClause<OMPC_Depend>,
VersionedClause<OMPC_From>,
|
This was referenced May 28, 2025
tblah
approved these changes
Jun 4, 2025
kparzysz
force-pushed
the
users/kparzysz/spr/t08-versioned-spellings
branch
from
b081ce6 to
4dcc159
Compare
Base automatically changed from
users/kparzysz/spr/t08-versioned-spellings
to
main
June 6, 2025 22:07
kparzysz
force-pushed
the
users/kparzysz/spr/t09-openmp60
branch
from
8385ab9 to
9099611
Compare
|
Hi @alexey-bataev, could you check if you're ok with this? I had to modify a few clang tests to accommodate this change. |
|
Can you add the tests for the new spellings? |
|
The modified tests do contain new spellings when the version is 60. Do you want me to extract these RUN lines into separate files? Right now we don't yet parse the new names, this is just checking the names in the diagnostics. |
|
@alexey-bataev, could you clarify what tests you had in mind? |
Would be good to see the new test for the new spellings, like |
|
We don't parse them yet, that will require additional changes. This patch will only affect what names are printed in diagnostic messages. |
|
I'll add a unit test that prints all affected directives with different versions. |
|
@alexey-bataev This is ready now. |
alexey-bataev
approved these changes
Jun 25, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/18562 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/168/builds/13495 Here is the relevant piece of the build log for the reference |
anthonyhatran
pushed a commit
to anthonyhatran/llvm-project
that referenced
this pull request
Jun 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For background information see
https://discourse.llvm.org/t/rfc-alternative-spellings-of-openmp-directives/85507