2015-10-29 10:03:40 +01:00
|
|
|
! This test exercises combined directives.
|
|
|
|
|
|
[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
2015-10-27 09:39:15 +01:00
|
|
|
! { 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
|
