20906c66f2
Merge from gomp-3_1-branch branch: 2011-08-02 Jakub Jelinek <jakub@redhat.com> gcc/ * c-parser.c (enum c_parser_prec): New enum, moved from within c_parser_binary_expression. (c_parser_binary_expression): Add PREC argument. Stop parsing if operator has lower or equal precedence than PREC. (c_parser_conditional_expression, c_parser_omp_for_loop): Adjust callers. (c_parser_omp_atomic): Handle parsing OpenMP 3.1 atomics. Adjust c_finish_omp_atomic caller. (c_parser_omp_taskyield): New function. (c_parser_pragma): Handle PRAGMA_OMP_TASKYIELD. (c_parser_omp_clause_name): Handle final and mergeable clauses. (c_parser_omp_clause_final, c_parser_omp_clause_mergeable): New functions. (c_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_FINAL and PRAGMA_OMP_CLAUSE_MERGEABLE. (OMP_TASK_CLAUSE_MASK): Allow final and mergeable clauses. (c_parser_omp_clause_reduction): Handle min and max. * c-typeck.c (c_finish_omp_clauses): Don't complain about const qualified predetermined vars in firstprivate clause. andle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. Handle MIN_EXPR and MAX_EXPR. * tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (dump_generic_node): Handle OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD and OMP_ATOMIC_CAPTURE_NEW. * tree.c (omp_clause_num_ops): Add OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (omp_clause_code_name): Likewise. (walk_tree_1): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. * tree.h (enum omp_clause_code): Add OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (OMP_CLAUSE_FINAL_EXPR): Define. * omp-low.c (scan_sharing_clauses): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. (expand_task_call): Likewise. (expand_omp_atomic_load, expand_omp_atomic_store): New functions. (expand_omp_atomic_fetch_op): Handle cases where old or new value is needed afterwards. (expand_omp_atomic): Call expand_omp_atomic_load resp. expand_omp_atomic_store. * gimplify.c (gimplify_omp_atomic, gimplify_expr): Handle OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD and OMP_ATOMIC_CAPTURE_NEW. (gimplify_scan_omp_clauses, gimplify_adjust_omp_clauses): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. * tree-nested.c (convert_nonlocal_omp_clauses, convert_local_omp_clauses): Likewise. * tree.def (OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD, OMP_ATOMIC_CAPTURE_NEW): New. * gimple.h (GF_OMP_ATOMIC_NEED_VALUE): New. (gimple_omp_atomic_need_value_p, gimple_omp_atomic_set_need_value): New inlines. * omp-builtins.def (BUILT_IN_GOMP_TASKYIELD): New builtin. * doc/generic.texi: Mention OMP_CLAUSE_COLLAPSE, OMP_CLAUSE_UNTIED, OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. gcc/c-family/ * c-common.h (c_finish_omp_atomic): Adjust prototype. (c_finish_omp_taskyield): New prototype. * c-omp.c (c_finish_omp_atomic): Add OPCODE, V, LHS1 and RHS1 arguments. Handle OMP_ATOMIC_READ, OMP_ATOMIC_CAPTURE_OLD and OMP_ATOMIC_CAPTURE_NEW in addition to OMP_ATOMIC. If LHS1 or RHS1 have side-effects, evaluate those too in the right spot, if it is a decl and LHS is also a decl, error out if they aren't the same. (c_finish_omp_taskyield): New function. * c-cppbuiltin.c (c_cpp_builtins): Change _OPENMP to 201107. * c-pragma.c (omp_pragmas): Add taskyield. * c-pragma.h (enum pragma_kind): Add PRAGMA_OMP_TASKYIELD. (enum pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_FINAL and PRAGMA_OMP_CLAUSE_MERGEABLE. gcc/cp/ * cp-tree.h (finish_omp_atomic): Adjust prototype. (cxx_omp_const_qual_no_mutable): New prototype. (finish_omp_taskyield): New prototype. * parser.c (cp_parser_omp_atomic): (cp_parser_omp_atomic): Handle parsing OpenMP 3.1 atomics. Adjust finish_omp_atomic caller. (cp_parser_omp_clause_name): Handle final and mergeable clauses. (cp_parser_omp_clause_final, cp_parser_omp_clause_mergeable): New functions. (cp_parser_omp_all_clauses): Handle PRAGMA_OMP_CLAUSE_FINAL and PRAGMA_OMP_CLAUSE_MERGEABLE. (OMP_TASK_CLAUSE_MASK): Allow final and mergeable clauses. (cp_parser_omp_taskyield): New function. (cp_parser_pragma): Handle PRAGMA_OMP_TASKYIELD. (cp_parser_omp_clause_reduction): Handle min and max. * pt.c (tsubst_expr) <case OMP_ATOMIC>: Handle OpenMP 3.1 atomics. (tsubst_omp_clauses): Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. * semantics.c (finish_omp_atomic): Add OPCODE, V, LHS1 and RHS1 arguments. Handle OpenMP 3.1 atomics. Adjust c_finish_omp_atomic caller. (finish_omp_clauses): Don't complain about const qualified predetermined vars and static data members in firstprivate clause. Handle OMP_CLAUSE_FINAL and OMP_CLAUSE_MERGEABLE. Handle MIN_EXPR and MAX_EXPR. (finish_omp_taskyield): New function. * cp-gimplify.c (cxx_omp_const_qual_no_mutable): New function. (cxx_omp_predetermined_sharing): Use it. gcc/fortran/ PR fortran/46752 * cpp.c (cpp_define_builtins): Change _OPENMP to 201107. * openmp.c (gfc_free_omp_clauses): Free also final_expr. (OMP_CLAUSE_FINAL, OMP_CLAUSE_MERGEABLE): Define. (gfc_match_omp_clauses): Handle parsing final and mergeable clauses. (OMP_TASK_CLAUSES): Allow final and mergeable clauses. (gfc_match_omp_taskyield): New function. (resolve_omp_clauses): Resolve final clause. Allow POINTERs and Cray pointers in clauses other than REDUCTION. (gfc_match_omp_atomic): Match optional read/write/update/capture keywords after !$omp atomic. (resolve_omp_atomic): Handle all OpenMP 3.1 atomic forms. * dump-parse-tree.c (show_omp_node): Handle EXEC_OMP_TASKYIELD, print final and mergeable clauses. (show_code_node): Handle EXEC_OMP_TASKYIELD. * trans-openmp.c (gfc_trans_omp_clauses): Handle final and mergeable clauses. (gfc_trans_omp_taskyield): New function. (gfc_trans_omp_directive): Handle EXEC_OMP_TASKYIELD. (gfc_trans_omp_atomic): Handle all OpenMP 3.1 atomic forms. (gfc_omp_clause_copy_ctor): Handle non-allocated allocatable. (gfc_omp_predetermined_sharing): Adjust comment. * gfortran.h (gfc_statement): Add ST_OMP_TASKYIELD and ST_OMP_END_ATOMIC. (gfc_omp_clauses): Add final_expr and mergeable fields. (gfc_exec_op): Add EXEC_OMP_TASKYIELD. (gfc_omp_atomic_op): New enum typedef. (struct gfc_code): Add ext.omp_atomic. * trans.c (trans_code): Handle EXEC_OMP_TASKYIELD. * frontend-passes.c (gfc_code_walker): Also walk final_expr. * resolve.c (gfc_resolve_blocks, resolve_code): Handle EXEC_OMP_TASKYIELD. * st.c (gfc_free_statement): Likewise. * match.h (gfc_match_omp_taskyield): New prototype. * parse.c (decode_omp_directive): Handle taskyield directive. Handle !$omp end atomic. (case_executable): Add ST_OMP_TASKYIELD case. (gfc_ascii_statement): Handle ST_OMP_TASKYIELD. (parse_omp_atomic): Return gfc_statement instead of void. For !$omp atomic capture parse two assignments instead of just one and require !$omp end atomic afterwards, for other !$omp atomic forms just allow !$omp end atomic at the end. (parse_omp_structured_block, parse_executable): Adjust parse_omp_atomic callers. 2011-08-02 Tobias Burnus <burnus@net-b.de> * intrinsic.c (OMP_LIB): Updated openmp_version's value to 201107. * gfortran.texi (OpenMP): Update ref to OpenMP 3.1. * intrinsic.texi (OpenMP Modules): Update ref to OpenMP 3.1; remove deleted omp_integer_kind and omp_logical_kind constants. gcc/testsuite/ PR fortran/46752 * gcc.dg/gomp/atomic-5.c: Adjust expected diagnostics. * gcc.dg/gomp/atomic-15.c: New test. * g++.dg/gomp/atomic-5.C: Adjust expected diagnostics. * g++.dg/gomp/atomic-15.C: New test. * g++.dg/gomp/private-1.C: New test. * g++.dg/gomp/sharing-2.C: New test. * gfortran.dg/gomp/crayptr1.f90: Don't expect error about Cray pointer in FIRSTPRIVATE/LASTPRIVATE. * gfortran.dg/gomp/omp_atomic2.f90: New test. libgomp/ PR fortran/42041 PR fortran/46752 * omp.h.in (omp_in_final): New prototype. * omp_lib.f90.in (omp_in_final): New interface. (omp_integer_kind, omp_logical_kind): Remove and replace all its uses in the module with 4. (openmp_version): Change to 201107. * omp_lib.h.in (omp_sched_static, omp_sched_dynamic, omp_sched_guided, omp_sched_auto): Use omp_sched_kind kind for the parameters. (omp_in_final): New external. (openmp_version): Change to 201107. * task.c (omp_in_final): New function. (gomp_init_task): Initialize final_task. (GOMP_task): Remove unused attribute from flags. Handle final tasks. (GOMP_taskyield): New function. (omp_in_final): Return true if if (false) or final (true) task or descendant of final (true). * fortran.c (omp_in_final_): New function. * libgomp.map (OMP_3.1): Export omp_in_final and omp_in_final_. (GOMP_3.0): Export GOMP_taskyield. * env.c (gomp_nthreads_var_list, gomp_nthreads_var_list_len): New variables. (parse_unsigned_long_list): New function. (initialize_env): Use it for OMP_NUM_THREADS. Call parse_boolean with "OMP_PROC_BIND". If OMP_PROC_BIND=true, call gomp_init_affinity even if parse_affinity returned false. * config/linux/affinity.c (gomp_init_affinity): Handle gomp_cpu_affinity_len == 0. * libgomp_g.h (GOMP_taskyield): New prototype. * libgomp.h (struct gomp_task): Add final_task field. (gomp_nthreads_var_list, gomp_nthreads_var_list_len): New externs. * team.c (gomp_team_start): Override new task's nthreads_var icv if list form OMP_NUM_THREADS has been used and it has value for the new nesting level. * testsuite/libgomp.c/atomic-11.c: New test. * testsuite/libgomp.c/atomic-12.c: New test. * testsuite/libgomp.c/atomic-13.c: New test. * testsuite/libgomp.c/atomic-14.c: New test. * testsuite/libgomp.c/reduction-6.c: New test. * testsuite/libgomp.c/task-5.c: New test. * testsuite/libgomp.c++/atomic-2.C: New test. * testsuite/libgomp.c++/atomic-3.C: New test. * testsuite/libgomp.c++/atomic-4.C: New test. * testsuite/libgomp.c++/atomic-5.C: New test. * testsuite/libgomp.c++/atomic-6.C: New test. * testsuite/libgomp.c++/atomic-7.C: New test. * testsuite/libgomp.c++/atomic-8.C: New test. * testsuite/libgomp.c++/atomic-9.C: New test. * testsuite/libgomp.c++/task-8.C: New test. * testsuite/libgomp.c++/reduction-4.C: New test. * testsuite/libgomp.fortran/allocatable7.f90: New test. * testsuite/libgomp.fortran/allocatable8.f90: New test. * testsuite/libgomp.fortran/crayptr3.f90: New test. * testsuite/libgomp.fortran/omp_atomic3.f90: New test. * testsuite/libgomp.fortran/omp_atomic4.f90: New test. * testsuite/libgomp.fortran/pointer1.f90: New test. * testsuite/libgomp.fortran/pointer2.f90: New test. * testsuite/libgomp.fortran/task4.f90: New test. 2011-08-02 Tobias Burnus <burnus@net-b.de> * libgomp.texi: Update OpenMP spec references to 3.1. (omp_in_final,OMP_PROC_BIND): New sections. (OMP_NUM_THREADS): Document that the value can be now a list. (GOMP_STACKSIZE,GOMP_CPU_AFFINITY): Update @ref. From-SVN: r177194
385 lines
10 KiB
C
385 lines
10 KiB
C
/* Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
|
|
Contributed by Richard Henderson <rth@redhat.com>.
|
|
|
|
This file is part of the GNU OpenMP 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/>. */
|
|
|
|
/* This file handles the maintainence of tasks in response to task
|
|
creation and termination. */
|
|
|
|
#include "libgomp.h"
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
|
|
/* Create a new task data structure. */
|
|
|
|
void
|
|
gomp_init_task (struct gomp_task *task, struct gomp_task *parent_task,
|
|
struct gomp_task_icv *prev_icv)
|
|
{
|
|
task->parent = parent_task;
|
|
task->icv = *prev_icv;
|
|
task->kind = GOMP_TASK_IMPLICIT;
|
|
task->in_taskwait = false;
|
|
task->in_tied_task = false;
|
|
task->final_task = false;
|
|
task->children = NULL;
|
|
gomp_sem_init (&task->taskwait_sem, 0);
|
|
}
|
|
|
|
/* Clean up a task, after completing it. */
|
|
|
|
void
|
|
gomp_end_task (void)
|
|
{
|
|
struct gomp_thread *thr = gomp_thread ();
|
|
struct gomp_task *task = thr->task;
|
|
|
|
gomp_finish_task (task);
|
|
thr->task = task->parent;
|
|
}
|
|
|
|
static inline void
|
|
gomp_clear_parent (struct gomp_task *children)
|
|
{
|
|
struct gomp_task *task = children;
|
|
|
|
if (task)
|
|
do
|
|
{
|
|
task->parent = NULL;
|
|
task = task->next_child;
|
|
}
|
|
while (task != children);
|
|
}
|
|
|
|
/* Called when encountering an explicit task directive. If IF_CLAUSE is
|
|
false, then we must not delay in executing the task. If UNTIED is true,
|
|
then the task may be executed by any member of the team. */
|
|
|
|
void
|
|
GOMP_task (void (*fn) (void *), void *data, void (*cpyfn) (void *, void *),
|
|
long arg_size, long arg_align, bool if_clause, unsigned flags)
|
|
{
|
|
struct gomp_thread *thr = gomp_thread ();
|
|
struct gomp_team *team = thr->ts.team;
|
|
|
|
#ifdef HAVE_BROKEN_POSIX_SEMAPHORES
|
|
/* If pthread_mutex_* is used for omp_*lock*, then each task must be
|
|
tied to one thread all the time. This means UNTIED tasks must be
|
|
tied and if CPYFN is non-NULL IF(0) must be forced, as CPYFN
|
|
might be running on different thread than FN. */
|
|
if (cpyfn)
|
|
if_clause = false;
|
|
if (flags & 1)
|
|
flags &= ~1;
|
|
#endif
|
|
|
|
if (!if_clause || team == NULL
|
|
|| (thr->task && thr->task->final_task)
|
|
|| team->task_count > 64 * team->nthreads)
|
|
{
|
|
struct gomp_task task;
|
|
|
|
gomp_init_task (&task, thr->task, gomp_icv (false));
|
|
task.kind = GOMP_TASK_IFFALSE;
|
|
task.final_task = (thr->task && thr->task->final_task) || (flags & 2);
|
|
if (thr->task)
|
|
task.in_tied_task = thr->task->in_tied_task;
|
|
thr->task = &task;
|
|
if (__builtin_expect (cpyfn != NULL, 0))
|
|
{
|
|
char buf[arg_size + arg_align - 1];
|
|
char *arg = (char *) (((uintptr_t) buf + arg_align - 1)
|
|
& ~(uintptr_t) (arg_align - 1));
|
|
cpyfn (arg, data);
|
|
fn (arg);
|
|
}
|
|
else
|
|
fn (data);
|
|
if (task.children)
|
|
{
|
|
gomp_mutex_lock (&team->task_lock);
|
|
gomp_clear_parent (task.children);
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
}
|
|
gomp_end_task ();
|
|
}
|
|
else
|
|
{
|
|
struct gomp_task *task;
|
|
struct gomp_task *parent = thr->task;
|
|
char *arg;
|
|
bool do_wake;
|
|
|
|
task = gomp_malloc (sizeof (*task) + arg_size + arg_align - 1);
|
|
arg = (char *) (((uintptr_t) (task + 1) + arg_align - 1)
|
|
& ~(uintptr_t) (arg_align - 1));
|
|
gomp_init_task (task, parent, gomp_icv (false));
|
|
task->kind = GOMP_TASK_IFFALSE;
|
|
task->in_tied_task = parent->in_tied_task;
|
|
thr->task = task;
|
|
if (cpyfn)
|
|
cpyfn (arg, data);
|
|
else
|
|
memcpy (arg, data, arg_size);
|
|
thr->task = parent;
|
|
task->kind = GOMP_TASK_WAITING;
|
|
task->fn = fn;
|
|
task->fn_data = arg;
|
|
task->in_tied_task = true;
|
|
task->final_task = (flags & 2) >> 1;
|
|
gomp_mutex_lock (&team->task_lock);
|
|
if (parent->children)
|
|
{
|
|
task->next_child = parent->children;
|
|
task->prev_child = parent->children->prev_child;
|
|
task->next_child->prev_child = task;
|
|
task->prev_child->next_child = task;
|
|
}
|
|
else
|
|
{
|
|
task->next_child = task;
|
|
task->prev_child = task;
|
|
}
|
|
parent->children = task;
|
|
if (team->task_queue)
|
|
{
|
|
task->next_queue = team->task_queue;
|
|
task->prev_queue = team->task_queue->prev_queue;
|
|
task->next_queue->prev_queue = task;
|
|
task->prev_queue->next_queue = task;
|
|
}
|
|
else
|
|
{
|
|
task->next_queue = task;
|
|
task->prev_queue = task;
|
|
team->task_queue = task;
|
|
}
|
|
++team->task_count;
|
|
gomp_team_barrier_set_task_pending (&team->barrier);
|
|
do_wake = team->task_running_count + !parent->in_tied_task
|
|
< team->nthreads;
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
if (do_wake)
|
|
gomp_team_barrier_wake (&team->barrier, 1);
|
|
}
|
|
}
|
|
|
|
void
|
|
gomp_barrier_handle_tasks (gomp_barrier_state_t state)
|
|
{
|
|
struct gomp_thread *thr = gomp_thread ();
|
|
struct gomp_team *team = thr->ts.team;
|
|
struct gomp_task *task = thr->task;
|
|
struct gomp_task *child_task = NULL;
|
|
struct gomp_task *to_free = NULL;
|
|
|
|
gomp_mutex_lock (&team->task_lock);
|
|
if (gomp_barrier_last_thread (state))
|
|
{
|
|
if (team->task_count == 0)
|
|
{
|
|
gomp_team_barrier_done (&team->barrier, state);
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
gomp_team_barrier_wake (&team->barrier, 0);
|
|
return;
|
|
}
|
|
gomp_team_barrier_set_waiting_for_tasks (&team->barrier);
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
if (team->task_queue != NULL)
|
|
{
|
|
struct gomp_task *parent;
|
|
|
|
child_task = team->task_queue;
|
|
parent = child_task->parent;
|
|
if (parent && parent->children == child_task)
|
|
parent->children = child_task->next_child;
|
|
child_task->prev_queue->next_queue = child_task->next_queue;
|
|
child_task->next_queue->prev_queue = child_task->prev_queue;
|
|
if (child_task->next_queue != child_task)
|
|
team->task_queue = child_task->next_queue;
|
|
else
|
|
team->task_queue = NULL;
|
|
child_task->kind = GOMP_TASK_TIED;
|
|
team->task_running_count++;
|
|
if (team->task_count == team->task_running_count)
|
|
gomp_team_barrier_clear_task_pending (&team->barrier);
|
|
}
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
if (to_free)
|
|
{
|
|
gomp_finish_task (to_free);
|
|
free (to_free);
|
|
to_free = NULL;
|
|
}
|
|
if (child_task)
|
|
{
|
|
thr->task = child_task;
|
|
child_task->fn (child_task->fn_data);
|
|
thr->task = task;
|
|
}
|
|
else
|
|
return;
|
|
gomp_mutex_lock (&team->task_lock);
|
|
if (child_task)
|
|
{
|
|
struct gomp_task *parent = child_task->parent;
|
|
if (parent)
|
|
{
|
|
child_task->prev_child->next_child = child_task->next_child;
|
|
child_task->next_child->prev_child = child_task->prev_child;
|
|
if (parent->children == child_task)
|
|
{
|
|
if (child_task->next_child != child_task)
|
|
parent->children = child_task->next_child;
|
|
else
|
|
{
|
|
parent->children = NULL;
|
|
if (parent->in_taskwait)
|
|
gomp_sem_post (&parent->taskwait_sem);
|
|
}
|
|
}
|
|
}
|
|
gomp_clear_parent (child_task->children);
|
|
to_free = child_task;
|
|
child_task = NULL;
|
|
team->task_running_count--;
|
|
if (--team->task_count == 0
|
|
&& gomp_team_barrier_waiting_for_tasks (&team->barrier))
|
|
{
|
|
gomp_team_barrier_done (&team->barrier, state);
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
gomp_team_barrier_wake (&team->barrier, 0);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Called when encountering a taskwait directive. */
|
|
|
|
void
|
|
GOMP_taskwait (void)
|
|
{
|
|
struct gomp_thread *thr = gomp_thread ();
|
|
struct gomp_team *team = thr->ts.team;
|
|
struct gomp_task *task = thr->task;
|
|
struct gomp_task *child_task = NULL;
|
|
struct gomp_task *to_free = NULL;
|
|
|
|
if (task == NULL || task->children == NULL)
|
|
return;
|
|
gomp_mutex_lock (&team->task_lock);
|
|
while (1)
|
|
{
|
|
if (task->children == NULL)
|
|
{
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
if (to_free)
|
|
{
|
|
gomp_finish_task (to_free);
|
|
free (to_free);
|
|
}
|
|
return;
|
|
}
|
|
if (task->children->kind == GOMP_TASK_WAITING)
|
|
{
|
|
child_task = task->children;
|
|
task->children = child_task->next_child;
|
|
child_task->prev_queue->next_queue = child_task->next_queue;
|
|
child_task->next_queue->prev_queue = child_task->prev_queue;
|
|
if (team->task_queue == child_task)
|
|
{
|
|
if (child_task->next_queue != child_task)
|
|
team->task_queue = child_task->next_queue;
|
|
else
|
|
team->task_queue = NULL;
|
|
}
|
|
child_task->kind = GOMP_TASK_TIED;
|
|
team->task_running_count++;
|
|
if (team->task_count == team->task_running_count)
|
|
gomp_team_barrier_clear_task_pending (&team->barrier);
|
|
}
|
|
else
|
|
/* All tasks we are waiting for are already running
|
|
in other threads. Wait for them. */
|
|
task->in_taskwait = true;
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
if (to_free)
|
|
{
|
|
gomp_finish_task (to_free);
|
|
free (to_free);
|
|
to_free = NULL;
|
|
}
|
|
if (child_task)
|
|
{
|
|
thr->task = child_task;
|
|
child_task->fn (child_task->fn_data);
|
|
thr->task = task;
|
|
}
|
|
else
|
|
{
|
|
gomp_sem_wait (&task->taskwait_sem);
|
|
task->in_taskwait = false;
|
|
return;
|
|
}
|
|
gomp_mutex_lock (&team->task_lock);
|
|
if (child_task)
|
|
{
|
|
child_task->prev_child->next_child = child_task->next_child;
|
|
child_task->next_child->prev_child = child_task->prev_child;
|
|
if (task->children == child_task)
|
|
{
|
|
if (child_task->next_child != child_task)
|
|
task->children = child_task->next_child;
|
|
else
|
|
task->children = NULL;
|
|
}
|
|
gomp_clear_parent (child_task->children);
|
|
to_free = child_task;
|
|
child_task = NULL;
|
|
team->task_count--;
|
|
team->task_running_count--;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Called when encountering a taskyield directive. */
|
|
|
|
void
|
|
GOMP_taskyield (void)
|
|
{
|
|
/* Nothing at the moment. */
|
|
}
|
|
|
|
int
|
|
omp_in_final (void)
|
|
{
|
|
struct gomp_thread *thr = gomp_thread ();
|
|
return thr->task && thr->task->final_task;
|
|
}
|
|
|
|
ialias (omp_in_final)
|