Hi!
This patch adds support for inoutset depend-kind in depend
clauses. It is very similar to the in depend-kind in that
a task with a dependency with that depend-kind is dependent
on all previously created sibling tasks with matching address
unless they have the same depend-kind.
In the in depend-kind case everything is dependent except
for in -> in dependency, for inoutset everything is
dependent except for inoutset -> inoutset dependency.
mutexinoutset is also similar (everything is dependent except
for mutexinoutset -> mutexinoutset dependency), but there is
also the additional restriction that only one task with
mutexinoutset for each address can be scheduled at once (i.e.
mutual exclusitivty). For now we support mutexinoutset
the same as inout/out, but the inoutset support is full.
In order not to bump the ABI for dependencies each time
(we've bumped it already once, the old ABI supports only
inout/out and in depend-kind, the new ABI supports
inout/out, mutexinoutset, in and depobj), this patch arranges
for inoutset to be at least for the time being always handled
as if it was specified through depobj even when it is not.
So it uses the new ABI for that and inoutset are represented
like depobj - pointer to a pair of pointers where the first one
will be the actual address of the object mentioned in depend
clause and second pointer will be (void *) GOMP_DEPEND_INOUTSET.
Bootstrapped/regtested on x86_64-linux and i686-linux, committed
to trunk.
2022-05-17 Jakub Jelinek <ja...@redhat.com>
gcc/
* tree-core.h (enum omp_clause_depend_kind): Add
OMP_CLAUSE_DEPEND_INOUTSET.
* tree-pretty-print.cc (dump_omp_clause): Handle
OMP_CLAUSE_DEPEND_INOUTSET.
* gimplify.cc (gimplify_omp_depend): Likewise.
* omp-low.cc (lower_depend_clauses): Likewise.
gcc/c-family/
* c-omp.cc (c_finish_omp_depobj): Handle
OMP_CLAUSE_DEPEND_INOUTSET.
gcc/c/
* c-parser.cc (c_parser_omp_clause_depend): Parse
inoutset depend-kind.
(c_parser_omp_depobj): Likewise.
gcc/cp/
* parser.cc (cp_parser_omp_clause_depend): Parse
inoutset depend-kind.
(cp_parser_omp_depobj): Likewise.
* cxx-pretty-print.cc (cxx_pretty_printer::statement): Handle
OMP_CLAUSE_DEPEND_INOUTSET.
gcc/testsuite/
* c-c++-common/gomp/all-memory-1.c (boo): Add test with
inoutset depend-kind.
* c-c++-common/gomp/all-memory-2.c (boo): Likewise.
* c-c++-common/gomp/depobj-1.c (f1): Likewise.
(f2): Adjusted expected diagnostics.
* g++.dg/gomp/depobj-1.C (f4): Adjust expected diagnostics.
include/
* gomp-constants.h (GOMP_DEPEND_INOUTSET): Define.
libgomp/
* libgomp.h (struct gomp_task_depend_entry): Change is_in type
from bool to unsigned char.
* task.c (gomp_task_handle_depend): Handle GOMP_DEPEND_INOUTSET.
Ignore dependencies where
task->depend[i].is_in && task->depend[i].is_in == ent->is_in
rather than just task->depend[i].is_in && ent->is_in. Remember
whether GOMP_DEPEND_IN loop is needed and guard the loop with that
conditional.
(gomp_task_maybe_wait_for_dependencies): Handle GOMP_DEPEND_INOUTSET.
Ignore dependencies where elem.is_in && elem.is_in == ent->is_in
rather than just elem.is_in && ent->is_in.
* testsuite/libgomp.c-c++-common/depend-1.c (test): Add task with
inoutset depend-kind.
* testsuite/libgomp.c-c++-common/depend-2.c (test): Likewise.
* testsuite/libgomp.c-c++-common/depend-3.c (test): Likewise.
* testsuite/libgomp.c-c++-common/depend-inoutset-1.c: New test.
--- gcc/tree-core.h.jj 2022-05-17 09:00:46.753995662 +0200
+++ gcc/tree-core.h 2022-05-17 11:19:00.901120286 +0200
@@ -1527,6 +1527,7 @@ enum omp_clause_depend_kind
OMP_CLAUSE_DEPEND_OUT,
OMP_CLAUSE_DEPEND_INOUT,
OMP_CLAUSE_DEPEND_MUTEXINOUTSET,
+ OMP_CLAUSE_DEPEND_INOUTSET,
OMP_CLAUSE_DEPEND_SOURCE,
OMP_CLAUSE_DEPEND_SINK,
OMP_CLAUSE_DEPEND_DEPOBJ,
--- gcc/tree-pretty-print.cc.jj 2022-05-17 09:00:46.794995110 +0200
+++ gcc/tree-pretty-print.cc 2022-05-17 11:19:00.902120273 +0200
@@ -804,6 +804,9 @@ dump_omp_clause (pretty_printer *pp, tre
case OMP_CLAUSE_DEPEND_MUTEXINOUTSET:
name = "mutexinoutset";
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ name = "inoutset";
+ break;
case OMP_CLAUSE_DEPEND_SOURCE:
pp_string (pp, "source)");
return;
--- gcc/gimplify.cc.jj 2022-05-17 09:00:46.563998222 +0200
+++ gcc/gimplify.cc 2022-05-17 11:19:00.890120434 +0200
@@ -8270,9 +8270,9 @@ gimplify_omp_depend (tree *list_p, gimpl
{
tree c;
gimple *g;
- size_t n[4] = { 0, 0, 0, 0 };
- bool unused[4];
- tree counts[4] = { NULL_TREE, NULL_TREE, NULL_TREE, NULL_TREE };
+ size_t n[5] = { 0, 0, 0, 0, 0 };
+ bool unused[5];
+ tree counts[5] = { NULL_TREE, NULL_TREE, NULL_TREE, NULL_TREE, NULL_TREE };
tree last_iter = NULL_TREE, last_count = NULL_TREE;
size_t i, j;
location_t first_loc = UNKNOWN_LOCATION;
@@ -8295,6 +8295,9 @@ gimplify_omp_depend (tree *list_p, gimpl
case OMP_CLAUSE_DEPEND_DEPOBJ:
i = 3;
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ i = 4;
+ break;
case OMP_CLAUSE_DEPEND_SOURCE:
case OMP_CLAUSE_DEPEND_SINK:
continue;
@@ -8400,14 +8403,14 @@ gimplify_omp_depend (tree *list_p, gimpl
else
n[i]++;
}
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 5; i++)
if (counts[i])
break;
- if (i == 4)
+ if (i == 5)
return 0;
tree total = size_zero_node;
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 5; i++)
{
unused[i] = counts[i] == NULL_TREE && n[i] == 0;
if (counts[i] == NULL_TREE)
@@ -8423,9 +8426,12 @@ gimplify_omp_depend (tree *list_p, gimpl
if (gimplify_expr (&total, pre_p, NULL, is_gimple_val, fb_rvalue)
== GS_ERROR)
return 2;
- bool is_old = unused[1] && unused[3];
+ bool is_old = unused[1] && unused[3] && unused[4];
tree totalpx = size_binop (PLUS_EXPR, unshare_expr (total),
size_int (is_old ? 1 : 4));
+ if (!unused[4])
+ totalpx = size_binop (PLUS_EXPR, totalpx,
+ size_binop (MULT_EXPR, counts[4], size_int (2)));
tree type = build_array_type (ptr_type_node, build_index_type (totalpx));
tree array = create_tmp_var_raw (type);
TREE_ADDRESSABLE (array) = 1;
@@ -8471,11 +8477,11 @@ gimplify_omp_depend (tree *list_p, gimpl
gimplify_and_add (tem, pre_p);
}
- tree cnts[4];
- for (j = 4; j; j--)
+ tree cnts[6];
+ for (j = 5; j; j--)
if (!unused[j - 1])
break;
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 5; i++)
{
if (i && (i >= j || unused[i - 1]))
{
@@ -8499,6 +8505,15 @@ gimplify_omp_depend (tree *list_p, gimpl
}
gimple_seq_add_stmt (pre_p, g);
}
+ if (unused[4])
+ cnts[5] = NULL_TREE;
+ else
+ {
+ tree t = size_binop (PLUS_EXPR, total, size_int (5));
+ cnts[5] = create_tmp_var (sizetype);
+ g = gimple_build_assign (cnts[i], t);
+ gimple_seq_add_stmt (pre_p, g);
+ }
last_iter = NULL_TREE;
tree last_bind = NULL_TREE;
@@ -8521,6 +8536,9 @@ gimplify_omp_depend (tree *list_p, gimpl
case OMP_CLAUSE_DEPEND_DEPOBJ:
i = 3;
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ i = 4;
+ break;
case OMP_CLAUSE_DEPEND_SOURCE:
case OMP_CLAUSE_DEPEND_SINK:
continue;
@@ -8625,14 +8643,42 @@ gimplify_omp_depend (tree *list_p, gimpl
return 2;
if (TREE_VALUE (t) != null_pointer_node)
TREE_VALUE (t) = build_fold_addr_expr (TREE_VALUE (t));
+ if (i == 4)
+ {
+ r = build4 (ARRAY_REF, ptr_type_node, array, cnts[i],
+ NULL_TREE, NULL_TREE);
+ tree r2 = build4 (ARRAY_REF, ptr_type_node, array, cnts[5],
+ NULL_TREE, NULL_TREE);
+ r2 = build_fold_addr_expr_with_type (r2, ptr_type_node);
+ tem = build2_loc (OMP_CLAUSE_LOCATION (c), MODIFY_EXPR,
+ void_type_node, r, r2);
+ append_to_statement_list_force (tem, last_body);
+ tem = build2_loc (OMP_CLAUSE_LOCATION (c), MODIFY_EXPR,
+ void_type_node, cnts[i],
+ size_binop (PLUS_EXPR, cnts[i],
+ size_int (1)));
+ append_to_statement_list_force (tem, last_body);
+ i = 5;
+ }
r = build4 (ARRAY_REF, ptr_type_node, array, cnts[i],
NULL_TREE, NULL_TREE);
tem = build2_loc (OMP_CLAUSE_LOCATION (c), MODIFY_EXPR,
void_type_node, r, TREE_VALUE (t));
append_to_statement_list_force (tem, last_body);
+ if (i == 5)
+ {
+ r = build4 (ARRAY_REF, ptr_type_node, array,
+ size_binop (PLUS_EXPR, cnts[i], size_int (1)),
+ NULL_TREE, NULL_TREE);
+ tem = build_int_cst (ptr_type_node, GOMP_DEPEND_INOUTSET);
+ tem = build2_loc (OMP_CLAUSE_LOCATION (c), MODIFY_EXPR,
+ void_type_node, r, tem);
+ append_to_statement_list_force (tem, last_body);
+ }
tem = build2_loc (OMP_CLAUSE_LOCATION (c), MODIFY_EXPR,
void_type_node, cnts[i],
- size_binop (PLUS_EXPR, cnts[i], size_int (1)));
+ size_binop (PLUS_EXPR, cnts[i],
+ size_int (1 + (i == 5))));
append_to_statement_list_force (tem, last_body);
TREE_VALUE (t) = null_pointer_node;
}
@@ -8656,12 +8702,38 @@ gimplify_omp_depend (tree *list_p, gimpl
if (gimplify_expr (&OMP_CLAUSE_DECL (c), pre_p, NULL,
is_gimple_val, fb_rvalue) == GS_ERROR)
return 2;
+ if (i == 4)
+ {
+ r = build4 (ARRAY_REF, ptr_type_node, array, cnts[i],
+ NULL_TREE, NULL_TREE);
+ tree r2 = build4 (ARRAY_REF, ptr_type_node, array, cnts[5],
+ NULL_TREE, NULL_TREE);
+ r2 = build_fold_addr_expr_with_type (r2, ptr_type_node);
+ tem = build2 (MODIFY_EXPR, void_type_node, r, r2);
+ gimplify_and_add (tem, pre_p);
+ g = gimple_build_assign (cnts[i], size_binop (PLUS_EXPR,
+ cnts[i],
+ size_int (1)));
+ gimple_seq_add_stmt (pre_p, g);
+ i = 5;
+ }
r = build4 (ARRAY_REF, ptr_type_node, array, cnts[i],
NULL_TREE, NULL_TREE);
tem = build2 (MODIFY_EXPR, void_type_node, r, OMP_CLAUSE_DECL (c));
gimplify_and_add (tem, pre_p);
- g = gimple_build_assign (cnts[i], size_binop (PLUS_EXPR, cnts[i],
- size_int (1)));
+ if (i == 5)
+ {
+ r = build4 (ARRAY_REF, ptr_type_node, array,
+ size_binop (PLUS_EXPR, cnts[i], size_int (1)),
+ NULL_TREE, NULL_TREE);
+ tem = build_int_cst (ptr_type_node, GOMP_DEPEND_INOUTSET);
+ tem = build2 (MODIFY_EXPR, void_type_node, r, tem);
+ append_to_statement_list_force (tem, last_body);
+ gimplify_and_add (tem, pre_p);
+ }
+ g = gimple_build_assign (cnts[i],
+ size_binop (PLUS_EXPR, cnts[i],
+ size_int (1 + (i == 5))));
gimple_seq_add_stmt (pre_p, g);
}
}
@@ -8685,7 +8757,7 @@ gimplify_omp_depend (tree *list_p, gimpl
else
{
tree prev = size_int (5);
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 5; i++)
{
if (unused[i])
continue;
--- gcc/omp-low.cc.jj 2022-05-17 09:00:46.569998141 +0200
+++ gcc/omp-low.cc 2022-05-17 11:19:00.900120300 +0200
@@ -12304,7 +12304,7 @@ lower_depend_clauses (tree *pclauses, gi
{
tree c, clauses;
gimple *g;
- size_t cnt[4] = { 0, 0, 0, 0 }, idx = 2, i;
+ size_t cnt[5] = { 0, 0, 0, 0, 0 }, idx = 2, i;
clauses = omp_find_clause (*pclauses, OMP_CLAUSE_DEPEND);
gcc_assert (clauses);
@@ -12328,16 +12328,20 @@ lower_depend_clauses (tree *pclauses, gi
case OMP_CLAUSE_DEPEND_DEPOBJ:
cnt[3]++;
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ cnt[4]++;
+ break;
case OMP_CLAUSE_DEPEND_SOURCE:
case OMP_CLAUSE_DEPEND_SINK:
/* FALLTHRU */
default:
gcc_unreachable ();
}
- if (cnt[1] || cnt[3])
+ if (cnt[1] || cnt[3] || cnt[4])
idx = 5;
- size_t total = cnt[0] + cnt[1] + cnt[2] + cnt[3];
- tree type = build_array_type_nelts (ptr_type_node, total + idx);
+ size_t total = cnt[0] + cnt[1] + cnt[2] + cnt[3] + cnt[4];
+ size_t inoutidx = total + idx;
+ tree type = build_array_type_nelts (ptr_type_node, total + idx + 2 * cnt[4]);
tree array = create_tmp_var (type);
TREE_ADDRESSABLE (array) = 1;
tree r = build4 (ARRAY_REF, ptr_type_node, array, size_int (0), NULL_TREE,
@@ -12358,7 +12362,7 @@ lower_depend_clauses (tree *pclauses, gi
g = gimple_build_assign (r, build_int_cst (ptr_type_node, cnt[i]));
gimple_seq_add_stmt (iseq, g);
}
- for (i = 0; i < 4; i++)
+ for (i = 0; i < 5; i++)
{
if (cnt[i] == 0)
continue;
@@ -12386,10 +12390,21 @@ lower_depend_clauses (tree *pclauses, gi
if (i != 3)
continue;
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ if (i != 4)
+ continue;
+ break;
default:
gcc_unreachable ();
}
tree t = OMP_CLAUSE_DECL (c);
+ if (i == 4)
+ {
+ t = build4 (ARRAY_REF, ptr_type_node, array,
+ size_int (inoutidx), NULL_TREE, NULL_TREE);
+ t = build_fold_addr_expr (t);
+ inoutidx += 2;
+ }
t = fold_convert (ptr_type_node, t);
gimplify_expr (&t, iseq, NULL, is_gimple_val, fb_rvalue);
r = build4 (ARRAY_REF, ptr_type_node, array, size_int (idx++),
@@ -12398,6 +12413,25 @@ lower_depend_clauses (tree *pclauses, gi
gimple_seq_add_stmt (iseq, g);
}
}
+ if (cnt[4])
+ for (c = clauses; c; c = OMP_CLAUSE_CHAIN (c))
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_DEPEND
+ && OMP_CLAUSE_DEPEND_KIND (c) == OMP_CLAUSE_DEPEND_INOUTSET)
+ {
+ tree t = OMP_CLAUSE_DECL (c);
+ t = fold_convert (ptr_type_node, t);
+ gimplify_expr (&t, iseq, NULL, is_gimple_val, fb_rvalue);
+ r = build4 (ARRAY_REF, ptr_type_node, array, size_int (idx++),
+ NULL_TREE, NULL_TREE);
+ g = gimple_build_assign (r, t);
+ gimple_seq_add_stmt (iseq, g);
+ t = build_int_cst (ptr_type_node, GOMP_DEPEND_INOUTSET);
+ r = build4 (ARRAY_REF, ptr_type_node, array, size_int (idx++),
+ NULL_TREE, NULL_TREE);
+ g = gimple_build_assign (r, t);
+ gimple_seq_add_stmt (iseq, g);
+ }
+
c = build_omp_clause (UNKNOWN_LOCATION, OMP_CLAUSE_DEPEND);
OMP_CLAUSE_DEPEND_KIND (c) = OMP_CLAUSE_DEPEND_LAST;
OMP_CLAUSE_DECL (c) = build_fold_addr_expr (array);
--- gcc/c-family/c-omp.cc.jj 2022-05-17 09:00:46.048005173 +0200
+++ gcc/c-family/c-omp.cc 2022-05-17 11:19:00.901120286 +0200
@@ -738,6 +738,7 @@ c_finish_omp_depobj (location_t loc, tre
case OMP_CLAUSE_DEPEND_OUT:
case OMP_CLAUSE_DEPEND_INOUT:
case OMP_CLAUSE_DEPEND_MUTEXINOUTSET:
+ case OMP_CLAUSE_DEPEND_INOUTSET:
kind = OMP_CLAUSE_DEPEND_KIND (clause);
t = OMP_CLAUSE_DECL (clause);
gcc_assert (t);
@@ -796,6 +797,9 @@ c_finish_omp_depobj (location_t loc, tre
case OMP_CLAUSE_DEPEND_MUTEXINOUTSET:
k = GOMP_DEPEND_MUTEXINOUTSET;
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ k = GOMP_DEPEND_INOUTSET;
+ break;
case OMP_CLAUSE_DEPEND_LAST:
k = -1;
break;
--- gcc/c/c-parser.cc.jj 2022-05-17 09:00:46.440999879 +0200
+++ gcc/c/c-parser.cc 2022-05-17 11:19:00.899120313 +0200
@@ -16067,7 +16067,7 @@ c_parser_omp_clause_affinity (c_parser *
depend ( depend-modifier , depend-kind: variable-list )
depend-kind:
- in | out | inout | mutexinoutset | depobj
+ in | out | inout | mutexinoutset | depobj | inoutset
depend-modifier:
iterator ( iterators-definition ) */
@@ -16099,6 +16099,8 @@ c_parser_omp_clause_depend (c_parser *pa
kind = OMP_CLAUSE_DEPEND_IN;
else if (strcmp ("inout", p) == 0)
kind = OMP_CLAUSE_DEPEND_INOUT;
+ else if (strcmp ("inoutset", p) == 0)
+ kind = OMP_CLAUSE_DEPEND_INOUTSET;
else if (strcmp ("mutexinoutset", p) == 0)
kind = OMP_CLAUSE_DEPEND_MUTEXINOUTSET;
else if (strcmp ("out", p) == 0)
@@ -19063,12 +19065,14 @@ c_parser_omp_depobj (c_parser *parser)
kind = OMP_CLAUSE_DEPEND_INOUT;
else if (!strcmp ("mutexinoutset", p2))
kind = OMP_CLAUSE_DEPEND_MUTEXINOUTSET;
+ else if (!strcmp ("inoutset", p2))
+ kind = OMP_CLAUSE_DEPEND_INOUTSET;
}
if (kind == OMP_CLAUSE_DEPEND_SOURCE)
{
clause = error_mark_node;
- error_at (c2_loc, "expected %<in%>, %<out%>, %<inout%> or "
- "%<mutexinoutset%>");
+ error_at (c2_loc, "expected %<in%>, %<out%>, %<inout%>, "
+ "%<mutexinoutset%> or %<inoutset%>");
}
c_parens.skip_until_found_close (parser);
}
--- gcc/cp/parser.cc.jj 2022-05-17 09:00:46.526998720 +0200
+++ gcc/cp/parser.cc 2022-05-17 11:19:00.896120354 +0200
@@ -39446,6 +39446,8 @@ cp_parser_omp_clause_depend (cp_parser *
kind = OMP_CLAUSE_DEPEND_IN;
else if (strcmp ("inout", p) == 0)
kind = OMP_CLAUSE_DEPEND_INOUT;
+ else if (strcmp ("inoutset", p) == 0)
+ kind = OMP_CLAUSE_DEPEND_INOUTSET;
else if (strcmp ("mutexinoutset", p) == 0)
kind = OMP_CLAUSE_DEPEND_MUTEXINOUTSET;
else if (strcmp ("out", p) == 0)
@@ -41745,12 +41747,14 @@ cp_parser_omp_depobj (cp_parser *parser,
kind = OMP_CLAUSE_DEPEND_INOUT;
else if (!strcmp ("mutexinoutset", p2))
kind = OMP_CLAUSE_DEPEND_MUTEXINOUTSET;
+ else if (!strcmp ("inoutset", p2))
+ kind = OMP_CLAUSE_DEPEND_INOUTSET;
}
if (kind == OMP_CLAUSE_DEPEND_SOURCE)
{
clause = error_mark_node;
- error_at (c2_loc, "expected %<in%>, %<out%>, %<inout%> or "
- "%<mutexinoutset%>");
+ error_at (c2_loc, "expected %<in%>, %<out%>, %<inout%>, "
+ "%<mutexinoutset%> or %<inoutset%>");
}
if (!c_parens.require_close (parser))
cp_parser_skip_to_closing_parenthesis (parser,
--- gcc/cp/cxx-pretty-print.cc.jj 2022-05-17 09:00:46.496999124 +0200
+++ gcc/cp/cxx-pretty-print.cc 2022-05-17 11:19:00.896120354 +0200
@@ -2139,6 +2139,9 @@ cxx_pretty_printer::statement (tree t)
case OMP_CLAUSE_DEPEND_MUTEXINOUTSET:
pp_cxx_ws_string (this, " update(mutexinoutset)");
break;
+ case OMP_CLAUSE_DEPEND_INOUTSET:
+ pp_cxx_ws_string (this, " update(inoutset)");
+ break;
case OMP_CLAUSE_DEPEND_LAST:
pp_cxx_ws_string (this, " destroy");
break;
--- gcc/testsuite/c-c++-common/gomp/all-memory-1.c.jj 2022-05-12
08:30:53.472434375 +0200
+++ gcc/testsuite/c-c++-common/gomp/all-memory-1.c 2022-05-17
11:22:29.295311157 +0200
@@ -49,4 +49,6 @@ boo (void)
;
#pragma omp task depend(mutexinoutset: omp_all_memory) /* { dg-error
"'omp_all_memory' used with 'depend' kind other than 'out' or 'inout'" } */
;
+ #pragma omp task depend(inoutset: omp_all_memory) /* { dg-error
"'omp_all_memory' used with 'depend' kind other than 'out' or 'inout'" } */
+ ;
}
--- gcc/testsuite/c-c++-common/gomp/all-memory-2.c.jj 2022-05-12
08:30:53.472434375 +0200
+++ gcc/testsuite/c-c++-common/gomp/all-memory-2.c 2022-05-17
11:23:01.090882557 +0200
@@ -52,4 +52,6 @@ boo (void)
;
#pragma omp task depend(mutexinoutset: omp_all_memory)
;
+ #pragma omp task depend(inoutset: omp_all_memory)
+ ;
}
--- gcc/testsuite/c-c++-common/gomp/depobj-1.c.jj 2022-05-17
09:00:46.652997023 +0200
+++ gcc/testsuite/c-c++-common/gomp/depobj-1.c 2022-05-17 11:25:31.464855522
+0200
@@ -21,6 +21,9 @@ f1 (void)
;
#pragma omp depobj(pdepobj[0]) depend(mutexinoutset:a)
#pragma omp depobj(*pdepobj) destroy
+ #pragma omp depobj(depobja[0]) depend(inoutset: a)
+ #pragma omp depobj(depobja[0]) update(mutexinoutset)
+ #pragma omp depobj(depobja[0]) update(inoutset)
}
void
@@ -38,7 +41,7 @@ f2 (void)
#pragma omp depobj (a) destroy /* { dg-error "type of
'depobj' expression is not 'omp_depend_t'" } */
#pragma omp depobj (depobj) depend(depobj:a) /* { dg-error "does not
have 'omp_depend_t' type in 'depend' clause with 'depobj' dependence type" } */
#pragma omp depobj (depobj) depend(depobj:*depobjb) /* { dg-error "'depobj'
dependence type specified in 'depend' clause on 'depobj' construct" } */
- #pragma omp depobj (depobj) update(foobar) /* { dg-error "expected
'in', 'out', 'inout' or 'mutexinoutset'" } */
+ #pragma omp depobj (depobj) update(foobar) /* { dg-error "expected
'in', 'out', 'inout', 'mutexinoutset' or 'inoutset'" } */
#pragma omp depobj (depobj) depend(in: *depobja) /* { dg-error "should
not have 'omp_depend_t' type in 'depend' clause with dependence type" } */
#pragma omp depobj (depobj) depend(in: a) depend(in: b) /* { dg-error
"expected" } */
#pragma omp depobj (depobj) depend(in: a) update(out) /* { dg-error
"expected" } */
--- gcc/testsuite/g++.dg/gomp/depobj-1.C.jj 2022-05-17 09:00:46.694996456
+0200
+++ gcc/testsuite/g++.dg/gomp/depobj-1.C 2022-05-17 11:19:00.896120354
+0200
@@ -83,7 +83,7 @@ f4 (void)
#pragma omp depobj (a) destroy // { dg-error "type of
'depobj' expression is not 'omp_depend_t'" }
#pragma omp depobj (depobj) depend(depobj:a) // { dg-error "does not
have 'omp_depend_t' type in 'depend' clause with 'depobj' dependence type" }
#pragma omp depobj (depobj) depend(depobj:*depobjb) // { dg-error "'depobj'
dependence type specified in 'depend' clause on 'depobj' construct" }
- #pragma omp depobj (depobj) update(foobar) // { dg-error "expected
'in', 'out', 'inout' or 'mutexinoutset'" }
+ #pragma omp depobj (depobj) update(foobar) // { dg-error "expected
'in', 'out', 'inout', 'mutexinoutset' or 'inoutset'" }
#pragma omp depobj (depobj) depend(in: *depobja) // { dg-error "should
not have 'omp_depend_t' type in 'depend' clause with dependence type" }
#pragma omp depobj (depobj) depend(in: a) depend(in: b) // { dg-error
"expected" }
#pragma omp depobj (depobj) depend(in: a) update(out) // { dg-error
"expected" }
--- include/gomp-constants.h.jj 2022-05-17 09:00:46.861994207 +0200
+++ include/gomp-constants.h 2022-05-17 11:19:00.902120273 +0200
@@ -328,6 +328,7 @@ enum gomp_map_kind
#define GOMP_DEPEND_OUT 2
#define GOMP_DEPEND_INOUT 3
#define GOMP_DEPEND_MUTEXINOUTSET 4
+#define GOMP_DEPEND_INOUTSET 5
/* HSA specific data structures. */
--- libgomp/libgomp.h.jj 2022-05-17 09:00:46.916993467 +0200
+++ libgomp/libgomp.h 2022-05-17 11:19:00.902120273 +0200
@@ -536,8 +536,8 @@ struct gomp_task_depend_entry
struct gomp_task_depend_entry *prev;
/* Task that provides the dependency in ADDR. */
struct gomp_task *task;
- /* Depend entry is of type "IN". */
- bool is_in;
+ /* Depend entry is of type "IN" (1) or "INOUTSET" (2). */
+ unsigned char is_in;
bool redundant;
bool redundant_out;
};
--- libgomp/task.c.jj 2022-05-17 09:00:46.970992739 +0200
+++ libgomp/task.c 2022-05-17 11:19:00.903120259 +0200
@@ -197,6 +197,7 @@ gomp_task_handle_depend (struct gomp_tas
/* ndepend - nout - nmutexinoutset - nin is # of depobjs */
size_t normal = nout + nmutexinoutset + nin;
size_t n = 0;
+ bool has_in = false;
for (i = normal; i < ndepend; i++)
{
void **d = (void **) (uintptr_t) depend[5 + i];
@@ -209,6 +210,8 @@ gomp_task_handle_depend (struct gomp_tas
case GOMP_DEPEND_MUTEXINOUTSET:
break;
case GOMP_DEPEND_IN:
+ case GOMP_DEPEND_INOUTSET:
+ has_in = true;
continue;
default:
gomp_fatal ("unknown omp_depend_t dependence type %d",
@@ -222,14 +225,17 @@ gomp_task_handle_depend (struct gomp_tas
task->depend[n].addr = depend[5 + i];
task->depend[n++].is_in = i >= nout + nmutexinoutset;
}
- for (i = normal; i < ndepend; i++)
- {
- void **d = (void **) (uintptr_t) depend[5 + i];
- if ((uintptr_t) d[1] != GOMP_DEPEND_IN)
- continue;
- task->depend[n].addr = d[0];
- task->depend[n++].is_in = 1;
- }
+ if (has_in)
+ for (i = normal; i < ndepend; i++)
+ {
+ void **d = (void **) (uintptr_t) depend[5 + i];
+ if ((uintptr_t) d[1] != GOMP_DEPEND_IN
+ && (uintptr_t) d[1] != GOMP_DEPEND_INOUTSET)
+ continue;
+ task->depend[n].addr = d[0];
+ task->depend[n++].is_in
+ = 1 + ((uintptr_t) d[1] == GOMP_DEPEND_INOUTSET);
+ }
}
task->num_dependees = 0;
if (__builtin_expect (parent->depend_all_memory && ndepend, false))
@@ -381,8 +387,10 @@ gomp_task_handle_depend (struct gomp_tas
last = ent;
- /* depend(in:...) doesn't depend on earlier depend(in:...). */
- if (task->depend[i].is_in && ent->is_in)
+ /* depend(in:...) doesn't depend on earlier depend(in:...).
+ Similarly depend(inoutset:...) doesn't depend on earlier
+ depend(inoutset:...). */
+ if (task->depend[i].is_in && task->depend[i].is_in == ent->is_in)
continue;
if (!ent->is_in)
@@ -1890,6 +1898,9 @@ gomp_task_maybe_wait_for_dependencies (v
case GOMP_DEPEND_MUTEXINOUTSET:
elem.is_in = 0;
break;
+ case GOMP_DEPEND_INOUTSET:
+ elem.is_in = 2;
+ break;
default:
gomp_fatal ("unknown omp_depend_t dependence type %d",
(int) (uintptr_t) d[1]);
@@ -1928,7 +1939,7 @@ gomp_task_maybe_wait_for_dependencies (v
}
ent = htab_find (task->depend_hash, &elem);
for (; ent; ent = ent->next)
- if (elem.is_in && ent->is_in)
+ if (elem.is_in && elem.is_in == ent->is_in)
continue;
else
{
--- libgomp/testsuite/libgomp.c-c++-common/depend-1.c.jj 2022-05-12
08:30:53.473434361 +0200
+++ libgomp/testsuite/libgomp.c-c++-common/depend-1.c 2022-05-17
15:05:35.812599494 +0200
@@ -48,6 +48,11 @@ test (int ifval)
usleep (5000);
b[4] = 48;
}
+ #pragma omp task shared(b) depend(inoutset: b[5])
+ {
+ usleep (5000);
+ b[5] = 49;
+ }
/* None of the above tasks depend on each other.
The following task depends on all but the a[4] = 46; one. */
#pragma omp task shared(a, b) depend(out: omp_all_memory) private(i)
if(ifval)
@@ -55,7 +60,7 @@ test (int ifval)
if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45
|| a[5] != 5 || a[6] != 6 || a[7] != 7
|| b[0] != 47 || b[1] != 2 || b[2] != 4 || b[3] != 6
- || b[4] != 48 || b[5] != 10 || b[6] != 12 || b[7] != 14)
+ || b[4] != 48 || b[5] != 49 || b[6] != 12 || b[7] != 14)
abort ();
for (i = 0; i < 8; ++i)
if (i != 4)
--- libgomp/testsuite/libgomp.c-c++-common/depend-2.c.jj 2022-05-12
08:30:53.473434361 +0200
+++ libgomp/testsuite/libgomp.c-c++-common/depend-2.c 2022-05-17
12:58:42.509467650 +0200
@@ -52,6 +52,11 @@ test (int ifval)
usleep (5000);
b[4] = 48;
}
+ #pragma omp task shared(b) depend(inoutset: b[5])
+ {
+ usleep (5000);
+ b[5] = 49;
+ }
/* None of the above tasks depend on each other.
The following task depends on all but the a[4] = 46; one. */
#pragma omp task shared(a, b) depend(depobj: d1) private(i) if(ifval)
@@ -59,7 +64,7 @@ test (int ifval)
if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45
|| a[5] != 5 || a[6] != 6 || a[7] != 7
|| b[0] != 47 || b[1] != 2 || b[2] != 4 || b[3] != 6
- || b[4] != 48 || b[5] != 10 || b[6] != 12 || b[7] != 14)
+ || b[4] != 48 || b[5] != 49 || b[6] != 12 || b[7] != 14)
abort ();
for (i = 0; i < 8; ++i)
if (i != 4)
--- libgomp/testsuite/libgomp.c-c++-common/depend-3.c.jj 2022-05-12
08:30:53.473434361 +0200
+++ libgomp/testsuite/libgomp.c-c++-common/depend-3.c 2022-05-17
13:00:03.427375956 +0200
@@ -48,6 +48,11 @@ main ()
usleep (5000);
b[4] = 48;
}
+ #pragma omp task shared(b) depend(inoutset: b[5])
+ {
+ usleep (5000);
+ b[5] = 49;
+ }
/* None of the above tasks depend on each other.
The following task depends on all but the a[4] = 46; one. */
#pragma omp task shared(a, b) depend(iterator (j=0:7), inout:
omp_all_memory) private(i)
@@ -55,7 +60,7 @@ main ()
if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45
|| a[5] != 5 || a[6] != 6 || a[7] != 7
|| b[0] != 47 || b[1] != 2 || b[2] != 4 || b[3] != 6
- || b[4] != 48 || b[5] != 10 || b[6] != 12 || b[7] != 14)
+ || b[4] != 48 || b[5] != 49 || b[6] != 12 || b[7] != 14)
abort ();
for (i = 0; i < 8; ++i)
if (i != 4)
--- libgomp/testsuite/libgomp.c-c++-common/depend-inoutset-1.c.jj
2022-05-17 13:45:20.133711784 +0200
+++ libgomp/testsuite/libgomp.c-c++-common/depend-inoutset-1.c 2022-05-17
15:20:54.597215874 +0200
@@ -0,0 +1,164 @@
+#include <omp.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+int
+main ()
+{
+ int a[8] = {};
+ omp_depend_t d1, d2;
+ #pragma omp depobj (d1) depend(inoutset: a)
+ #pragma omp depobj (d2) depend(inout: a)
+ #pragma omp depobj (d2) update(inoutset)
+ #pragma omp parallel
+ {
+ #pragma omp barrier
+ #pragma omp master
+ {
+ #pragma omp task shared(a) depend(out: a)
+ {
+ usleep (5000);
+ a[0] = 1; a[1] = 2; a[2] = 3; a[3] = 4;
+ }
+ /* The above task needs to finish first. */
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 1 || a[1] != 2 || a[2] != 3 || a[3] != 4)
+ abort ();
+ usleep (5000);
+ a[4] = 42;
+ }
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 1 || a[1] != 2 || a[2] != 3 || a[3] != 4)
+ abort ();
+ usleep (5000);
+ a[5] = 43;
+ }
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 1 || a[1] != 2 || a[2] != 3 || a[3] != 4)
+ abort ();
+ usleep (5000);
+ a[6] = 44;
+ }
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 1 || a[1] != 2 || a[2] != 3 || a[3] != 4)
+ abort ();
+ usleep (5000);
+ a[7] = 45;
+ }
+ /* The above 4 tasks can be scheduled in any order but need to wait
+ for the depend(out: a) task. */
+ #pragma omp task shared(a) depend(inoutset: a)
+ {
+ if (a[4] != 42 || a[5] != 43 || a[6] != 44 || a[7] != 45)
+ abort ();
+ usleep (5000);
+ a[0] = 42;
+ }
+ #pragma omp task shared(a) depend(iterator(i=1:3:2), inoutset: a)
+ {
+ if (a[4] != 42 || a[5] != 43 || a[6] != 44 || a[7] != 45)
+ abort ();
+ usleep (5000);
+ a[1] = 43;
+ }
+ #pragma omp task shared(a) depend(depobj: d1)
+ {
+ if (a[4] != 42 || a[5] != 43 || a[6] != 44 || a[7] != 45)
+ abort ();
+ usleep (5000);
+ a[2] = 44;
+ }
+ #pragma omp task shared(a) depend(depobj: d2)
+ {
+ if (a[4] != 42 || a[5] != 43 || a[6] != 44 || a[7] != 45)
+ abort ();
+ usleep (5000);
+ a[3] = 45;
+ }
+ /* The above 4 tasks can be scheduled in any order but need to wait
+ for all the above depend(in: a) tasks. */
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45)
+ abort ();
+ usleep (5000);
+ a[4] = 46;
+ }
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45)
+ abort ();
+ usleep (5000);
+ a[5] = 47;
+ }
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45)
+ abort ();
+ usleep (5000);
+ a[6] = 48;
+ }
+ #pragma omp task shared(a) depend(in: a)
+ {
+ if (a[0] != 42 || a[1] != 43 || a[2] != 44 || a[3] != 45)
+ abort ();
+ usleep (5000);
+ a[7] = 49;
+ }
+ /* The above 4 tasks can be scheduled in any order but need to wait
+ for all the above depend(inoutset: a),
+ depend(iterator(i=1:3:2), inoutset: a), depend(depobj: d1) and
+ depend(depobj: d2) tasks. */
+ #pragma omp task shared(a) depend(inoutset: a)
+ {
+ if (a[4] != 46|| a[5] != 47 || a[6] != 48 || a[7] != 49)
+ abort ();
+ usleep (5000);
+ a[0] = 50;
+ }
+ /* The above task needs to wait for all the above 4 depend(in: a)
+ tasks. */
+ #pragma omp task shared(a) depend(out: a)
+ {
+ if (a[0] != 50 || a[4] != 46|| a[5] != 47 || a[6] != 48 || a[7] != 49)
+ abort ();
+ usleep (5000);
+ a[0] = 51;
+ }
+ /* The above task needs to wait for the above depend(inoutset: a) task. */
+ #pragma omp task shared(a) depend(inoutset: a)
+ {
+ if (a[0] != 51 || a[4] != 46|| a[5] != 47 || a[6] != 48 || a[7] != 49)
+ abort ();
+ usleep (5000);
+ a[0] = 52;
+ }
+ /* The above task needs to wait for the above depend(out: a) task. */
+ #pragma omp task shared(a) depend(mutexinoutset: a)
+ {
+ if (a[0] != 52 || a[4] != 46|| a[5] != 47 || a[6] != 48 || a[7] != 49)
+ abort ();
+ usleep (5000);
+ a[0] = 53;
+ }
+ /* The above task needs to wait for the above depend(inoutset: a) task. */
+ #pragma omp task shared(a) depend(inoutset: a)
+ {
+ if (a[0] != 53 || a[4] != 46|| a[5] != 47 || a[6] != 48 || a[7] != 49)
+ abort ();
+ usleep (5000);
+ a[0] = 54;
+ }
+ /* The above task needs to wait for the above
+ depend(mutexinoutset: a) task. */
+ }
+ }
+ if (a[0] != 54 || a[1] != 43 || a[2] != 44 || a[3] != 45
+ || a[4] != 46|| a[5] != 47 || a[6] != 48 || a[7] != 49)
+ abort ();
+ return 0;
+}
Jakub
