From 2c4c872529d6e1051fb9cdd641ad5cc9fbc0e2cb Mon Sep 17 00:00:00 2001 From: tschwinge Date: Tue, 27 Oct 2015 08:39:15 +0000 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229404 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog | 5 +++ .../libgomp.oacc-c-c++-common/combdir-1.c | 52 ++++++++++++++++++++++ .../testsuite/libgomp.oacc-fortran/combdir-1.f90 | 37 +++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 (limited to 'libgomp') diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index afc49ae164c..ca34af8203c 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2015-10-27 James Norris + + * testsuite/libgomp.oacc-c-c++-common/combdir-1.c: New file. + * testsuite/libgomp.oacc-fortran/combdir-1.f90: Likewise. + 2015-10-26 Thomas Schwinge * testsuite/libgomp.oacc-c-c++-common/abort-1.c: Print to stderr. diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c new file mode 100644 index 00000000000..a7def920b94 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/combdir-1.c @@ -0,0 +1,52 @@ +/* { dg-do run } */ + +#include + +int +main (int argc, char **argv) +{ + const int N = 32; + float a[N], b[N]; + int i; + + for (i = 0; i < N; i++) + { + a[i] = 1.0; + b[i] = 0.0; + } + +#pragma acc parallel loop copy (a[0:N]) copy (b[0:N]) + for (i = 0; i < N; i++) + { + b[i] = 2.0; + a[i] = a[i] + b[i]; + } + + for (i = 0; i < N; i++) + { + if (a[i] != 3.0) + abort (); + + if (b[i] != 2.0) + abort (); + } + +#pragma acc kernels loop copy (a[0:N]) copy (b[0:N]) + for (i = 0; i < N; i++) + { + b[i] = 3.0; + a[i] = a[i] + b[i]; + } + + for (i = 0; i < N; i++) + { + if (a[i] != 6.0) + abort (); + + if (b[i] != 3.0) + abort (); + } + + return 0; + +} diff --git a/libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 new file mode 100644 index 00000000000..0cd8a670abb --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-fortran/combdir-1.f90 @@ -0,0 +1,37 @@ +! { dg-do run } + +program main + integer, parameter :: n = 32 + real :: a(n), b(n); + integer :: i + + do i = 1, n + a(i) = 1.0 + b(i) = 0.0 + end do + + !$acc parallel loop copy (a(1:n)) copy (b(1:n)) + do i = 1, n + b(i) = 2.0 + a(i) = a(i) + b(i) + end do + + do i = 1, n + if (a(i) .ne. 3.0) call abort + + if (b(i) .ne. 2.0) call abort + end do + + !$acc kernels loop copy (a(1:n)) copy (b(1:n)) + do i = 1, n + b(i) = 3.0; + a(i) = a(i) + b(i) + end do + + do i = 1, n + if (a(i) .ne. 6.0) call abort + + if (b(i) .ne. 3.0) call abort + end do + +end program main -- cgit v1.2.1