diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 349497d58ee631edbd22347c9c7a523d97bb2317..084f174513b03d5fd3f5808900659bd738eb3d50 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,29 @@
+2018-12-14 Thomas Schwinge <thomas@codesourcery.com>
+ Chung-Lin Tang <cltang@codesourcery.com>
+
+ * oacc-mem.c (acc_present_or_create): Remove definition and change
+ to alias of acc_create.
+ (acc_present_or_copyin): Remove definition and change to alias of
+ acc_copyin.
+ * oacc-parallel.c (GOACC_enter_exit_data): Call acc_create instead
+ of acc_present_or_create.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-1.c: Remove.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-2.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-3.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-4.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-5.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-6.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-7.c: Likewise.
+ * testsuite/libgomp.oacc-c-c++-common/data-already-8.c: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-1.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-2.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-3.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-4.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-5.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-6.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-7.f: Likewise.
+ * testsuite/libgomp.oacc-fortran/data-already-8.f: Likewise.
+
2018-12-14 Thomas Schwinge <thomas@codesourcery.com>
PR libgomp/88495
diff --git a/libgomp/oacc-mem.c b/libgomp/oacc-mem.c
index 72414b7489714c6405c31b8002d9a6b73199d3ee..e352379bfeb38402db6bd6ea51c9b1a74590a7a2 100644
--- a/libgomp/oacc-mem.c
+++ b/libgomp/oacc-mem.c
@@ -544,51 +544,54 @@ acc_create_async (void *h, size_t s, int async)
present_create_copy (FLAG_PRESENT | FLAG_CREATE, h, s, async);
}
-void *
-acc_copyin (void *h, size_t s)
-{
- return present_create_copy (FLAG_PRESENT | FLAG_CREATE | FLAG_COPY, h, s,
- acc_async_sync);
-}
-
-void
-acc_copyin_async (void *h, size_t s, int async)
-{
- present_create_copy (FLAG_PRESENT | FLAG_CREATE | FLAG_COPY, h, s, async);
-}
-
+/* acc_present_or_create used to be what acc_create is now. */
+/* acc_pcreate is acc_present_or_create by a different name. */
+#ifdef HAVE_ATTRIBUTE_ALIAS
+strong_alias (acc_create, acc_present_or_create)
+strong_alias (acc_create, acc_pcreate)
+#else
void *
acc_present_or_create (void *h, size_t s)
{
- return present_create_copy (FLAG_PRESENT | FLAG_CREATE, h, s, acc_async_sync);
+ return acc_create (h, s);
}
-/* acc_pcreate is acc_present_or_create by a different name. */
-#ifdef HAVE_ATTRIBUTE_ALIAS
-strong_alias (acc_present_or_create, acc_pcreate)
-#else
void *
acc_pcreate (void *h, size_t s)
{
- return acc_present_or_create (h, s);
+ return acc_create (h, s);
}
#endif
void *
-acc_present_or_copyin (void *h, size_t s)
+acc_copyin (void *h, size_t s)
{
return present_create_copy (FLAG_PRESENT | FLAG_CREATE | FLAG_COPY, h, s,
acc_async_sync);
}
+void
+acc_copyin_async (void *h, size_t s, int async)
+{
+ present_create_copy (FLAG_PRESENT | FLAG_CREATE | FLAG_COPY, h, s, async);
+}
+
+/* acc_present_or_copyin used to be what acc_copyin is now. */
/* acc_pcopyin is acc_present_or_copyin by a different name. */
#ifdef HAVE_ATTRIBUTE_ALIAS
-strong_alias (acc_present_or_copyin, acc_pcopyin)
+strong_alias (acc_copyin, acc_present_or_copyin)
+strong_alias (acc_copyin, acc_pcopyin)
#else
+void *
+acc_present_or_copyin (void *h, size_t s)
+{
+ return acc_copyin (h, s);
+}
+
void *
acc_pcopyin (void *h, size_t s)
{
- return acc_present_or_copyin (h, s);
+ return acc_copyin (h, s);
}
#endif
diff --git a/libgomp/oacc-parallel.c b/libgomp/oacc-parallel.c
index 89b6b6f6fc2b1c3b092617404ef41ea38808fbda..e2405d73d5a9637aaa8bb42f6d8f78ff15b402e3 100644
--- a/libgomp/oacc-parallel.c
+++ b/libgomp/oacc-parallel.c
@@ -425,14 +425,10 @@ GOACC_enter_exit_data (int device, size_t mapnum,
switch (kind)
{
case GOMP_MAP_ALLOC:
- acc_present_or_create (hostaddrs[i], sizes[i]);
- break;
case GOMP_MAP_FORCE_ALLOC:
acc_create (hostaddrs[i], sizes[i]);
break;
case GOMP_MAP_TO:
- acc_present_or_copyin (hostaddrs[i], sizes[i]);
- break;
case GOMP_MAP_FORCE_TO:
acc_copyin (hostaddrs[i], sizes[i]);
break;
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c
deleted file mode 100644
index fd3b77dcff5ab1f74c04f5e09962fccd95cb7894..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-1.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-#include <openacc.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
- acc_copyin (&i, sizeof i);
-
- fprintf (stderr, "CheCKpOInT\n");
-#pragma acc data copy (i)
- ++i;
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c
deleted file mode 100644
index 0118b2568e2340656913fce72a70f4213e552d96..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-2.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
-#pragma acc data present_or_copy (i)
- {
- fprintf (stderr, "CheCKpOInT\n");
-#pragma acc data copyout (i)
- ++i;
- }
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-3.c
deleted file mode 100644
index b346c69826fb4f92f5b922fd89e3d9ee52f7a237..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-3.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-#include <openacc.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
-#pragma acc data present_or_copy (i)
- {
- fprintf (stderr, "CheCKpOInT\n");
- acc_copyin (&i, sizeof i);
- }
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c
deleted file mode 100644
index e99ad33d9bea49b8ee8d010feaf16ffa4715d25b..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-4.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-#include <openacc.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
- acc_present_or_copyin (&i, sizeof i);
- fprintf (stderr, "CheCKpOInT\n");
- acc_copyin (&i, sizeof i);
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c
deleted file mode 100644
index f8370c006df19d4aa113e46c8bfd4694d899add3..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-5.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-#include <openacc.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
-#pragma acc enter data create (i)
- fprintf (stderr, "CheCKpOInT\n");
- acc_copyin (&i, sizeof i);
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c
deleted file mode 100644
index d7f4deb18e48738deedc1d40dfde21e8b92870fe..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-6.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-#include <openacc.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
- acc_present_or_copyin (&i, sizeof i);
- fprintf (stderr, "CheCKpOInT\n");
-#pragma acc enter data create (i)
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c
deleted file mode 100644
index 54be59507ca043b10daaeeeae5d45c9cb7927fa4..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-7.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-#include <openacc.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
-#pragma acc enter data create (i)
- fprintf (stderr, "CheCKpOInT\n");
- acc_create (&i, sizeof i);
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c
deleted file mode 100644
index e5c0f9cfb32375f2710d9b045f1f8c7f28d464e3..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/data-already-8.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */
-
-#include <stdio.h>
-
-int
-main (int argc, char *argv[])
-{
- int i;
-
-#pragma acc data create (i)
- {
- fprintf (stderr, "CheCKpOInT\n");
-#pragma acc parallel copyin (i)
- ++i;
- }
-
- return 0;
-}
-
-/* { dg-output "CheCKpOInT(\n|\r\n|\r).*" } */
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
deleted file mode 100644
index fab0ffc99cc34c0ecdf89adec13fbba33a64a715..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-1.f
+++ /dev/null
@@ -1,16 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
- INCLUDE "openacc_lib.h"
-
- INTEGER I
-
- CALL ACC_COPYIN (I)
- WRITE(0, *) "CheCKpOInT"
-!$ACC DATA COPY (I)
- I = 0
-!$ACC END DATA
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
deleted file mode 100644
index bd03062670f0f0e2a9346dcd5d650da3c6f935b0..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-2.f
+++ /dev/null
@@ -1,16 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
-
- INTEGER I
-
-!$ACC DATA PRESENT_OR_COPY (I)
- WRITE(0, *) "CheCKpOInT"
-!$ACC DATA COPYOUT (I)
- I = 0
-!$ACC END DATA
-!$ACC END DATA
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-3.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-3.f
deleted file mode 100644
index 60ea3864e4e086f52a97b2ca8dc7576548ee06cb..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-3.f
+++ /dev/null
@@ -1,15 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
- INCLUDE "openacc_lib.h"
-
- INTEGER I
-
-!$ACC DATA PRESENT_OR_COPY (I)
- WRITE(0, *) "CheCKpOInT"
- CALL ACC_COPYIN (I)
-!$ACC END DATA
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f
deleted file mode 100644
index 2abdbf0f868a4e94d22ab35d110ed9489455b2f6..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-4.f
+++ /dev/null
@@ -1,14 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
- INCLUDE "openacc_lib.h"
-
- INTEGER I
-
- CALL ACC_PRESENT_OR_COPYIN (I)
- WRITE(0, *) "CheCKpOInT"
- CALL ACC_COPYIN (I)
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f
deleted file mode 100644
index f361d8c177231188043563c912f212dbb602463c..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-5.f
+++ /dev/null
@@ -1,14 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
- INCLUDE "openacc_lib.h"
-
- INTEGER I
-
-!$ACC ENTER DATA CREATE (I)
- WRITE(0, *) "CheCKpOInT"
- CALL ACC_COPYIN (I)
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f
deleted file mode 100644
index a864737c69238ad11943bb339793d6e4410ebfe9..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-6.f
+++ /dev/null
@@ -1,14 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
- INCLUDE "openacc_lib.h"
-
- INTEGER I
-
- CALL ACC_PRESENT_OR_COPYIN (I)
- WRITE(0, *) "CheCKpOInT"
-!$ACC ENTER DATA CREATE (I)
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f
deleted file mode 100644
index 0d893280e40bf662980a85812479d9f4dc249fa2..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-7.f
+++ /dev/null
@@ -1,14 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
- INCLUDE "openacc_lib.h"
-
- INTEGER I
-
-!$ACC ENTER DATA CREATE (I)
- WRITE(0, *) "CheCKpOInT"
- CALL ACC_CREATE (I)
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }
diff --git a/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f b/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
deleted file mode 100644
index 7a41f67225a427ffb21e8159c9c5446be9852969..0000000000000000000000000000000000000000
--- a/libgomp/testsuite/libgomp.oacc-fortran/data-already-8.f
+++ /dev/null
@@ -1,16 +0,0 @@
-! { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } }
-
- IMPLICIT NONE
-
- INTEGER I
-
-!$ACC DATA CREATE (I)
- WRITE(0, *) "CheCKpOInT"
-!$ACC PARALLEL COPYIN (I)
- I = 0
-!$ACC END PARALLEL
-!$ACC END DATA
-
- END
-
-! { dg-output "CheCKpOInT(\n|\r\n|\r).*" }