diff options
| author | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2015-10-27 09:39:15 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gcc.gnu.org> | 2015-10-27 09:39:15 +0100 |
| commit | 88bae6f494dc867edd8e6257658974d629bdc53b (patch) | |
| tree | 6ab5ea8ba1b8126fa0e7ad76b11ad320ba2c7edb /gcc/tree-pretty-print.c | |
| parent | 5acdb61b69011e9d0f6b507fc37160b85ba04c51 (diff) | |
| download | gcc-88bae6f494dc867edd8e6257658974d629bdc53b.zip gcc-88bae6f494dc867edd8e6257658974d629bdc53b.tar.gz gcc-88bae6f494dc867edd8e6257658974d629bdc53b.tar.bz2 | |
[PR c/64765, c/64880] Support OpenACC Combined Directives in C, C++
gcc/c-family/
PR c/64765
PR c/64880
* c-common.h (c_oacc_split_loop_clauses): Declare function.
* c-omp.c (c_oacc_split_loop_clauses): New function.
gcc/c/
PR c/64765
PR c/64880
* c-parser.c (c_parser_oacc_loop): Add mask, cclauses formal
parameters, and handle these. Adjust all users.
(c_parser_oacc_kernels, c_parser_oacc_parallel): Merge functions
into...
(c_parser_oacc_kernels_parallel): ... this new function. Adjust
all users.
* c-tree.h (c_finish_oacc_parallel, c_finish_oacc_kernels): Don't
declare functions.
(c_finish_omp_construct): Declare function.
* c-typeck.c (c_finish_oacc_parallel, c_finish_oacc_kernels):
Merge functions into...
(c_finish_omp_construct): ... this new function.
gcc/cp/
PR c/64765
PR c/64880
* cp-tree.h (finish_oacc_kernels, finish_oacc_parallel): Don't
declare functions.
(finish_omp_construct): Declare function.
* parser.c (cp_parser_oacc_loop): Add p_name, mask, cclauses
formal parameters, and handle these. Adjust all users.
(cp_parser_oacc_kernels, cp_parser_oacc_parallel): Merge functions
into...
(cp_parser_oacc_kernels_parallel): ... this new function. Adjust
all users.
* semantics.c (finish_oacc_kernels, finish_oacc_parallel): Merge functions into...
(finish_omp_construct): ... this new function.
gcc/
* tree.h (OACC_PARALLEL_BODY, OACC_PARALLEL_CLAUSES)
(OACC_KERNELS_BODY, OACC_KERNELS_CLAUSES, OACC_KERNELS_COMBINED)
(OACC_PARALLEL_COMBINED): Don't define macros. Adjust all users.
gcc/testsuite/
PR c/64765
PR c/64880
* c-c++-common/goacc/loop-1.c: Don't skip for C++. Don't prune
sorry message.
(PR64765): New function.
* gfortran.dg/goacc/coarray_2.f90: XFAIL.
* gfortran.dg/goacc/combined_loop.f90: Extend. Don't prune
sorry message.
* gfortran.dg/goacc/cray.f95: Refine prune directive.
* gfortran.dg/goacc/parameter.f95: Likewise.
libgomp/
* testsuite/libgomp.oacc-c-c++-common/combdir-1.c: New file.
* testsuite/libgomp.oacc-fortran/combdir-1.f90: Likewise.
From-SVN: r229404
Diffstat (limited to 'gcc/tree-pretty-print.c')
| -rw-r--r-- | gcc/tree-pretty-print.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 11f90051..b1f76d5 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -2676,13 +2676,11 @@ dump_generic_node (pretty_printer *pp, tree node, int spc, int flags, case OACC_PARALLEL: pp_string (pp, "#pragma acc parallel"); - dump_omp_clauses (pp, OACC_PARALLEL_CLAUSES (node), spc, flags); - goto dump_omp_body; + goto dump_omp_clauses_body; case OACC_KERNELS: pp_string (pp, "#pragma acc kernels"); - dump_omp_clauses (pp, OACC_KERNELS_CLAUSES (node), spc, flags); - goto dump_omp_body; + goto dump_omp_clauses_body; case OACC_DATA: pp_string (pp, "#pragma acc data"); @@ -2722,6 +2720,11 @@ dump_generic_node (pretty_printer *pp, tree node, int spc, int flags, case OMP_PARALLEL: pp_string (pp, "#pragma omp parallel"); dump_omp_clauses (pp, OMP_PARALLEL_CLAUSES (node), spc, flags); + goto dump_omp_body; + + dump_omp_clauses_body: + dump_omp_clauses (pp, OMP_CLAUSES (node), spc, flags); + goto dump_omp_body; dump_omp_body: if (!(flags & TDF_SLIM) && OMP_BODY (node)) |