
This commit adds -fopenmp-allocators which enables support for 'omp allocators' and 'omp allocate' that are associated with a Fortran allocate-stmt. If such a construct is encountered, an error is shown, unless the -fopenmp-allocators flag is present. With -fopenmp -fopenmp-allocators, those constructs get turned into GOMP_alloc allocations, while -fopenmp-allocators (also without -fopenmp) ensures deallocation and reallocation (via intrinsic assignments) are properly directed to GOMP_free/omp_realloc - while normal Fortran allocations are processed by free/realloc. In order to distinguish a 'malloc'ed from a 'GOMP_alloc'ed memory, the version field of the Fortran array discriptor is (mis)used: 0 indicates the normal Fortran allocation while 1 denotes GOMP_alloc. For scalars, there is record keeping in libgomp: GOMP_add_alloc(ptr) will add the pointer address to a splay_tree while GOMP_is_alloc(ptr) will return true it was previously added but also removes it from the list. Besides Fortran FE work, BUILT_IN_GOMP_REALLOC is no part of omp-builtins.def and libgomp gains the mentioned two new function. gcc/ChangeLog: * builtin-types.def (BT_FN_PTR_PTR_SIZE_PTRMODE_PTRMODE): New. * omp-builtins.def (BUILT_IN_GOMP_REALLOC): New. * builtins.cc (builtin_fnspec): Handle it. * gimple-ssa-warn-access.cc (fndecl_alloc_p, matching_alloc_calls_p): Likewise. * gimple.cc (nonfreeing_call_p): Likewise. * predict.cc (expr_expected_value_1): Likewise. * tree-ssa-ccp.cc (evaluate_stmt): Likewise. * tree.cc (fndecl_dealloc_argno): Likewise. gcc/fortran/ChangeLog: * dump-parse-tree.cc (show_omp_node): Handle EXEC_OMP_ALLOCATE and EXEC_OMP_ALLOCATORS. * f95-lang.cc (ATTR_ALLOC_WARN_UNUSED_RESULT_SIZE_2_NOTHROW_LIST): Add 'ECF_LEAF | ECF_MALLOC' to existing 'ECF_NOTHROW'. (ATTR_ALLOC_WARN_UNUSED_RESULT_SIZE_2_NOTHROW_LEAF_LIST): Define. * gfortran.h (gfc_omp_clauses): Add contained_in_target_construct. * invoke.texi (-fopenacc, -fopenmp): Update based on C version. (-fopenmp-simd): New, based on C version. (-fopenmp-allocators): New. * lang.opt (fopenmp-allocators): Add. * openmp.cc (resolve_omp_clauses): For allocators/allocate directive, add target and no dynamic_allocators diagnostic and more invalid diagnostic. * parse.cc (decode_omp_directive): Set contains_teams_construct. * trans-array.h (gfc_array_allocate): Update prototype. (gfc_conv_descriptor_version): New prototype. * trans-decl.cc (gfc_init_default_dt): Fix comment. * trans-array.cc (gfc_conv_descriptor_version): New. (gfc_array_allocate): Support GOMP_alloc allocation. (gfc_alloc_allocatable_for_assignment, structure_alloc_comps): Handle GOMP_free/omp_realloc as needed. * trans-expr.cc (gfc_conv_procedure_call): Likewise. (alloc_scalar_allocatable_for_assignment): Likewise. * trans-intrinsic.cc (conv_intrinsic_move_alloc): Likewise. * trans-openmp.cc (gfc_trans_omp_allocators, gfc_trans_omp_directive): Handle allocators/allocate directive. (gfc_omp_call_add_alloc, gfc_omp_call_is_alloc): New. * trans-stmt.h (gfc_trans_allocate): Update prototype. * trans-stmt.cc (gfc_trans_allocate): Support GOMP_alloc. * trans-types.cc (gfc_get_dtype_rank_type): Set version field. * trans.cc (gfc_allocate_using_malloc, gfc_allocate_allocatable): Update to handle GOMP_alloc. (gfc_deallocate_with_status, gfc_deallocate_scalar_with_status): Handle GOMP_free. (trans_code): Update call. * trans.h (gfc_allocate_allocatable, gfc_allocate_using_malloc): Update prototype. (gfc_omp_call_add_alloc, gfc_omp_call_is_alloc): New prototype. * types.def (BT_FN_PTR_PTR_SIZE_PTRMODE_PTRMODE): New. libgomp/ChangeLog: * allocator.c (struct fort_alloc_splay_tree_key_s, fort_alloc_splay_compare, GOMP_add_alloc, GOMP_is_alloc): New. * libgomp.h: Define splay_tree_static for 'reverse' splay tree. * libgomp.map (GOMP_5.1.2): New; add GOMP_add_alloc and GOMP_is_alloc; move GOMP_target_map_indirect_ptr from ... (GOMP_5.1.1): ... here. * libgomp.texi (Impl. Status, Memory management): Update for allocators/allocate directives. * splay-tree.c: Handle splay_tree_static define to declare all functions as static. (splay_tree_lookup_node): New. * splay-tree.h: Handle splay_tree_decl_only define. (splay_tree_lookup_node): New prototype. * target.c: Define splay_tree_static for 'reverse'. * testsuite/libgomp.fortran/allocators-1.f90: New test. * testsuite/libgomp.fortran/allocators-2.f90: New test. * testsuite/libgomp.fortran/allocators-3.f90: New test. * testsuite/libgomp.fortran/allocators-4.f90: New test. * testsuite/libgomp.fortran/allocators-5.f90: New test. gcc/testsuite/ChangeLog: * gfortran.dg/gomp/allocate-14.f90: Add coarray and not-listed tests. * gfortran.dg/gomp/allocate-5.f90: Remove sorry dg-message. * gfortran.dg/bind_c_array_params_2.f90: Update expected dump for dtype '.version=0'. * gfortran.dg/gomp/allocate-16.f90: New test. * gfortran.dg/gomp/allocators-3.f90: New test. * gfortran.dg/gomp/allocators-4.f90: New test.
298 lines
7.3 KiB
C
298 lines
7.3 KiB
C
/* A splay-tree datatype.
|
|
Copyright (C) 1998-2023 Free Software Foundation, Inc.
|
|
Contributed by Mark Mitchell (mark@markmitchell.com).
|
|
|
|
This file is part of the GNU Offloading and Multi Processing Library
|
|
(libgomp).
|
|
|
|
Libgomp is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* The splay tree code copied from include/splay-tree.h and adjusted,
|
|
so that all the data lives directly in splay_tree_node_s structure
|
|
and no extra allocations are needed. */
|
|
|
|
/* For an easily readable description of splay-trees, see:
|
|
|
|
Lewis, Harry R. and Denenberg, Larry. Data Structures and Their
|
|
Algorithms. Harper-Collins, Inc. 1991.
|
|
|
|
The major feature of splay trees is that all basic tree operations
|
|
are amortized O(log n) time for a tree with n nodes. */
|
|
|
|
#include "libgomp.h"
|
|
|
|
/* Rotate the edge joining the left child N with its parent P. PP is the
|
|
grandparents' pointer to P. */
|
|
|
|
static inline void
|
|
rotate_left (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
|
|
{
|
|
splay_tree_node tmp;
|
|
tmp = n->right;
|
|
n->right = p;
|
|
p->left = tmp;
|
|
*pp = n;
|
|
}
|
|
|
|
/* Rotate the edge joining the right child N with its parent P. PP is the
|
|
grandparents' pointer to P. */
|
|
|
|
static inline void
|
|
rotate_right (splay_tree_node *pp, splay_tree_node p, splay_tree_node n)
|
|
{
|
|
splay_tree_node tmp;
|
|
tmp = n->left;
|
|
n->left = p;
|
|
p->right = tmp;
|
|
*pp = n;
|
|
}
|
|
|
|
/* Bottom up splay of KEY. */
|
|
|
|
static void
|
|
splay_tree_splay (splay_tree sp, splay_tree_key key)
|
|
{
|
|
if (sp->root == NULL)
|
|
return;
|
|
|
|
do {
|
|
int cmp1, cmp2;
|
|
splay_tree_node n, c;
|
|
|
|
n = sp->root;
|
|
cmp1 = splay_compare (key, &n->key);
|
|
|
|
/* Found. */
|
|
if (cmp1 == 0)
|
|
return;
|
|
|
|
/* Left or right? If no child, then we're done. */
|
|
if (cmp1 < 0)
|
|
c = n->left;
|
|
else
|
|
c = n->right;
|
|
if (!c)
|
|
return;
|
|
|
|
/* Next one left or right? If found or no child, we're done
|
|
after one rotation. */
|
|
cmp2 = splay_compare (key, &c->key);
|
|
if (cmp2 == 0
|
|
|| (cmp2 < 0 && !c->left)
|
|
|| (cmp2 > 0 && !c->right))
|
|
{
|
|
if (cmp1 < 0)
|
|
rotate_left (&sp->root, n, c);
|
|
else
|
|
rotate_right (&sp->root, n, c);
|
|
return;
|
|
}
|
|
|
|
/* Now we have the four cases of double-rotation. */
|
|
if (cmp1 < 0 && cmp2 < 0)
|
|
{
|
|
rotate_left (&n->left, c, c->left);
|
|
rotate_left (&sp->root, n, n->left);
|
|
}
|
|
else if (cmp1 > 0 && cmp2 > 0)
|
|
{
|
|
rotate_right (&n->right, c, c->right);
|
|
rotate_right (&sp->root, n, n->right);
|
|
}
|
|
else if (cmp1 < 0 && cmp2 > 0)
|
|
{
|
|
rotate_right (&n->left, c, c->right);
|
|
rotate_left (&sp->root, n, n->left);
|
|
}
|
|
else if (cmp1 > 0 && cmp2 < 0)
|
|
{
|
|
rotate_left (&n->right, c, c->left);
|
|
rotate_right (&sp->root, n, n->right);
|
|
}
|
|
} while (1);
|
|
}
|
|
|
|
/* Insert a new NODE into SP. The NODE shouldn't exist in the tree. */
|
|
|
|
#ifdef splay_tree_static
|
|
__attribute__((unused)) static void
|
|
#else
|
|
attribute_hidden void
|
|
#endif
|
|
splay_tree_insert (splay_tree sp, splay_tree_node node)
|
|
{
|
|
int comparison = 0;
|
|
|
|
splay_tree_splay (sp, &node->key);
|
|
|
|
if (sp->root)
|
|
comparison = splay_compare (&sp->root->key, &node->key);
|
|
|
|
if (sp->root && comparison == 0)
|
|
gomp_fatal ("Duplicate node");
|
|
else
|
|
{
|
|
/* Insert it at the root. */
|
|
if (sp->root == NULL)
|
|
node->left = node->right = NULL;
|
|
else if (comparison < 0)
|
|
{
|
|
node->left = sp->root;
|
|
node->right = node->left->right;
|
|
node->left->right = NULL;
|
|
}
|
|
else
|
|
{
|
|
node->right = sp->root;
|
|
node->left = node->right->left;
|
|
node->right->left = NULL;
|
|
}
|
|
|
|
sp->root = node;
|
|
}
|
|
}
|
|
|
|
/* Remove node with KEY from SP. It is not an error if it did not exist. */
|
|
|
|
#ifdef splay_tree_static
|
|
__attribute__((unused)) static void
|
|
#else
|
|
attribute_hidden void
|
|
#endif
|
|
splay_tree_remove (splay_tree sp, splay_tree_key key)
|
|
{
|
|
splay_tree_splay (sp, key);
|
|
|
|
if (sp->root && splay_compare (&sp->root->key, key) == 0)
|
|
{
|
|
splay_tree_node left, right;
|
|
|
|
left = sp->root->left;
|
|
right = sp->root->right;
|
|
|
|
/* One of the children is now the root. Doesn't matter much
|
|
which, so long as we preserve the properties of the tree. */
|
|
if (left)
|
|
{
|
|
sp->root = left;
|
|
|
|
/* If there was a right child as well, hang it off the
|
|
right-most leaf of the left child. */
|
|
if (right)
|
|
{
|
|
while (left->right)
|
|
left = left->right;
|
|
left->right = right;
|
|
}
|
|
}
|
|
else
|
|
sp->root = right;
|
|
}
|
|
}
|
|
|
|
/* Lookup KEY in SP, returning NODE if present, and NULL
|
|
otherwise. */
|
|
|
|
#ifdef splay_tree_static
|
|
__attribute__((unused)) static splay_tree_node
|
|
#else
|
|
attribute_hidden splay_tree_node
|
|
#endif
|
|
splay_tree_lookup_node (splay_tree sp, splay_tree_key key)
|
|
{
|
|
splay_tree_splay (sp, key);
|
|
|
|
if (sp->root && splay_compare (&sp->root->key, key) == 0)
|
|
return sp->root;
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
/* Likewise but return the key. */
|
|
|
|
#ifdef splay_tree_static
|
|
__attribute__((unused)) static splay_tree_key
|
|
#else
|
|
attribute_hidden splay_tree_key
|
|
#endif
|
|
splay_tree_lookup (splay_tree sp, splay_tree_key key)
|
|
{
|
|
splay_tree_splay (sp, key);
|
|
|
|
if (sp->root && splay_compare (&sp->root->key, key) == 0)
|
|
return &sp->root->key;
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
/* Helper function for splay_tree_foreach.
|
|
|
|
Run FUNC on every node in KEY. */
|
|
|
|
static void
|
|
splay_tree_foreach_internal (splay_tree_node node, splay_tree_callback func,
|
|
void *data)
|
|
{
|
|
if (!node)
|
|
return;
|
|
func (&node->key, data);
|
|
splay_tree_foreach_internal (node->left, func, data);
|
|
/* Yeah, whatever. GCC can fix my tail recursion. */
|
|
splay_tree_foreach_internal (node->right, func, data);
|
|
}
|
|
|
|
/* Run FUNC on each of the nodes in SP. */
|
|
|
|
#ifdef splay_tree_static
|
|
__attribute__((unused)) static void
|
|
#else
|
|
attribute_hidden void
|
|
#endif
|
|
splay_tree_foreach (splay_tree sp, splay_tree_callback func, void *data)
|
|
{
|
|
splay_tree_foreach_internal (sp->root, func, data);
|
|
}
|
|
|
|
/* Like above, except when func returns != 0, stop early. */
|
|
|
|
static int
|
|
splay_tree_foreach_internal_lazy (splay_tree_node node,
|
|
splay_tree_callback_stop func, void *data)
|
|
{
|
|
if (!node)
|
|
return 0;
|
|
if (func (&node->key, data))
|
|
return 1;
|
|
if (splay_tree_foreach_internal_lazy (node->left, func, data))
|
|
return 1;
|
|
/* Yeah, whatever. GCC can fix my tail recursion. */
|
|
return splay_tree_foreach_internal_lazy (node->right, func, data);
|
|
}
|
|
|
|
#ifdef splay_tree_static
|
|
__attribute__((unused)) static void
|
|
#else
|
|
attribute_hidden void
|
|
#endif
|
|
splay_tree_foreach_lazy (splay_tree sp, splay_tree_callback_stop func,
|
|
void *data)
|
|
{
|
|
splay_tree_foreach_internal_lazy (sp->root, func, data);
|
|
}
|