diff options
| author | Andrew Stubbs <ams@codesourcery.com> | 2022-01-27 13:48:50 +0000 |
|---|---|---|
| committer | Andrew Stubbs <ams@codesourcery.com> | 2023-12-06 16:48:57 +0000 |
| commit | e9a19ead498fcc89186b724c6e76854f7751a89b (patch) | |
| tree | 05acad4ba5e84a74d71b939372771b19e3d6287e /libgomp/allocator.c | |
| parent | 30486fab717a90dc7516722c24ef9c5ea246c350 (diff) | |
| download | gcc-e9a19ead498fcc89186b724c6e76854f7751a89b.zip gcc-e9a19ead498fcc89186b724c6e76854f7751a89b.tar.gz gcc-e9a19ead498fcc89186b724c6e76854f7751a89b.tar.bz2 | |
openmp, nvptx: low-lat memory access traits
The NVPTX low latency memory is not accessible outside the team that allocates
it, and therefore should be unavailable for allocators with the access trait
"all". This change means that the omp_low_lat_mem_alloc predefined
allocator no longer works (but omp_cgroup_mem_alloc still does).
libgomp/ChangeLog:
* allocator.c (MEMSPACE_VALIDATE): New macro.
(omp_init_allocator): Use MEMSPACE_VALIDATE.
(omp_aligned_alloc): Use OMP_LOW_LAT_MEM_ALLOC_INVALID.
(omp_aligned_calloc): Likewise.
(omp_realloc): Likewise.
* config/nvptx/allocator.c (nvptx_memspace_validate): New function.
(MEMSPACE_VALIDATE): New macro.
(OMP_LOW_LAT_MEM_ALLOC_INVALID): New define.
* libgomp.texi: Document low-latency implementation details.
* testsuite/libgomp.c/omp_alloc-1.c (main): Add gnu_lowlat.
* testsuite/libgomp.c/omp_alloc-2.c (main): Add gnu_lowlat.
* testsuite/libgomp.c/omp_alloc-3.c (main): Add gnu_lowlat.
* testsuite/libgomp.c/omp_alloc-4.c (main): Add access trait.
* testsuite/libgomp.c/omp_alloc-5.c (main): Add gnu_lowlat.
* testsuite/libgomp.c/omp_alloc-6.c (main): Add access trait.
* testsuite/libgomp.c/omp_alloc-traits.c: New test.
Diffstat (limited to 'libgomp/allocator.c')
| -rw-r--r-- | libgomp/allocator.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libgomp/allocator.c b/libgomp/allocator.c index fa39812..a8a80f8 100644 --- a/libgomp/allocator.c +++ b/libgomp/allocator.c @@ -56,6 +56,10 @@ #define MEMSPACE_FREE(MEMSPACE, ADDR, SIZE) \ free (((void)(MEMSPACE), (void)(SIZE), (ADDR))) #endif +#ifndef MEMSPACE_VALIDATE +#define MEMSPACE_VALIDATE(MEMSPACE, ACCESS) \ + (((void)(MEMSPACE), (void)(ACCESS), 1)) +#endif /* Map the predefined allocators to the correct memory space. The index to this table is the omp_allocator_handle_t enum value. @@ -439,6 +443,10 @@ omp_init_allocator (omp_memspace_handle_t memspace, int ntraits, if (data.pinned) return omp_null_allocator; + /* Reject unsupported memory spaces. */ + if (!MEMSPACE_VALIDATE (data.memspace, data.access)) + return omp_null_allocator; + ret = gomp_malloc (sizeof (struct omp_allocator_data)); *ret = data; #ifndef HAVE_SYNC_BUILTINS @@ -522,6 +530,10 @@ retry: new_size += new_alignment - sizeof (void *); if (__builtin_add_overflow (size, new_size, &new_size)) goto fail; +#ifdef OMP_LOW_LAT_MEM_ALLOC_INVALID + if (allocator == omp_low_lat_mem_alloc) + goto fail; +#endif if (__builtin_expect (allocator_data && allocator_data->pool_size < ~(uintptr_t) 0, 0)) @@ -820,6 +832,10 @@ retry: goto fail; if (__builtin_add_overflow (size_temp, new_size, &new_size)) goto fail; +#ifdef OMP_LOW_LAT_MEM_ALLOC_INVALID + if (allocator == omp_low_lat_mem_alloc) + goto fail; +#endif if (__builtin_expect (allocator_data && allocator_data->pool_size < ~(uintptr_t) 0, 0)) @@ -1054,6 +1070,10 @@ retry: if (__builtin_add_overflow (size, new_size, &new_size)) goto fail; old_size = data->size; +#ifdef OMP_LOW_LAT_MEM_ALLOC_INVALID + if (allocator == omp_low_lat_mem_alloc) + goto fail; +#endif if (__builtin_expect (allocator_data && allocator_data->pool_size < ~(uintptr_t) 0, 0)) |