Rename GOMP_MAP_FORCE_DEALLOC to GOMP_MAP_DELETE

Also rename the Fortran OMP_MAP_FORCE_DEALLOC to OMP_MAP_DELETE.

	include/
	* gomp-constants.h (enum gomp_map_kind): Rename
	GOMP_MAP_FORCE_DEALLOC to GOMP_MAP_DELETE.  Adjust all users.

	gcc/fortran/
	* gfortran.h (enum gfc_omp_map_op): Rename OMP_MAP_FORCE_DEALLOC
	to OMP_MAP_DELETE.  Adjust all users.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234294 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 60ec996..82d6eca 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -10715,7 +10715,7 @@ c_parser_oacc_data_clause (c_parser *parser, pragma_omp_clause c_kind,
       kind = GOMP_MAP_FORCE_ALLOC;
       break;
     case PRAGMA_OACC_CLAUSE_DELETE:
-      kind = GOMP_MAP_FORCE_DEALLOC;
+      kind = GOMP_MAP_DELETE;
       break;
     case PRAGMA_OACC_CLAUSE_DEVICE:
       kind = GOMP_MAP_FORCE_TO;

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 62570d4..8ba4ffe 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -30086,7 +30086,7 @@ cp_parser_oacc_data_clause (cp_parser *parser, pragma_omp_clause c_kind,
       kind = GOMP_MAP_FORCE_ALLOC;
       break;
     case PRAGMA_OACC_CLAUSE_DELETE:
-      kind = GOMP_MAP_FORCE_DEALLOC;
+      kind = GOMP_MAP_DELETE;
       break;
     case PRAGMA_OACC_CLAUSE_DEVICE:
       kind = GOMP_MAP_FORCE_TO;

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 9ed112e..105e7b4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-17  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * gfortran.h (enum gfc_omp_map_op): Rename OMP_MAP_FORCE_DEALLOC
+       to OMP_MAP_DELETE.  Adjust all users.
+
 2016-03-13  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
            Jim MacArthur  <jim.macarthur@codethink.co.uk>
 

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 33fffd8..a0fb5fd 100644 (file)
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -1112,8 +1112,8 @@ enum gfc_omp_map_op
   OMP_MAP_TO,
   OMP_MAP_FROM,
   OMP_MAP_TOFROM,
+  OMP_MAP_DELETE,
   OMP_MAP_FORCE_ALLOC,
-  OMP_MAP_FORCE_DEALLOC,
   OMP_MAP_FORCE_TO,
   OMP_MAP_FORCE_FROM,
   OMP_MAP_FORCE_TOFROM,

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 51ab96e..a6c39cd 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -764,7 +764,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, uint64_t mask,
       if ((mask & OMP_CLAUSE_DELETE)
          && gfc_match ("delete ( ") == MATCH_YES
          && gfc_match_omp_map_clause (&c->lists[OMP_LIST_MAP],
-                                      OMP_MAP_FORCE_DEALLOC))
+                                      OMP_MAP_DELETE))
        continue;
       if ((mask & OMP_CLAUSE_PRESENT)
          && gfc_match ("present ( ") == MATCH_YES

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 5990202..a905ca6 100644 (file)
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -2119,12 +2119,12 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
                case OMP_MAP_TOFROM:
                  OMP_CLAUSE_SET_MAP_KIND (node, GOMP_MAP_TOFROM);
                  break;
+               case OMP_MAP_DELETE:
+                 OMP_CLAUSE_SET_MAP_KIND (node, GOMP_MAP_DELETE);
+                 break;
                case OMP_MAP_FORCE_ALLOC:
                  OMP_CLAUSE_SET_MAP_KIND (node, GOMP_MAP_FORCE_ALLOC);
                  break;
-               case OMP_MAP_FORCE_DEALLOC:
-                 OMP_CLAUSE_SET_MAP_KIND (node, GOMP_MAP_FORCE_DEALLOC);
-                 break;
                case OMP_MAP_FORCE_TO:
                  OMP_CLAUSE_SET_MAP_KIND (node, GOMP_MAP_FORCE_TO);
                  break;

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index f3e5c39..3687e7a 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -8194,7 +8194,7 @@ gimplify_oacc_declare_1 (tree clause)
       case GOMP_MAP_ALLOC:
       case GOMP_MAP_FORCE_ALLOC:
       case GOMP_MAP_FORCE_TO:
-       new_op = GOMP_MAP_FORCE_DEALLOC;
+       new_op = GOMP_MAP_DELETE;
        ret = true;
        break;
 

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 82dec9d..3fd6eb3 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -15746,7 +15746,7 @@ lower_omp_target (gimple_stmt_iterator *gsi_p, omp_context *ctx)
          case GOMP_MAP_TOFROM:
          case GOMP_MAP_POINTER:
          case GOMP_MAP_TO_PSET:
-         case GOMP_MAP_FORCE_DEALLOC:
+         case GOMP_MAP_DELETE:
          case GOMP_MAP_RELEASE:
          case GOMP_MAP_ALWAYS_TO:
          case GOMP_MAP_ALWAYS_FROM:

diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 9c13d84..39e3691 100644 (file)
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -621,7 +621,7 @@ dump_omp_clause (pretty_printer *pp, tree clause, int spc, int flags)
        case GOMP_MAP_FORCE_PRESENT:
          pp_string (pp, "force_present");
          break;
-       case GOMP_MAP_FORCE_DEALLOC:
+       case GOMP_MAP_DELETE:
          pp_string (pp, "delete");
          break;
        case GOMP_MAP_FORCE_DEVICEPTR:

diff --git a/include/ChangeLog b/include/ChangeLog
index c48156f..d09d548 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-17  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * gomp-constants.h (enum gomp_map_kind): Rename
+       GOMP_MAP_FORCE_DEALLOC to GOMP_MAP_DELETE.  Adjust all users.
+
 2016-03-03  Than McIntosh <thanm@google.com>
 
        * plugin-api.h: Add new hooks to the plugin transfer vector to

diff --git a/include/gomp-constants.h b/include/gomp-constants.h
index a8e7723..e31c2e0 100644 (file)
--- a/include/gomp-constants.h
+++ b/include/gomp-constants.h
@@ -67,7 +67,7 @@ enum gomp_map_kind
     /* Must already be present.  */
     GOMP_MAP_FORCE_PRESENT =           (GOMP_MAP_FLAG_SPECIAL_0 | 2),
     /* Deallocate a mapping, without copying from device.  */
-    GOMP_MAP_FORCE_DEALLOC =           (GOMP_MAP_FLAG_SPECIAL_0 | 3),
+    GOMP_MAP_DELETE =                  (GOMP_MAP_FLAG_SPECIAL_0 | 3),
     /* Is a device pointer.  OMP_CLAUSE_SIZE for these is unused; is implicitly
        POINTER_SIZE_UNITS.  */
     GOMP_MAP_FORCE_DEVICEPTR =         (GOMP_MAP_FLAG_SPECIAL_1 | 0),
@@ -125,11 +125,9 @@ enum gomp_map_kind
     GOMP_MAP_DELETE_ZERO_LEN_ARRAY_SECTION
       =                                        (GOMP_MAP_FLAG_SPECIAL_2
                                         | GOMP_MAP_FLAG_SPECIAL | 3),
-    /* OpenMP 4.5 alias for forced deallocation.  */
-    GOMP_MAP_DELETE =                  GOMP_MAP_FORCE_DEALLOC,
     /* Decrement usage count and deallocate if zero.  */
     GOMP_MAP_RELEASE =                 (GOMP_MAP_FLAG_SPECIAL_2
-                                        | GOMP_MAP_FORCE_DEALLOC),
+                                        | GOMP_MAP_DELETE),
 
     /* Internal to GCC, not used in libgomp.  */
     /* Do not map, but pointer assign a pointer instead.  */

diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c
index f795bf7..1fdb01d 100644 (file)
--- a/libgomp/oacc-parallel.c
+++ b/libgomp/oacc-parallel.c
@@ -307,7 +307,7 @@ GOACC_enter_exit_data (int device, size_t mapnum,
          break;
        }
 
-      if (kind == GOMP_MAP_FORCE_DEALLOC
+      if (kind == GOMP_MAP_DELETE
          || kind == GOMP_MAP_FORCE_FROM)
        break;
 
@@ -374,7 +374,7 @@ GOACC_enter_exit_data (int device, size_t mapnum,
                                         == GOMP_MAP_FORCE_FROM,
                                         async, 1);
                break;
-             case GOMP_MAP_FORCE_DEALLOC:
+             case GOMP_MAP_DELETE:
                acc_delete (hostaddrs[i], sizes[i]);
                break;
              case GOMP_MAP_FORCE_FROM:
@@ -522,10 +522,10 @@ GOACC_declare (int device, size_t mapnum,
       switch (kind)
        {
          case GOMP_MAP_FORCE_ALLOC:
-         case GOMP_MAP_FORCE_DEALLOC:
          case GOMP_MAP_FORCE_FROM:
          case GOMP_MAP_FORCE_TO:
          case GOMP_MAP_POINTER:
+         case GOMP_MAP_DELETE:
            GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
                                   &kinds[i], 0, 0);
            break;