On Fri, Dec 19, 2014 at 01:20:52PM +0100, Thomas Schwinge wrote:
> Hi Jakub!
>
> On Fri, 19 Dec 2014 11:36:39 +0100, Jakub Jelinek <ja...@redhat.com> wrote:
> > On Thu, Dec 18, 2014 at 07:00:09PM +0100, Thomas Schwinge wrote:
> > > > The point is that we now have lots of clauses, and making it clear what
> > > > from
> > > > those clauses are Cilk+, what are OpenACC, what are OpenMP will help
> > > > with
> > > > code readability.
> >
> > So here is what I'd like to see with PRAGMA_O*_CLAUSE_*, it matches what we
> > do already for Cilk+ and at least to me makes the code more readable.
>
> Thanks for the patch! OK, so that's what you meant. So be it. :-)
>
> > gomp-4_0-branch compiles with it, haven't tested anything.
>
> Looks good, too. Are you going to commit your patch?
Done now, after writing ChangeLog for it.
2014-12-19 Jakub Jelinek <ja...@redhat.com>
c-family/
* c-pragma.h (enum pragma_omp_clause): Rename
OpenACC only clauses to PRAGMA_OACC_CLAUSE_* from
PRAGMA_OMP_CLAUSE_*. For clauses shared by OpenMP
and OpenACC add PRAGMA_OACC_CLAUSE_* aliases to
PRAGMA_OMP_CLAUSE_* values.
c/
* c-parser.c (c_parser_omp_clause_name): Use PRAGMA_OACC_CLAUSE_*
for OpenACC only clauses.
(c_parser_oacc_data_clause, c_parser_oacc_data_clause_deviceptr,
c_parser_oacc_all_clauses): Use PRAGMA_OACC_CLAUSE_* instead of
PRAGMA_OMP_CLAUSE_*.
(OACC_DATA_CLAUSE_MASK, OACC_KERNELS_CLAUSE_MASK,
OACC_ENTER_DATA_CLAUSE_MASK, OACC_EXIT_DATA_CLAUSE_MASK,
OACC_LOOP_CLAUSE_MASK, OACC_PARALLEL_CLAUSE_MASK,
OACC_UPDATE_CLAUSE_MASK, OACC_WAIT_CLAUSE_MASK): Likewise.
cp/
* parser.c (cp_parser_omp_clause_name): Use PRAGMA_OACC_CLAUSE_*
for OpenACC only clauses.
(cp_parser_oacc_data_clause, cp_parser_oacc_data_clause_deviceptr,
cp_parser_oacc_all_clauses): Use PRAGMA_OACC_CLAUSE_* instead of
PRAGMA_OMP_CLAUSE_*.
(OACC_DATA_CLAUSE_MASK, OACC_KERNELS_CLAUSE_MASK,
OACC_ENTER_DATA_CLAUSE_MASK, OACC_EXIT_DATA_CLAUSE_MASK,
OACC_LOOP_CLAUSE_MASK, OACC_PARALLEL_CLAUSE_MASK,
OACC_UPDATE_CLAUSE_MASK, OACC_WAIT_CLAUSE_MASK): Likewise.
Jakub
