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.h | |
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.h')
-rw-r--r-- | gcc/tree.h | 20 |
1 files changed, 0 insertions, 20 deletions
@@ -1,4 +1,3 @@ - /* Definitions for the ubiquitous 'tree' type for GNU compilers. Copyright (C) 1989-2015 Free Software Foundation, Inc. @@ -1218,16 +1217,6 @@ extern void protected_set_expr_location (tree, location_t); #define OMP_STANDALONE_CLAUSES(NODE) \ TREE_OPERAND (TREE_RANGE_CHECK (NODE, OACC_CACHE, OMP_TARGET_EXIT_DATA), 0) -#define OACC_PARALLEL_BODY(NODE) \ - TREE_OPERAND (OACC_PARALLEL_CHECK (NODE), 0) -#define OACC_PARALLEL_CLAUSES(NODE) \ - TREE_OPERAND (OACC_PARALLEL_CHECK (NODE), 1) - -#define OACC_KERNELS_BODY(NODE) \ - TREE_OPERAND (OACC_KERNELS_CHECK(NODE), 0) -#define OACC_KERNELS_CLAUSES(NODE) \ - TREE_OPERAND (OACC_KERNELS_CHECK(NODE), 1) - #define OACC_DATA_BODY(NODE) \ TREE_OPERAND (OACC_DATA_CHECK (NODE), 0) #define OACC_DATA_CLAUSES(NODE) \ @@ -1332,15 +1321,6 @@ extern void protected_set_expr_location (tree, location_t); #define OMP_SECTION_LAST(NODE) \ (OMP_SECTION_CHECK (NODE)->base.private_flag) -/* True on an OACC_KERNELS statement if is represents combined kernels loop - directive. */ -#define OACC_KERNELS_COMBINED(NODE) \ - (OACC_KERNELS_CHECK (NODE)->base.private_flag) - -/* Like OACC_KERNELS_COMBINED, but for parallel loop directive. */ -#define OACC_PARALLEL_COMBINED(NODE) \ - (OACC_PARALLEL_CHECK (NODE)->base.private_flag) - /* True on an OMP_PARALLEL statement if it represents an explicit combined parallel work-sharing constructs. */ #define OMP_PARALLEL_COMBINED(NODE) \ |