Re: openmp: Add basic library allocator support
On Tue, Jun 02, 2020 at 11:26:37AM +0200, Sebastian Huber wrote: > with this patch I get the following error for target arm-rtems6: > > ../../../gnu-mirror-gcc-86b14bb/libgomp/allocator.c: In function 'omp_free': > ../../../gnu-mirror-gcc-86b14bb/libgomp/allocator.c:351:42: error: 'struct > omp_mem_header' has no member named 'new_size' > Â 351 |Â Â Â allocator_data->used_pool_size -= data->new_size; > Â Â Â Â Â |Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â > Â Â Â Â Â Â Â Â ^~ Oops, sorry, fixed thusly, tested also with #undef HAVE_SYNC_BUILTINS early in the file, committed to trunk. 2020-06-02 Jakub Jelinek * allocator.c (omp_free): Fix up build if HAVE_SYNC_BUILTINS is not defined. --- libgomp/allocator.c +++ libgomp/allocator.c @@ -348,7 +348,7 @@ omp_free (void *ptr, omp_allocator_handle_t allocator) MEMMODEL_RELAXED); #else gomp_mutex_lock (&allocator_data->lock); - allocator_data->used_pool_size -= data->new_size; + allocator_data->used_pool_size -= data->size; gomp_mutex_unlock (&allocator_data->lock); #endif } Jakub
Re: openmp: Add basic library allocator support
Hello,
On 19/05/2020 10:24, Jakub Jelinek via Gcc-patches wrote:
+ gomp_mutex_lock (&allocator_data->lock);
+ if (__builtin_add_overflow (allocator_data->used_pool_size, new_size,
+ &used_pool_size)
+ || used_pool_size > allocator_data->pool_size)
+ {
+ gomp_mutex_unlock (&allocator_data->lock);
+ goto fail;
+ }
+ allocator_data->used_pool_size = used_pool_size;
+ gomp_mutex_unlock (&allocator_data->lock);
+#endif
+ ptr = malloc (new_size);
+ if (ptr == NULL)
+ {
+#ifdef HAVE_SYNC_BUILTINS
+ __atomic_add_fetch (&allocator_data->used_pool_size, -new_size,
+ MEMMODEL_RELAXED);
+#else
+ gomp_mutex_lock (&allocator_data->lock);
+ allocator_data->used_pool_size -= new_size;
+ gomp_mutex_unlock (&allocator_data->lock);
+#endif
with this patch I get the following error for target arm-rtems6:
../../../gnu-mirror-gcc-86b14bb/libgomp/allocator.c: In function 'omp_free':
../../../gnu-mirror-gcc-86b14bb/libgomp/allocator.c:351:42: error:
'struct omp_mem_header' has no member named 'new_size'
351 | allocator_data->used_pool_size -= data->new_size;
| ^~
Re: openmp: Add basic library allocator support
On Tue, May 19, 2020 at 04:56:51AM -0700, H.J. Lu wrote: > > 2020-05-19 Jakub Jelinek > > > > * omp.h.in (omp_uintptr_t): New typedef. > > (__GOMP_UINTPTR_T_ENUM): Define. > > (omp_memspace_handle_t, omp_allocator_handle_t, > > omp_alloctrait_key_t, > > omp_alloctrait_value_t, omp_alloctrait_t): New typedefs. > > (__GOMP_DEFAULT_NULL_ALLOCATOR): Define. > > (omp_init_allocator, omp_destroy_allocator, > > omp_set_default_allocator, > > omp_get_default_allocator, omp_alloc, omp_free): Declare. > > * libgomp.h (struct gomp_team_state): Add def_allocator field. > > (gomp_def_allocator): Declare. > > * libgomp.map (OMP_5.0.1): Export omp_set_default_allocator, > > omp_get_default_allocator, omp_init_allocator, > > omp_destroy_allocator, > > omp_alloc and omp_free. > > * team.c (gomp_team_start): Copy over ts.def_allocator. > > * env.c (gomp_def_allocator): New variable. > > (parse_wait_policy): Adjust function comment. > > (parse_allocator): New function. > > (handle_omp_display_env): Print OMP_ALLOCATOR. > > (initialize_env): Call parse_allocator. > > * Makefile.am (libgomp_la_SOURCES): Add allocator.c. > > * allocator.c: New file. > > * icv.c (omp_set_default_allocator, omp_get_default_allocator): New > > functions. > > * testsuite/libgomp.c-c++-common/alloc-1.c: New test. > > * testsuite/libgomp.c-c++-common/alloc-2.c: New test. > > * testsuite/libgomp.c-c++-common/alloc-3.c: New test. > > * Makefile.in: Regenerated. > > Did you check in allocator.c? Forgot to git add it, fixed in r11-494-ge107157171af25f6c89be02d62b0a7235a5c988d On the bright side, Martin's pre-commit-hook would reject it because of that, but I've committed it immediately before installing the hook :(. Sorry. Jakub
Re: openmp: Add basic library allocator support
On Tue, May 19, 2020 at 1:27 AM Jakub Jelinek via Gcc-patches
wrote:
>
> Hi!
>
> This patch adds very basic allocator support (omp_{init,destroy}_allocator,
> omp_{alloc,free}, omp_[sg]et_default_allocator).
> The plan is to use memkind (likely dlopened) for high bandwidth memory, but
> that part isn't implemented yet, probably mlock for pinned memory and see
> what other options there are for other kinds of memory.
> For offloading targets, we need to decide if we want to support the
> dynamic allocators (and on which targets), or if e.g. all we do is at compile
> time replace omp_alloc/omp_free calls with constexpr predefined allocators
> with something special.
>
> And allocate directive and allocator/uses_allocators clauses are future work
> too.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.
>
> 2020-05-19 Jakub Jelinek
>
> * omp.h.in (omp_uintptr_t): New typedef.
> (__GOMP_UINTPTR_T_ENUM): Define.
> (omp_memspace_handle_t, omp_allocator_handle_t, omp_alloctrait_key_t,
> omp_alloctrait_value_t, omp_alloctrait_t): New typedefs.
> (__GOMP_DEFAULT_NULL_ALLOCATOR): Define.
> (omp_init_allocator, omp_destroy_allocator, omp_set_default_allocator,
> omp_get_default_allocator, omp_alloc, omp_free): Declare.
> * libgomp.h (struct gomp_team_state): Add def_allocator field.
> (gomp_def_allocator): Declare.
> * libgomp.map (OMP_5.0.1): Export omp_set_default_allocator,
> omp_get_default_allocator, omp_init_allocator, omp_destroy_allocator,
> omp_alloc and omp_free.
> * team.c (gomp_team_start): Copy over ts.def_allocator.
> * env.c (gomp_def_allocator): New variable.
> (parse_wait_policy): Adjust function comment.
> (parse_allocator): New function.
> (handle_omp_display_env): Print OMP_ALLOCATOR.
> (initialize_env): Call parse_allocator.
> * Makefile.am (libgomp_la_SOURCES): Add allocator.c.
> * allocator.c: New file.
> * icv.c (omp_set_default_allocator, omp_get_default_allocator): New
> functions.
> * testsuite/libgomp.c-c++-common/alloc-1.c: New test.
> * testsuite/libgomp.c-c++-common/alloc-2.c: New test.
> * testsuite/libgomp.c-c++-common/alloc-3.c: New test.
> * Makefile.in: Regenerated.
Did you check in allocator.c?
--
H.J.
openmp: Add basic library allocator support
Hi!
This patch adds very basic allocator support (omp_{init,destroy}_allocator,
omp_{alloc,free}, omp_[sg]et_default_allocator).
The plan is to use memkind (likely dlopened) for high bandwidth memory, but
that part isn't implemented yet, probably mlock for pinned memory and see
what other options there are for other kinds of memory.
For offloading targets, we need to decide if we want to support the
dynamic allocators (and on which targets), or if e.g. all we do is at compile
time replace omp_alloc/omp_free calls with constexpr predefined allocators
with something special.
And allocate directive and allocator/uses_allocators clauses are future work
too.
Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.
2020-05-19 Jakub Jelinek
* omp.h.in (omp_uintptr_t): New typedef.
(__GOMP_UINTPTR_T_ENUM): Define.
(omp_memspace_handle_t, omp_allocator_handle_t, omp_alloctrait_key_t,
omp_alloctrait_value_t, omp_alloctrait_t): New typedefs.
(__GOMP_DEFAULT_NULL_ALLOCATOR): Define.
(omp_init_allocator, omp_destroy_allocator, omp_set_default_allocator,
omp_get_default_allocator, omp_alloc, omp_free): Declare.
* libgomp.h (struct gomp_team_state): Add def_allocator field.
(gomp_def_allocator): Declare.
* libgomp.map (OMP_5.0.1): Export omp_set_default_allocator,
omp_get_default_allocator, omp_init_allocator, omp_destroy_allocator,
omp_alloc and omp_free.
* team.c (gomp_team_start): Copy over ts.def_allocator.
* env.c (gomp_def_allocator): New variable.
(parse_wait_policy): Adjust function comment.
(parse_allocator): New function.
(handle_omp_display_env): Print OMP_ALLOCATOR.
(initialize_env): Call parse_allocator.
* Makefile.am (libgomp_la_SOURCES): Add allocator.c.
* allocator.c: New file.
* icv.c (omp_set_default_allocator, omp_get_default_allocator): New
functions.
* testsuite/libgomp.c-c++-common/alloc-1.c: New test.
* testsuite/libgomp.c-c++-common/alloc-2.c: New test.
* testsuite/libgomp.c-c++-common/alloc-3.c: New test.
* Makefile.in: Regenerated.
--- libgomp/omp.h.in.jj 2020-01-12 11:54:39.018374107 +0100
+++ libgomp/omp.h.in2020-05-14 15:46:58.046243665 +0200
@@ -90,11 +90,87 @@ typedef enum omp_pause_resource_t
omp_pause_hard = 2
} omp_pause_resource_t;
+typedef __UINTPTR_TYPE__ omp_uintptr_t;
+
+#if __cplusplus >= 201103L
+# define __GOMP_UINTPTR_T_ENUM : omp_uintptr_t
+#else
+# define __GOMP_UINTPTR_T_ENUM
+#endif
+
+typedef enum omp_memspace_handle_t __GOMP_UINTPTR_T_ENUM
+{
+ omp_default_mem_space = 0,
+ omp_large_cap_mem_space = 1,
+ omp_const_mem_space = 2,
+ omp_high_bw_mem_space = 3,
+ omp_low_lat_mem_space = 4,
+ __omp_memspace_handle_t_max__ = __UINTPTR_MAX__
+} omp_memspace_handle_t;
+
+typedef enum omp_allocator_handle_t __GOMP_UINTPTR_T_ENUM
+{
+ omp_null_allocator = 0,
+ omp_default_mem_alloc = 1,
+ omp_large_cap_mem_alloc = 2,
+ omp_const_mem_alloc = 3,
+ omp_high_bw_mem_alloc = 4,
+ omp_low_lat_mem_alloc = 5,
+ omp_cgroup_mem_alloc = 6,
+ omp_pteam_mem_alloc = 7,
+ omp_thread_mem_alloc = 8,
+ __omp_allocator_handle_t_max__ = __UINTPTR_MAX__
+} omp_allocator_handle_t;
+
+typedef enum omp_alloctrait_key_t
+{
+ omp_atk_sync_hint = 1,
+ omp_atk_alignment = 2,
+ omp_atk_access = 3,
+ omp_atk_pool_size = 4,
+ omp_atk_fallback = 5,
+ omp_atk_fb_data = 6,
+ omp_atk_pinned = 7,
+ omp_atk_partition = 8
+} omp_alloctrait_key_t;
+
+typedef enum omp_alloctrait_value_t
+{
+ omp_atv_false = 0,
+ omp_atv_true = 1,
+ omp_atv_default = 2,
+ omp_atv_contended = 3,
+ omp_atv_uncontended = 4,
+ omp_atv_sequential = 5,
+ omp_atv_private = 6,
+ omp_atv_all = 7,
+ omp_atv_thread = 8,
+ omp_atv_pteam = 9,
+ omp_atv_cgroup = 10,
+ omp_atv_default_mem_fb = 11,
+ omp_atv_null_fb = 12,
+ omp_atv_abort_fb = 13,
+ omp_atv_allocator_fb = 14,
+ omp_atv_environment = 15,
+ omp_atv_nearest = 16,
+ omp_atv_blocked = 17,
+ omp_atv_interleaved = 18,
+ __omp_alloctrait_value_max__ = __UINTPTR_MAX__
+} omp_alloctrait_value_t;
+
+typedef struct omp_alloctrait_t
+{
+ omp_alloctrait_key_t key;
+ omp_uintptr_t value;
+} omp_alloctrait_t;
+
#ifdef __cplusplus
extern "C" {
# define __GOMP_NOTHROW throw ()
+# define __GOMP_DEFAULT_NULL_ALLOCATOR = omp_null_allocator
#else
# define __GOMP_NOTHROW __attribute__((__nothrow__))
+# define __GOMP_DEFAULT_NULL_ALLOCATOR
#endif
extern void omp_set_num_threads (int) __GOMP_NOTHROW;
@@ -188,6 +264,20 @@ extern __SIZE_TYPE__ omp_capture_affinit
extern int omp_pause_resource (omp_pause_resource_t, int) __GOMP_NOTHROW;
extern int omp_pause_resource_all (omp_pause_resource_t) __GOMP_NOTHROW;
+extern omp_allocator_handle_t omp_init_allocator (omp_memspace_handle_t,
+ int,
+ const omp_alloctrait_t [])
+ __GOMP
