Hi!
On Mon, 7 Nov 2016 12:45:43 -0800, Cesar Philippidis <ce...@codesourcery.com>
wrote:
> It looks like gomp-4_0-branch was using the GOVD_USE_DEVPTR attribute [...]
> I've applied this patch remove GOVD_USE_DEVPTR from gomp4.
> 2016-11-07 Cesar Philippidis <ce...@codesourcery.com>
>
> gcc/fortran/
> * openmp.c (gfc_match_omp_map_clause): New common_block argument.
> [...]
That's a different patch, gomp-4_0-branch r240165. Here is the correct
one, gomp-4_0-branch r241933:
commit 5f6e13b2084c0d037504b4c6c82008246c5f6f6d
Author: cesar <cesar@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon Nov 7 20:30:34 2016 +0000
gcc/
* gimplify.c (enum gimplify_omp_var_data): Remove stale
GOVD_USE_DEVPTR.
(gimplify_scan_omp_clauses): Likewise.
(gimplify_adjust_omp_clauses_1): Likewise.
gcc/testsuite/
* c-c++-common/goacc/deviceptr-4.c: Adjust testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@241933
138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog.gomp | 7 +++++++
gcc/gimplify.c | 7 -------
gcc/testsuite/ChangeLog.gomp | 4 ++++
gcc/testsuite/c-c++-common/goacc/deviceptr-4.c | 2 +-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index ab229b6..d36b8f8 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,10 @@
+2016-11-07 Cesar Philippidis <ce...@codesourcery.com>
+
+ * gimplify.c (enum gimplify_omp_var_data): Remove stale
+ GOVD_USE_DEVPTR.
+ (gimplify_scan_omp_clauses): Likewise.
+ (gimplify_adjust_omp_clauses_1): Likewise.
+
2016-10-28 Cesar Philippidis <ce...@codesourcery.com>
* config/nvptx/nvptx.c (nvptx_single): Use a single predicate
diff --git gcc/gimplify.c gcc/gimplify.c
index 0168df5..2c25a2e 100644
--- gcc/gimplify.c
+++ gcc/gimplify.c
@@ -93,9 +93,6 @@ enum gimplify_omp_var_data
/* Flag for GOVD_MAP, if it is a forced mapping. */
GOVD_MAP_FORCE = 262144,
- /* OpenACC deviceptr clause. */
- GOVD_USE_DEVPTR = 524288,
-
GOVD_DATA_SHARE_CLASS = (GOVD_SHARED | GOVD_PRIVATE | GOVD_FIRSTPRIVATE
| GOVD_LASTPRIVATE | GOVD_REDUCTION | GOVD_LINEAR
| GOVD_LOCAL)
@@ -7307,8 +7304,6 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq
*pre_p,
if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ALWAYS_TO
|| OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_ALWAYS_TOFROM)
flags |= GOVD_MAP_ALWAYS_TO;
- else if (OMP_CLAUSE_MAP_KIND (c) == GOMP_MAP_FORCE_DEVICEPTR)
- flags |= GOVD_USE_DEVPTR;
goto do_add;
case OMP_CLAUSE_DEPEND:
@@ -8057,8 +8052,6 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void
*data)
struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp->outer_context;
splay_tree_node on
= splay_tree_lookup (ctx->variables, (splay_tree_key) decl);
- if (on && (on->value & GOVD_USE_DEVPTR))
- OMP_CLAUSE_SET_MAP_KIND (clause, GOMP_MAP_FORCE_PRESENT);
}
OMP_CLAUSE_SIZE (clause) = DECL_SIZE_UNIT (decl);
}
diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp
index 5974bca..6050abe 100644
--- gcc/testsuite/ChangeLog.gomp
+++ gcc/testsuite/ChangeLog.gomp
@@ -1,3 +1,7 @@
+2016-11-07 Cesar Philippidis <ce...@codesourcery.com>
+
+ * c-c++-common/goacc/deviceptr-4.c: Adjust testcase.
+
2016-10-05 Cesar Philippidis <ce...@codesourcery.com>
* gfortran.dg/goacc/tile-lowering.f95: Add more coverage.
diff --git gcc/testsuite/c-c++-common/goacc/deviceptr-4.c
gcc/testsuite/c-c++-common/goacc/deviceptr-4.c
index 7962843..db1b916 100644
--- gcc/testsuite/c-c++-common/goacc/deviceptr-4.c
+++ gcc/testsuite/c-c++-common/goacc/deviceptr-4.c
@@ -8,4 +8,4 @@ subr (int *a)
a[0] += 1.0;
}
-/* { dg-final { scan-tree-dump-times "#pragma omp target
oacc_parallel.*map\\(force_present:a" 1 "gimple" } } */
+/* { dg-final { scan-tree-dump-times "#pragma omp target
oacc_parallel.*map\\(tofrom:a" 1 "gimple" } } */
