[flang][OpenMP] Add parsing support for Task detach #112312
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
NimishMishra
requested review from
ergawy,
Meinersbur,
tblah,
kiranchandramohan,
mjklemm,
luporl and
kiranktp
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-fir-hlfir @llvm/pr-subscribers-flang-parser Author: None (NimishMishra) ChangesAdd parsing support for task detach, along with parse/unparse tests. Full diff: https://github.com/llvm/llvm-project/pull/112312.diff 6 Files Affected:
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 5d243b4e5d3e9a..f21eae3b92d5bd 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -507,6 +507,7 @@ class ParseTreeDumper {
NODE_ENUM(OmpDefaultmapClause, ImplicitBehavior)
NODE_ENUM(OmpDefaultmapClause, VariableCategory)
NODE(parser, OmpDependClause)
+ NODE(parser, OmpDetachClause)
NODE(OmpDependClause, InOut)
NODE(OmpDependClause, Sink)
NODE(OmpDependClause, Source)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 21b4a344dbc438..484aaf50e223f0 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3515,6 +3515,12 @@ struct OmpIfClause {
std::tuple<std::optional<DirectiveNameModifier>, ScalarLogicalExpr> t;
};
+// OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle)
+struct OmpDetachClause {
+ WRAPPER_CLASS_BOILERPLATE(OmpDetachClause, OmpObject);
+ CharBlock source;
+};
+
// 2.8.1 aligned-clause -> ALIGNED (variable-name-list[ : scalar-constant])
struct OmpAlignedClause {
TUPLE_CLASS_BOILERPLATE(OmpAlignedClause);
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 8634c522cf343a..2a67f87128588f 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -215,7 +215,7 @@ TYPE_PARSER(construct<OmpIfClause>(
":"),
scalarLogicalExpr))
-// 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list)
+// OpenMPv5.2 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list)
TYPE_PARSER(construct<OmpReductionOperator>(Parser<DefinedOperator>{}) ||
construct<OmpReductionOperator>(Parser<ProcedureDesignator>{}))
@@ -298,6 +298,10 @@ TYPE_CONTEXT_PARSER("Omp LINEAR clause"_en_US,
construct<OmpLinearClause>(construct<OmpLinearClause::WithoutModifier>(
nonemptyList(name), maybe(":" >> scalarIntConstantExpr)))))
+// 12.5.2 detach-clause -> DETACH (event-handle)
+TYPE_PARSER(construct<OmpDetachClause>(
+ Parser<OmpObject>{}))
+
// 2.8.1 ALIGNED (list: alignment)
TYPE_PARSER(construct<OmpAlignedClause>(
Parser<OmpObjectList>{}, maybe(":" >> scalarIntConstantExpr)))
@@ -414,6 +418,8 @@ TYPE_PARSER(
parenthesized(Parser<OmpReductionClause>{}))) ||
"IN_REDUCTION" >> construct<OmpClause>(construct<OmpClause::InReduction>(
parenthesized(Parser<OmpInReductionClause>{}))) ||
+ "DETACH" >> construct<OmpClause>(construct<OmpClause::Detach>(
+ parenthesized(Parser<OmpDetachClause>{}))) ||
"TASK_REDUCTION" >>
construct<OmpClause>(construct<OmpClause::TaskReduction>(
parenthesized(Parser<OmpReductionClause>{}))) ||
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index d1011fe58a0264..bb8ec168ced2d5 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2131,6 +2131,9 @@ class UnparseVisitor {
Put(":");
Walk(std::get<OmpObjectList>(x.t));
}
+ void Unparse(const OmpDetachClause &x){
+ Walk(x.v);
+ }
void Unparse(const OmpInReductionClause &x) {
Walk(std::get<OmpReductionOperator>(x.t));
Put(":");
diff --git a/flang/test/Parser/OpenMP/task.f90 b/flang/test/Parser/OpenMP/task.f90
new file mode 100644
index 00000000000000..dbeb6e51b345b1
--- /dev/null
+++ b/flang/test/Parser/OpenMP/task.f90
@@ -0,0 +1,16 @@
+! RUN: %flang_fc1 -fdebug-dump-parse-tree -fopenmp -fopenmp-version=50 %s | FileCheck --ignore-case %s
+! RUN: %flang_fc1 -fdebug-unparse -fopenmp -fopenmp-version=50 %s | FileCheck --ignore-case --check-prefix="CHECK-UNPARSE" %s
+
+!CHECK: OmpBlockDirective -> llvm::omp::Directive = task
+!CHECK: OmpClauseList -> OmpClause -> Detach -> OmpDetachClause -> OmpObject -> Designator -> DataRef -> Name = 'event'
+
+!CHECK-UNPARSE: INTEGER(KIND=8_4) event
+!CHECK-UNPARSE: !$OMP TASK DETACH(event)
+!CHECK-UNPARSE: !$OMP END TASK
+subroutine task_detach
+ use omp_lib
+ implicit none
+ integer(kind=omp_event_handle_kind) :: event
+ !$omp task detach(event)
+ !$omp end task
+end subroutine
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index f2f09812a86905..6ed224f0857a9b 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -132,6 +132,7 @@ def OMPC_Destroy : Clause<"destroy"> {
}
def OMPC_Detach : Clause<"detach"> {
let clangClass = "OMPDetachClause";
+ let flangClass = "OmpDetachClause";
}
def OMPC_Device : Clause<"device"> {
let clangClass = "OMPDeviceClause";
|
|
@llvm/pr-subscribers-flang-openmp Author: None (NimishMishra) ChangesAdd parsing support for task detach, along with parse/unparse tests. Full diff: https://github.com/llvm/llvm-project/pull/112312.diff 6 Files Affected:
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 5d243b4e5d3e9a..f21eae3b92d5bd 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -507,6 +507,7 @@ class ParseTreeDumper {
NODE_ENUM(OmpDefaultmapClause, ImplicitBehavior)
NODE_ENUM(OmpDefaultmapClause, VariableCategory)
NODE(parser, OmpDependClause)
+ NODE(parser, OmpDetachClause)
NODE(OmpDependClause, InOut)
NODE(OmpDependClause, Sink)
NODE(OmpDependClause, Source)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 21b4a344dbc438..484aaf50e223f0 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3515,6 +3515,12 @@ struct OmpIfClause {
std::tuple<std::optional<DirectiveNameModifier>, ScalarLogicalExpr> t;
};
+// OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle)
+struct OmpDetachClause {
+ WRAPPER_CLASS_BOILERPLATE(OmpDetachClause, OmpObject);
+ CharBlock source;
+};
+
// 2.8.1 aligned-clause -> ALIGNED (variable-name-list[ : scalar-constant])
struct OmpAlignedClause {
TUPLE_CLASS_BOILERPLATE(OmpAlignedClause);
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 8634c522cf343a..2a67f87128588f 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -215,7 +215,7 @@ TYPE_PARSER(construct<OmpIfClause>(
":"),
scalarLogicalExpr))
-// 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list)
+// OpenMPv5.2 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list)
TYPE_PARSER(construct<OmpReductionOperator>(Parser<DefinedOperator>{}) ||
construct<OmpReductionOperator>(Parser<ProcedureDesignator>{}))
@@ -298,6 +298,10 @@ TYPE_CONTEXT_PARSER("Omp LINEAR clause"_en_US,
construct<OmpLinearClause>(construct<OmpLinearClause::WithoutModifier>(
nonemptyList(name), maybe(":" >> scalarIntConstantExpr)))))
+// 12.5.2 detach-clause -> DETACH (event-handle)
+TYPE_PARSER(construct<OmpDetachClause>(
+ Parser<OmpObject>{}))
+
// 2.8.1 ALIGNED (list: alignment)
TYPE_PARSER(construct<OmpAlignedClause>(
Parser<OmpObjectList>{}, maybe(":" >> scalarIntConstantExpr)))
@@ -414,6 +418,8 @@ TYPE_PARSER(
parenthesized(Parser<OmpReductionClause>{}))) ||
"IN_REDUCTION" >> construct<OmpClause>(construct<OmpClause::InReduction>(
parenthesized(Parser<OmpInReductionClause>{}))) ||
+ "DETACH" >> construct<OmpClause>(construct<OmpClause::Detach>(
+ parenthesized(Parser<OmpDetachClause>{}))) ||
"TASK_REDUCTION" >>
construct<OmpClause>(construct<OmpClause::TaskReduction>(
parenthesized(Parser<OmpReductionClause>{}))) ||
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index d1011fe58a0264..bb8ec168ced2d5 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2131,6 +2131,9 @@ class UnparseVisitor {
Put(":");
Walk(std::get<OmpObjectList>(x.t));
}
+ void Unparse(const OmpDetachClause &x){
+ Walk(x.v);
+ }
void Unparse(const OmpInReductionClause &x) {
Walk(std::get<OmpReductionOperator>(x.t));
Put(":");
diff --git a/flang/test/Parser/OpenMP/task.f90 b/flang/test/Parser/OpenMP/task.f90
new file mode 100644
index 00000000000000..dbeb6e51b345b1
--- /dev/null
+++ b/flang/test/Parser/OpenMP/task.f90
@@ -0,0 +1,16 @@
+! RUN: %flang_fc1 -fdebug-dump-parse-tree -fopenmp -fopenmp-version=50 %s | FileCheck --ignore-case %s
+! RUN: %flang_fc1 -fdebug-unparse -fopenmp -fopenmp-version=50 %s | FileCheck --ignore-case --check-prefix="CHECK-UNPARSE" %s
+
+!CHECK: OmpBlockDirective -> llvm::omp::Directive = task
+!CHECK: OmpClauseList -> OmpClause -> Detach -> OmpDetachClause -> OmpObject -> Designator -> DataRef -> Name = 'event'
+
+!CHECK-UNPARSE: INTEGER(KIND=8_4) event
+!CHECK-UNPARSE: !$OMP TASK DETACH(event)
+!CHECK-UNPARSE: !$OMP END TASK
+subroutine task_detach
+ use omp_lib
+ implicit none
+ integer(kind=omp_event_handle_kind) :: event
+ !$omp task detach(event)
+ !$omp end task
+end subroutine
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMP.td b/llvm/include/llvm/Frontend/OpenMP/OMP.td
index f2f09812a86905..6ed224f0857a9b 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMP.td
+++ b/llvm/include/llvm/Frontend/OpenMP/OMP.td
@@ -132,6 +132,7 @@ def OMPC_Destroy : Clause<"destroy"> {
}
def OMPC_Detach : Clause<"detach"> {
let clangClass = "OMPDetachClause";
+ let flangClass = "OmpDetachClause";
}
def OMPC_Device : Clause<"device"> {
let clangClass = "OMPDeviceClause";
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
NimishMishra
force-pushed
the
task_detach_parse
branch
from
2a51b4d to
cea1f26
Compare
| // OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle) | ||
| struct OmpDetachClause { | ||
| WRAPPER_CLASS_BOILERPLATE(OmpDetachClause, OmpObject); | ||
| CharBlock source; |
There was a problem hiding this comment.
Is this used currently? Don't you have to use a sourced() parser to fill it?
There was a problem hiding this comment.
My thought was to pre-emptively add it for the patch on semantic checks for detach clause. Yeah I missed the sourced(), thanks for that. I am removing this though; on second thoughts, we would have the source for the task construct itself. So that should be sufficient to report any errors. If at all needed, we can bring this back later. Does that work?
luporl
reviewed
Oct 15, 2024
| !CHECK-UNPARSE: !$OMP TASK DETACH(event) | ||
| !CHECK-UNPARSE: !$OMP END TASK | ||
| subroutine task_detach | ||
| use omp_lib |
There was a problem hiding this comment.
use omp_lib needs ! REQUIRES: openmp_runtime, to avoid errors when OpenMP runtime is not available.
flang/lib/Parser/openmp-parsers.cpp
Outdated
| @@ -215,7 +215,7 @@ TYPE_PARSER(construct<OmpIfClause>( | |||
| ":"), | |||
| scalarLogicalExpr)) | |||
|
|
|||
| // 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list) | |||
| // OpenMPv5.2 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list) | |||
There was a problem hiding this comment.
The 2.15.3.6 reference is from OpenMP 4.5. In OpenMP 5.2 it seems to be 5.5.8.
There was a problem hiding this comment.
Ah sorry. I accidentally modified the REDUCTION. Reverting it.
mjklemm
reviewed
Oct 17, 2024
flang/lib/Parser/openmp-parsers.cpp
Outdated
| @@ -298,6 +298,9 @@ TYPE_CONTEXT_PARSER("Omp LINEAR clause"_en_US, | |||
| construct<OmpLinearClause>(construct<OmpLinearClause::WithoutModifier>( | |||
| nonemptyList(name), maybe(":" >> scalarIntConstantExpr))))) | |||
|
|
|||
| // 12.5.2 detach-clause -> DETACH (event-handle) | |||
There was a problem hiding this comment.
Suggested change
| // 12.5.2 detach-clause -> DETACH (event-handle) | |
| // OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle) |
There was a problem hiding this comment.
Thanks. Added it.
NimishMishra
commented
Oct 19, 2024
| // OpenMPv5.2 12.5.2 detach-clause -> DETACH (event-handle) | ||
| struct OmpDetachClause { | ||
| WRAPPER_CLASS_BOILERPLATE(OmpDetachClause, OmpObject); | ||
| CharBlock source; |
There was a problem hiding this comment.
My thought was to pre-emptively add it for the patch on semantic checks for detach clause. Yeah I missed the sourced(), thanks for that. I am removing this though; on second thoughts, we would have the source for the task construct itself. So that should be sufficient to report any errors. If at all needed, we can bring this back later. Does that work?
flang/lib/Parser/openmp-parsers.cpp
Outdated
| @@ -215,7 +215,7 @@ TYPE_PARSER(construct<OmpIfClause>( | |||
| ":"), | |||
| scalarLogicalExpr)) | |||
|
|
|||
| // 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list) | |||
| // OpenMPv5.2 2.15.3.6 REDUCTION (reduction-identifier: variable-name-list) | |||
There was a problem hiding this comment.
Ah sorry. I accidentally modified the REDUCTION. Reverting it.
flang/lib/Parser/openmp-parsers.cpp
Outdated
| @@ -298,6 +298,9 @@ TYPE_CONTEXT_PARSER("Omp LINEAR clause"_en_US, | |||
| construct<OmpLinearClause>(construct<OmpLinearClause::WithoutModifier>( | |||
| nonemptyList(name), maybe(":" >> scalarIntConstantExpr))))) | |||
|
|
|||
| // 12.5.2 detach-clause -> DETACH (event-handle) | |||
There was a problem hiding this comment.
Thanks. Added it.
| !CHECK-UNPARSE: !$OMP TASK DETACH(event) | ||
| !CHECK-UNPARSE: !$OMP END TASK | ||
| subroutine task_detach | ||
| use omp_lib |
NimishMishra
force-pushed
the
task_detach_parse
branch
from
cea1f26 to
a01657c
Compare
NimishMishra
force-pushed
the
task_detach_parse
branch
from
46253a5 to
fb8aeae
Compare
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/140/builds/10080 Here is the relevant piece of the build log for the reference |
|
Can anyone suggest on how to fix the buildbot failure on Issue: "Cannot read module file for module 'omp_lib': Source file 'omp_lib.mod' was not found" We need the module file to access |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/29/builds/6009 Here is the relevant piece of the build log for the reference |
|
FYI there are actually 2 failures on Linaro's bots: https://lab.llvm.org/buildbot/#/builders/29/builds/6009 (looks like the same cause, the missing file) You won't be getting failure emails because your commit address is set to a GitHub noreply address. Consider changing that to a real email address for future contributions. |
|
@luporl might be able to help here. On a high level, you would find out what produces that omp_lib ( |
Can you try adding |
|
Thanks @DavidSpickett and @kiranchandramohan for the suggestions. I think this should solve the issue. I am monitoring the buildbots at the moment, will update here once they are clean. Thanks |
|
The buildbots flang-aarch64-rel-assert and openmp-offload-sles-build-only are now clean. |
PhilippRados
pushed a commit
to PhilippRados/llvm-project
that referenced
this pull request
Nov 6, 2024
Add parsing support for task detach, along with parse/unparse tests.
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.
Add parsing support for task detach, along with parse/unparse tests.