openmp: Support in_reduction for Fortran

This patch is a merge of:
https://gcc.gnu.org/pipermail/gcc-patches/2021-September/579673.html

with some of the adjustments suggested by Jakub:
https://gcc.gnu.org/pipermail/gcc-patches/2021-September/579694.html

This patch does the required adjustments to let 'in_reduction' work for Fortran.
Task directive in_reduction now also works for Fortran after this patch.

gcc/fortran/ChangeLog:

	* openmp.c (gfc_match_omp_clause_reduction): Add 'openmp_target' default
	false parameter. Add 'always,tofrom' map for OMP_LIST_IN_REDUCTION case.
	(gfc_match_omp_clauses): Add 'openmp_target' default false parameter,
	adjust call to gfc_match_omp_clause_reduction.
	(match_omp): Adjust call to gfc_match_omp_clauses
	* trans-openmp.c (gfc_trans_omp_taskgroup): Add call to
	gfc_match_omp_clause, create and return block.

gcc/ChangeLog:

	* omp-low.c (scan_sharing_clauses): Place in_reduction copy of variable
	in outer ctx if if exists. Check if non-existent in field_map before
	installing OMP_CLAUSE_IN_REDUCTION decl.

gcc/testsuite/ChangeLog:

	* gfortran.dg/gomp/reduction4.f90: Adjust omp target in_reduction' scan
	pattern.

libgomp/ChangeLog:

	* testsuite/libgomp.fortran/target-in-reduction-1.f90: New test.

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 52200a1df51a147f072ccc4c29b48e670898b321..1dd97271fd250b9b15b05b0362a74f1c2357a0ef 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -1139,7 +1139,7 @@ failed:
 
 static match
 gfc_match_omp_clause_reduction (char pc, gfc_omp_clauses *c, bool openacc,
-                               bool allow_derived)
+                               bool allow_derived, bool openmp_target = false)
 {
   if (pc == 'r' && gfc_match ("reduction ( ") != MATCH_YES)
     return MATCH_NO;
@@ -1286,6 +1286,19 @@ gfc_match_omp_clause_reduction (char pc, gfc_omp_clauses *c, bool openacc,
            n->u2.udr = gfc_get_omp_namelist_udr ();
            n->u2.udr->udr = udr;
          }
+       if (openmp_target && list_idx == OMP_LIST_IN_REDUCTION)
+         {
+           gfc_omp_namelist *p = gfc_get_omp_namelist (), **tl;
+           p->sym = n->sym;
+           p->where = p->where;
+           p->u.map_op = OMP_MAP_ALWAYS_TOFROM;
+
+           tl = &c->lists[OMP_LIST_MAP];
+           while (*tl)
+             tl = &((*tl)->next);
+           *tl = p;
+           p->next = NULL;
+         }
      }
   return MATCH_YES;
 }
@@ -1354,7 +1367,7 @@ gfc_match_dupl_atomic (bool not_dupl, const char *name)
 static match
 gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
                       bool first = true, bool needs_space = true,
