diff --git a/libgomp/allocator.c b/libgomp/allocator.c index dce600f5bd7..deebb6a79fa 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 e0177dca6fb..6b9ac96cff6 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 973b87be80a..e870755891c 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 00000000000..01ae150dd87 --- /dev/null +++ b/libgomp/testsuite/libgomp.c-c++-common/alloc-10.c @@ -0,0 +1,25 @@ +#include +#include +#include + +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 00000000000..3d10959a018 --- /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