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++, commitea82325afe
) and Tobias (Fortran, commitfff15bad1a
). 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.
This commit is contained in:
parent
07dd3bcda1
commit
f70977936a
|
@ -82,7 +82,7 @@ omp_init_allocator (omp_memspace_handle_t memspace, int ntraits,
|
||||||
break;
|
break;
|
||||||
case omp_atv_contended:
|
case omp_atv_contended:
|
||||||
case omp_atv_uncontended:
|
case omp_atv_uncontended:
|
||||||
case omp_atv_sequential:
|
case omp_atv_serialized:
|
||||||
case omp_atv_private:
|
case omp_atv_private:
|
||||||
data.sync_hint = traits[i].value;
|
data.sync_hint = traits[i].value;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -157,7 +157,7 @@ typedef enum omp_alloctrait_value_t
|
||||||
omp_atv_contended = 3,
|
omp_atv_contended = 3,
|
||||||
omp_atv_uncontended = 4,
|
omp_atv_uncontended = 4,
|
||||||
omp_atv_serialized = 5,
|
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_private = 6,
|
||||||
omp_atv_all = 7,
|
omp_atv_all = 7,
|
||||||
omp_atv_thread = 8,
|
omp_atv_thread = 8,
|
||||||
|
|
|
@ -840,7 +840,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if _OPENMP >= 202011
|
#if _OPENMP >= 202011
|
||||||
!GCC$ ATTRIBUTES DEPRECATED :: omp_proc_bind_master
|
!GCC$ ATTRIBUTES DEPRECATED :: omp_proc_bind_master, omp_atv_sequential
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
end module omp_lib
|
end module omp_lib
|
||||||
|
|
|
@ -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);
|
||||||
|
}
|
|
@ -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
|
Loading…
Reference in New Issue