-                      bool openacc = false)
+                      bool openacc = false, bool openmp_target = false)
 {
   bool error = false;
   gfc_omp_clauses *c = gfc_get_omp_clauses ();
@@ -2058,8 +2071,8 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
              goto error;
            }
          if ((mask & OMP_CLAUSE_IN_REDUCTION)
-             && gfc_match_omp_clause_reduction (pc, c, openacc,
-                                                allow_derived) == MATCH_YES)
+             && gfc_match_omp_clause_reduction (pc, c, openacc, allow_derived,
+                                                openmp_target) == MATCH_YES)
            continue;
          if ((mask & OMP_CLAUSE_INBRANCH)
              && (m = gfc_match_dupl_check (!c->inbranch && !c->notinbranch,
@@ -3484,7 +3497,8 @@ static match
 match_omp (gfc_exec_op op, const omp_mask mask)
 {
   gfc_omp_clauses *c;
-  if (gfc_match_omp_clauses (&c, mask) != MATCH_YES)
+  if (gfc_match_omp_clauses (&c, mask, true, true, false,
+                            (op == EXEC_OMP_TARGET)) != MATCH_YES)
     return MATCH_ERROR;
   new_st.op = op;
   new_st.ext.omp_clauses = c;

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index f7f3043ac9d96f3a43c85f1bbd9fa437103ec59f..9d455efee42e531bba895b5b03fc4cb1bc13039b 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -6428,12 +6428,17 @@ gfc_trans_omp_task (gfc_code *code)
 static tree
 gfc_trans_omp_taskgroup (gfc_code *code)
 {
+  stmtblock_t block;
+  gfc_start_block (&block);
   tree body = gfc_trans_code (code->block->next);
   tree stmt = make_node (OMP_TASKGROUP);
   TREE_TYPE (stmt) = void_type_node;
   OMP_TASKGROUP_BODY (stmt) = body;
-  OMP_TASKGROUP_CLAUSES (stmt) = NULL_TREE;
-  return stmt;
+  OMP_TASKGROUP_CLAUSES (stmt) = gfc_trans_omp_clauses (&block,
+                                                       code->ext.omp_clauses,
+                                                       code->loc);
+  gfc_add_expr_to_block (&block, stmt);
+  return gfc_finish_block (&block);
 }
 
 static tree

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index ceb8dbfc4ff49fa26201111c380ba9ca5104e93b..d4e263c33ac325b3980bbcb04b1af1745db8c716 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -1409,9 +1409,13 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
                      gcc_assert (DECL_P (t));
                    }
                  tree at = t;
+                 omp_context *scan_ctx = ctx;
                  if (ctx->outer)
-                   scan_omp_op (&at, ctx->outer);
-                 tree nt = omp_copy_decl_1 (at, ctx);
+                   {
+                     scan_omp_op (&at, ctx->outer);
+                     scan_ctx = ctx->outer;
+                   }
+                 tree nt = omp_copy_decl_1 (at, scan_ctx);
                  splay_tree_insert (ctx->field_map,
                                     (splay_tree_key) &DECL_CONTEXT (t),
                                     (splay_tree_value) nt);
@@ -1450,9 +1454,13 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
          if (is_omp_target (ctx->stmt))
            {
              tree at = decl;
+             omp_context *scan_ctx = ctx;
              if (ctx->outer)
-               scan_omp_op (&at, ctx->outer);
-             tree nt = omp_copy_decl_1 (at, ctx);
+               {
+                 scan_omp_op (&at, ctx->outer);
+                 scan_ctx = ctx->outer;
+               }
+             tree nt = omp_copy_decl_1 (at, scan_ctx);
              splay_tree_insert (ctx->field_map,
                                 (splay_tree_key) &DECL_CONTEXT (decl),
                                 (splay_tree_value) nt);
@@ -1472,7 +1480,9 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
              if (!is_global_var (maybe_lookup_decl_in_outer_ctx (decl, ctx)))
                {
                  by_ref = use_pointer_for_field (decl, ctx);
-                 if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_IN_REDUCTION)
+                 if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_IN_REDUCTION
+                     && !splay_tree_lookup (ctx->field_map,
+                                            (splay_tree_key) decl))
                    install_var_field (decl, by_ref, 3, ctx);
                }
              install_var_local (decl, ctx);

diff --git a/gcc/testsuite/gfortran.dg/gomp/reduction4.f90 b/gcc/testsuite/gfortran.dg/gomp/reduction4.f90
index 52d504bac716cd24ea6f23efa7dd639f12ab5d53..71b4231f315176f017f52f20b34f40dfc882aae9 100644 (file)
--- a/gcc/testsuite/gfortran.dg/gomp/reduction4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/reduction4.f90
@@ -137,7 +137,7 @@ end
 ! { dg-final { scan-tree-dump-times "#pragma omp sections reduction\\(task,\\\+:a\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "#pragma omp simd linear\\(i:1\\) reduction\\(\\\+:a\\)" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "#pragma omp simd linear\\(i:1\\) reduction\\(task,\\\+:a\\)" 1 "original" } }
-! { dg-final { scan-tree-dump-times "#pragma omp target in_reduction\\(\\\+:b\\)" 1 "original" } }
+! { dg-final { scan-tree-dump-times "#pragma omp target map\\(always,tofrom:b\\) in_reduction\\(\\\+:b\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "#pragma omp task in_reduction\\(\\\+:a\\)" 1 "original" } }
 ! { dg-final { scan-tree-dump-times "#pragma omp teams reduction\\(\\\+:b\\)" 2 "original" } }
 ! { dg-final { scan-tree-dump-times "#pragma omp taskloop reduction\\(\\\+:a\\) in_reduction\\(\\\+:b\\)" 2 "original" } }

diff --git a/libgomp/testsuite/libgomp.fortran/target-in-reduction-1.f90 b/libgomp/testsuite/libgomp.fortran/target-in-reduction-1.f90
new file mode 100644 (file)
index 0000000..68512e2
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/target-in-reduction-1.f90
@@ -0,0 +1,33 @@
+! { dg-do run }
+
+subroutine foo (x, y)
+  integer :: x, y
+
+  !$omp taskgroup task_reduction (+: x, y)
+
+  !$omp target in_reduction (+: x, y)
+  x = x + 8
+  y = y + 16
+  !$omp end target
+
+  !$omp task in_reduction (+: x, y)
+  x = x + 2
+  y = y + 4
+  !$omp end task
+
+  !$omp end taskgroup
+
+end subroutine foo
+
+program main
+  integer :: x, y
+
+  x = 1
+  y = 1
+
+  call foo (x, y)
+
+  if (x .ne. 11) stop 1
+  if (y .ne. 21) stop 2
+
+end program main