[gomp4] acc dealloc map

[gomp4] acc dealloc map

[Cesar Philippidis]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

All of the various OpenACC memory maps are now fully supported in GCC.
This patch removes an obsolete sorry message complaining about
DEALLOCATE maps not being implemented.

I've committed this to gomp-4_0-branch.

Cesar

[-- Attachment #2: bugfix-maps.diff --]
[-- Type: text/x-patch, Size: 1133 bytes --]

2014-10-20  Cesar Philippidis  <cesar@codesourcery.com>

	gcc/
	* gimplify.c (gimplify_scan_omp_clauses): Remove switch stmt which
	declared OMP_CLAUSE_MAP_FORCE_DEALLOC as unimplemented.
	(gimplify_expr): Remove OACC_WAIT, since it handled directly by the
	front ends.


diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 5a8904f..448673e 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -6052,17 +6052,6 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
 	  goto do_add;
 
 	case OMP_CLAUSE_MAP:
-	  switch (OMP_CLAUSE_MAP_KIND (c))
-	    {
-	    case OMP_CLAUSE_MAP_FORCE_DEALLOC:
-	      input_location = OMP_CLAUSE_LOCATION (c);
-	      /* TODO.  */
-	      sorry ("data clause not yet implemented");
-	      remove = true;
-	      break;
-	    default:
-	      break;
-	    }
 	  decl = OMP_CLAUSE_DECL (c);
 	  if (error_operand_p (decl))
 	    {
@@ -8307,7 +8296,6 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
 	case OACC_DECLARE:
 	case OACC_ENTER_DATA:
 	case OACC_EXIT_DATA:
-	case OACC_WAIT:
 	case OACC_CACHE:
 	  sorry ("directive not yet implemented");
 	  ret = GS_ALL_DONE;

[gomp4] Remove unused OACC_WAIT (was: acc dealloc map)

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 4472 bytes --]

Hi!

On Mon, 20 Oct 2014 13:30:23 -0700, Cesar Philippidis <cesar@codesourcery.com> wrote:
> 2014-10-20  Cesar Philippidis  <cesar@codesourcery.com>
> 
> 	gcc/
> 	* gimplify.c [...]
> 	(gimplify_expr): Remove OACC_WAIT, since it handled directly by the
> 	front ends.

In r217136, I have now completely removed it:

commit 1f7efc1d102a69676af101767271664a5788664e
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Wed Nov 5 15:43:08 2014 +0000

    Remove unused OACC_WAIT.
    
    	gcc/
    	* tree.def (OACC_WAIT): Remove.  Update all users.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@217136 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog.gomp      | 2 ++
 gcc/doc/generic.texi    | 5 -----
 gcc/gimplify.c          | 2 --
 gcc/tree-pretty-print.c | 5 -----
 gcc/tree.def            | 4 ----
 gcc/tree.h              | 3 ---
 6 files changed, 2 insertions(+), 19 deletions(-)

diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index ae1afd0..5b2bade 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,5 +1,7 @@
 2014-11-05  Thomas Schwinge  <thomas@codesourcery.com>
 
+	* tree.def (OACC_WAIT): Remove.  Update all users.
+
 	* omp-builtins.def (BUILT_IN_OMP_SET_NUM_THREADS): Remove.
 
 2014-11-03  Cesar Philippidis  <cesar@codesourcery.com>
diff --git gcc/doc/generic.texi gcc/doc/generic.texi
index e756cf3..a638b87 100644
--- gcc/doc/generic.texi
+++ gcc/doc/generic.texi
@@ -2058,7 +2058,6 @@ edge.  Rethrowing the exception is represented using @code{RESX_EXPR}.
 @tindex OACC_UPDATE
 @tindex OACC_ENTER_DATA
 @tindex OACC_EXIT_DATA
-@tindex OACC_WAIT
 @tindex OACC_CACHE
 @tindex OMP_PARALLEL
 @tindex OMP_FOR
@@ -2115,10 +2114,6 @@ Represents @code{#pragma acc enter data [clause1 @dots{} clauseN]}.
 
 Represents @code{#pragma acc exit data [clause1 @dots{} clauseN]}.
 
-@item OACC_WAIT
-
-Represents @code{#pragma acc wait [(num @dots{})]}.
-
 @item OACC_CACHE
 
 Represents @code{#pragma acc cache (var @dots{})}.
diff --git gcc/gimplify.c gcc/gimplify.c
index bdf4f4a..bfd7f66 100644
--- gcc/gimplify.c
+++ gcc/gimplify.c
@@ -4425,7 +4425,6 @@ is_gimple_stmt (tree t)
     case OACC_UPDATE:
     case OACC_ENTER_DATA:
     case OACC_EXIT_DATA:
-    case OACC_WAIT:
     case OACC_CACHE:
     case OMP_PARALLEL:
     case OMP_FOR:
@@ -8755,7 +8754,6 @@ gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p,
 		  && code != OACC_UPDATE
 		  && code != OACC_ENTER_DATA
 		  && code != OACC_EXIT_DATA
-		  && code != OACC_WAIT
 		  && code != OACC_CACHE
 		  && code != OMP_CRITICAL
 		  && code != OMP_FOR
diff --git gcc/tree-pretty-print.c gcc/tree-pretty-print.c
index 6f80e80..f311ed9 100644
--- gcc/tree-pretty-print.c
+++ gcc/tree-pretty-print.c
@@ -2546,11 +2546,6 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       dump_omp_clauses (buffer, OACC_EXIT_DATA_CLAUSES (node), spc, flags);
       break;
 
-    case OACC_WAIT:
-      pp_string (buffer, "#pragma acc wait");
-      dump_omp_clauses (buffer, OACC_WAIT_CLAUSES (node), spc, flags);
-      break;
-
     case OACC_CACHE:
       pp_string (buffer, "#pragma acc cache");
       dump_omp_clauses (buffer, OACC_CACHE_CLAUSES(node), spc, flags);
diff --git gcc/tree.def gcc/tree.def
index 1af7d81..871a7fb 100644
--- gcc/tree.def
+++ gcc/tree.def
@@ -1163,10 +1163,6 @@ DEFTREECODE (OACC_ENTER_DATA, "oacc_enter_data", tcc_statement, 1)
    Operand 0: OACC_EXIT_DATA_CLAUSES: List of clauses.  */
 DEFTREECODE (OACC_EXIT_DATA, "oacc_exit_data", tcc_statement, 1)
 
-/* OpenACC - #pragma acc wait [clause1 ... clauseN]
-   Operand 0: OACC_WAIT_CLAUSES: List of clauses.  */
-DEFTREECODE (OACC_WAIT, "oacc_wait", tcc_statement, 1)
-
 /* OpenACC - #pragma acc cache [clause1 ... clauseN]
    Operand 0: OACC_CACHE_CLAUSES: List of clauses.  */
 DEFTREECODE (OACC_CACHE, "oacc_cache", tcc_statement, 1)
diff --git gcc/tree.h gcc/tree.h
index ba5fc83..c91e716 100644
--- gcc/tree.h
+++ gcc/tree.h
@@ -1199,9 +1199,6 @@ extern void protected_set_expr_location (tree, location_t);
 #define OACC_UPDATE_CLAUSES(NODE) \
   TREE_OPERAND (OACC_UPDATE_CHECK (NODE), 0)
 
-#define OACC_WAIT_CLAUSES(NODE) \
-  TREE_OPERAND (OACC_WAIT_CHECK (NODE), 0)
-
 #define OACC_CACHE_CLAUSES(NODE) \
   TREE_OPERAND (OACC_CACHE_CHECK (NODE), 0)
 


Grüße,
 Thomas

[-- Attachment #2: Type: application/pgp-signature, Size: 472 bytes --]