From f70977936a306e2fb4140361ba47bf5d5cc0a47d Mon Sep 17 00:00:00 2001
From: Marcel Vollweiler <marcel@codesourcery.com>
Date: Mon, 11 Oct 2021 04:34:51 -0700
Subject: [PATCH] libgomp: Add tests for omp_atv_serialized and deprecate
omp_atv_sequential.
The variable omp_atv_sequential was replaced by omp_atv_serialized in OpenMP
5.1. This was already implemented by Jakub (C/C++, commit ea82325afec) and
Tobias (Fortran, commit fff15bad1ab).
This patch adds two tests to check if omp_atv_serialized is available (one test
for C/C++ and one for Fortran). Besides that omp_atv_sequential is marked as
deprecated in C/C++ and Fortran for OpenMP 5.1.
libgomp/ChangeLog:
* allocator.c (omp_init_allocator): Replace omp_atv_sequential with
omp_atv_serialized.
* omp.h.in: Add deprecated flag for omp_atv_sequential.
* omp_lib.f90.in: Add deprecated flag for omp_atv_sequential.
* testsuite/libgomp.c-c++-common/alloc-10.c: New test.
* testsuite/libgomp.fortran/alloc-12.f90: New test.
---
libgomp/allocator.c | 2 +-
libgomp/omp.h.in | 2 +-
libgomp/omp_lib.f90.in | 2 +-
.../testsuite/libgomp.c-c++-common/alloc-10.c | 25 +++++++++++++++++
.../testsuite/libgomp.fortran/alloc-12.f90 | 28 +++++++++++++++++++
5 files changed, 56 insertions(+), 3 deletions(-)
create mode 100644 libgomp/testsuite/libgomp.c-c++-common/alloc-10.c
create mode 100644 libgomp/testsuite/libgomp.fortran/alloc-12.f90
diff --git a/libgomp/allocator.c b/libgomp/allocator.c
index dce600f5bd74..deebb6a79fab 100644
--- a/libgomp/allocator.c
+++ b/libgomp/allocator.c
@@ -82,7 +82,7 @@ omp_init_allocator (omp_memspace_handle_t memspace, int ntraits,
break;
case omp_atv_contended:
case omp_atv_uncontended:
- case omp_atv_sequential:
+ case omp_atv_serialized:
case omp_atv_private:
data.sync_hint = traits[i].value;
break;
diff --git a/libgomp/omp.h.in b/libgomp/omp.h.in
index e0177dca6fbb..6b9ac96cff63 100644
--- a/libgomp/omp.h.in
+++ b/libgomp/omp.h.in
@@ -157,7 +157,7 @@ typedef enum omp_alloctrait_value_t
omp_atv_contended = 3,
omp_atv_uncontended = 4,
omp_atv_serialized = 5,
- omp_atv_sequential = omp_atv_serialized,
+ omp_atv_sequential __GOMP_DEPRECATED_5_1 = omp_atv_serialized,
omp_atv_private = 6,
omp_atv_all = 7,
omp_atv_thread = 8,
diff --git a/libgomp/omp_lib.f90.in b/libgomp/omp_lib.f90.in
index 973b87be80aa..e870755891ce 100644
--- a/libgomp/omp_lib.f90.in
+++ b/libgomp/omp_lib.f90.in
@@ -840,7 +840,7 @@
#endif
#if _OPENMP >= 202011
-!GCC$ ATTRIBUTES DEPRECATED :: omp_proc_bind_master
+!GCC$ ATTRIBUTES DEPRECATED :: omp_proc_bind_master, omp_atv_sequential
#endif
end module omp_lib
diff --git a/libgomp/testsuite/libgomp.c-c++-common/alloc-10.c b/libgomp/testsuite/libgomp.c-c++-common/alloc-10.c
new file mode 100644
index 000000000000..01ae150dd870
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c-c++-common/alloc-10.c
@@ -0,0 +1,25 @@
+#include <omp.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+const omp_alloctrait_t traits[]
+= { { omp_atk_alignment, 64 },
+ { omp_atk_sync_hint, omp_atv_serialized },
+ { omp_atk_fallback, omp_atv_null_fb } };
+
+int
+main ()
+{
+ omp_allocator_handle_t a;
+ int *volatile p;
+ a = omp_init_allocator (omp_default_mem_space, 3, traits);
+ if (a == omp_null_allocator)
+ abort ();
+ p = (int *) omp_alloc (3072, a);
+ if ((((uintptr_t) p) % 64) != 0)
+ abort ();
+ p[0] = 1;
+ p[3071 / sizeof (int)] = 2;
+ omp_free (p, a);
+ omp_destroy_allocator (a);
+}
diff --git a/libgomp/testsuite/libgomp.fortran/alloc-12.f90 b/libgomp/testsuite/libgomp.fortran/alloc-12.f90
new file mode 100644
index 000000000000..3d10959a0180
--- /dev/null
+++ b/libgomp/testsuite/libgomp.fortran/alloc-12.f90
@@ -0,0 +1,28 @@
+! { dg-additional-options "-Wall -Wextra" }
+program main
+ use omp_lib
+ use ISO_C_Binding
+ implicit none (external, type)
+ type(c_ptr) :: p
+ integer, pointer, contiguous :: ip(:)
+ type (omp_alloctrait) :: traits(3)
+ integer (omp_allocator_handle_kind) :: a
+ integer (c_ptrdiff_t) :: iptr
+
+ traits = [omp_alloctrait (omp_atk_alignment, 64), &
+ omp_alloctrait (omp_atk_fallback, omp_atv_null_fb), &
+ omp_alloctrait (omp_atk_sync_hint, omp_atv_serialized)]
+ a = omp_init_allocator (omp_default_mem_space, 3, traits)
+ if (a == omp_null_allocator) stop 1
+
+ p = omp_alloc (3 * c_sizeof (0), a)
+ if (.not. c_associated (p)) stop 2
+ call c_f_pointer (p, ip, [3])
+ if (mod (TRANSFER (p, iptr), 64) /= 0) &
+ stop 3
+ ip(1) = 1
+ ip(2) = 2
+ ip(3) = 3
+ call omp_free (p, a)
+ call omp_destroy_allocator (a)
+end program main
--
GitLab