OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6d49813501
gcc/libgomp/testsuite/libgomp.c-c++-common/alloc-9.c
Jakub Jelinek 342aedf0e5 libgomp: alloc* test fixes [PR102628, PR102668] 
As reported, the alloc-9.c test and alloc-{1,2,3}.F* and alloc-11.f90
tests fail on powerpc64-linux with -m32.
The reason why it fails just there is that malloc doesn't guarantee there
128-bit alignment (historically glibc guaranteed 2 * sizeof (void *)
alignment from malloc).

There are two separate issues.
One is a thinko on my side.
In this part of alloc-9.c test (copied to alloc-11.f90), we have
2 allocators, a with pool size 1024B and alignment 16B and default fallback
and a2 with pool size 512B and alignment 32B and a as fallback allocator.
We start at no allocations in both at line 194 and do:
  p = (int *) omp_alloc (sizeof (int), a2);
// This succeeds in a2 and needs 4+overhead bytes (which includes the 32B alignment)
  p = (int *) omp_realloc (p, 420, a, a2);
// This allocates 420 bytes+overhead in a, with 16B alignment and deallocates the above
  q = (int *) omp_alloc (sizeof (int), a);
// This allocates 4+overhead bytes in a, with 16B alignment
  q = (int *) omp_realloc (q, 420, a2, a);
// This allocates 420+overhead in a2 with 32B alignment
  q = (int *) omp_realloc (q, 768, a2, a2);
// This attempts to reallocate, but as there are elevated alignment
// requirements doesn't try to just realloc (even if it wanted to try that
// a2 is almost full, with 512-420-overhead bytes left in it), so it
// tries to alloc in a2, but there is no space left in the pool, falls
// back to a, which already has 420+overhead bytes allocated in it and
// 1024-420-overhead bytes left and so fails too and fails to default
// non-pool allocator that allocates it, but doesn't guarantee alignment
// higher than malloc guarantees.
// But, the test expected 16B alignment.

So, I've slightly lowered the allocation sizes in that part of the test
420->320 and 768 -> 568, so that the last test still fails to allocate
in a2 (568 > 512-320-overhead) but succeeds in a as fallback, which was
the intent of the test.

Another thing is that alloc-1.F90 seems to be transcription of
libgomp.c-c++-common/alloc-1.c into Fortran, but alloc-1.c had:
  q = (int *) omp_alloc (768, a2);
  if ((((uintptr_t) q) % 16) != 0)
    abort ();
  q[0] = 7;
  q[767 / sizeof (int)] = 8;
  r = (int *) omp_alloc (512, a2);
  if ((((uintptr_t) r) % __alignof (int)) != 0)
    abort ();
there but Fortran has:
        cq = omp_alloc (768_c_size_t, a2)
        if (mod (transfer (cq, intptr), 16_c_intptr_t) /= 0) stop 12
        call c_f_pointer (cq, q, [768 / c_sizeof (i)])
        q(1) = 7
        q(768 / c_sizeof (i)) = 8
        cr = omp_alloc (512_c_size_t, a2)
        if (mod (transfer (cr, intptr), 16_c_intptr_t) /= 0) stop 13
I'm changing the latter to 4_c_intptr_t because other spots in the
testcase do that, Fortran sadly doesn't have c_alignof, but strictly
speaking it isn't correct, __alignof (int) could be on some architectures
smaller than 4.
So probably alloc-1.F90 etc. should also have
! { dg-additional-sources alloc-7.c }
! { dg-prune-output "command-line option '-fintrinsic-modules-path=.*' is valid for Fortran but not for C" }
and use get__alignof_int.

2021-10-12  Jakub Jelinek  <jakub@redhat.com>

	PR libgomp/102628
	PR libgomp/102668
	* testsuite/libgomp.c-c++-common/alloc-9.c (main): Decrease
	allocation sizes from 420 to 320 and from 768 to 568.
	* testsuite/libgomp.fortran/alloc-11.f90: Likewise.
	* testsuite/libgomp.fortran/alloc-1.F90: Change expected alignment
	for cr from 16 to 4.
2021-10-12 09:30:41 +02:00

272 lines
8.1 KiB
C
Raw Blame History

