e460634820
gcc/ 2015-11-14 Jakub Jelinek <jakub@redhat.com> * omp-low.c (lower_omp_ordered): Add argument to GOMP_SMD_ORDERED_* internal calls - 0 if ordered simd and 1 for ordered threads simd. * tree-vectorizer.c (adjust_simduid_builtins): If GOMP_SIMD_ORDERED_* argument is 1, replace it with GOMP_ordered_* call instead of removing it. gcc/c/ 2015-11-14 Jakub Jelinek <jakub@redhat.com> * c-typeck.c (c_finish_omp_clauses): Don't mark GOMP_MAP_FIRSTPRIVATE_POINTER decls addressable. gcc/cp/ 2015-11-14 Jakub Jelinek <jakub@redhat.com> * semantics.c (finish_omp_clauses): Don't mark GOMP_MAP_FIRSTPRIVATE_POINTER decls addressable. libgomp/ 2015-11-14 Jakub Jelinek <jakub@redhat.com> Aldy Hernandez <aldyh@redhat.com> Ilya Verbin <ilya.verbin@intel.com> * ordered.c (gomp_doacross_init, GOMP_doacross_post, GOMP_doacross_wait, gomp_doacross_ull_init, GOMP_doacross_ull_post, GOMP_doacross_ull_wait): For GFS_GUIDED don't divide number of iterators or IV by chunk size. * parallel.c (gomp_resolve_num_threads): Don't assume that if thr->ts.team is non-NULL, then pool must be non-NULL. * libgomp-plugin.h (GOMP_PLUGIN_target_task_completion): Declare. * libgomp.map (GOMP_PLUGIN_1.1): New symbol version, export GOMP_PLUGIN_target_task_completion. * Makefile.am (libgomp_la_SOURCES): Add priority_queue.c. * Makefile.in: Regenerate. * libgomp.h: Shuffle prototypes and forward definitions around so priority queues can be defined. (enum gomp_task_kind): Add GOMP_TASK_ASYNC_RUNNING. (enum gomp_target_task_state): New enum. (struct gomp_target_task): Add state, tgt, task and team fields. (gomp_create_target_task): Change return type to bool, add state argument. (gomp_target_task_fn): Change return type to bool. (struct gomp_device_descr): Add async_run_func. (struct gomp_task): Remove children, next_child, prev_child, next_queue, prev_queue, next_taskgroup, prev_taskgroup. Add pnode field. (struct gomp_taskgroup): Remove children. Add taskgroup_queue. (struct gomp_team): Change task_queue type to a priority queue. (splay_compare): Define inline. (priority_queue_offset): New. (priority_node_to_task): New. (task_to_priority_node): New. * oacc-mem.c: Do not include splay-tree.h. * priority_queue.c: New file. * priority_queue.h: New file. * splay-tree.c: Do not include splay-tree.h. (splay_tree_foreach_internal): New. (splay_tree_foreach): New. * splay-tree.h: Become re-entrant if splay_tree_prefix is defined. (splay_tree_callback): Define typedef. * target.c (splay_compare): Move to libgomp.h. (GOMP_target): Don't adjust *thr in any way around running offloaded task. (GOMP_target_ext): Likewise. Handle target nowait. (GOMP_target_update_ext, GOMP_target_enter_exit_data): Check return value from gomp_create_target_task, if false, fallthrough as if no dependencies exist. (gomp_target_task_fn): Change return type to bool, return true if the task should have another part scheduled later. Handle target nowait. (gomp_load_plugin_for_device): Initialize async_run. * task.c (gomp_init_task): Initialize children_queue. (gomp_clear_parent_in_list): New. (gomp_clear_parent_in_tree): New. (gomp_clear_parent): Handle priorities. (GOMP_task): Likewise. (priority_queue_move_task_first, gomp_target_task_completion, GOMP_PLUGIN_target_task_completion): New functions. (gomp_create_target_task): Use priority queues. Change return type to bool, add state argument, return false if for async {{enter,exit} data,update} constructs no dependencies need to be waited for, handle target nowait. Set task->fn to NULL instead of gomp_target_task_fn. (verify_children_queue): Remove. (priority_list_upgrade_task): New. (priority_queue_upgrade_task): New. (verify_task_queue): Remove. (priority_list_downgrade_task): New. (priority_queue_downgrade_task): New. (gomp_task_run_pre): Use priority queues. Abstract code out to priority_queue_downgrade_task. (gomp_task_run_post_handle_dependers): Use priority queues. (gomp_task_run_post_remove_parent): Likewise. (gomp_task_run_post_remove_taskgroup): Likewise. (gomp_barrier_handle_tasks): Likewise. Handle target nowait target tasks specially. (GOMP_taskwait): Likewise. (gomp_task_maybe_wait_for_dependencies): Likewise. Abstract code to priority-queue_upgrade_task. (GOMP_taskgroup_start): Use priority queues. (GOMP_taskgroup_end): Likewise. Handle target nowait target tasks specially. If taskgroup is NULL, and thr->ts.level is 0, act as a barrier. * taskloop.c (GOMP_taskloop): Handle priorities. * team.c (gomp_new_team): Call priority_queue_init. (free_team): Call priority_queue_free. (gomp_free_thread): Call gomp_team_end if thr->ts.team is artificial team created for target nowait in implicit parallel region. (gomp_team_start): For nested check, test thr->ts.level instead of thr->ts.team != NULL. * testsuite/libgomp.c/doacross-3.c: New test. * testsuite/libgomp.c/ordered-5.c: New test. * testsuite/libgomp.c/priority.c: New test. * testsuite/libgomp.c/target-31.c: New test. * testsuite/libgomp.c/target-32.c: New test. * testsuite/libgomp.c/target-33.c: New test. * testsuite/libgomp.c/target-34.c: New test. liboffloadmic/ 2015-11-14 Ilya Verbin <ilya.verbin@intel.com> * runtime/offload_host.cpp (task_completion_callback): New variable. (offload_proxy_task_completed_ooo): Call task_completion_callback. (__offload_register_task_callback): New function. * runtime/offload_host.h (__offload_register_task_callback): New declaration. * plugin/libgomp-plugin-intelmic.cpp (offload): Add async_data argument, handle async offloading. (register_main_image): Call register_main_image. (GOMP_OFFLOAD_init_device, get_target_table, GOMP_OFFLOAD_alloc, GOMP_OFFLOAD_free, GOMP_OFFLOAD_host2dev, GOMP_OFFLOAD_dev2host, GOMP_OFFLOAD_dev2dev) Adjust offload callers. (GOMP_OFFLOAD_async_run): New function. (GOMP_OFFLOAD_run): Implement using GOMP_OFFLOAD_async_run. From-SVN: r230381
341 lines
9.4 KiB
C
341 lines
9.4 KiB
C
/* Copyright (C) 2015 Free Software Foundation, Inc.
|
|
Contributed by Jakub Jelinek <jakub@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/>. */
|
|
|
|
/* This file handles the taskloop construct. It is included twice, once
|
|
for the long and once for unsigned long long variant. */
|
|
|
|
/* 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_taskloop (void (*fn) (void *), void *data, void (*cpyfn) (void *, void *),
|
|
long arg_size, long arg_align, unsigned flags,
|
|
unsigned long num_tasks, int priority,
|
|
TYPE start, TYPE end, TYPE step)
|
|
{
|
|
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)
|
|
flags &= ~GOMP_TASK_FLAG_IF;
|
|
flags &= ~GOMP_TASK_FLAG_UNTIED;
|
|
#endif
|
|
|
|
/* If parallel or taskgroup has been cancelled, don't start new tasks. */
|
|
if (team && gomp_team_barrier_cancelled (&team->barrier))
|
|
return;
|
|
|
|
#ifdef TYPE_is_long
|
|
TYPE s = step;
|
|
if (step > 0)
|
|
{
|
|
if (start >= end)
|
|
return;
|
|
s--;
|
|
}
|
|
else
|
|
{
|
|
if (start <= end)
|
|
return;
|
|
s++;
|
|
}
|
|
UTYPE n = (end - start + s) / step;
|
|
#else
|
|
UTYPE n;
|
|
if (flags & GOMP_TASK_FLAG_UP)
|
|
{
|
|
if (start >= end)
|
|
return;
|
|
n = (end - start + step - 1) / step;
|
|
}
|
|
else
|
|
{
|
|
if (start <= end)
|
|
return;
|
|
n = (start - end - step - 1) / -step;
|
|
}
|
|
#endif
|
|
|
|
TYPE task_step = step;
|
|
unsigned long nfirst = n;
|
|
if (flags & GOMP_TASK_FLAG_GRAINSIZE)
|
|
{
|
|
unsigned long grainsize = num_tasks;
|
|
#ifdef TYPE_is_long
|
|
num_tasks = n / grainsize;
|
|
#else
|
|
UTYPE ndiv = n / grainsize;
|
|
num_tasks = ndiv;
|
|
if (num_tasks != ndiv)
|
|
num_tasks = ~0UL;
|
|
#endif
|
|
if (num_tasks <= 1)
|
|
{
|
|
num_tasks = 1;
|
|
task_step = end - start;
|
|
}
|
|
else if (num_tasks >= grainsize
|
|
#ifndef TYPE_is_long
|
|
&& num_tasks != ~0UL
|
|
#endif
|
|
)
|
|
{
|
|
UTYPE mul = num_tasks * grainsize;
|
|
task_step = (TYPE) grainsize * step;
|
|
if (mul != n)
|
|
{
|
|
task_step += step;
|
|
nfirst = n - mul - 1;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
UTYPE div = n / num_tasks;
|
|
UTYPE mod = n % num_tasks;
|
|
task_step = (TYPE) div * step;
|
|
if (mod)
|
|
{
|
|
task_step += step;
|
|
nfirst = mod - 1;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (num_tasks == 0)
|
|
num_tasks = team ? team->nthreads : 1;
|
|
if (num_tasks >= n)
|
|
num_tasks = n;
|
|
else
|
|
{
|
|
UTYPE div = n / num_tasks;
|
|
UTYPE mod = n % num_tasks;
|
|
task_step = (TYPE) div * step;
|
|
if (mod)
|
|
{
|
|
task_step += step;
|
|
nfirst = mod - 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (flags & GOMP_TASK_FLAG_NOGROUP)
|
|
{
|
|
if (thr->task && thr->task->taskgroup && thr->task->taskgroup->cancelled)
|
|
return;
|
|
}
|
|
else
|
|
ialias_call (GOMP_taskgroup_start) ();
|
|
|
|
if (priority > gomp_max_task_priority_var)
|
|
priority = gomp_max_task_priority_var;
|
|
|
|
if ((flags & GOMP_TASK_FLAG_IF) == 0 || team == NULL
|
|
|| (thr->task && thr->task->final_task)
|
|
|| team->task_count + num_tasks > 64 * team->nthreads)
|
|
{
|
|
unsigned long i;
|
|
if (__builtin_expect (cpyfn != NULL, 0))
|
|
{
|
|
struct gomp_task task[num_tasks];
|
|
struct gomp_task *parent = thr->task;
|
|
arg_size = (arg_size + arg_align - 1) & ~(arg_align - 1);
|
|
char buf[num_tasks * arg_size + arg_align - 1];
|
|
char *arg = (char *) (((uintptr_t) buf + arg_align - 1)
|
|
& ~(uintptr_t) (arg_align - 1));
|
|
char *orig_arg = arg;
|
|
for (i = 0; i < num_tasks; i++)
|
|
{
|
|
gomp_init_task (&task[i], parent, gomp_icv (false));
|
|
task[i].priority = priority;
|
|
task[i].kind = GOMP_TASK_UNDEFERRED;
|
|
task[i].final_task = (thr->task && thr->task->final_task)
|
|
|| (flags & GOMP_TASK_FLAG_FINAL);
|
|
if (thr->task)
|
|
{
|
|
task[i].in_tied_task = thr->task->in_tied_task;
|
|
task[i].taskgroup = thr->task->taskgroup;
|
|
}
|
|
thr->task = &task[i];
|
|
cpyfn (arg, data);
|
|
arg += arg_size;
|
|
}
|
|
arg = orig_arg;
|
|
for (i = 0; i < num_tasks; i++)
|
|
{
|
|
thr->task = &task[i];
|
|
((TYPE *)arg)[0] = start;
|
|
start += task_step;
|
|
((TYPE *)arg)[1] = start;
|
|
if (i == nfirst)
|
|
task_step -= step;
|
|
fn (arg);
|
|
arg += arg_size;
|
|
if (!priority_queue_empty_p (&task[i].children_queue,
|
|
MEMMODEL_RELAXED))
|
|
{
|
|
gomp_mutex_lock (&team->task_lock);
|
|
gomp_clear_parent (&task[i].children_queue);
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
}
|
|
gomp_end_task ();
|
|
}
|
|
}
|
|
else
|
|
for (i = 0; i < num_tasks; i++)
|
|
{
|
|
struct gomp_task task;
|
|
|
|
gomp_init_task (&task, thr->task, gomp_icv (false));
|
|
task.priority = priority;
|
|
task.kind = GOMP_TASK_UNDEFERRED;
|
|
task.final_task = (thr->task && thr->task->final_task)
|
|
|| (flags & GOMP_TASK_FLAG_FINAL);
|
|
if (thr->task)
|
|
{
|
|
task.in_tied_task = thr->task->in_tied_task;
|
|
task.taskgroup = thr->task->taskgroup;
|
|
}
|
|
thr->task = &task;
|
|
((TYPE *)data)[0] = start;
|
|
start += task_step;
|
|
((TYPE *)data)[1] = start;
|
|
if (i == nfirst)
|
|
task_step -= step;
|
|
fn (data);
|
|
if (!priority_queue_empty_p (&task.children_queue,
|
|
MEMMODEL_RELAXED))
|
|
{
|
|
gomp_mutex_lock (&team->task_lock);
|
|
gomp_clear_parent (&task.children_queue);
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
}
|
|
gomp_end_task ();
|
|
}
|
|
}
|
|
else
|
|
{
|
|
struct gomp_task *tasks[num_tasks];
|
|
struct gomp_task *parent = thr->task;
|
|
struct gomp_taskgroup *taskgroup = parent->taskgroup;
|
|
char *arg;
|
|
int do_wake;
|
|
unsigned long i;
|
|
|
|
for (i = 0; i < num_tasks; i++)
|
|
{
|
|
struct gomp_task *task
|
|
= gomp_malloc (sizeof (*task) + arg_size + arg_align - 1);
|
|
tasks[i] = task;
|
|
arg = (char *) (((uintptr_t) (task + 1) + arg_align - 1)
|
|
& ~(uintptr_t) (arg_align - 1));
|
|
gomp_init_task (task, parent, gomp_icv (false));
|
|
task->priority = priority;
|
|
task->kind = GOMP_TASK_UNDEFERRED;
|
|
task->in_tied_task = parent->in_tied_task;
|
|
task->taskgroup = taskgroup;
|
|
thr->task = task;
|
|
if (cpyfn)
|
|
{
|
|
cpyfn (arg, data);
|
|
task->copy_ctors_done = true;
|
|
}
|
|
else
|
|
memcpy (arg, data, arg_size);
|
|
((TYPE *)arg)[0] = start;
|
|
start += task_step;
|
|
((TYPE *)arg)[1] = start;
|
|
if (i == nfirst)
|
|
task_step -= step;
|
|
thr->task = parent;
|
|
task->kind = GOMP_TASK_WAITING;
|
|
task->fn = fn;
|
|
task->fn_data = arg;
|
|
task->final_task = (flags & GOMP_TASK_FLAG_FINAL) >> 1;
|
|
}
|
|
gomp_mutex_lock (&team->task_lock);
|
|
/* If parallel or taskgroup has been cancelled, don't start new
|
|
tasks. */
|
|
if (__builtin_expect ((gomp_team_barrier_cancelled (&team->barrier)
|
|
|| (taskgroup && taskgroup->cancelled))
|
|
&& cpyfn == NULL, 0))
|
|
{
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
for (i = 0; i < num_tasks; i++)
|
|
{
|
|
gomp_finish_task (tasks[i]);
|
|
free (tasks[i]);
|
|
}
|
|
if ((flags & GOMP_TASK_FLAG_NOGROUP) == 0)
|
|
ialias_call (GOMP_taskgroup_end) ();
|
|
return;
|
|
}
|
|
if (taskgroup)
|
|
taskgroup->num_children += num_tasks;
|
|
for (i = 0; i < num_tasks; i++)
|
|
{
|
|
struct gomp_task *task = tasks[i];
|
|
priority_queue_insert (PQ_CHILDREN, &parent->children_queue,
|
|
task, priority,
|
|
PRIORITY_INSERT_BEGIN,
|
|
/*last_parent_depends_on=*/false,
|
|
task->parent_depends_on);
|
|
if (taskgroup)
|
|
priority_queue_insert (PQ_TASKGROUP, &taskgroup->taskgroup_queue,
|
|
task, priority, PRIORITY_INSERT_BEGIN,
|
|
/*last_parent_depends_on=*/false,
|
|
task->parent_depends_on);
|
|
priority_queue_insert (PQ_TEAM, &team->task_queue, task, priority,
|
|
PRIORITY_INSERT_END,
|
|
/*last_parent_depends_on=*/false,
|
|
task->parent_depends_on);
|
|
++team->task_count;
|
|
++team->task_queued_count;
|
|
}
|
|
gomp_team_barrier_set_task_pending (&team->barrier);
|
|
if (team->task_running_count + !parent->in_tied_task
|
|
< team->nthreads)
|
|
{
|
|
do_wake = team->nthreads - team->task_running_count
|
|
- !parent->in_tied_task;
|
|
if ((unsigned long) do_wake > num_tasks)
|
|
do_wake = num_tasks;
|
|
}
|
|
else
|
|
do_wake = 0;
|
|
gomp_mutex_unlock (&team->task_lock);
|
|
if (do_wake)
|
|
gomp_team_barrier_wake (&team->barrier, do_wake);
|
|
}
|
|
if ((flags & GOMP_TASK_FLAG_NOGROUP) == 0)
|
|
ialias_call (GOMP_taskgroup_end) ();
|
|
}
|