From ae2dca26602678f8b70e22da1bce8302c0751b75 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 15 Feb 2023 11:27:55 +0100 Subject: [PATCH] Add 'libgomp.c/alloc-ompx_host_mem_alloc-1.c' OpenMP 'ompx_host_mem_alloc' is available for host and nvptx offloading as of og12 commit 84914e197d91a67b3d27db0e4c69a433462983a5 "openmp, nvptx: ompx_unified_shared_mem_alloc", and for GCN offloading as of og12 commit c77c45a641fedc3fe770e909cc010fb1735bdbbd "amdgcn, libgomp: low-latency allocator". libgomp/ * testsuite/libgomp.c/alloc-ompx_host_mem_alloc-1.c: New. --- libgomp/ChangeLog.omp | 2 + .../libgomp.c/alloc-ompx_host_mem_alloc-1.c | 77 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 libgomp/testsuite/libgomp.c/alloc-ompx_host_mem_alloc-1.c diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index ef957e3d2d8..6b816e46cd2 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,7 @@ 2023-03-24 Thomas Schwinge + * testsuite/libgomp.c/alloc-ompx_host_mem_alloc-1.c: New. + * config/gcn/allocator.c (gcn_memspace_free): Explicitly handle 'memspace == ompx_host_mem_space'. diff --git a/libgomp/testsuite/libgomp.c/alloc-ompx_host_mem_alloc-1.c b/libgomp/testsuite/libgomp.c/alloc-ompx_host_mem_alloc-1.c new file mode 100644 index 00000000000..683b7aff3d4 --- /dev/null +++ b/libgomp/testsuite/libgomp.c/alloc-ompx_host_mem_alloc-1.c @@ -0,0 +1,77 @@ +/* Verify that on the host we can but on a device we cannot allocate 'ompx_host_mem_alloc' memory. */ + +/* { dg-additional-options -DOFFLOAD_DEVICE { target offload_device } } */ + +#include + +#pragma omp requires dynamic_allocators + +int main() +{ +#pragma omp target + { + char *c, *c_; + + c = omp_alloc(1, ompx_host_mem_alloc); +#ifdef OFFLOAD_DEVICE + if (c) + __builtin_abort (); +#else + if (!c) + __builtin_abort (); +#endif + omp_free(c, ompx_host_mem_alloc); + + c = omp_aligned_alloc(128, 256, ompx_host_mem_alloc); +#ifdef OFFLOAD_DEVICE + if (c) + __builtin_abort (); +#else + if (!c) + __builtin_abort (); +#endif + omp_free(c, omp_null_allocator); + + c = omp_calloc(1, 1, ompx_host_mem_alloc); +#ifdef OFFLOAD_DEVICE + if (c) + __builtin_abort (); +#else + if (!c) + __builtin_abort (); +#endif + c_ = omp_realloc(c, 2, ompx_host_mem_alloc, ompx_host_mem_alloc); +#ifdef OFFLOAD_DEVICE + if (c_) + __builtin_abort (); +#else + if (!c_) + __builtin_abort (); +#endif + c = omp_realloc(c_, 0, ompx_host_mem_alloc, ompx_host_mem_alloc); + if (c) + __builtin_abort (); + + c = omp_aligned_calloc(64, 1, 512, ompx_host_mem_alloc); +#ifdef OFFLOAD_DEVICE + if (c) + __builtin_abort (); +#else + if (!c) + __builtin_abort (); +#endif + c_ = omp_realloc(c, 2, c ? omp_null_allocator : ompx_host_mem_alloc, omp_null_allocator); +#ifdef OFFLOAD_DEVICE + if (c_) + __builtin_abort (); +#else + if (!c_) + __builtin_abort (); +#endif + c = omp_realloc(c_, 0, omp_null_allocator, omp_null_allocator); + if (c) + __builtin_abort (); + } + + return 0; +} -- 2.25.1