#include <omp.h>
#include <stdint.h>
#include <stdlib.h>
const omp_alloctrait_t traits2[]
= { { omp_atk_alignment, 16 },
{ omp_atk_sync_hint, omp_atv_default },
{ omp_atk_access, omp_atv_default },
{ omp_atk_pool_size, 1024 },
{ omp_atk_fallback, omp_atv_default_mem_fb },
{ omp_atk_partition, omp_atv_environment } };
omp_alloctrait_t traits3[]
= { { omp_atk_sync_hint, omp_atv_uncontended },
{ omp_atk_alignment, 32 },
{ omp_atk_access, omp_atv_all },
{ omp_atk_pool_size, 512 },
{ omp_atk_fallback, omp_atv_allocator_fb },
{ omp_atk_fb_data, 0 },
{ omp_atk_partition, omp_atv_default } };
const omp_alloctrait_t traits4[]
= { { omp_atk_alignment, 128 },
{ omp_atk_pool_size, 1024 },
{ omp_atk_fallback, omp_atv_null_fb } };
int
main ()
{
int *volatile p = (int *) omp_alloc (3 * sizeof (int), omp_default_mem_alloc);
int *volatile q;
int *volatile r;
omp_alloctrait_t traits[3]
= { { omp_atk_alignment, 64 },
{ omp_atk_fallback, omp_atv_null_fb },
{ omp_atk_pool_size, 4096 } };
omp_alloctrait_t traits5[2]
= { { omp_atk_fallback, omp_atv_null_fb },
{ omp_atk_pool_size, 4096 } };
omp_allocator_handle_t a, a2;
if ((((uintptr_t) p) % __alignof (int)) != 0)
abort ();
p[0] = 1;
p[1] = 2;
p[2] = 3;
p = (int *) omp_realloc (p, 4 * sizeof (int), omp_default_mem_alloc, omp_default_mem_alloc);
if ((((uintptr_t) p) % __alignof (int)) != 0 || p[0] != 1 || p[1] != 2 || p[2] != 3)
abort ();
p[0] = 4;
p[1] = 5;
p[2] = 6;
p[3] = 7;
p = (int *) omp_realloc (p, 2 * sizeof (int), omp_default_mem_alloc, omp_default_mem_alloc);
if ((((uintptr_t) p) % __alignof (int)) != 0 || p[0] != 4 || p[1] != 5)
abort ();
p[0] = 8;
p[1] = 9;
if (omp_realloc (p, 0, omp_null_allocator, omp_default_mem_alloc) != NULL)
abort ();
p = (int *) omp_realloc (NULL, 2 * sizeof (int), omp_default_mem_alloc, omp_null_allocator);
if ((((uintptr_t) p) % __alignof (int)) != 0)
abort ();
p[0] = 1;
p[1] = 2;
p = (int *) omp_realloc (p, 5 * sizeof (int), omp_default_mem_alloc, omp_default_mem_alloc);
if ((((uintptr_t) p) % __alignof (int)) != 0 || p[0] != 1 || p[1] != 2)
abort ();
p[0] = 3;
p[1] = 4;
p[2] = 5;
p[3] = 6;
p[4] = 7;
omp_free (p, omp_null_allocator);
omp_set_default_allocator (omp_default_mem_alloc);
if (omp_realloc (NULL, 0, omp_null_allocator, omp_null_allocator) != NULL)
abort ();
p = (int *) omp_alloc (sizeof (int), omp_null_allocator);
if ((((uintptr_t) p) % __alignof (int)) != 0)
abort ();
p[0] = 3;
p = (int *) omp_realloc (p, 3 * sizeof (int), omp_null_allocator, omp_null_allocator);
if ((((uintptr_t) p) % __alignof (int)) != 0 || p[0] != 3)
abort ();
p[0] = 4;
p[1] = 5;
p[2] = 6;
if (omp_realloc (p, 0, omp_null_allocator, omp_get_default_allocator ()) != NULL)
abort ();
a = omp_init_allocator (omp_default_mem_space, 3, traits);
if (a == omp_null_allocator)
abort ();
p = (int *) omp_alloc (sizeof (int), a);
if ((((uintptr_t) p) % 64) != 0)
abort ();
p[0] = 7;
p = (int *) omp_realloc (p, 3072, a, a);
if ((((uintptr_t) p) % 64) != 0 || p[0] != 7)
abort ();
p[0] = 1;
p[3071 / sizeof (int)] = 2;
q = (int *) omp_alloc (sizeof (int), a);
if ((((uintptr_t) q) % 64) != 0)
abort ();
q[0] = 8;
if (omp_realloc (q, 3072, a, a) != NULL)
abort ();
omp_free (p, a);
omp_free (q, a);
p = (int *) omp_alloc (sizeof (int), a);
p[0] = 42;
p = (int *) omp_realloc (p, 3072, a, a);
if (p[0] != 42)
abort ();
p[0] = 3;
p[3071 / sizeof (int)] = 4;
omp_realloc (p, 0, omp_null_allocator, omp_null_allocator);
omp_set_default_allocator (a);
if (omp_get_default_allocator () != a)
abort ();
p = (int *) omp_alloc (31, omp_null_allocator);
if (p == NULL)
abort ();
p = (int *) omp_realloc (p, 3072, omp_null_allocator, omp_null_allocator);
if (p == NULL)
abort ();
q = (int *) omp_alloc (sizeof (int), omp_null_allocator);
if (q == NULL)
abort ();
if (omp_realloc (q, 3072, omp_null_allocator, omp_null_allocator) != NULL)
abort ();
omp_free (p, a);
omp_free (q, a);
omp_destroy_allocator (a);
a = omp_init_allocator (omp_default_mem_space, 2, traits5);
if (a == omp_null_allocator)
abort ();
omp_set_default_allocator (a);
if (omp_get_default_allocator () != a)
abort ();
p = (int *) omp_alloc (3071, omp_null_allocator);
if (p == NULL)
abort ();
p = (int *) omp_realloc (p, 3072, omp_null_allocator, omp_null_allocator);
if (p == NULL)
abort ();
q = (int *) omp_alloc (sizeof (int), omp_null_allocator);
if (q == NULL)
abort ();
if (omp_realloc (q, 3072, omp_null_allocator, omp_null_allocator) != NULL)
abort ();
omp_free (p, a);
omp_free (q, a);
omp_destroy_allocator (a);
a = omp_init_allocator (omp_default_mem_space,
sizeof (traits2) / sizeof (traits2[0]),
traits2);
if (a == omp_null_allocator)
abort ();
if (traits3[5].key != omp_atk_fb_data)
abort ();
traits3[5].value = (uintptr_t) a;
a2 = omp_init_allocator (omp_default_mem_space,
sizeof (traits3) / sizeof (traits3[0]),
traits3);
if (a2 == omp_null_allocator)
abort ();
p = (int *) omp_alloc (sizeof (int), a2);
if ((((uintptr_t) p) % 32) != 0)
abort ();
p[0] = 84;
p = (int *) omp_realloc (p, 380, a2, a2);
if ((((uintptr_t) p) % 32) != 0 || p[0] != 84)
abort ();
p[0] = 5;
p[379 / sizeof (int)] = 6;
q = (int *) omp_alloc (sizeof (int), a2);
if ((((uintptr_t) q) % 32) != 0)
abort ();
q[0] = 42;
q = (int *) omp_realloc (q, 768, a2, a2);
if ((((uintptr_t) q) % 16) != 0 || q[0] != 42)
abort ();
q[0] = 7;
q[767 / sizeof (int)] = 8;
r = (int *) omp_realloc (NULL, 512, a2, omp_null_allocator);
if ((((uintptr_t) r) % __alignof (int)) != 0)
abort ();
r[0] = 9;
r[511 / sizeof (int)] = 10;
omp_free (p, omp_null_allocator);
omp_free (q, a2);
omp_free (r, omp_null_allocator);
p = (int *) omp_alloc (sizeof (int), a2);
if ((((uintptr_t) p) % 32) != 0)
abort ();
p[0] = 85;
p = (int *) omp_realloc (p, 320, a, a2);
if ((((uintptr_t) p) % 16) != 0 || p[0] != 85)
abort ();
p[0] = 5;
p[319 / sizeof (int)] = 6;
q = (int *) omp_alloc (sizeof (int), a);
if ((((uintptr_t) q) % 16) != 0)
abort ();
q[0] = 43;
q = (int *) omp_realloc (q, 320, a2, a);
if ((((uintptr_t) q) % 32) != 0 || q[0] != 43)
abort ();
q[0] = 44;
q[319 / sizeof (int)] = 8;
q = (int *) omp_realloc (q, 568, a2, a2);
if ((((uintptr_t) q) % 16) != 0 || q[0] != 44)
abort ();
q[0] = 7;
q[567 / sizeof (int)] = 8;
omp_free (p, omp_null_allocator);
omp_free (q, a2);
omp_destroy_allocator (a2);
omp_destroy_allocator (a);
a = omp_init_allocator (omp_default_mem_space,
sizeof (traits4) / sizeof (traits4[0]),
traits4);
if (a == omp_null_allocator)
abort ();
if (traits3[5].key != omp_atk_fb_data)
abort ();
traits3[5].value = (uintptr_t) a;
a2 = omp_init_allocator (omp_default_mem_space,
sizeof (traits3) / sizeof (traits3[0]),
traits3);
if (a2 == omp_null_allocator)
abort ();
omp_set_default_allocator (a2);
#ifdef __cplusplus
p = static_cast <int *> (omp_realloc (NULL, 420));
#else
p = (int *) omp_realloc (NULL, 420, omp_null_allocator, omp_null_allocator);
#endif
if ((((uintptr_t) p) % 32) != 0)
abort ();
p[0] = 5;
p[419 / sizeof (int)] = 6;
q = (int *) omp_realloc (NULL, sizeof (int), omp_null_allocator, omp_null_allocator);
if ((((uintptr_t) q) % 32) != 0)
abort ();
q[0] = 99;
q = (int *) omp_realloc (q, 700, omp_null_allocator, omp_null_allocator);
if ((((uintptr_t) q) % 128) != 0 || q[0] != 99)
abort ();
q[0] = 7;
q[699 / sizeof (int)] = 8;
if (omp_realloc (NULL, 768, omp_null_allocator, omp_null_allocator) != NULL)
abort ();
#ifdef __cplusplus
omp_free (p);
if (omp_realloc (q, 0) != NULL)
abort ();
omp_free (NULL);
#else
omp_free (p, omp_null_allocator);
if (omp_realloc (q, 0, omp_null_allocator, omp_null_allocator) != NULL)
abort ();
omp_free (NULL, omp_null_allocator);
#endif
omp_free (NULL, omp_null_allocator);
omp_destroy_allocator (a2);
omp_destroy_allocator (a);
return 0;
}
Reference in New Issue View Git Blame Copy Permalink