[flang][OpenMP] Parse GROUPPRIVATE directive by kparzysz · Pull Request #153807 · llvm/llvm-project (original) (raw)
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
[ Show hidden characters]({{ revealButtonHref }})
No semantic checks or lowering yet.
This is the common point for clang and flang implementations.
No semantic checks or lowering yet.
@llvm/pr-subscribers-flang-semantics
@llvm/pr-subscribers-flang-fir-hlfir
@llvm/pr-subscribers-flang-openmp
Author: Krzysztof Parzyszek (kparzysz)
Changes
No semantic checks or lowering yet.
Full diff: https://github.com/llvm/llvm-project/pull/153807.diff
9 Files Affected:
- (modified) flang/include/flang/Parser/dump-parse-tree.h (+1)
- (modified) flang/include/flang/Parser/parse-tree.h (+12-2)
- (modified) flang/lib/Lower/OpenMP/OpenMP.cpp (+7)
- (modified) flang/lib/Parser/openmp-parsers.cpp (+8)
- (modified) flang/lib/Parser/unparse.cpp (+7)
- (modified) flang/lib/Semantics/check-omp-structure.cpp (+13)
- (modified) flang/lib/Semantics/check-omp-structure.h (+2)
- (added) flang/test/Lower/OpenMP/Todo/groupprivate.f90 (+9)
- (added) flang/test/Parser/OpenMP/groupprivate.f90 (+30)
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h index 2c666a6d09a7b..8fbc6ccc639bf 100644 --- a/flang/include/flang/Parser/dump-parse-tree.h +++ b/flang/include/flang/Parser/dump-parse-tree.h @@ -729,6 +729,7 @@ class ParseTreeDumper { NODE(parser, OpenMPLoopConstruct) NODE(parser, OpenMPExecutableAllocate) NODE(parser, OpenMPAllocatorsConstruct)
- NODE(parser, OpenMPGroupprivate) NODE(parser, OpenMPRequiresConstruct) NODE(parser, OpenMPSimpleStandaloneConstruct) NODE(parser, OpenMPStandaloneConstruct) diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h index e72190f019dd1..ae0259fe9025e 100644 --- a/flang/include/flang/Parser/parse-tree.h +++ b/flang/include/flang/Parser/parse-tree.h @@ -4943,6 +4943,15 @@ struct OpenMPDeclareSimdConstruct { std::tuple<Verbatim, std::optional, OmpClauseList> t; };
+// ref: [6.0:301-303] +// +// groupprivate-directive -> +// GROUPPRIVATE (variable-list-item...) // since 6.0 +struct OpenMPGroupprivate {
- WRAPPER_CLASS_BOILERPLATE(OpenMPGroupprivate, OmpDirectiveSpecification);
- CharBlock source; +};
- // 2.4 requires -> REQUIRES requires-clause[ [ [,] requires-clause]...] struct OpenMPRequiresConstruct { TUPLE_CLASS_BOILERPLATE(OpenMPRequiresConstruct); @@ -4970,8 +4979,9 @@ struct OpenMPDeclarativeConstruct { std::variant<OpenMPDeclarativeAllocate, OpenMPDeclarativeAssumes, OpenMPDeclareMapperConstruct, OpenMPDeclareReductionConstruct, OpenMPDeclareSimdConstruct, OpenMPDeclareTargetConstruct,
OmpDeclareVariantDirective, OpenMPThreadprivate, OpenMPRequiresConstruct,OpenMPUtilityConstruct, OmpMetadirectiveDirective>
OmpDeclareVariantDirective, OpenMPGroupprivate, OpenMPThreadprivate,OpenMPRequiresConstruct, OpenMPUtilityConstruct,OmpMetadirectiveDirective> u;
};
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp index fef64ccc15015..ec2ec37e623f8 100644 --- a/flang/lib/Lower/OpenMP/OpenMP.cpp +++ b/flang/lib/Lower/OpenMP/OpenMP.cpp @@ -3593,6 +3593,13 @@ genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable, } }
+static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,lower::pft::Evaluation &eval,const parser::OpenMPGroupprivate &directive) {- TODO(converter.getCurrentLocation(), "GROUPPRIVATE"); +}
- static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable, semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp index 46b14861096f1..41c16212f5771 100644 --- a/flang/lib/Parser/openmp-parsers.cpp +++ b/flang/lib/Parser/openmp-parsers.cpp @@ -1773,6 +1773,12 @@ TYPE_PARSER(sourced(construct( verbatim("DECLARE SIMD"_tok) || verbatim("DECLARE_SIMD"_tok), maybe(parenthesized(name)), Parser{})))
+TYPE_PARSER(sourced( //
- construct(
predicated(OmpDirectiveNameParser{},IsDirective(llvm::omp::Directive::OMPD_groupprivate)) >=Parser<OmpDirectiveSpecification>{})))- // 2.4 Requires construct TYPE_PARSER(sourced(construct( verbatim("REQUIRES"_tok), Parser{})))
@@ -1808,6 +1814,8 @@ TYPE_PARSER( Parser{}) || construct( Parser{}) ||
construct<OpenMPDeclarativeConstruct>(Parser<OpenMPGroupprivate>{}) || construct<OpenMPDeclarativeConstruct>( Parser<OpenMPRequiresConstruct>{}) || construct<OpenMPDeclarativeConstruct>(
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp index 4f8d498972807..4294a6d491648 100644 --- a/flang/lib/Parser/unparse.cpp +++ b/flang/lib/Parser/unparse.cpp @@ -2716,6 +2716,13 @@ class UnparseVisitor { void Unparse(const OpenMPDispatchConstruct &x) { // Unparse(static_cast<const OmpBlockConstruct &>(x)); }
- void Unparse(const OpenMPGroupprivate &x) {
- BeginOpenMP();
- Word("!$OMP ");
- Walk(x.v);
- Put("\n");
- EndOpenMP();
- } void Unparse(const OpenMPRequiresConstruct &y) { BeginOpenMP(); Word("!$OMP REQUIRES "); diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp index bf126bbb0d8c1..ea8c391999331 100644 --- a/flang/lib/Semantics/check-omp-structure.cpp +++ b/flang/lib/Semantics/check-omp-structure.cpp @@ -571,6 +571,10 @@ template struct DirectiveSpellingVisitor { Directive::OMPD_declare_variant); return false; }
- bool Pre(const parser::OpenMPGroupprivate &x) {
- checker_(x.v.DirName().source, Directive::OMPD_groupprivate);
- return false;
- } bool Pre(const parser::OpenMPThreadprivate &x) { checker_( std::getparser::Verbatim(x.t).source, Directive::OMPD_threadprivate);
@@ -1189,6 +1193,15 @@ void OmpStructureChecker::CheckThreadprivateOrDeclareTargetVar( } }
+void OmpStructureChecker::Enter(const parser::OpenMPGroupprivate &x) {
- PushContextAndClauseSets(
x.v.DirName().source, llvm::omp::Directive::OMPD_groupprivate);
+} + +void OmpStructureChecker::Leave(const parser::OpenMPGroupprivate &x) {
- dirContext_.pop_back(); +}
- void OmpStructureChecker::Enter(const parser::OpenMPThreadprivate &c) { const auto &dir{std::getparser::Verbatim(c.t)}; PushContextAndClauseSets( diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h index a973aee28d0e2..9bc8ae79f3765 100644 --- a/flang/lib/Semantics/check-omp-structure.h +++ b/flang/lib/Semantics/check-omp-structure.h @@ -126,6 +126,8 @@ class OmpStructureChecker void Leave(const parser::OpenMPAllocatorsConstruct &); void Enter(const parser::OpenMPRequiresConstruct &); void Leave(const parser::OpenMPRequiresConstruct &);
- void Enter(const parser::OpenMPGroupprivate &);
- void Leave(const parser::OpenMPGroupprivate &); void Enter(const parser::OpenMPThreadprivate &); void Leave(const parser::OpenMPThreadprivate &);
diff --git a/flang/test/Lower/OpenMP/Todo/groupprivate.f90 b/flang/test/Lower/OpenMP/Todo/groupprivate.f90 new file mode 100644 index 0000000000000..9ad9b9382760c --- /dev/null +++ b/flang/test/Lower/OpenMP/Todo/groupprivate.f90 @@ -0,0 +1,9 @@ +!RUN: %not_todo_cmd %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=60 -o - %s 2>&1 | FileCheck %s + +!CHECK: not yet implemented: GROUPPRIVATE + +module m +implicit none +integer :: x +!$omp groupprivate(x) +end module diff --git a/flang/test/Parser/OpenMP/groupprivate.f90 b/flang/test/Parser/OpenMP/groupprivate.f90 new file mode 100644 index 0000000000000..8bd840147a2dd --- /dev/null +++ b/flang/test/Parser/OpenMP/groupprivate.f90 @@ -0,0 +1,30 @@ +!RUN: %flang_fc1 -fdebug-unparse -fopenmp -fopenmp-version=60 %s | FileCheck --ignore-case --check-prefix="UNPARSE" %s +!RUN: %flang_fc1 -fdebug-dump-parse-tree -fopenmp -fopenmp-version=60 %s | FileCheck --check-prefix="PARSE-TREE" %s + +module m +implicit none + +integer :: x, y(10), z +!$omp groupprivate(x, y) device_type(nohost) +!$omp groupprivate(z) + +end module + +!UNPARSE: MODULE m +!UNPARSE: IMPLICIT NONE +!UNPARSE: INTEGER x, y(10_4), z +!UNPARSE: !$OMP GROUPPRIVATE(x, y) DEVICE_TYPE(NOHOST) +!UNPARSE: !$OMP GROUPPRIVATE(z) +!UNPARSE: END MODULE + +!PARSE-TREE: DeclarationConstruct -> SpecificationConstruct -> OpenMPDeclarativeConstruct -> OpenMPGroupprivate -> OmpDirectiveSpecification +!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = groupprivate +!PARSE-TREE: | OmpArgumentList -> OmpArgument -> OmpLocator -> OmpObject -> Designator -> DataRef -> Name = 'x' +!PARSE-TREE: | OmpArgument -> OmpLocator -> OmpObject -> Designator -> DataRef -> Name = 'y' +!PARSE-TREE: | OmpClauseList -> OmpClause -> DeviceType -> OmpDeviceTypeClause -> DeviceTypeDescription = Nohost +!PARSE-TREE: | Flags = None +!PARSE-TREE: DeclarationConstruct -> SpecificationConstruct -> OpenMPDeclarativeConstruct -> OpenMPGroupprivate -> OmpDirectiveSpecification +!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = groupprivate +!PARSE-TREE: | OmpArgumentList -> OmpArgument -> OmpLocator -> OmpObject -> Designator -> DataRef -> Name = 'z' +!PARSE-TREE: | OmpClauseList -> +!PARSE-TREE: | Flags = None
@llvm/pr-subscribers-flang-parser
Author: Krzysztof Parzyszek (kparzysz)
Changes
No semantic checks or lowering yet.
Full diff: https://github.com/llvm/llvm-project/pull/153807.diff
9 Files Affected:
- (modified) flang/include/flang/Parser/dump-parse-tree.h (+1)
- (modified) flang/include/flang/Parser/parse-tree.h (+12-2)
- (modified) flang/lib/Lower/OpenMP/OpenMP.cpp (+7)
- (modified) flang/lib/Parser/openmp-parsers.cpp (+8)
- (modified) flang/lib/Parser/unparse.cpp (+7)
- (modified) flang/lib/Semantics/check-omp-structure.cpp (+13)
- (modified) flang/lib/Semantics/check-omp-structure.h (+2)
- (added) flang/test/Lower/OpenMP/Todo/groupprivate.f90 (+9)
- (added) flang/test/Parser/OpenMP/groupprivate.f90 (+30)
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h index 2c666a6d09a7b..8fbc6ccc639bf 100644 --- a/flang/include/flang/Parser/dump-parse-tree.h +++ b/flang/include/flang/Parser/dump-parse-tree.h @@ -729,6 +729,7 @@ class ParseTreeDumper { NODE(parser, OpenMPLoopConstruct) NODE(parser, OpenMPExecutableAllocate) NODE(parser, OpenMPAllocatorsConstruct)
- NODE(parser, OpenMPGroupprivate) NODE(parser, OpenMPRequiresConstruct) NODE(parser, OpenMPSimpleStandaloneConstruct) NODE(parser, OpenMPStandaloneConstruct) diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h index e72190f019dd1..ae0259fe9025e 100644 --- a/flang/include/flang/Parser/parse-tree.h +++ b/flang/include/flang/Parser/parse-tree.h @@ -4943,6 +4943,15 @@ struct OpenMPDeclareSimdConstruct { std::tuple<Verbatim, std::optional, OmpClauseList> t; };
+// ref: [6.0:301-303] +// +// groupprivate-directive -> +// GROUPPRIVATE (variable-list-item...) // since 6.0 +struct OpenMPGroupprivate {
- WRAPPER_CLASS_BOILERPLATE(OpenMPGroupprivate, OmpDirectiveSpecification);
- CharBlock source; +};
- // 2.4 requires -> REQUIRES requires-clause[ [ [,] requires-clause]...] struct OpenMPRequiresConstruct { TUPLE_CLASS_BOILERPLATE(OpenMPRequiresConstruct); @@ -4970,8 +4979,9 @@ struct OpenMPDeclarativeConstruct { std::variant<OpenMPDeclarativeAllocate, OpenMPDeclarativeAssumes, OpenMPDeclareMapperConstruct, OpenMPDeclareReductionConstruct, OpenMPDeclareSimdConstruct, OpenMPDeclareTargetConstruct,
OmpDeclareVariantDirective, OpenMPThreadprivate, OpenMPRequiresConstruct,OpenMPUtilityConstruct, OmpMetadirectiveDirective>
OmpDeclareVariantDirective, OpenMPGroupprivate, OpenMPThreadprivate,OpenMPRequiresConstruct, OpenMPUtilityConstruct,OmpMetadirectiveDirective> u;
};
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp index fef64ccc15015..ec2ec37e623f8 100644 --- a/flang/lib/Lower/OpenMP/OpenMP.cpp +++ b/flang/lib/Lower/OpenMP/OpenMP.cpp @@ -3593,6 +3593,13 @@ genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable, } }
+static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,lower::pft::Evaluation &eval,const parser::OpenMPGroupprivate &directive) {- TODO(converter.getCurrentLocation(), "GROUPPRIVATE"); +}
- static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable, semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp index 46b14861096f1..41c16212f5771 100644 --- a/flang/lib/Parser/openmp-parsers.cpp +++ b/flang/lib/Parser/openmp-parsers.cpp @@ -1773,6 +1773,12 @@ TYPE_PARSER(sourced(construct( verbatim("DECLARE SIMD"_tok) || verbatim("DECLARE_SIMD"_tok), maybe(parenthesized(name)), Parser{})))
+TYPE_PARSER(sourced( //
- construct(
predicated(OmpDirectiveNameParser{},IsDirective(llvm::omp::Directive::OMPD_groupprivate)) >=Parser<OmpDirectiveSpecification>{})))- // 2.4 Requires construct TYPE_PARSER(sourced(construct( verbatim("REQUIRES"_tok), Parser{})))
@@ -1808,6 +1814,8 @@ TYPE_PARSER( Parser{}) || construct( Parser{}) ||
construct<OpenMPDeclarativeConstruct>(Parser<OpenMPGroupprivate>{}) || construct<OpenMPDeclarativeConstruct>( Parser<OpenMPRequiresConstruct>{}) || construct<OpenMPDeclarativeConstruct>(
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp index 4f8d498972807..4294a6d491648 100644 --- a/flang/lib/Parser/unparse.cpp +++ b/flang/lib/Parser/unparse.cpp @@ -2716,6 +2716,13 @@ class UnparseVisitor { void Unparse(const OpenMPDispatchConstruct &x) { // Unparse(static_cast<const OmpBlockConstruct &>(x)); }
- void Unparse(const OpenMPGroupprivate &x) {
- BeginOpenMP();
- Word("!$OMP ");
- Walk(x.v);
- Put("\n");
- EndOpenMP();
- } void Unparse(const OpenMPRequiresConstruct &y) { BeginOpenMP(); Word("!$OMP REQUIRES "); diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp index bf126bbb0d8c1..ea8c391999331 100644 --- a/flang/lib/Semantics/check-omp-structure.cpp +++ b/flang/lib/Semantics/check-omp-structure.cpp @@ -571,6 +571,10 @@ template struct DirectiveSpellingVisitor { Directive::OMPD_declare_variant); return false; }
- bool Pre(const parser::OpenMPGroupprivate &x) {
- checker_(x.v.DirName().source, Directive::OMPD_groupprivate);
- return false;
- } bool Pre(const parser::OpenMPThreadprivate &x) { checker_( std::getparser::Verbatim(x.t).source, Directive::OMPD_threadprivate);
@@ -1189,6 +1193,15 @@ void OmpStructureChecker::CheckThreadprivateOrDeclareTargetVar( } }
+void OmpStructureChecker::Enter(const parser::OpenMPGroupprivate &x) {
- PushContextAndClauseSets(
x.v.DirName().source, llvm::omp::Directive::OMPD_groupprivate);
+} + +void OmpStructureChecker::Leave(const parser::OpenMPGroupprivate &x) {
- dirContext_.pop_back(); +}
- void OmpStructureChecker::Enter(const parser::OpenMPThreadprivate &c) { const auto &dir{std::getparser::Verbatim(c.t)}; PushContextAndClauseSets( diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h index a973aee28d0e2..9bc8ae79f3765 100644 --- a/flang/lib/Semantics/check-omp-structure.h +++ b/flang/lib/Semantics/check-omp-structure.h @@ -126,6 +126,8 @@ class OmpStructureChecker void Leave(const parser::OpenMPAllocatorsConstruct &); void Enter(const parser::OpenMPRequiresConstruct &); void Leave(const parser::OpenMPRequiresConstruct &);
- void Enter(const parser::OpenMPGroupprivate &);
- void Leave(const parser::OpenMPGroupprivate &); void Enter(const parser::OpenMPThreadprivate &); void Leave(const parser::OpenMPThreadprivate &);
diff --git a/flang/test/Lower/OpenMP/Todo/groupprivate.f90 b/flang/test/Lower/OpenMP/Todo/groupprivate.f90 new file mode 100644 index 0000000000000..9ad9b9382760c --- /dev/null +++ b/flang/test/Lower/OpenMP/Todo/groupprivate.f90 @@ -0,0 +1,9 @@ +!RUN: %not_todo_cmd %flang_fc1 -emit-hlfir -fopenmp -fopenmp-version=60 -o - %s 2>&1 | FileCheck %s + +!CHECK: not yet implemented: GROUPPRIVATE + +module m +implicit none +integer :: x +!$omp groupprivate(x) +end module diff --git a/flang/test/Parser/OpenMP/groupprivate.f90 b/flang/test/Parser/OpenMP/groupprivate.f90 new file mode 100644 index 0000000000000..8bd840147a2dd --- /dev/null +++ b/flang/test/Parser/OpenMP/groupprivate.f90 @@ -0,0 +1,30 @@ +!RUN: %flang_fc1 -fdebug-unparse -fopenmp -fopenmp-version=60 %s | FileCheck --ignore-case --check-prefix="UNPARSE" %s +!RUN: %flang_fc1 -fdebug-dump-parse-tree -fopenmp -fopenmp-version=60 %s | FileCheck --check-prefix="PARSE-TREE" %s + +module m +implicit none + +integer :: x, y(10), z +!$omp groupprivate(x, y) device_type(nohost) +!$omp groupprivate(z) + +end module + +!UNPARSE: MODULE m +!UNPARSE: IMPLICIT NONE +!UNPARSE: INTEGER x, y(10_4), z +!UNPARSE: !$OMP GROUPPRIVATE(x, y) DEVICE_TYPE(NOHOST) +!UNPARSE: !$OMP GROUPPRIVATE(z) +!UNPARSE: END MODULE + +!PARSE-TREE: DeclarationConstruct -> SpecificationConstruct -> OpenMPDeclarativeConstruct -> OpenMPGroupprivate -> OmpDirectiveSpecification +!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = groupprivate +!PARSE-TREE: | OmpArgumentList -> OmpArgument -> OmpLocator -> OmpObject -> Designator -> DataRef -> Name = 'x' +!PARSE-TREE: | OmpArgument -> OmpLocator -> OmpObject -> Designator -> DataRef -> Name = 'y' +!PARSE-TREE: | OmpClauseList -> OmpClause -> DeviceType -> OmpDeviceTypeClause -> DeviceTypeDescription = Nohost +!PARSE-TREE: | Flags = None +!PARSE-TREE: DeclarationConstruct -> SpecificationConstruct -> OpenMPDeclarativeConstruct -> OpenMPGroupprivate -> OmpDirectiveSpecification +!PARSE-TREE: | OmpDirectiveName -> llvm::omp::Directive = groupprivate +!PARSE-TREE: | OmpArgumentList -> OmpArgument -> OmpLocator -> OmpObject -> Designator -> DataRef -> Name = 'z' +!PARSE-TREE: | OmpClauseList -> +!PARSE-TREE: | Flags = None
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks
Base automatically changed from users/kparzysz/g01-groupprivate-def to main
