a6d22fb21c
2021-01-16 Kwok Cheung Yeung <kcy@codesourcery.com> gcc/ * builtin-types.def (BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT): Rename to... (BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR): ...this. Add extra argument. * gimplify.c (omp_default_clause): Ensure that event handle is firstprivate in a task region. (gimplify_scan_omp_clauses): Handle OMP_CLAUSE_DETACH. (gimplify_adjust_omp_clauses): Likewise. * omp-builtins.def (BUILT_IN_GOMP_TASK): Change function type to BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR. * omp-expand.c (expand_task_call): Add GOMP_TASK_FLAG_DETACH to flags if detach clause specified. Add detach argument when generating call to GOMP_task. * omp-low.c (scan_sharing_clauses): Setup data environment for detach clause. (finish_taskreg_scan): Move field for variable containing the event handle to the front of the struct. * tree-core.h (enum omp_clause_code): Add OMP_CLAUSE_DETACH. Fix ordering. * tree-nested.c (convert_nonlocal_omp_clauses): Handle OMP_CLAUSE_DETACH clause. (convert_local_omp_clauses): Handle OMP_CLAUSE_DETACH clause. * tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE_DETACH. * tree.c (omp_clause_num_ops): Add entry for OMP_CLAUSE_DETACH. Fix ordering. (omp_clause_code_name): Add entry for OMP_CLAUSE_DETACH. Fix ordering. (walk_tree_1): Handle OMP_CLAUSE_DETACH. gcc/c-family/ * c-pragma.h (pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_DETACH. Redefine PRAGMA_OACC_CLAUSE_DETACH. gcc/c/ * c-parser.c (c_parser_omp_clause_detach): New. (c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH clause. (OMP_TASK_CLAUSE_MASK): Add mask for PRAGMA_OMP_CLAUSE_DETACH. * c-typeck.c (c_finish_omp_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH clause. Prevent use of detach with mergeable and overriding the data sharing mode of the event handle. gcc/cp/ * parser.c (cp_parser_omp_clause_detach): New. (cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_DETACH. (OMP_TASK_CLAUSE_MASK): Add mask for PRAGMA_OMP_CLAUSE_DETACH. * pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_DETACH clause. * semantics.c (finish_omp_clauses): Handle OMP_CLAUSE_DETACH clause. Prevent use of detach with mergeable and overriding the data sharing mode of the event handle. gcc/fortran/ * dump-parse-tree.c (show_omp_clauses): Handle detach clause. * frontend-passes.c (gfc_code_walker): Walk detach expression. * gfortran.h (struct gfc_omp_clauses): Add detach field. (gfc_c_intptr_kind): New. * openmp.c (gfc_free_omp_clauses): Free detach clause. (gfc_match_omp_detach): New. (enum omp_mask1): Add OMP_CLAUSE_DETACH. (enum omp_mask2): Remove OMP_CLAUSE_DETACH. (gfc_match_omp_clauses): Handle OMP_CLAUSE_DETACH for OpenMP. (OMP_TASK_CLAUSES): Add OMP_CLAUSE_DETACH. (resolve_omp_clauses): Prevent use of detach with mergeable and overriding the data sharing mode of the event handle. * trans-openmp.c (gfc_trans_omp_clauses): Handle detach clause. * trans-types.c (gfc_c_intptr_kind): New. (gfc_init_kinds): Initialize gfc_c_intptr_kind. * types.def (BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT): Rename to... (BT_FN_VOID_OMPFN_PTR_OMPCPYFN_LONG_LONG_BOOL_UINT_PTR_INT_PTR): ...this. Add extra argument. gcc/testsuite/ * c-c++-common/gomp/task-detach-1.c: New. * g++.dg/gomp/task-detach-1.C: New. * gcc.dg/gomp/task-detach-1.c: New. * gfortran.dg/gomp/task-detach-1.f90: New. include/ * gomp-constants.h (GOMP_TASK_FLAG_DETACH): New. libgomp/ * fortran.c (omp_fulfill_event_): New. * libgomp.h (struct gomp_task): Add detach and completion_sem fields. (struct gomp_team): Add task_detach_queue and task_detach_count fields. * libgomp.map (OMP_5.0.1): Add omp_fulfill_event and omp_fulfill_event_. * libgomp_g.h (GOMP_task): Add extra argument. * omp.h.in (enum omp_event_handle_t): New. (omp_fulfill_event): New. * omp_lib.f90.in (omp_event_handle_kind): New. (omp_fulfill_event): New. * omp_lib.h.in (omp_event_handle_kind): New. (omp_fulfill_event): Declare. * priority_queue.c (priority_tree_find): New. (priority_list_find): New. (priority_queue_find): New. * priority_queue.h (priority_queue_predicate): New. (priority_queue_find): New. * task.c (gomp_init_task): Initialize detach field. (task_fulfilled_p): New. (GOMP_task): Add detach argument. Ignore detach argument if GOMP_TASK_FLAG_DETACH not set in flags. Initialize completion_sem field. Copy address of completion_sem into detach argument and into the start of the data record. Wait for detach event if task not deferred. (gomp_barrier_handle_tasks): Queue tasks with unfulfilled events. Remove completed tasks and requeue dependent tasks. (omp_fulfill_event): New. * team.c (gomp_new_team): Initialize task_detach_queue and task_detach_count fields. (free_team): Free task_detach_queue field. * testsuite/libgomp.c-c++-common/task-detach-1.c: New testcase. * testsuite/libgomp.c-c++-common/task-detach-2.c: New testcase. * testsuite/libgomp.c-c++-common/task-detach-3.c: New testcase. * testsuite/libgomp.c-c++-common/task-detach-4.c: New testcase. * testsuite/libgomp.c-c++-common/task-detach-5.c: New testcase. * testsuite/libgomp.c-c++-common/task-detach-6.c: New testcase. * testsuite/libgomp.fortran/task-detach-1.f90: New testcase. * testsuite/libgomp.fortran/task-detach-2.f90: New testcase. * testsuite/libgomp.fortran/task-detach-3.f90: New testcase. * testsuite/libgomp.fortran/task-detach-4.f90: New testcase. * testsuite/libgomp.fortran/task-detach-5.f90: New testcase. * testsuite/libgomp.fortran/task-detach-6.f90: New testcase.
358 lines
10 KiB
C
358 lines
10 KiB
C
/* Copyright (C) 2015-2021 Free Software Foundation, Inc.
|
|
Contributed by Aldy Hernandez <aldyh@redhat.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/>. */
|
|
|
|
/* Priority queue implementation of GOMP tasks. */
|
|
|
|
#include "libgomp.h"
|
|
|
|
#if _LIBGOMP_CHECKING_
|
|
#include <stdio.h>
|
|
|
|
/* Sanity check to verify whether a TASK is in LIST. Return TRUE if
|
|
found, FALSE otherwise.
|
|
|
|
TYPE is the type of priority queue this task resides in. */
|
|
|
|
static inline bool
|
|
priority_queue_task_in_list_p (enum priority_queue_type type,
|
|
struct priority_list *list,
|
|
struct gomp_task *task)
|
|
{
|
|
struct priority_node *p = list->tasks;
|
|
do
|
|
{
|
|
if (priority_node_to_task (type, p) == task)
|
|
return true;
|
|
p = p->next;
|
|
}
|
|
while (p != list->tasks);
|
|
return false;
|
|
}
|
|
|
|
/* Tree version of priority_queue_task_in_list_p. */
|
|
|
|
static inline bool
|
|
priority_queue_task_in_tree_p (enum priority_queue_type type,
|
|
struct priority_queue *head,
|
|
struct gomp_task *task)
|
|
{
|
|
struct priority_list *list
|
|
= priority_queue_lookup_priority (head, task->priority);
|
|
if (!list)
|
|
return false;
|
|
return priority_queue_task_in_list_p (type, list, task);
|
|
}
|
|
|
|
/* Generic version of priority_queue_task_in_list_p that works for
|
|
trees or lists. */
|
|
|
|
bool
|
|
priority_queue_task_in_queue_p (enum priority_queue_type type,
|
|
struct priority_queue *head,
|
|
struct gomp_task *task)
|
|
{
|
|
if (priority_queue_empty_p (head, MEMMODEL_RELAXED))
|
|
return false;
|
|
if (priority_queue_multi_p (head))
|
|
return priority_queue_task_in_tree_p (type, head, task);
|
|
else
|
|
return priority_queue_task_in_list_p (type, &head->l, task);
|
|
}
|
|
|
|
/* Sanity check LIST to make sure the tasks therein are in the right
|
|
order. LIST is a priority list of type TYPE.
|
|
|
|
The expected order is that GOMP_TASK_WAITING tasks come before
|
|
GOMP_TASK_TIED/GOMP_TASK_ASYNC_RUNNING ones.
|
|
|
|
If CHECK_DEPS is TRUE, we also check that parent_depends_on WAITING
|
|
tasks come before !parent_depends_on WAITING tasks. This is only
|
|
applicable to the children queue, and the caller is expected to
|
|
ensure that we are verifying the children queue. */
|
|
|
|
static void
|
|
priority_list_verify (enum priority_queue_type type,
|
|
struct priority_list *list, bool check_deps)
|
|
{
|
|
bool seen_tied = false;
|
|
bool seen_plain_waiting = false;
|
|
struct priority_node *p = list->tasks;
|
|
while (1)
|
|
{
|
|
struct gomp_task *t = priority_node_to_task (type, p);
|
|
if (seen_tied && t->kind == GOMP_TASK_WAITING)
|
|
gomp_fatal ("priority_queue_verify: WAITING task after TIED");
|
|
if (t->kind >= GOMP_TASK_TIED)
|
|
seen_tied = true;
|
|
else if (check_deps && t->kind == GOMP_TASK_WAITING)
|
|
{
|
|
if (t->parent_depends_on)
|
|
{
|
|
if (seen_plain_waiting)
|
|
gomp_fatal ("priority_queue_verify: "
|
|
"parent_depends_on after !parent_depends_on");
|
|
}
|
|
else
|
|
seen_plain_waiting = true;
|
|
}
|
|
p = p->next;
|
|
if (p == list->tasks)
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Callback type for priority_tree_verify_callback. */
|
|
struct cbtype
|
|
{
|
|
enum priority_queue_type type;
|
|
bool check_deps;
|
|
};
|
|
|
|
/* Verify every task in NODE.
|
|
|
|
Callback for splay_tree_foreach. */
|
|
|
|
static void
|
|
priority_tree_verify_callback (prio_splay_tree_key key, void *data)
|
|
{
|
|
struct cbtype *cb = (struct cbtype *) data;
|
|
priority_list_verify (cb->type, &key->l, cb->check_deps);
|
|
}
|
|
|
|
/* Generic version of priority_list_verify.
|
|
|
|
Sanity check HEAD to make sure the tasks therein are in the right
|
|
order. The priority_queue holds tasks of type TYPE.
|
|
|
|
If CHECK_DEPS is TRUE, we also check that parent_depends_on WAITING
|
|
tasks come before !parent_depends_on WAITING tasks. This is only
|
|
applicable to the children queue, and the caller is expected to
|
|
ensure that we are verifying the children queue. */
|
|
|
|
void
|
|
priority_queue_verify (enum priority_queue_type type,
|
|
struct priority_queue *head, bool check_deps)
|
|
{
|
|
if (priority_queue_empty_p (head, MEMMODEL_RELAXED))
|
|
return;
|
|
if (priority_queue_multi_p (head))
|
|
{
|
|
struct cbtype cb = { type, check_deps };
|
|
prio_splay_tree_foreach (&head->t,
|
|
priority_tree_verify_callback, &cb);
|
|
}
|
|
else
|
|
priority_list_verify (type, &head->l, check_deps);
|
|
}
|
|
#endif /* _LIBGOMP_CHECKING_ */
|
|
|
|
/* Tree version of priority_queue_find. */
|
|
|
|
static struct gomp_task *
|
|
priority_tree_find (enum priority_queue_type type,
|
|
prio_splay_tree_node node,
|
|
priority_queue_predicate pred)
|
|
{
|
|
again:
|
|
if (!node)
|
|
return NULL;
|
|
struct gomp_task *task = priority_tree_find (type, node->right, pred);
|
|
if (task)
|
|
return task;
|
|
task = priority_node_to_task (type, node->key.l.tasks);
|
|
if (pred (task))
|
|
return task;
|
|
node = node->left;
|
|
goto again;
|
|
}
|
|
|
|
/* List version of priority_queue_find. */
|
|
|
|
static struct gomp_task *
|
|
priority_list_find (enum priority_queue_type type,
|
|
struct priority_list *list,
|
|
priority_queue_predicate pred)
|
|
{
|
|
struct priority_node *node = list->tasks;
|
|
if (!node)
|
|
return NULL;
|
|
|
|
do
|
|
{
|
|
struct gomp_task *task = priority_node_to_task (type, node);
|
|
if (pred (task))
|
|
return task;
|
|
node = node->next;
|
|
}
|
|
while (node != list->tasks);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the highest priority task in the priority queue HEAD that
|
|
satisfies the predicate PRED. HEAD contains tasks of type TYPE. */
|
|
|
|
struct gomp_task *
|
|
priority_queue_find (enum priority_queue_type type,
|
|
struct priority_queue *head,
|
|
priority_queue_predicate pred)
|
|
{
|
|
if (priority_queue_multi_p (head))
|
|
return priority_tree_find (type, head->t.root, pred);
|
|
else
|
|
return priority_list_find (type, &head->l, pred);
|
|
}
|
|
|
|
/* Remove NODE from priority queue HEAD, wherever it may be inside the
|
|
tree. HEAD contains tasks of type TYPE. */
|
|
|
|
void
|
|
priority_tree_remove (enum priority_queue_type type,
|
|
struct priority_queue *head,
|
|
struct priority_node *node)
|
|
{
|
|
/* ?? The only reason this function is not inlined is because we
|
|
need to find the priority within gomp_task (which has not been
|
|
completely defined in the header file). If the lack of inlining
|
|
is a concern, we could pass the priority number as a
|
|
parameter, or we could move this to libgomp.h. */
|
|
int priority = priority_node_to_task (type, node)->priority;
|
|
|
|
/* ?? We could avoid this lookup by keeping a pointer to the key in
|
|
the priority_node. */
|
|
struct priority_list *list
|
|
= priority_queue_lookup_priority (head, priority);
|
|
#if _LIBGOMP_CHECKING_
|
|
if (!list)
|
|
gomp_fatal ("Unable to find priority %d", priority);
|
|
#endif
|
|
/* If NODE was the last in its priority, clean up the priority. */
|
|
if (priority_list_remove (list, node, MEMMODEL_RELAXED))
|
|
{
|
|
prio_splay_tree_remove (&head->t, (prio_splay_tree_key) list);
|
|
list->tasks = NULL;
|
|
#if _LIBGOMP_CHECKING_
|
|
memset (list, 0xaf, sizeof (*list));
|
|
#endif
|
|
free (list);
|
|
}
|
|
}
|
|
|
|
/* Return the highest priority WAITING task in a splay tree NODE. If
|
|
there are no WAITING tasks available, return NULL.
|
|
|
|
NODE is a priority list containing tasks of type TYPE.
|
|
|
|
The right most node in a tree contains the highest priority.
|
|
Recurse down to find such a node. If the task at that max node is
|
|
not WAITING, bubble back up and look at the remaining tasks
|
|
in-order. */
|
|
|
|
static struct gomp_task *
|
|
priority_tree_next_task_1 (enum priority_queue_type type,
|
|
prio_splay_tree_node node)
|
|
{
|
|
again:
|
|
if (!node)
|
|
return NULL;
|
|
struct gomp_task *ret = priority_tree_next_task_1 (type, node->right);
|
|
if (ret)
|
|
return ret;
|
|
ret = priority_node_to_task (type, node->key.l.tasks);
|
|
if (ret->kind == GOMP_TASK_WAITING)
|
|
return ret;
|
|
node = node->left;
|
|
goto again;
|
|
}
|
|
|
|
/* Return the highest priority WAITING task from within Q1 and Q2,
|
|
while giving preference to tasks from Q1. Q1 is a queue containing
|
|
items of type TYPE1. Q2 is a queue containing items of type TYPE2.
|
|
|
|
Since we are mostly interested in Q1, if there are no WAITING tasks
|
|
in Q1, we don't bother checking Q2, and just return NULL.
|
|
|
|
As a special case, Q2 can be NULL, in which case, we just choose
|
|
the highest priority WAITING task in Q1. This is an optimization
|
|
to speed up looking through only one queue.
|
|
|
|
If the returned task is chosen from Q1, *Q1_CHOSEN_P is set to
|
|
TRUE, otherwise it is set to FALSE. */
|
|
|
|
struct gomp_task *
|
|
priority_tree_next_task (enum priority_queue_type type1,
|
|
struct priority_queue *q1,
|
|
enum priority_queue_type type2,
|
|
struct priority_queue *q2,
|
|
bool *q1_chosen_p)
|
|
{
|
|
struct gomp_task *t1 = priority_tree_next_task_1 (type1, q1->t.root);
|
|
if (!t1
|
|
/* Special optimization when only searching through one queue. */
|
|
|| !q2)
|
|
{
|
|
*q1_chosen_p = true;
|
|
return t1;
|
|
}
|
|
struct gomp_task *t2 = priority_tree_next_task_1 (type2, q2->t.root);
|
|
if (!t2 || t1->priority > t2->priority)
|
|
{
|
|
*q1_chosen_p = true;
|
|
return t1;
|
|
}
|
|
if (t2->priority > t1->priority)
|
|
{
|
|
*q1_chosen_p = false;
|
|
return t2;
|
|
}
|
|
/* If we get here, the priorities are the same, so we must look at
|
|
parent_depends_on to make our decision. */
|
|
#if _LIBGOMP_CHECKING_
|
|
if (t1 != t2)
|
|
gomp_fatal ("priority_tree_next_task: t1 != t2");
|
|
#endif
|
|
if (t2->parent_depends_on && !t1->parent_depends_on)
|
|
{
|
|
*q1_chosen_p = false;
|
|
return t2;
|
|
}
|
|
*q1_chosen_p = true;
|
|
return t1;
|
|
}
|
|
|
|
/* Priority splay trees comparison function. */
|
|
static inline int
|
|
prio_splay_compare (prio_splay_tree_key x, prio_splay_tree_key y)
|
|
{
|
|
if (x->l.priority == y->l.priority)
|
|
return 0;
|
|
return x->l.priority < y->l.priority ? -1 : 1;
|
|
}
|
|
|
|
/* Define another splay tree instantiation, for priority_list's. */
|
|
#define splay_tree_prefix prio
|
|
#define splay_tree_c
|
|
#include "splay-tree.h"
|