re PR target/80090 (Incorrect assembler - output_addr_const may generate visibility...

[gcc.git] / libgomp / oacc-parallel.c

diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c
index e31bc0a7bc6304d5a7a4cd41c93c6a6715d0370d..a8cff9e480b1bd8b05667c93d2ca0fcba165e38b 100644 (file)
--- a/libgomp/oacc-parallel.c
+++ b/libgomp/oacc-parallel.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
+/* Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
    Contributed by Mentor Embedded.
 
@@ -103,6 +103,10 @@ GOACC_parallel_keyed (int device, void (*fn) (void *),
       return;
     }
 
+  /* Default: let the runtime choose.  */
+  for (i = 0; i != GOMP_DIM_MAX; i++)
+    dims[i] = 0;
+
   va_start (ap, kinds);
   /* TODO: This will need amending when device_type is implemented.  */
   while ((tag = va_arg (ap, unsigned)) != 0)
@@ -168,24 +172,21 @@ GOACC_parallel_keyed (int device, void (*fn) (void *),
     tgt_fn = (void (*)) fn;
 
   tgt = gomp_map_vars (acc_dev, mapnum, hostaddrs, NULL, sizes, kinds, true,
-                      false);
+                      GOMP_MAP_VARS_OPENACC);
 
   devaddrs = gomp_alloca (sizeof (void *) * mapnum);
   for (i = 0; i < mapnum; i++)
-    devaddrs[i] = (void *) (tgt->list[i]->tgt->tgt_start
-                           + tgt->list[i]->tgt_offset);
+    devaddrs[i] = (void *) (tgt->list[i].key->tgt->tgt_start
+                           + tgt->list[i].key->tgt_offset);
 
-  acc_dev->openacc.exec_func (tgt_fn, mapnum, hostaddrs, devaddrs, sizes,
-                             kinds, async, dims, tgt);
+  acc_dev->openacc.exec_func (tgt_fn, mapnum, hostaddrs, devaddrs,
+                             async, dims, tgt);
 
   /* If running synchronously, unmap immediately.  */
   if (async < acc_async_noval)
     gomp_unmap_vars (tgt, true);
   else
-    {
-      gomp_copy_from_async (tgt);
-      acc_dev->openacc.register_async_cleanup_func (tgt);
-    }
+    tgt->device_descr->openacc.register_async_cleanup_func (tgt, async);
 
   acc_dev->openacc.async_set_async_func (acc_async_sync);
 }
@@ -228,7 +229,8 @@ GOACC_data_start (int device, size_t mapnum,
   if ((acc_dev->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM)
       || host_fallback)
     {
-      tgt = gomp_map_vars (NULL, 0, NULL, NULL, NULL, NULL, true, false);
+      tgt = gomp_map_vars (NULL, 0, NULL, NULL, NULL, NULL, true,
+                          GOMP_MAP_VARS_OPENACC);
       tgt->prev = thr->mapped_data;
       thr->mapped_data = tgt;
 
@@ -237,7 +239,7 @@ GOACC_data_start (int device, size_t mapnum,
 
   gomp_debug (0, "  %s: prepare mappings\n", __FUNCTION__);
   tgt = gomp_map_vars (acc_dev, mapnum, hostaddrs, NULL, sizes, kinds, true,
-                      false);
+                      GOMP_MAP_VARS_OPENACC);
   gomp_debug (0, "  %s: mappings prepared\n", __FUNCTION__);
   tgt->prev = thr->mapped_data;
   thr->mapped_data = tgt;
@@ -302,7 +304,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;
 
@@ -369,7 +371,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:
@@ -500,3 +502,61 @@ GOACC_get_thread_num (void)
 {
   return 0;
 }
+
+void
+GOACC_declare (int device, size_t mapnum,
+              void **hostaddrs, size_t *sizes, unsigned short *kinds)
+{
+  int i;
+
+  for (i = 0; i < mapnum; i++)
+    {
+      unsigned char kind = kinds[i] & 0xff;
+
+      if (kind == GOMP_MAP_POINTER || kind == GOMP_MAP_TO_PSET)
+       continue;
+
+      switch (kind)
+       {
+         case GOMP_MAP_FORCE_ALLOC:
+         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;
+
+         case GOMP_MAP_FORCE_DEVICEPTR:
+           break;
+
+         case GOMP_MAP_ALLOC:
+           if (!acc_is_present (hostaddrs[i], sizes[i]))
+             GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
+                                    &kinds[i], 0, 0);
+           break;
+
+         case GOMP_MAP_TO:
+           GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
+                                  &kinds[i], 0, 0);
+
+           break;
+
+         case GOMP_MAP_FROM:
+           kinds[i] = GOMP_MAP_FORCE_FROM;
+           GOACC_enter_exit_data (device, 1, &hostaddrs[i], &sizes[i],
+                                  &kinds[i], 0, 0);
+           break;
+
+         case GOMP_MAP_FORCE_PRESENT:
+           if (!acc_is_present (hostaddrs[i], sizes[i]))
+             gomp_fatal ("[%p,%ld] is not mapped", hostaddrs[i],
+                         (unsigned long) sizes[i]);
+           break;
+
+         default:
+           assert (0);
+           break;
+       }
+    }
+}