Hi Jakub! On Wed, 29 Apr 2015 16:36:24 +0200, Jakub Jelinek <ja...@redhat.com> wrote: > On Wed, Apr 29, 2015 at 04:31:32PM +0200, Thomas Schwinge wrote: > > > So yes, I really prefer OMP_STANDALONE_CLAUSES over OMP_CLAUSES for > > > everything. > > > > Like this (for trunk)? > > > > commit 300e28fce192cb56d73cb61f787872643030f0bf > > Author: Thomas Schwinge <tho...@codesourcery.com> > > Date: Wed Apr 29 16:18:49 2015 +0200 > > > > Add OMP_STANDALONE_CLAUSES. > > > > gcc/ > > * tree.h (OACC_CACHE_CLAUSES, OACC_DECLARE_CLAUSES) > > (OACC_ENTER_DATA_CLAUSES, OACC_EXIT_DATA_CLAUSES) > > (OACC_UPDATE_CLAUSES, OMP_TARGET_UPDATE_CLAUSES): Merge into... > > (OMP_STANDALONE_CLAUSES): ... this new macro. Adjust all users. > > I would keep the specific *_CLAUSES macros, just add > OMP_STANDALONE_CLAUSES and change the uses only if you are dealing with > multiple different codes. That will match OMP_CLAUSES vs. OMP_FOR_CLAUSES, > OMP_PARALLEL_CLAUSES etc.
My (non-explicit) rationale has been:
> > --- gcc/c/c-parser.c
> > +++ gcc/c/c-parser.c
> > @@ -11987,7 +11987,7 @@ c_parser_oacc_cache (location_t loc, c_parser
> > *parser)
> >
> > stmt = make_node (OACC_CACHE);
We have just created a OACC_CACHE node here...
> > TREE_TYPE (stmt) = void_type_node;
> > - OACC_CACHE_CLAUSES (stmt) = clauses;
> > + OMP_STANDALONE_CLAUSES (stmt) = clauses;
..., so there is no point in checking here that we're indeed dealing
specifically with an OACC_CACHE node.
> So, drop hunks like this.
>
> > @@ -12155,10 +12155,7 @@ c_parser_oacc_enter_exit_data (c_parser *parser,
> > bool enter)
> >
> > stmt = enter ? make_node (OACC_ENTER_DATA) : make_node (OACC_EXIT_DATA);
> > TREE_TYPE (stmt) = void_type_node;
> > - if (enter)
> > - OACC_ENTER_DATA_CLAUSES (stmt) = clauses;
> > - else
> > - OACC_EXIT_DATA_CLAUSES (stmt) = clauses;
> > + OMP_STANDALONE_CLAUSES (stmt) = clauses;
> > SET_EXPR_LOCATION (stmt, loc);
> > add_stmt (stmt);
> > }
>
> And just keep ones like this.
Done. (I also reverted the gcc/cp/pt.c:tsubst_expr change which
motivated this patch; will include that with the patch adding support for
C++ templates usage with OpenACC directives.) OK for trunk?
commit 82e588b6d62f9e7254e76a3dfcc46efceb2075a5
Author: Thomas Schwinge <tho...@codesourcery.com>
Date: Wed Apr 29 17:08:17 2015 +0200
Add OMP_STANDALONE_CLAUSES.
gcc/
* tree.h (OMP_STANDALONE_CLAUSES): New macro.
* gimplify.c (gimplify_omp_workshare): Use it.
gcc/c/
* c-parser.c (c_parser_oacc_enter_exit_data): Use
OMP_STANDALONE_CLAUSES.
gcc/cp/
* parser.c (cp_parser_oacc_enter_exit_data): Use
OMP_STANDALONE_CLAUSES.
---
gcc/c/c-parser.c | 5 +----
gcc/cp/parser.c | 5 +----
gcc/gimplify.c | 13 +++++--------
gcc/tree.h | 6 ++++++
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git gcc/c/c-parser.c gcc/c/c-parser.c
index f5e2ac2c..015de7f 100644
--- gcc/c/c-parser.c
+++ gcc/c/c-parser.c
@@ -12155,10 +12155,7 @@ c_parser_oacc_enter_exit_data (c_parser *parser, bool
enter)
stmt = enter ? make_node (OACC_ENTER_DATA) : make_node (OACC_EXIT_DATA);
TREE_TYPE (stmt) = void_type_node;
- if (enter)
- OACC_ENTER_DATA_CLAUSES (stmt) = clauses;
- else
- OACC_EXIT_DATA_CLAUSES (stmt) = clauses;
+ OMP_STANDALONE_CLAUSES (stmt) = clauses;
SET_EXPR_LOCATION (stmt, loc);
add_stmt (stmt);
}
diff --git gcc/cp/parser.c gcc/cp/parser.c
index 4ea2ca2..cfb512b 100644
--- gcc/cp/parser.c
+++ gcc/cp/parser.c
@@ -31606,10 +31606,7 @@ cp_parser_oacc_enter_exit_data (cp_parser *parser,
cp_token *pragma_tok,
stmt = enter ? make_node (OACC_ENTER_DATA) : make_node (OACC_EXIT_DATA);
TREE_TYPE (stmt) = void_type_node;
- if (enter)
- OACC_ENTER_DATA_CLAUSES (stmt) = clauses;
- else
- OACC_EXIT_DATA_CLAUSES (stmt) = clauses;
+ OMP_STANDALONE_CLAUSES (stmt) = clauses;
SET_EXPR_LOCATION (stmt, pragma_tok->location);
add_stmt (stmt);
return stmt;
diff --git gcc/gimplify.c gcc/gimplify.c
index c68bd47..bda62ce 100644
--- gcc/gimplify.c
+++ gcc/gimplify.c
@@ -7427,34 +7427,31 @@ gimplify_omp_workshare (tree *expr_p, gimple_seq *pre_p)
static void
gimplify_omp_target_update (tree *expr_p, gimple_seq *pre_p)
{
- tree expr = *expr_p, clauses;
+ tree expr = *expr_p;
int kind;
gomp_target *stmt;
switch (TREE_CODE (expr))
{
case OACC_ENTER_DATA:
- clauses = OACC_ENTER_DATA_CLAUSES (expr);
kind = GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA;
break;
case OACC_EXIT_DATA:
- clauses = OACC_EXIT_DATA_CLAUSES (expr);
kind = GF_OMP_TARGET_KIND_OACC_ENTER_EXIT_DATA;
break;
case OACC_UPDATE:
- clauses = OACC_UPDATE_CLAUSES (expr);
kind = GF_OMP_TARGET_KIND_OACC_UPDATE;
break;
case OMP_TARGET_UPDATE:
- clauses = OMP_TARGET_UPDATE_CLAUSES (expr);
kind = GF_OMP_TARGET_KIND_UPDATE;
break;
default:
gcc_unreachable ();
}
- gimplify_scan_omp_clauses (&clauses, pre_p, ORT_WORKSHARE);
- gimplify_adjust_omp_clauses (pre_p, &clauses);
- stmt = gimple_build_omp_target (NULL, kind, clauses);
+ gimplify_scan_omp_clauses (&OMP_STANDALONE_CLAUSES (expr), pre_p,
+ ORT_WORKSHARE);
+ gimplify_adjust_omp_clauses (pre_p, &OMP_STANDALONE_CLAUSES (expr));
+ stmt = gimple_build_omp_target (NULL, kind, OMP_STANDALONE_CLAUSES (expr));
gimplify_seq_add_stmt (pre_p, stmt);
*expr_p = NULL_TREE;
diff --git gcc/tree.h gcc/tree.h
index 2ec9708..e17bd9b 100644
--- gcc/tree.h
+++ gcc/tree.h
@@ -1197,11 +1197,17 @@ extern void protected_set_expr_location (tree,
location_t);
/* OpenMP and OpenACC directive and clause accessors. */
+/* Generic accessors for OMP nodes that keep the body as operand 0, and clauses
+ as operand 1. */
#define OMP_BODY(NODE) \
TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_PARALLEL, OMP_CRITICAL), 0)
#define OMP_CLAUSES(NODE) \
TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_PARALLEL, OMP_SINGLE), 1)
+/* Generic accessors for OMP nodes that keep clauses as operand 0. */
+#define OMP_STANDALONE_CLAUSES(NODE) \
+ TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_CACHE, OMP_TARGET_UPDATE), 0)
+
#define OACC_PARALLEL_BODY(NODE) \
TREE_OPERAND (OACC_PARALLEL_CHECK (NODE), 0)
#define OACC_PARALLEL_CLAUSES(NODE) \
Grüße,
Thomas
pgpLzZsgFNPct.pgp
Description: PGP signature
