0494285ab0
* libgomp.h (struct gomp_task_depend_entry): Add redundant_out field. (struct gomp_taskwait): New type. (struct gomp_task): Add taskwait and parent_depends_on, remove in_taskwait and taskwait_sem fields. (gomp_finish_task): Don't destroy taskwait_sem. * task.c (gomp_init_task): Don't init in_taskwait, instead init taskwait and parent_depends_on. (GOMP_task): For if (0) tasks with depend clause that depend on earlier tasks don't defer them, instead call gomp_task_maybe_wait_for_dependencies to wait for the dependencies. Initialize redundant_out field, for redundant out entries just move them at the end of linked list instead of removing them completely, and set redundant_out flag instead of redundant. (gomp_task_run_pre): Update last_parent_depends_on if scheduling that task. (gomp_task_run_post_handle_dependers): If parent is in gomp_task_maybe_wait_for_dependencies and newly runnable task is not parent_depends_on, queue it in parent->children linked list after all runnable tasks with parent_depends_on set. Adjust for addition of taskwait indirection. (gomp_task_run_post_remove_parent): If parent is in gomp_task_maybe_wait_for_dependencies and task to be removed is parent_depends_on, decrement n_depend and if needed awake parent. Adjust for addition of taskwait indirection. (GOMP_taskwait): Adjust for addition of taskwait indirection. (gomp_task_maybe_wait_for_dependencies): New function. * testsuite/libgomp.c/depend-5.c: New test. From-SVN: r213408
99 lines
2.0 KiB
C
99 lines
2.0 KiB
C
#include <stdlib.h>
|
|
|
|
__attribute__((noinline, noclone)) void
|
|
f1 (int ifval)
|
|
{
|
|
int x = 1, y = 2, z = 3;
|
|
#pragma omp parallel
|
|
#pragma omp single
|
|
{
|
|
#pragma omp task shared (x) depend(out: x)
|
|
x = 2;
|
|
#pragma omp task shared (x) depend(inout: x)
|
|
{
|
|
if (x != 2)
|
|
abort ();
|
|
x = 3;
|
|
}
|
|
#pragma omp task shared (x) depend(inout: x)
|
|
{
|
|
if (x != 3)
|
|
abort ();
|
|
x = 4;
|
|
}
|
|
#pragma omp task shared (z) depend(in: z)
|
|
if (z != 3)
|
|
abort ();
|
|
#pragma omp task shared (z) depend(in: z)
|
|
if (z != 3)
|
|
abort ();
|
|
#pragma omp task shared (z) depend(in: z)
|
|
if (z != 3)
|
|
abort ();
|
|
#pragma omp task shared (z) depend(in: z)
|
|
if (z != 3)
|
|
abort ();
|
|
#pragma omp task shared (z) depend(in: z)
|
|
if (z != 3)
|
|
abort ();
|
|
#pragma omp task shared (z) depend(in: z)
|
|
if (z != 3)
|
|
abort ();
|
|
#pragma omp task shared (y) depend(in: y)
|
|
if (y != 2)
|
|
abort ();
|
|
#pragma omp task shared (y) depend(in: y)
|
|
if (y != 2)
|
|
abort ();
|
|
#pragma omp task shared (y) depend(in: y)
|
|
if (y != 2)
|
|
abort ();
|
|
#pragma omp task shared (y) depend(in: y)
|
|
if (y != 2)
|
|
abort ();
|
|
#pragma omp task if (ifval) shared (x, y) depend(in: x) depend(inout: y)
|
|
{
|
|
if (x != 4 || y != 2)
|
|
abort ();
|
|
y = 3;
|
|
}
|
|
if (ifval == 0)
|
|
{
|
|
/* The above if (0) task should have waited till all
|
|
the tasks with x and y dependencies finish. */
|
|
if (x != 4 || y != 3)
|
|
abort ();
|
|
x = 5;
|
|
y = 4;
|
|
}
|
|
#pragma omp task shared (z) depend(inout: z)
|
|
{
|
|
if (z != 3)
|
|
abort ();
|
|
z = 4;
|
|
}
|
|
#pragma omp task shared (z) depend(inout: z)
|
|
{
|
|
if (z != 4)
|
|
abort ();
|
|
z = 5;
|
|
}
|
|
#pragma omp taskwait
|
|
if (x != (ifval ? 4 : 5) || y != (ifval ? 3 : 4) || z != 5)
|
|
abort ();
|
|
#pragma omp task if (ifval) shared (x, y) depend(in: x) depend(inout: y)
|
|
{
|
|
if (x != (ifval ? 4 : 5) || y != (ifval ? 3 : 4))
|
|
abort ();
|
|
}
|
|
}
|
|
}
|
|
|
|
int
|
|
main ()
|
|
{
|
|
f1 (0);
|
|
f1 (1);
|
|
return 0;
|
|
}
|