* [committed] openmp: Add support for enter clause on declare target
@ 2022-05-27 10:54 Jakub Jelinek
2022-05-27 14:52 ` [Patch] OpenMP/Fortran: Add support for enter clause on declare target (was: [committed] openmp: Add support for enter clause on declare target) Tobias Burnus
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2022-05-27 10:54 UTC (permalink / raw)
To: gcc-patches; +Cc: Tobias Burnus
Hi!
OpenMP 5.1 and earlier had 2 different uses of to clause, one for target
update construct with one semantics, and one for declare target directive
with a different semantics.
Under the hood we were using OMP_CLAUSE_TO_DECLARE to represent the latter.
OpenMP 5.2 renamed the declare target clause to to enter, the old one is
kept as a deprecated alias.
As we are far from having full OpenMP 5.2 support, this patch adds support
for the enter clause (and renames OMP_CLAUSE_TO_DECLARE to OMP_CLAUSE_ENTER
with a flag to tell the spelling of the clause for better diagnostics),
but doesn't deprecate the to clause on declare target just yet (that
should be done as one of the last steps in 5.2 support).
Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.
2022-05-27 Jakub Jelinek <jakub@redhat.com>
gcc/
* tree-core.h (enum omp_clause_code): Rename OMP_CLAUSE_TO_DECLARE
to OMP_CLAUSE_ENTER.
* tree.h (OMP_CLAUSE_ENTER_TO): Define.
* tree.cc (omp_clause_num_ops, omp_clause_code_name): Rename
OMP_CLAUSE_TO_DECLARE to OMP_CLAUSE_ENTER.
* tree-pretty-print.cc (dump_omp_clause): Handle OMP_CLAUSE_ENTER
instead of OMP_CLAUSE_TO_DECLARE, if OMP_CLAUSE_ENTER_TO, print
"to" instead of "enter".
* tree-nested.cc (convert_nonlocal_omp_clauses,
convert_local_omp_clauses): Handle OMP_CLAUSE_ENTER instead of
OMP_CLAUSE_TO_DECLARE.
gcc/c-family/
* c-pragma.h (enum pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_ENTER.
gcc/c/
* c-parser.cc (c_parser_omp_clause_name): Parse enter clause.
(c_parser_omp_all_clauses): For to clause on declare target, use
OMP_CLAUSE_ENTER clause with OMP_CLAUSE_ENTER_TO instead of
OMP_CLAUSE_TO_DECLARE clause. Handle PRAGMA_OMP_CLAUSE_ENTER.
(OMP_DECLARE_TARGET_CLAUSE_MASK): Add enter clause.
(c_parser_omp_declare_target): Use OMP_CLAUSE_ENTER instead of
OMP_CLAUSE_TO_DECLARE.
* c-typeck.cc (c_finish_omp_clauses): Handle OMP_CLAUSE_ENTER instead
of OMP_CLAUSE_TO_DECLARE, to OMP_CLAUSE_ENTER_TO use "to" as clause
name in diagnostics instead of
omp_clause_code_name[OMP_CLAUSE_CODE (c)].
gcc/cp/
* parser.cc (cp_parser_omp_clause_name): Parse enter clause.
(cp_parser_omp_all_clauses): For to clause on declare target, use
OMP_CLAUSE_ENTER clause with OMP_CLAUSE_ENTER_TO instead of
OMP_CLAUSE_TO_DECLARE clause. Handle PRAGMA_OMP_CLAUSE_ENTER.
(OMP_DECLARE_TARGET_CLAUSE_MASK): Add enter clause.
(cp_parser_omp_declare_target): Use OMP_CLAUSE_ENTER instead of
OMP_CLAUSE_TO_DECLARE.
* semantics.cc (finish_omp_clauses): Handle OMP_CLAUSE_ENTER instead
of OMP_CLAUSE_TO_DECLARE, to OMP_CLAUSE_ENTER_TO use "to" as clause
name in diagnostics instead of
omp_clause_code_name[OMP_CLAUSE_CODE (c)].
gcc/testsuite/
* c-c++-common/gomp/clauses-3.c: Add tests with enter clause instead
of to or modify some existing to clauses to enter.
* c-c++-common/gomp/declare-target-1.c: Likewise.
* c-c++-common/gomp/declare-target-2.c: Likewise.
* c-c++-common/gomp/declare-target-3.c: Likewise.
* g++.dg/gomp/attrs-9.C: Likewise.
* g++.dg/gomp/declare-target-1.C: Likewise.
libgomp/
* testsuite/libgomp.c-c++-common/target-40.c: Modify some existing to
clauses to enter.
* testsuite/libgomp.c/target-41.c: Likewise.
--- gcc/tree-core.h.jj 2022-05-27 11:29:15.787812586 +0200
+++ gcc/tree-core.h 2022-05-27 11:47:00.250820434 +0200
@@ -302,9 +302,9 @@ enum omp_clause_code {
/* OpenMP clause: uniform (argument-list). */
OMP_CLAUSE_UNIFORM,
- /* OpenMP clause: to (extended-list).
- Only when it appears in declare target. */
- OMP_CLAUSE_TO_DECLARE,
+ /* OpenMP clause: enter (extended-list).
+ to is a deprecated alias when it appears in declare target. */
+ OMP_CLAUSE_ENTER,
/* OpenMP clause: link (variable-list). */
OMP_CLAUSE_LINK,
--- gcc/tree.h.jj 2022-05-27 11:29:16.026810118 +0200
+++ gcc/tree.h 2022-05-27 11:47:00.246820475 +0200
@@ -1925,6 +1925,10 @@ class auto_suppress_location_wrappers
#define OMP_CLAUSE_BIND_KIND(NODE) \
(OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_BIND)->omp_clause.subcode.bind_kind)
+/* True if ENTER clause is spelled as TO. */
+#define OMP_CLAUSE_ENTER_TO(NODE) \
+ (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_ENTER)->base.public_flag)
+
#define OMP_CLAUSE_TILE_LIST(NODE) \
OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_TILE), 0)
#define OMP_CLAUSE_TILE_ITERVAR(NODE) \
--- gcc/tree.cc.jj 2022-05-27 11:29:15.954810861 +0200
+++ gcc/tree.cc 2022-05-27 11:47:00.238820558 +0200
@@ -280,7 +280,7 @@ unsigned const char omp_clause_num_ops[]
1, /* OMP_CLAUSE_DEPEND */
1, /* OMP_CLAUSE_NONTEMPORAL */
1, /* OMP_CLAUSE_UNIFORM */
- 1, /* OMP_CLAUSE_TO_DECLARE */
+ 1, /* OMP_CLAUSE_ENTER */
1, /* OMP_CLAUSE_LINK */
1, /* OMP_CLAUSE_DETACH */
1, /* OMP_CLAUSE_USE_DEVICE_PTR */
@@ -370,7 +370,7 @@ const char * const omp_clause_code_name[
"depend",
"nontemporal",
"uniform",
- "to",
+ "enter",
"link",
"detach",
"use_device_ptr",
--- gcc/tree-pretty-print.cc.jj 2022-05-27 11:29:15.909811326 +0200
+++ gcc/tree-pretty-print.cc 2022-05-27 11:47:00.251820423 +0200
@@ -517,8 +517,11 @@ dump_omp_clause (pretty_printer *pp, tre
case OMP_CLAUSE__SCANTEMP_:
name = "_scantemp_";
goto print_remap;
- case OMP_CLAUSE_TO_DECLARE:
- name = "to";
+ case OMP_CLAUSE_ENTER:
+ if (OMP_CLAUSE_ENTER_TO (clause))
+ name = "to";
+ else
+ name = "enter";
goto print_remap;
case OMP_CLAUSE_LINK:
name = "link";
--- gcc/tree-nested.cc.jj 2022-05-27 11:29:15.844811997 +0200
+++ gcc/tree-nested.cc 2022-05-27 11:47:00.238820558 +0200
@@ -1335,7 +1335,7 @@ convert_nonlocal_omp_clauses (tree *pcla
case OMP_CLAUSE_FIRSTPRIVATE:
case OMP_CLAUSE_COPYPRIVATE:
case OMP_CLAUSE_SHARED:
- case OMP_CLAUSE_TO_DECLARE:
+ case OMP_CLAUSE_ENTER:
case OMP_CLAUSE_LINK:
case OMP_CLAUSE_USE_DEVICE_PTR:
case OMP_CLAUSE_USE_DEVICE_ADDR:
@@ -2120,7 +2120,7 @@ convert_local_omp_clauses (tree *pclause
case OMP_CLAUSE_FIRSTPRIVATE:
case OMP_CLAUSE_COPYPRIVATE:
case OMP_CLAUSE_SHARED:
- case OMP_CLAUSE_TO_DECLARE:
+ case OMP_CLAUSE_ENTER:
case OMP_CLAUSE_LINK:
case OMP_CLAUSE_USE_DEVICE_PTR:
case OMP_CLAUSE_USE_DEVICE_ADDR:
--- gcc/c-family/c-pragma.h.jj 2022-05-27 11:29:15.278817842 +0200
+++ gcc/c-family/c-pragma.h 2022-05-27 11:47:00.250820434 +0200
@@ -90,7 +90,7 @@ enum pragma_kind {
/* All clauses defined by OpenACC 2.0, and OpenMP 2.5, 3.0, 3.1, 4.0, 4.5, 5.0,
- and 5.1. Used internally by both C and C++ parsers. */
+ 5.1 and 5.2. Used internally by both C and C++ parsers. */
enum pragma_omp_clause {
PRAGMA_OMP_CLAUSE_NONE = 0,
@@ -108,6 +108,7 @@ enum pragma_omp_clause {
PRAGMA_OMP_CLAUSE_DEVICE,
PRAGMA_OMP_CLAUSE_DEVICE_TYPE,
PRAGMA_OMP_CLAUSE_DIST_SCHEDULE,
+ PRAGMA_OMP_CLAUSE_ENTER,
PRAGMA_OMP_CLAUSE_FILTER,
PRAGMA_OMP_CLAUSE_FINAL,
PRAGMA_OMP_CLAUSE_FIRSTPRIVATE,
--- gcc/c/c-parser.cc.jj 2022-05-27 11:29:15.368816913 +0200
+++ gcc/c/c-parser.cc 2022-05-27 11:47:00.250820434 +0200
@@ -12771,6 +12771,10 @@ c_parser_omp_clause_name (c_parser *pars
else if (!strcmp ("dist_schedule", p))
result = PRAGMA_OMP_CLAUSE_DIST_SCHEDULE;
break;
+ case 'e':
+ if (!strcmp ("enter", p))
+ result = PRAGMA_OMP_CLAUSE_ENTER;
+ break;
case 'f':
if (!strcmp ("filter", p))
result = PRAGMA_OMP_CLAUSE_FILTER;
@@ -17055,9 +17059,13 @@ c_parser_omp_all_clauses (c_parser *pars
break;
case PRAGMA_OMP_CLAUSE_TO:
if ((mask & (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_LINK)) != 0)
- clauses
- = c_parser_omp_var_list_parens (parser, OMP_CLAUSE_TO_DECLARE,
- clauses);
+ {
+ tree nl = c_parser_omp_var_list_parens (parser, OMP_CLAUSE_ENTER,
+ clauses);
+ for (tree c = nl; c != clauses; c = OMP_CLAUSE_CHAIN (c))
+ OMP_CLAUSE_ENTER_TO (c) = 1;
+ clauses = nl;
+ }
else
clauses = c_parser_omp_clause_to (parser, clauses);
c_name = "to";
@@ -17158,6 +17166,12 @@ c_parser_omp_all_clauses (c_parser *pars
clauses);
c_name = "simd";
break;
+ case PRAGMA_OMP_CLAUSE_ENTER:
+ clauses
+ = c_parser_omp_var_list_parens (parser, OMP_CLAUSE_ENTER,
+ clauses);
+ c_name = "enter";
+ break;
default:
c_parser_error (parser, "expected %<#pragma omp%> clause");
goto saw_error;
@@ -22006,6 +22020,7 @@ c_finish_omp_declare_simd (c_parser *par
#define OMP_DECLARE_TARGET_CLAUSE_MASK \
( (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_TO) \
+ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ENTER) \
| (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_LINK) \
| (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_DEVICE_TYPE))
@@ -22020,7 +22035,7 @@ c_parser_omp_declare_target (c_parser *p
"#pragma omp declare target");
else if (c_parser_next_token_is (parser, CPP_OPEN_PAREN))
{
- clauses = c_parser_omp_var_list_parens (parser, OMP_CLAUSE_TO_DECLARE,
+ clauses = c_parser_omp_var_list_parens (parser, OMP_CLAUSE_ENTER,
clauses);
clauses = c_finish_omp_clauses (clauses, C_ORT_OMP);
c_parser_skip_to_pragma_eol (parser);
--- gcc/c/c-typeck.cc.jj 2022-05-27 11:29:15.447816097 +0200
+++ gcc/c/c-typeck.cc 2022-05-27 11:47:00.248820455 +0200
@@ -15248,37 +15248,40 @@ c_finish_omp_clauses (tree clauses, enum
}
break;
- case OMP_CLAUSE_TO_DECLARE:
+ case OMP_CLAUSE_ENTER:
case OMP_CLAUSE_LINK:
t = OMP_CLAUSE_DECL (c);
+ const char *cname;
+ cname = omp_clause_code_name[OMP_CLAUSE_CODE (c)];
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER
+ && OMP_CLAUSE_ENTER_TO (c))
+ cname = "to";
if (TREE_CODE (t) == FUNCTION_DECL
- && OMP_CLAUSE_CODE (c) == OMP_CLAUSE_TO_DECLARE)
+ && OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER)
;
else if (!VAR_P (t))
{
- if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_TO_DECLARE)
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER)
error_at (OMP_CLAUSE_LOCATION (c),
"%qE is neither a variable nor a function name in "
- "clause %qs", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ "clause %qs", t, cname);
else
error_at (OMP_CLAUSE_LOCATION (c),
- "%qE is not a variable in clause %qs", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ "%qE is not a variable in clause %qs", t, cname);
remove = true;
}
else if (DECL_THREAD_LOCAL_P (t))
{
error_at (OMP_CLAUSE_LOCATION (c),
"%qD is threadprivate variable in %qs clause", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ cname);
remove = true;
}
else if (!lang_hooks.types.omp_mappable_type (TREE_TYPE (t)))
{
error_at (OMP_CLAUSE_LOCATION (c),
"%qD does not have a mappable type in %qs clause", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ cname);
remove = true;
}
if (remove)
--- gcc/cp/parser.cc.jj 2022-05-27 11:29:49.279466733 +0200
+++ gcc/cp/parser.cc 2022-05-27 11:47:00.245820486 +0200
@@ -36498,6 +36498,10 @@ cp_parser_omp_clause_name (cp_parser *pa
else if (!strcmp ("dist_schedule", p))
result = PRAGMA_OMP_CLAUSE_DIST_SCHEDULE;
break;
+ case 'e':
+ if (!strcmp ("enter", p))
+ result = PRAGMA_OMP_CLAUSE_ENTER;
+ break;
case 'f':
if (!strcmp ("filter", p))
result = PRAGMA_OMP_CLAUSE_FILTER;
@@ -40418,8 +40422,13 @@ cp_parser_omp_all_clauses (cp_parser *pa
break;
case PRAGMA_OMP_CLAUSE_TO:
if ((mask & (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_LINK)) != 0)
- clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_TO_DECLARE,
- clauses);
+ {
+ tree nl = cp_parser_omp_var_list (parser, OMP_CLAUSE_ENTER,
+ clauses);
+ for (tree c = nl; c != clauses; c = OMP_CLAUSE_CHAIN (c))
+ OMP_CLAUSE_ENTER_TO (c) = 1;
+ clauses = nl;
+ }
else
clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_TO, clauses,
true);
@@ -40526,6 +40535,11 @@ cp_parser_omp_all_clauses (cp_parser *pa
clauses, token->location);
c_name = "simd";
break;
+ case PRAGMA_OMP_CLAUSE_ENTER:
+ clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_ENTER,
+ clauses);
+ c_name = "enter";
+ break;
default:
cp_parser_error (parser, "expected %<#pragma omp%> clause");
goto saw_error;
@@ -46037,6 +46051,7 @@ handle_omp_declare_target_clause (tree c
#define OMP_DECLARE_TARGET_CLAUSE_MASK \
( (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_TO) \
+ | (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_ENTER) \
| (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_LINK) \
| (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_DEVICE_TYPE))
@@ -46056,7 +46071,7 @@ cp_parser_omp_declare_target (cp_parser
"#pragma omp declare target", pragma_tok);
else if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN))
{
- clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_TO_DECLARE,
+ clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_ENTER,
clauses);
clauses = finish_omp_clauses (clauses, C_ORT_OMP);
cp_parser_require_pragma_eol (parser, pragma_tok);
--- gcc/cp/semantics.cc.jj 2022-05-27 11:29:15.675813742 +0200
+++ gcc/cp/semantics.cc 2022-05-27 11:47:00.240820538 +0200
@@ -8341,48 +8341,50 @@ finish_omp_clauses (tree clauses, enum c
}
break;
- case OMP_CLAUSE_TO_DECLARE:
+ case OMP_CLAUSE_ENTER:
case OMP_CLAUSE_LINK:
t = OMP_CLAUSE_DECL (c);
+ const char *cname;
+ cname = omp_clause_code_name[OMP_CLAUSE_CODE (c)];
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER
+ && OMP_CLAUSE_ENTER_TO (c))
+ cname = "to";
if (TREE_CODE (t) == FUNCTION_DECL
- && OMP_CLAUSE_CODE (c) == OMP_CLAUSE_TO_DECLARE)
+ && OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER)
;
else if (!VAR_P (t))
{
- if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_TO_DECLARE)
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER)
{
if (TREE_CODE (t) == TEMPLATE_ID_EXPR)
error_at (OMP_CLAUSE_LOCATION (c),
- "template %qE in clause %qs", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ "template %qE in clause %qs", t, cname);
else if (really_overloaded_fn (t))
error_at (OMP_CLAUSE_LOCATION (c),
"overloaded function name %qE in clause %qs", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ cname);
else
error_at (OMP_CLAUSE_LOCATION (c),
"%qE is neither a variable nor a function name "
- "in clause %qs", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ "in clause %qs", t, cname);
}
else
error_at (OMP_CLAUSE_LOCATION (c),
- "%qE is not a variable in clause %qs", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ "%qE is not a variable in clause %qs", t, cname);
remove = true;
}
else if (DECL_THREAD_LOCAL_P (t))
{
error_at (OMP_CLAUSE_LOCATION (c),
"%qD is threadprivate variable in %qs clause", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ cname);
remove = true;
}
else if (!cp_omp_mappable_type (TREE_TYPE (t)))
{
error_at (OMP_CLAUSE_LOCATION (c),
"%qD does not have a mappable type in %qs clause", t,
- omp_clause_code_name[OMP_CLAUSE_CODE (c)]);
+ cname);
cp_omp_emit_unmappable_type_notes (TREE_TYPE (t));
remove = true;
}
--- gcc/testsuite/c-c++-common/gomp/clauses-3.c.jj 2020-01-12 11:54:37.012404372 +0100
+++ gcc/testsuite/c-c++-common/gomp/clauses-3.c 2022-05-27 11:59:45.430896866 +0200
@@ -3,6 +3,8 @@ struct S { int *s; char u; struct T v; l
void bar (int *);
#pragma omp declare target to (bar)
+void baz (int *);
+#pragma omp declare target enter (baz)
int
main ()
@@ -18,6 +20,6 @@ main ()
#pragma omp target map (s.s[0]) map (s.v.b[:3])
;
#pragma omp target map (s.s[0]) map (s.v.b[:3])
- bar (s.s);
+ baz (s.s);
return 0;
}
--- gcc/testsuite/c-c++-common/gomp/declare-target-1.c.jj 2020-01-12 11:54:37.012404372 +0100
+++ gcc/testsuite/c-c++-common/gomp/declare-target-1.c 2022-05-27 12:00:03.903705311 +0200
@@ -10,4 +10,4 @@ long c;
#pragma omp end declare target
#pragma omp declare target (bar, a)
-#pragma omp declare target to (b) link (d) to (foo)
+#pragma omp declare target to (b) link (d) enter (foo)
--- gcc/testsuite/c-c++-common/gomp/declare-target-2.c.jj 2020-01-12 11:54:37.012404372 +0100
+++ gcc/testsuite/c-c++-common/gomp/declare-target-2.c 2022-05-27 12:03:33.651530321 +0200
@@ -7,6 +7,7 @@ extern int a;
#pragma omp end declare target
int b;
#pragma omp declare target to (b) link (b) /* { dg-error "appears more than once on the same .declare target. directive" } */
+#pragma omp declare target enter (b) link (b) /* { dg-error "appears more than once on the same .declare target. directive" } */
int c;
#pragma omp declare target (c)
#pragma omp declare target link (c) /* { dg-error "specified both in declare target" } */
@@ -32,9 +33,13 @@ int m;
#pragma omp declare target to (k)
#pragma omp declare target (k)
#pragma omp declare target to (k, m) link (l)
+#pragma omp declare target enter (k, m) link (l)
#pragma omp declare target link (l)
int n, o, s, t;
#pragma omp declare target to (n) to (n) /* { dg-error "appears more than once on the same .declare target. directive" } */
+#pragma omp declare target enter (n) enter (n) /* { dg-error "appears more than once on the same .declare target. directive" } */
+#pragma omp declare target enter (n) to (n) /* { dg-error "appears more than once on the same .declare target. directive" } */
+#pragma omp declare target to (n) enter (n) /* { dg-error "appears more than once on the same .declare target. directive" } */
#pragma omp declare target link (o, o) /* { dg-error "appears more than once on the same .declare target. directive" } */
#pragma omp declare target (s, t, s) /* { dg-error "appears more than once on the same .declare target. directive" } */
int p, q, r;
--- gcc/testsuite/c-c++-common/gomp/declare-target-3.c.jj 2020-01-12 11:54:37.012404372 +0100
+++ gcc/testsuite/c-c++-common/gomp/declare-target-3.c 2022-05-27 12:37:12.891601614 +0200
@@ -15,10 +15,13 @@ extern int f[];
#pragma omp declare target to (f) /* { dg-error "'f' does not have a mappable type in 'to' clause" } */
extern int g[];
#pragma omp declare target to (g) /* { dg-error "'g' does not have a mappable type in 'to' clause" } */
+extern int g2[];
+#pragma omp declare target enter (g2) /* { dg-error "'g2' does not have a mappable type in 'enter' clause" } */
int g[3];
extern int h[];
int h[3];
#pragma omp declare target to (h)
+#pragma omp declare target enter (h)
int i[] = { 1, 2, 3 };
int j[] = { 1, 2, 3 };
--- gcc/testsuite/g++.dg/gomp/attrs-9.C.jj 2021-08-19 17:07:48.141927011 +0200
+++ gcc/testsuite/g++.dg/gomp/attrs-9.C 2022-05-27 12:14:13.987890317 +0200
@@ -6,8 +6,8 @@ int a;
[[omp::directive (declare target (a))]];
int t;
[[omp::sequence (omp::directive (threadprivate (t)))]];
-int b, c;
-[[omp::directive (declare target, to (b), link (c))]];
+int b, c, e;
+[[omp::directive (declare target, to (b), link (c), enter (e))]];
[[omp::directive (declare target)]];
[[omp::directive (declare target)]];
int d;
--- gcc/testsuite/g++.dg/gomp/declare-target-1.C.jj 2020-01-12 11:54:37.177401882 +0100
+++ gcc/testsuite/g++.dg/gomp/declare-target-1.C 2022-05-27 12:42:21.280410003 +0200
@@ -16,6 +16,7 @@ void f5 (T);
#pragma omp declare target (f3)
#pragma omp declare target to (f4) // { dg-error "overloaded function name .f4. in clause .to." }
#pragma omp declare target to (f5<int>) // { dg-error "template .f5<int>. in clause .to." }
+#pragma omp declare target enter (f5<short>) // { dg-error "template .f5<short int>. in clause .enter." }
template <int N>
void f6 (int)
{
@@ -35,3 +36,7 @@ int v;
#pragma omp declare target (N::M::f7)
#pragma omp declare target to (::N::f8)
#pragma omp declare target to (::f9) to (::v)
+#pragma omp declare target to (::f9, ::v)
+#pragma omp declare target enter (::N::f8)
+#pragma omp declare target enter (::f9) enter (::v)
+#pragma omp declare target enter (::f9, ::v)
--- libgomp/testsuite/libgomp.c-c++-common/target-40.c.jj 2020-07-28 15:39:10.150754275 +0200
+++ libgomp/testsuite/libgomp.c-c++-common/target-40.c 2022-05-27 12:17:12.072043662 +0200
@@ -18,7 +18,7 @@ int a = 1;
int *b = &a;
int **c = &b;
fnp2 f5 (void) { f3 (); return f4; }
-#pragma omp declare target to (c)
+#pragma omp declare target enter (c)
int
main ()
--- libgomp/testsuite/libgomp.c/target-41.c.jj 2020-10-22 09:36:18.165593710 +0200
+++ libgomp/testsuite/libgomp.c/target-41.c 2022-05-27 12:17:43.602716707 +0200
@@ -11,7 +11,7 @@ foo (void)
v++;
}
-#pragma omp declare target to (v, foo)
+#pragma omp declare target enter (v, foo)
int
main ()
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread* [Patch] OpenMP/Fortran: Add support for enter clause on declare target (was: [committed] openmp: Add support for enter clause on declare target)
2022-05-27 10:54 [committed] openmp: Add support for enter clause on declare target Jakub Jelinek
@ 2022-05-27 14:52 ` Tobias Burnus
2022-05-27 15:20 ` Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Tobias Burnus @ 2022-05-27 14:52 UTC (permalink / raw)
To: Jakub Jelinek, gcc-patches; +Cc: fortran
[-- Attachment #1: Type: text/plain, Size: 976 bytes --]
This patch adds the Fortran support to the just-committed C/C++ support for the 'enter' clause.
The 'TO'/'ENTER' usage is first stored in a linked list – and
then as attribute to the symbol. I am not sure how to handle it best.
I did went for adding an ENTER_LIST but kept only using the single attribute.
Result: In one diagnostic, I use 'TO or ENTER clause' in the other,
I can properly use 'TO' or 'ENTER' clause.
This could be kept as is, but to save memory it would be possible
to drop the ENTER_LIST – or, to improve diagnostic, we could try harder
(e.g. by re-walking the list or by another gfc_attribute). Preferences?
If not, I would go for the attached middle way.
Tobias
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Attachment #2: declare-target-enter-f90.diff --]
[-- Type: text/x-patch, Size: 15449 bytes --]
OpenMP/Fortran: Add support for enter clause on declare target
Fortran version to C/C++ commit r13-797-g0ccba4ed8571c18c7015413441e971
gcc/fortran/ChangeLog:
* dump-parse-tree.cc (show_omp_clauses): Handle OMP_LIST_ENTER.
* gfortran.h: Add OMP_LIST_ENTER.
* openmp.cc (enum omp_mask2, OMP_DECLARE_TARGET_CLAUSES): Add
OMP_CLAUSE_ENTER.
(gfc_match_omp_clauses, gfc_match_omp_declare_target,
resolve_omp_clauses): Handle 'enter' clause.
libgomp/ChangeLog:
* libgomp.texi (OpenMP 5.2): Mark 'enter' clause as supported.
* testsuite/libgomp.fortran/declare-target-1.f90: Extend to test
explicit 'to' and 'enter' clause.
* testsuite/libgomp.fortran/declare-target-2.f90: Update accordingly.
gcc/testsuite/ChangeLog:
* gfortran.dg/gomp/declare-target-2.f90: Add 'enter' clause test.
* gfortran.dg/gomp/declare-target-4.f90: Likewise.
gcc/fortran/dump-parse-tree.cc | 1 +
gcc/fortran/gfortran.h | 1 +
gcc/fortran/openmp.cc | 59 +++++++++++++++-------
.../gfortran.dg/gomp/declare-target-2.f90 | 18 +++++--
.../gfortran.dg/gomp/declare-target-4.f90 | 9 +++-
libgomp/libgomp.texi | 2 +-
.../testsuite/libgomp.fortran/declare-target-1.f90 | 4 +-
.../testsuite/libgomp.fortran/declare-target-2.f90 | 10 +++-
8 files changed, 76 insertions(+), 28 deletions(-)
diff --git a/gcc/fortran/dump-parse-tree.cc b/gcc/fortran/dump-parse-tree.cc
index 4e8986bd599..e3affb8bc48 100644
--- a/gcc/fortran/dump-parse-tree.cc
+++ b/gcc/fortran/dump-parse-tree.cc
@@ -1679,6 +1679,7 @@ show_omp_clauses (gfc_omp_clauses *omp_clauses)
case OMP_LIST_IN_REDUCTION: type = "IN_REDUCTION"; break;
case OMP_LIST_TASK_REDUCTION: type = "TASK_REDUCTION"; break;
case OMP_LIST_DEVICE_RESIDENT: type = "DEVICE_RESIDENT"; break;
+ case OMP_LIST_ENTER: type = "ENTER"; break;
case OMP_LIST_LINK: type = "LINK"; break;
case OMP_LIST_USE_DEVICE: type = "USE_DEVICE"; break;
case OMP_LIST_CACHE: type = "CACHE"; break;
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 5d970bc1df0..0bac8657790 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -1395,6 +1395,7 @@ enum
OMP_LIST_NONTEMPORAL,
OMP_LIST_ALLOCATE,
OMP_LIST_HAS_DEVICE_ADDR,
+ OMP_LIST_ENTER,
OMP_LIST_NUM /* Must be the last. */
};
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index efa62b64f2b..66c30ebea51 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -986,6 +986,7 @@ enum omp_mask2
OMP_CLAUSE_ATTACH,
OMP_CLAUSE_NOHOST,
OMP_CLAUSE_HAS_DEVICE_ADDR, /* OpenMP 5.1 */
+ OMP_CLAUSE_ENTER, /* OpenMP 5.2 */
/* This must come last. */
OMP_MASK2_LAST
};
@@ -2101,6 +2102,16 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
continue;
}
break;
+ case 'e':
+ if ((mask & OMP_CLAUSE_ENTER))
+ {
+ m = gfc_match_omp_to_link ("enter (", &c->lists[OMP_LIST_ENTER]);
+ if (m == MATCH_ERROR)
+ goto error;
+ if (m == MATCH_YES)
+ continue;
+ }
+ break;
case 'f':
if ((mask & OMP_CLAUSE_FAIL)
&& (m = gfc_match_dupl_check (c->fail == OMP_MEMORDER_UNSET,
@@ -2921,8 +2932,12 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
continue;
if ((mask & OMP_CLAUSE_TO) && (mask & OMP_CLAUSE_LINK))
{
- if (gfc_match_omp_to_link ("to (", &c->lists[OMP_LIST_TO])
- == MATCH_YES)
+ /* Declare target: 'to' is an alias for 'enter';
+ 'to' is deprecated since 5.2. */
+ m = gfc_match_omp_to_link ("to (", &c->lists[OMP_LIST_TO]);
+ if (m == MATCH_ERROR)
+ goto error;
+ if (m == MATCH_YES)
continue;
}
else if ((mask & OMP_CLAUSE_TO)
@@ -3724,7 +3739,8 @@ cleanup:
#define OMP_ORDERED_CLAUSES \
(omp_mask (OMP_CLAUSE_THREADS) | OMP_CLAUSE_SIMD)
#define OMP_DECLARE_TARGET_CLAUSES \
- (omp_mask (OMP_CLAUSE_TO) | OMP_CLAUSE_LINK | OMP_CLAUSE_DEVICE_TYPE)
+ (omp_mask (OMP_CLAUSE_ENTER) | OMP_CLAUSE_LINK | OMP_CLAUSE_DEVICE_TYPE \
+ | OMP_CLAUSE_TO)
#define OMP_ATOMIC_CLAUSES \
(omp_mask (OMP_CLAUSE_ATOMIC) | OMP_CLAUSE_CAPTURE | OMP_CLAUSE_HINT \
| OMP_CLAUSE_MEMORDER | OMP_CLAUSE_COMPARE | OMP_CLAUSE_FAIL \
@@ -4530,7 +4546,7 @@ gfc_match_omp_declare_target (void)
{
c = gfc_get_omp_clauses ();
gfc_current_locus = old_loc;
- m = gfc_match_omp_to_link (" (", &c->lists[OMP_LIST_TO]);
+ m = gfc_match_omp_to_link (" (", &c->lists[OMP_LIST_ENTER]);
if (m != MATCH_YES)
goto syntax;
if (gfc_match_omp_eos () != MATCH_YES)
@@ -4544,16 +4560,20 @@ gfc_match_omp_declare_target (void)
gfc_buffer_error (false);
- for (list = OMP_LIST_TO; list != OMP_LIST_NUM;
- list = (list == OMP_LIST_TO ? OMP_LIST_LINK : OMP_LIST_NUM))
+ for (list = OMP_LIST_ENTER; list != OMP_LIST_NUM;
+ list = (list == OMP_LIST_ENTER
+ ? OMP_LIST_TO
+ : (list == OMP_LIST_TO ? OMP_LIST_LINK : OMP_LIST_NUM)))
for (n = c->lists[list]; n; n = n->next)
if (n->sym)
n->sym->mark = 0;
else if (n->u.common->head)
n->u.common->head->mark = 0;
- for (list = OMP_LIST_TO; list != OMP_LIST_NUM;
- list = (list == OMP_LIST_TO ? OMP_LIST_LINK : OMP_LIST_NUM))
+ for (list = OMP_LIST_ENTER; list != OMP_LIST_NUM;
+ list = (list == OMP_LIST_ENTER
+ ? OMP_LIST_TO
+ : (list == OMP_LIST_TO ? OMP_LIST_LINK : OMP_LIST_NUM)))
for (n = c->lists[list]; n; n = n->next)
if (n->sym)
{
@@ -4564,14 +4584,14 @@ gfc_match_omp_declare_target (void)
&& n->sym->attr.omp_declare_target_link
&& list != OMP_LIST_LINK)
gfc_error_now ("OMP DECLARE TARGET variable at %L previously "
- "mentioned in LINK clause and later in TO clause",
- &n->where);
+ "mentioned in LINK clause and later in %s clause",
+ &n->where, list == OMP_LIST_TO ? "TO" : "ENTER");
else if (n->sym->attr.omp_declare_target
&& !n->sym->attr.omp_declare_target_link
&& list == OMP_LIST_LINK)
gfc_error_now ("OMP DECLARE TARGET variable at %L previously "
- "mentioned in TO clause and later in LINK clause",
- &n->where);
+ "mentioned in TO or ENTER clause and later in "
+ "LINK clause", &n->where);
else if (n->sym->mark)
gfc_error_now ("Variable at %L mentioned multiple times in "
"clauses of the same OMP DECLARE TARGET directive",
@@ -4598,14 +4618,14 @@ gfc_match_omp_declare_target (void)
&& n->u.common->omp_declare_target_link
&& list != OMP_LIST_LINK)
gfc_error_now ("OMP DECLARE TARGET COMMON at %L previously "
- "mentioned in LINK clause and later in TO clause",
- &n->where);
+ "mentioned in LINK clause and later in %s clause",
+ &n->where, list == OMP_LIST_TO ? "TO" : "ENTER");
else if (n->u.common->omp_declare_target
&& !n->u.common->omp_declare_target_link
&& list == OMP_LIST_LINK)
gfc_error_now ("OMP DECLARE TARGET COMMON at %L previously "
- "mentioned in TO clause and later in LINK clause",
- &n->where);
+ "mentioned in TO or ENTER clause and later in "
+ "LINK clause", &n->where);
else if (n->u.common->head && n->u.common->head->mark)
gfc_error_now ("COMMON at %L mentioned multiple times in "
"clauses of the same OMP DECLARE TARGET directive",
@@ -4639,7 +4659,10 @@ gfc_match_omp_declare_target (void)
s->attr.omp_device_type = c->device_type;
}
}
- if (c->device_type && !c->lists[OMP_LIST_TO] && !c->lists[OMP_LIST_LINK])
+ if (c->device_type
+ && !c->lists[OMP_LIST_ENTER]
+ && !c->lists[OMP_LIST_TO]
+ && !c->lists[OMP_LIST_LINK])
gfc_warning_now (0, "OMP DECLARE TARGET directive at %L with only "
"DEVICE_TYPE clause is ignored", &old_loc);
@@ -6331,7 +6354,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses,
"IN_REDUCTION", "TASK_REDUCTION",
"DEVICE_RESIDENT", "LINK", "USE_DEVICE",
"CACHE", "IS_DEVICE_PTR", "USE_DEVICE_PTR", "USE_DEVICE_ADDR",
- "NONTEMPORAL", "ALLOCATE", "HAS_DEVICE_ADDR" };
+ "NONTEMPORAL", "ALLOCATE", "HAS_DEVICE_ADDR", "ENTER" };
STATIC_ASSERT (ARRAY_SIZE (clause_names) == OMP_LIST_NUM);
if (omp_clauses == NULL)
diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-target-2.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-target-2.f90
index 2217eab07e5..7ac25c84483 100644
--- a/gcc/testsuite/gfortran.dg/gomp/declare-target-2.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/declare-target-2.f90
@@ -1,9 +1,9 @@
! { dg-do compile }
module declare_target_2
- !$omp declare target to (a) link (a) ! { dg-error "TO clause and later in LINK" }
+ !$omp declare target to (a) link (a) ! { dg-error "TO or ENTER clause and later in LINK" }
!$omp declare target (b)
- !$omp declare target link (b) ! { dg-error "TO clause and later in LINK" }
+ !$omp declare target link (b) ! { dg-error "TO or ENTER clause and later in LINK" }
!$omp declare target link (f)
!$omp declare target to (f) ! { dg-error "LINK clause and later in TO" }
!$omp declare target(c, c) ! { dg-error "mentioned multiple times in clauses of the same" }
@@ -39,9 +39,9 @@ subroutine foo ! { dg-error "attribute conflicts" }
!$omp declare target to (/c2/)
!$omp declare target (/c2/)
!$omp declare target to(/c2/)
- !$omp declare target link(/c2/) ! { dg-error "TO clause and later in LINK" }
+ !$omp declare target link(/c2/) ! { dg-error "TO or ENTER clause and later in LINK" }
!$omp declare target link(/c3/)
- !$omp declare target (/c3/) ! { dg-error "LINK clause and later in TO" }
+ !$omp declare target (/c3/) ! { dg-error "LINK clause and later in ENTER" }
!$omp declare target (/c4/, /c4/) ! { dg-error "mentioned multiple times in clauses of the same" }
!$omp declare target to (/c4/) to(/c4/) ! { dg-error "mentioned multiple times in clauses of the same" }
!$omp declare target link (/c5/)
@@ -49,3 +49,13 @@ subroutine foo ! { dg-error "attribute conflicts" }
!$omp declare target link(/c5/)link(/c5/) ! { dg-error "mentioned multiple times in clauses of the same" }
!$omp declare target link(/c5/,/c5/) ! { dg-error "mentioned multiple times in clauses of the same" }
end subroutine
+
+module declare_target_3
+ !$omp declare target enter (a) link (a) ! { dg-error "TO or ENTER clause and later in LINK" }
+ !$omp declare target link(b) enter(b) ! { dg-error "TO or ENTER clause and later in LINK" }
+ !$omp declare target to (c) enter (c) ! { dg-error "mentioned multiple times in clauses of the same" }
+ !$omp declare target enter (d) to (d) ! { dg-error "mentioned multiple times in clauses of the same" }
+ !$omp declare target enter (e) enter (e) ! { dg-error "mentioned multiple times in clauses of the same" }
+ integer, save :: a, b, c, d, e
+end
+
diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-target-4.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-target-4.f90
index 8947b887534..4f5de4bd8c7 100644
--- a/gcc/testsuite/gfortran.dg/gomp/declare-target-4.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/declare-target-4.f90
@@ -21,6 +21,10 @@ subroutine f5
!$omp declare target device_type (nohost) to (f5)
end subroutine
+subroutine f6
+ !$omp declare target enter (f6) device_type (any)
+end subroutine
+
module mymod
! device_type is ignored for variables in OpenMP 5.0
! but TR8 and later apply those rules to variables as well
@@ -69,13 +73,14 @@ module m2
public :: m, n, o, p, q, r, s, t, u, v, w, x
end module m2
-! { dg-final { scan-tree-dump-times "omp declare target" 7 "original" } }
-! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(" 7 "original" } }
+! { dg-final { scan-tree-dump-times "omp declare target" 8 "original" } }
+! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(" 8 "original" } }
! { dg-final { scan-tree-dump-not "__attribute__\\(\\(omp declare target \[^\n\r\]*\[\n\r\]void f1" "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(any\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r]void f2" 1 "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(any\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r\]void f3" 1 "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(host\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r\]void f4" 1 "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(nohost\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r\]void f5" 1 "original" } }
+! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(any\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r]void f6" 1 "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(any\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r\]void s1" 1 "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(nohost\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r\]void s2" 1 "original" } }
! { dg-final { scan-tree-dump-times "__attribute__\\(\\(omp declare target \\(device_type\\(host\\)\\)\\)\\)\[\n\r]__attribute__\[^\n\r]+\[\n\r\]void s3" 1 "original" } }
diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi
index 56aab4494ad..ff02ccd4969 100644
--- a/libgomp/libgomp.texi
+++ b/libgomp/libgomp.texi
@@ -368,7 +368,7 @@ The OpenMP 4.5 specification is fully supported.
@item If a matching mapped list item is not found in the data environment, the
pointer retains its original value @tab N @tab
@item New @code{enter} clause as alias for @code{to} on declare target directive
- @tab N @tab
+ @tab Y @tab
@item Deprecation of @code{to} clause on declare target directive @tab N @tab
@item Extended list of directives permitted in Fortran pure procedures
@tab N @tab
diff --git a/libgomp/testsuite/libgomp.fortran/declare-target-1.f90 b/libgomp/testsuite/libgomp.fortran/declare-target-1.f90
index fd9c26fde95..d9abf685a54 100644
--- a/libgomp/testsuite/libgomp.fortran/declare-target-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/declare-target-1.f90
@@ -2,8 +2,10 @@
! { dg-additional-sources declare-target-2.f90 }
module declare_target_1_mod
- integer :: var_x
+ integer :: var_x, var_y, var_z
!$omp declare target(var_x)
+ !$omp declare target to(var_y)
+ !$omp declare target enter(var_z)
end module declare_target_1_mod
interface
diff --git a/libgomp/testsuite/libgomp.fortran/declare-target-2.f90 b/libgomp/testsuite/libgomp.fortran/declare-target-2.f90
index 85fc68c6ede..2210fc5a52f 100644
--- a/libgomp/testsuite/libgomp.fortran/declare-target-2.f90
+++ b/libgomp/testsuite/libgomp.fortran/declare-target-2.f90
@@ -7,12 +7,18 @@ subroutine foo
use declare_target_1_mod
var_x = 10
- !$omp target update to(var_x)
+ var_y = 20
+ var_z = 30
+ !$omp target update to(var_x, var_y, var_z)
!$omp target
var_x = var_x * 2;
+ var_y = var_y * 3;
+ var_z = var_z * 4;
!$omp end target
- !$omp target update from(var_x)
+ !$omp target update from(var_x, var_y, var_z)
if (var_x /= 20) stop 1
+ if (var_y /= 20*3) stop 2
+ if (var_z /= 30*4) stop 3
end subroutine foo
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Patch] OpenMP/Fortran: Add support for enter clause on declare target (was: [committed] openmp: Add support for enter clause on declare target)
2022-05-27 14:52 ` [Patch] OpenMP/Fortran: Add support for enter clause on declare target (was: [committed] openmp: Add support for enter clause on declare target) Tobias Burnus
@ 2022-05-27 15:20 ` Jakub Jelinek
2022-05-27 15:44 ` Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2022-05-27 15:20 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc-patches, fortran
On Fri, May 27, 2022 at 04:52:17PM +0200, Tobias Burnus wrote:
> This patch adds the Fortran support to the just-committed C/C++ support for the 'enter' clause.
>
> The 'TO'/'ENTER' usage is first stored in a linked list – and
> then as attribute to the symbol. I am not sure how to handle it best.
> I did went for adding an ENTER_LIST but kept only using the single attribute.
>
> Result: In one diagnostic, I use 'TO or ENTER clause' in the other,
> I can properly use 'TO' or 'ENTER' clause.
>
> This could be kept as is, but to save memory it would be possible
> to drop the ENTER_LIST – or, to improve diagnostic, we could try harder
> (e.g. by re-walking the list or by another gfc_attribute). Preferences?
> If not, I would go for the attached middle way.
>
> Tobias
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
> OpenMP/Fortran: Add support for enter clause on declare target
>
> Fortran version to C/C++ commit r13-797-g0ccba4ed8571c18c7015413441e971
>
> gcc/fortran/ChangeLog:
>
> * dump-parse-tree.cc (show_omp_clauses): Handle OMP_LIST_ENTER.
> * gfortran.h: Add OMP_LIST_ENTER.
> * openmp.cc (enum omp_mask2, OMP_DECLARE_TARGET_CLAUSES): Add
> OMP_CLAUSE_ENTER.
> (gfc_match_omp_clauses, gfc_match_omp_declare_target,
> resolve_omp_clauses): Handle 'enter' clause.
>
> libgomp/ChangeLog:
>
> * libgomp.texi (OpenMP 5.2): Mark 'enter' clause as supported.
> * testsuite/libgomp.fortran/declare-target-1.f90: Extend to test
> explicit 'to' and 'enter' clause.
> * testsuite/libgomp.fortran/declare-target-2.f90: Update accordingly.
>
> gcc/testsuite/ChangeLog:
>
> * gfortran.dg/gomp/declare-target-2.f90: Add 'enter' clause test.
> * gfortran.dg/gomp/declare-target-4.f90: Likewise.
Mostly good, but see below.
> - for (list = OMP_LIST_TO; list != OMP_LIST_NUM;
> - list = (list == OMP_LIST_TO ? OMP_LIST_LINK : OMP_LIST_NUM))
> + for (list = OMP_LIST_ENTER; list != OMP_LIST_NUM;
> + list = (list == OMP_LIST_ENTER
> + ? OMP_LIST_TO
> + : (list == OMP_LIST_TO ? OMP_LIST_LINK : OMP_LIST_NUM)))
> for (n = c->lists[list]; n; n = n->next)
> if (n->sym)
> {
> @@ -4564,14 +4584,14 @@ gfc_match_omp_declare_target (void)
> && n->sym->attr.omp_declare_target_link
> && list != OMP_LIST_LINK)
> gfc_error_now ("OMP DECLARE TARGET variable at %L previously "
> - "mentioned in LINK clause and later in TO clause",
> - &n->where);
> + "mentioned in LINK clause and later in %s clause",
> + &n->where, list == OMP_LIST_TO ? "TO" : "ENTER");
> else if (n->sym->attr.omp_declare_target
> && !n->sym->attr.omp_declare_target_link
> && list == OMP_LIST_LINK)
> gfc_error_now ("OMP DECLARE TARGET variable at %L previously "
> - "mentioned in TO clause and later in LINK clause",
> - &n->where);
> + "mentioned in TO or ENTER clause and later in "
> + "LINK clause", &n->where);
The wording of the messages "previously mentioned in FOO and later in BAR clause"
makes not much sense to me, because we in the Fortran FE don't remember which
clause was specified earlier and which one was later.
The loop is walking first all enter clauses, then all to clauses, then all
link clauses.
Now, if we change the wording so that it complains that a variable is
"mentioned in both FOO and BAR clauses", we could avoid the TO or ENTER
stuff even without some O(n^2) complexity or extra bit somewhere simply
by walking the clauses in the order of TO, LINK, ENTER (or ENTER, LINK, TO)
clauses, wer could be exact.
Though, further thinking about it, this isn't just about the case
where it is on the same declare target, but also on multiple and in that
case previous/later makes sense.
As we don't remember if it was previously TO or ENTER, I'd just suggest:
1) simplify the 2 for cycles, with 3 lists it is too unreadable, so use
something like:
static const int to_enter_link_lists[]
= { OMP_LIST_TO, OMP_LIST_ENTER, OMP_LIST_LINK };
for (int listn = 0; listn < ARRAY_SIZE (to_enter_link_lists)
&& (list = to_enter_link_lists[listn], true); ++listn)
2) move the
else if (n->sym->mark)
gfc_error_now ("Variable at %L mentioned multiple times in "
"clauses of the same OMP DECLARE TARGET directive",
&n->where);
diagnostics earlier, above
else if (n->sym->attr.omp_declare_target
&& n->sym->attr.omp_declare_target_link
&& list != OMP_LIST_LINK)
and adjust testsuite if needed
Ok with those changes.
On the C/C++ FE side, I'll need to change %<to%> to %<to%> or %<enter%>.
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Patch] OpenMP/Fortran: Add support for enter clause on declare target (was: [committed] openmp: Add support for enter clause on declare target)
2022-05-27 15:20 ` Jakub Jelinek
@ 2022-05-27 15:44 ` Jakub Jelinek
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Jelinek @ 2022-05-27 15:44 UTC (permalink / raw)
To: Tobias Burnus, gcc-patches, fortran
On Fri, May 27, 2022 at 05:20:08PM +0200, Jakub Jelinek wrote:
> 2) move the
> else if (n->sym->mark)
> gfc_error_now ("Variable at %L mentioned multiple times in "
> "clauses of the same OMP DECLARE TARGET directive",
> &n->where);
> diagnostics earlier, above
> else if (n->sym->attr.omp_declare_target
> && n->sym->attr.omp_declare_target_link
> && list != OMP_LIST_LINK)
> and adjust testsuite if needed
Note, that matches what the C/C++ FEs do, they also first check for clauses
on the same construct and only afterwards do the link vs. to/enter on
separate directives.
Here is an incremental patch I plan to commit after full testing for the
C/C++ FE wording.
2022-05-27 Jakub Jelinek <jakub@redhat.com>
gcc/c/
* c-parser.cc (c_parser_omp_declare_target): If OMP_CLAUSE_LINK was
seen first, use "%<to%>" or "%<enter%>" depending on
OMP_CLAUSE_ENTER_TO of the current clause, otherwise use
"%<to%> or %<enter%>" wording.
gcc/cp/
* parser.c (handle_omp_declare_target_clause): If OMP_CLAUSE_LINK was
seen first, use "%<to%>" or "%<enter%>" depending on
OMP_CLAUSE_ENTER_TO of the current clause, otherwise use
"%<to%> or %<enter%>" wording.
gcc/testsuite/
* c-c++-common/gomp/declare-target-2.c: Add further tests for mixing of
link and to/enter clauses on separate directives.
--- gcc/c/c-parser.cc.jj 2022-05-26 23:22:30.312850583 +0200
+++ gcc/c/c-parser.cc 2022-05-27 17:28:59.120420300 +0200
@@ -22067,9 +22067,14 @@ c_parser_omp_declare_target (c_parser *p
id = get_identifier ("omp declare target");
if (at2)
{
- error_at (OMP_CLAUSE_LOCATION (c),
- "%qD specified both in declare target %<link%> and %<to%>"
- " clauses", t);
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER)
+ error_at (OMP_CLAUSE_LOCATION (c),
+ "%qD specified both in declare target %<link%> and %qs"
+ " clauses", t, OMP_CLAUSE_ENTER_TO (c) ? "to" : "enter");
+ else
+ error_at (OMP_CLAUSE_LOCATION (c),
+ "%qD specified both in declare target %<link%> and "
+ "%<to%> or %<enter%> clauses", t);
continue;
}
if (!at1)
--- gcc/cp/parser.cc.jj 2022-05-26 23:22:30.306850645 +0200
+++ gcc/cp/parser.cc 2022-05-27 17:31:19.086980582 +0200
@@ -45991,9 +45991,14 @@ handle_omp_declare_target_clause (tree c
id = get_identifier ("omp declare target");
if (at2)
{
- error_at (OMP_CLAUSE_LOCATION (c),
- "%qD specified both in declare target %<link%> and %<to%>"
- " clauses", t);
+ if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_ENTER)
+ error_at (OMP_CLAUSE_LOCATION (c),
+ "%qD specified both in declare target %<link%> and %qs"
+ " clauses", t, OMP_CLAUSE_ENTER_TO (c) ? "to" : "enter");
+ else
+ error_at (OMP_CLAUSE_LOCATION (c),
+ "%qD specified both in declare target %<link%> and "
+ "%<to%> or %<enter%> clauses", t);
return false;
}
if (!at1)
--- gcc/testsuite/c-c++-common/gomp/declare-target-2.c.jj 2022-05-27 12:31:36.114087022 +0200
+++ gcc/testsuite/c-c++-common/gomp/declare-target-2.c 2022-05-27 17:38:12.173731493 +0200
@@ -10,7 +10,22 @@ int b;
#pragma omp declare target enter (b) link (b) /* { dg-error "appears more than once on the same .declare target. directive" } */
int c;
#pragma omp declare target (c)
-#pragma omp declare target link (c) /* { dg-error "specified both in declare target" } */
+#pragma omp declare target link (c) /* { dg-error "specified both in declare target 'link' and 'to' or 'enter' clauses" } */
+int c2;
+#pragma omp declare target to (c2)
+#pragma omp declare target link (c2) /* { dg-error "specified both in declare target 'link' and 'to' or 'enter' clauses" } */
+int c3;
+#pragma omp declare target enter (c3)
+#pragma omp declare target link (c3) /* { dg-error "specified both in declare target 'link' and 'to' or 'enter' clauses" } */
+int c4;
+#pragma omp declare target link (c4)
+#pragma omp declare target (c4) /* { dg-error "specified both in declare target 'link' and 'enter' clauses" } */
+int c5;
+#pragma omp declare target link (c5)
+#pragma omp declare target to (c5) /* { dg-error "specified both in declare target 'link' and 'to' clauses" } */
+int c6;
+#pragma omp declare target link (c6)
+#pragma omp declare target enter (c6) /* { dg-error "specified both in declare target 'link' and 'enter' clauses" } */
int foo (void);
#pragma omp declare target link (foo) /* { dg-error "is not a variable in clause" } */
struct S;
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-27 15:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-27 10:54 [committed] openmp: Add support for enter clause on declare target Jakub Jelinek
2022-05-27 14:52 ` [Patch] OpenMP/Fortran: Add support for enter clause on declare target (was: [committed] openmp: Add support for enter clause on declare target) Tobias Burnus
2022-05-27 15:20 ` Jakub Jelinek
2022-05-27 15:44 ` Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).