From 88bae6f494dc867edd8e6257658974d629bdc53b Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 27 Oct 2015 09:39:15 +0100 Subject: [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 --- gcc/testsuite/ChangeLog | 13 +++++++++++++ gcc/testsuite/c-c++-common/goacc/loop-1.c | 10 +++++++--- gcc/testsuite/gfortran.dg/goacc/coarray_2.f90 | 1 + gcc/testsuite/gfortran.dg/goacc/combined_loop.f90 | 9 ++++++++- gcc/testsuite/gfortran.dg/goacc/cray.f95 | 2 +- gcc/testsuite/gfortran.dg/goacc/parameter.f95 | 2 +- 6 files changed, 31 insertions(+), 6 deletions(-) (limited to 'gcc/testsuite') diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f4f8a0..e1cb93c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2015-10-27 Thomas Schwinge + + 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. + 2015-10-26 Louis Krupp PR fortran/66056 diff --git a/gcc/testsuite/c-c++-common/goacc/loop-1.c b/gcc/testsuite/c-c++-common/goacc/loop-1.c index 2d8f4d5..4cf5429 100644 --- a/gcc/testsuite/c-c++-common/goacc/loop-1.c +++ b/gcc/testsuite/c-c++-common/goacc/loop-1.c @@ -1,5 +1,3 @@ -/* { dg-skip-if "not yet" { c++ } } */ - int test1() { int i, j, k, b[10]; @@ -69,4 +67,10 @@ int test1() } return 0; } -/* { dg-prune-output "sorry, unimplemented: directive not yet implemented" } */ + +// PR64765 +void PR64765(float *f, double *r) { + int i; + #pragma acc kernels loop create(f) copy(r) + for(i = 64; i < 76; i += 5) {} +} diff --git a/gcc/testsuite/gfortran.dg/goacc/coarray_2.f90 b/gcc/testsuite/gfortran.dg/goacc/coarray_2.f90 index f35d4b9..f9cf9ac 100644 --- a/gcc/testsuite/gfortran.dg/goacc/coarray_2.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/coarray_2.f90 @@ -2,6 +2,7 @@ ! { dg-additional-options "-fcoarray=lib" } ! ! PR fortran/63861 +! { dg-xfail-if "" { *-*-* } } module test contains diff --git a/gcc/testsuite/gfortran.dg/goacc/combined_loop.f90 b/gcc/testsuite/gfortran.dg/goacc/combined_loop.f90 index b8be649..abb10f9 100644 --- a/gcc/testsuite/gfortran.dg/goacc/combined_loop.f90 +++ b/gcc/testsuite/gfortran.dg/goacc/combined_loop.f90 @@ -6,7 +6,14 @@ subroutine oacc1() implicit none integer :: i integer :: a - !$acc parallel loop reduction(+:a) ! { dg-excess-errors "sorry, unimplemented: directive not yet implemented" } + !$acc parallel loop reduction(+:a) do i = 1,5 enddo + !$acc end parallel loop + !$acc kernels loop collapse(2) + do i = 2,6 + do a = 3,5 + enddo + enddo + !$acc end kernels loop end subroutine oacc1 diff --git a/gcc/testsuite/gfortran.dg/goacc/cray.f95 b/gcc/testsuite/gfortran.dg/goacc/cray.f95 index 8f2c077..52789fe 100644 --- a/gcc/testsuite/gfortran.dg/goacc/cray.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/cray.f95 @@ -53,4 +53,4 @@ contains !$acc update self (ptr) end subroutine oacc1 end module test -! { dg-prune-output "unimplemented" } +! { dg-prune-output "ACC cache unimplemented" } diff --git a/gcc/testsuite/gfortran.dg/goacc/parameter.f95 b/gcc/testsuite/gfortran.dg/goacc/parameter.f95 index 1364181..454924a 100644 --- a/gcc/testsuite/gfortran.dg/goacc/parameter.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/parameter.f95 @@ -29,4 +29,4 @@ contains !$acc update self (a) ! { dg-error "not a variable" } end subroutine oacc1 end module test -! { dg-prune-output "unimplemented" } +! { dg-prune-output "ACC cache unimplemented" } -- cgit v1.1