[flang-commits] [flang] e72f573 - [flang][OpenMP] Added parser support for defaultmap (OpenMP 5.0)
Shraiysh Vaishay via flang-commits
flang-commits at lists.llvm.org
Wed Jun 1 00:23:11 PDT 2022
Author: Dossay Oryspayev
Date: 2022-06-01T12:52:20+05:30
New Revision: e72f5738488766e61dec55d4bd93bb542825eca5
URL: https://github.com/llvm/llvm-project/commit/e72f5738488766e61dec55d4bd93bb542825eca5
DIFF: https://github.com/llvm/llvm-project/commit/e72f5738488766e61dec55d4bd93bb542825eca5.diff
LOG: [flang][OpenMP] Added parser support for defaultmap (OpenMP 5.0)
This patch adds parser support for defaultmap clause [OpenMP 5.0].
Reviewed By: kiranchandramohan, peixin, shraiysh
Differential Revision: https://reviews.llvm.org/D124190
Added:
flang/test/Parser/omp-defaultmap-unparse.f90
Modified:
flang/include/flang/Parser/parse-tree.h
flang/lib/Parser/openmp-parsers.cpp
Removed:
################################################################################
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 23c572c2a6b73..4824e4a51a9be 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -3346,8 +3346,9 @@ struct OmpMapClause {
// 2.15.5.2 defaultmap -> DEFAULTMAP (implicit-behavior[:variable-category])
struct OmpDefaultmapClause {
TUPLE_CLASS_BOILERPLATE(OmpDefaultmapClause);
- ENUM_CLASS(ImplicitBehavior, Tofrom)
- ENUM_CLASS(VariableCategory, Scalar)
+ ENUM_CLASS(
+ ImplicitBehavior, Alloc, To, From, Tofrom, Firstprivate, None, Default)
+ ENUM_CLASS(VariableCategory, Scalar, Aggregate, Allocatable, Pointer)
std::tuple<ImplicitBehavior, std::optional<VariableCategory>> t;
};
@@ -3754,7 +3755,6 @@ struct OpenMPCancelConstruct {
std::tuple<Verbatim, OmpCancelType, std::optional<If>> t;
};
-
// 2.17.8 flush -> FLUSH [memory-order-clause] [(variable-name-list)]
struct OpenMPFlushConstruct {
TUPLE_CLASS_BOILERPLATE(OpenMPFlushConstruct);
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 9a4f4bbcc7abd..8d298f0304f51 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -52,12 +52,30 @@ TYPE_PARSER(construct<OmpMapType>(
TYPE_PARSER(construct<OmpMapClause>(
maybe(Parser<OmpMapType>{}), Parser<OmpObjectList>{}))
-// 2.15.5.2 defaultmap -> DEFAULTMAP (TOFROM:SCALAR)
+// [OpenMP 5.0]
+// 2.19.7.2 defaultmap(implicit-behavior[:variable-category])
+// implicit-behavior -> ALLOC | TO | FROM | TOFROM | FIRSRTPRIVATE | NONE |
+// DEFAULT
+// variable-category -> SCALAR | AGGREGATE | ALLOCATABLE | POINTER
TYPE_PARSER(construct<OmpDefaultmapClause>(
construct<OmpDefaultmapClause::ImplicitBehavior>(
- "TOFROM" >> pure(OmpDefaultmapClause::ImplicitBehavior::Tofrom)),
- maybe(":" >> construct<OmpDefaultmapClause::VariableCategory>("SCALAR" >>
- pure(OmpDefaultmapClause::VariableCategory::Scalar)))))
+ "ALLOC" >> pure(OmpDefaultmapClause::ImplicitBehavior::Alloc) ||
+ "TO"_id >> pure(OmpDefaultmapClause::ImplicitBehavior::To) ||
+ "FROM" >> pure(OmpDefaultmapClause::ImplicitBehavior::From) ||
+ "TOFROM" >> pure(OmpDefaultmapClause::ImplicitBehavior::Tofrom) ||
+ "FIRSTPRIVATE" >>
+ pure(OmpDefaultmapClause::ImplicitBehavior::Firstprivate) ||
+ "NONE" >> pure(OmpDefaultmapClause::ImplicitBehavior::None) ||
+ "DEFAULT" >> pure(OmpDefaultmapClause::ImplicitBehavior::Default)),
+ maybe(":" >>
+ construct<OmpDefaultmapClause::VariableCategory>(
+ "SCALAR" >> pure(OmpDefaultmapClause::VariableCategory::Scalar) ||
+ "AGGREGATE" >>
+ pure(OmpDefaultmapClause::VariableCategory::Aggregate) ||
+ "ALLOCATABLE" >>
+ pure(OmpDefaultmapClause::VariableCategory::Allocatable) ||
+ "POINTER" >>
+ pure(OmpDefaultmapClause::VariableCategory::Pointer)))))
// 2.7.1 SCHEDULE ([modifier1 [, modifier2]:]kind[, chunk_size])
// Modifier -> MONITONIC | NONMONOTONIC | SIMD
diff --git a/flang/test/Parser/omp-defaultmap-unparse.f90 b/flang/test/Parser/omp-defaultmap-unparse.f90
new file mode 100644
index 0000000000000..e7333b02bc8f6
--- /dev/null
+++ b/flang/test/Parser/omp-defaultmap-unparse.f90
@@ -0,0 +1,144 @@
+! RUN: %flang_fc1 -fdebug-unparse-no-sema -fopenmp %s | FileCheck --ignore-case %s
+! RUN: %flang_fc1 -fdebug-dump-parse-tree-no-sema -fopenmp %s | FileCheck --check-prefix="PARSE-TREE" %s
+program main
+!CHECK-LABEL: program main
+ implicit none
+
+ integer, parameter :: N = 256
+
+ type data01
+ integer :: a
+ integer :: arr(N)
+ end type
+
+ real :: arrA(N), arrB(N)
+ integer, target :: arrC(N)
+ type(data01) :: data01_a
+ integer, allocatable :: alloc_arr(:)
+ integer, pointer :: ptrArr(:)
+
+ arrA = 1.414
+ arrB = 3.14
+ arrC = -1
+ data01_a%a = -1
+ data01_arr = -1
+ allocate(alloc_arr(N))
+ alloc_arr = -1
+
+
+!CHECK: !$omp target defaultmap(tofrom:scalar)
+ !$omp target defaultmap(tofrom:scalar)
+ do i = 1, N
+ a = 3.14
+ enddo
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = Tofrom
+!PARSE-TREE: VariableCategory = Scalar
+
+!CHECK: !$omp target defaultmap(alloc:scalar)
+ !$omp target defaultmap(alloc:scalar)
+ a = 4.56
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = Alloc
+!PARSE-TREE: VariableCategory = Scalar
+
+!CHECK: !$omp target defaultmap(none)
+ !$omp target defaultmap(none)
+ a = 6.78
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = None
+
+!CHECK: !$omp target defaultmap(none:scalar)
+ !$omp target defaultmap(none:scalar)
+ a = 4.78
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = None
+!PARSE-TREE: VariableCategory = Scalar
+
+!CHECK: !$omp target defaultmap(to:scalar)
+ !$omp target defaultmap(to:scalar)
+ a = 2.39
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = To
+!PARSE-TREE: VariableCategory = Scalar
+
+!CHECK: !$omp target defaultmap(firstprivate:scalar)
+ !$omp target defaultmap(firstprivate:scalar)
+ a = 9.45
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = Firstprivate
+!PARSE-TREE: VariableCategory = Scalar
+
+!CHECK: !$omp target defaultmap(tofrom:aggregate)
+ !$omp target defaultmap(tofrom:aggregate)
+ arrC(1) = 10
+ data01_a%a = 11
+ data01_a%arr(1) = 100
+ data01_a%arr(2) = 245
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = Tofrom
+!PARSE-TREE: VariableCategory = Aggregate
+
+!CHECK: !$omp target defaultmap(tofrom:allocatable)
+ !$omp target defaultmap(tofrom:allocatable)
+ alloc_arr(23) = 234
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = Tofrom
+!PARSE-TREE: VariableCategory = Allocatable
+
+!CHECK: !$omp target defaultmap(default:pointer)
+ !$omp target defaultmap(default:pointer)
+ ptrArr=>arrC
+ ptrArr(2) = 5
+ prtArr(200) = 34
+!CHECK: !$omp end target
+ !$omp end target
+
+!PARSE-TREE: OmpBeginBlockDirective
+!PARSE-TREE: OmpBlockDirective -> llvm::omp::Directive = target
+!PARSE-TREE: OmpClauseList -> OmpClause -> Defaultmap -> OmpDefaultmapClause
+!PARSE-TREE: ImplicitBehavior = Default
+!PARSE-TREE: VariableCategory = Pointer
+
+end program main
+!CHECK-LABEL: end program main
More information about the flang-commits
mailing list