OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some OpenACC host_data cleanup 

gcc/c/
	* c-parser.c (c_parser_omp_clause_name)
	(c_parser_oacc_all_clauses): Alphabetical sorting.
	gcc/cp/
	* parser.c (cp_parser_omp_clause_name)
	(cp_parser_oacc_all_clauses): Alphabetical sorting.
	* pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_USE_DEVICE.
	gcc/testsuite/
	* c-c++-common/goacc/host_data-5.c: New file.
	* c-c++-common/goacc/host_data-6.c: Likewise.
	* gfortran.dg/goacc/coarray.f95: XFAIL.
	* gfortran.dg/goacc/coarray_2.f90: Adjust dg-excess-errors
	directive.
	* gfortran.dg/goacc/host_data-tree.f95: Remove dg-prune-output
	directive.
	libgomp/
	* testsuite/libgomp.oacc-c-c++-common/host_data-2.c: Restrict to
	target openacc_nvidia_accel_selected.
	* testsuite/libgomp.oacc-c-c++-common/host_data-4.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/host_data-5.c: Likewise.
	* testsuite/libgomp.oacc-c-c++-common/host_data-3.c: Remove file.
	* testsuite/libgomp.oacc-c-c++-common/host_data-6.c: Remove file.

Co-Authored-By: James Norris <James_Norris@mentor.com>
Co-Authored-By: Julian Brown <julian@codesourcery.com>

From-SVN: r231184
This commit is contained in:
Thomas Schwinge 2015-12-02 16:53:34 +01:00 committed by Thomas Schwinge
parent db0f1c7a90
commit ff7a55bf56
15 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/c/ChangeLog
View File

@ -1,3 +1,8 @@
2015-12-02 Thomas Schwinge <thomas@codesourcery.com>
* c-parser.c (c_parser_omp_clause_name)
(c_parser_oacc_all_clauses): Alphabetical sorting.
2015-12-02 Jakub Jelinek <jakub@redhat.com>
PR c/68533

12
gcc/c/c-parser.c
View File

@ -10277,10 +10277,10 @@ c_parser_omp_clause_name (c_parser *parser)
result = PRAGMA_OMP_CLAUSE_UNIFORM;
else if (!strcmp ("untied", p))
result = PRAGMA_OMP_CLAUSE_UNTIED;
else if (!strcmp ("use_device_ptr", p))
result = PRAGMA_OMP_CLAUSE_USE_DEVICE_PTR;
else if (!strcmp ("use_device", p))
result = PRAGMA_OACC_CLAUSE_USE_DEVICE;
else if (!strcmp ("use_device_ptr", p))
result = PRAGMA_OMP_CLAUSE_USE_DEVICE_PTR;
break;
case 'v':
if (!strcmp ("vector", p))
@ -12951,10 +12951,6 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask,
clauses = c_parser_oacc_data_clause (parser, c_kind, clauses);
c_name = "self";
break;
case PRAGMA_OACC_CLAUSE_USE_DEVICE:
clauses = c_parser_oacc_clause_use_device (parser, clauses);
c_name = "use_device";
break;
case PRAGMA_OACC_CLAUSE_SEQ:
clauses = c_parser_oacc_simple_clause (parser, OMP_CLAUSE_SEQ,
clauses);
@ -12964,6 +12960,10 @@ c_parser_oacc_all_clauses (c_parser *parser, omp_clause_mask mask,
clauses = c_parser_oacc_clause_tile (parser, clauses);
c_name = "tile";
break;
case PRAGMA_OACC_CLAUSE_USE_DEVICE:
clauses = c_parser_oacc_clause_use_device (parser, clauses);
c_name = "use_device";
break;
case PRAGMA_OACC_CLAUSE_VECTOR:
c_name = "vector";
clauses = c_parser_oacc_shape_clause (parser, OMP_CLAUSE_VECTOR,

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2015-12-02 Thomas Schwinge <thomas@codesourcery.com>
* parser.c (cp_parser_omp_clause_name)
(cp_parser_oacc_all_clauses): Alphabetical sorting.
* pt.c (tsubst_omp_clauses): Handle OMP_CLAUSE_USE_DEVICE.
2015-12-02 Andreas Arnez <arnez@linux.vnet.ibm.com>
PR gcov-profile/68603

20
gcc/cp/parser.c
View File

@ -29230,10 +29230,10 @@ cp_parser_omp_clause_name (cp_parser *parser)
result = PRAGMA_OMP_CLAUSE_UNIFORM;
else if (!strcmp ("untied", p))
result = PRAGMA_OMP_CLAUSE_UNTIED;
else if (!strcmp ("use_device_ptr", p))
result = PRAGMA_OMP_CLAUSE_USE_DEVICE_PTR;
else if (!strcmp ("use_device", p))
result = PRAGMA_OACC_CLAUSE_USE_DEVICE;
else if (!strcmp ("use_device_ptr", p))
result = PRAGMA_OMP_CLAUSE_USE_DEVICE_PTR;
break;
case 'v':
if (!strcmp ("vector", p))
@ -31600,11 +31600,6 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask,
clauses = cp_parser_oacc_data_clause (parser, c_kind, clauses);
c_name = "self";
break;
case PRAGMA_OACC_CLAUSE_USE_DEVICE:
clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_USE_DEVICE,
clauses);
c_name = "use_device";
break;
case PRAGMA_OACC_CLAUSE_SEQ:
clauses = cp_parser_oacc_simple_clause (parser, OMP_CLAUSE_SEQ,
clauses, here);
@ -31614,6 +31609,11 @@ cp_parser_oacc_all_clauses (cp_parser *parser, omp_clause_mask mask,
clauses = cp_parser_oacc_clause_tile (parser, here, clauses);
c_name = "tile";
break;
case PRAGMA_OACC_CLAUSE_USE_DEVICE:
clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_USE_DEVICE,
clauses);
c_name = "use_device";
break;
case PRAGMA_OACC_CLAUSE_VECTOR:
c_name = "vector";
clauses = cp_parser_oacc_shape_clause (parser, OMP_CLAUSE_VECTOR,
@ -34516,13 +34516,13 @@ cp_parser_oacc_data (cp_parser *parser, cp_token *pragma_tok)
return stmt;
}
#define OACC_HOST_DATA_CLAUSE_MASK \
( (OMP_CLAUSE_MASK_1 << PRAGMA_OACC_CLAUSE_USE_DEVICE) )
/* OpenACC 2.0:
# pragma acc host_data <clauses> new-line
structured-block */
#define OACC_HOST_DATA_CLAUSE_MASK \
( (OMP_CLAUSE_MASK_1 << PRAGMA_OACC_CLAUSE_USE_DEVICE) )
static tree
cp_parser_oacc_host_data (cp_parser *parser, cp_token *pragma_tok)
{

2
gcc/cp/pt.c
View File

@ -14387,6 +14387,7 @@ tsubst_omp_clauses (tree clauses, bool declare_simd, bool allow_fields,
case OMP_CLAUSE_FROM:
case OMP_CLAUSE_TO:
case OMP_CLAUSE_MAP:
case OMP_CLAUSE_USE_DEVICE:
case OMP_CLAUSE_USE_DEVICE_PTR:
case OMP_CLAUSE_IS_DEVICE_PTR:
OMP_CLAUSE_DECL (nc)
@ -14513,6 +14514,7 @@ tsubst_omp_clauses (tree clauses, bool declare_simd, bool allow_fields,
case OMP_CLAUSE_COPYPRIVATE:
case OMP_CLAUSE_LINEAR:
case OMP_CLAUSE_REDUCTION:
case OMP_CLAUSE_USE_DEVICE:
case OMP_CLAUSE_USE_DEVICE_PTR:
case OMP_CLAUSE_IS_DEVICE_PTR:
/* tsubst_expr on SCOPE_REF results in returning

15
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,18 @@
2015-12-02 Thomas Schwinge <thomas@codesourcery.com>
* gfortran.dg/goacc/coarray.f95: XFAIL.
* gfortran.dg/goacc/coarray_2.f90: Adjust dg-excess-errors
directive.
* gfortran.dg/goacc/host_data-tree.f95: Remove dg-prune-output
directive.
2015-12-02 Thomas Schwinge <thomas@codesourcery.com>
Julian Brown <julian@codesourcery.com>
James Norris <James_Norris@mentor.com>
* c-c++-common/goacc/host_data-5.c: New file.
* c-c++-common/goacc/host_data-6.c: Likewise.
2015-12-02 Tom de Vries <tom@codesourcery.com>
* c-c++-common/goacc/kernels-default-2.c: New test.

6
libgomp/testsuite/libgomp.oacc-c-c++-common/host_data-3.c → gcc/testsuite/c-c++-common/goacc/host_data-5.c
View File

@ -1,8 +1,5 @@
/* { dg-do compile } */
#include <openacc.h>
#include <stdlib.h>
#define N 1024
int main (int argc, char* argv[])
@ -20,9 +17,6 @@ int main (int argc, char* argv[])
xp = x;
}
}
if (xp != acc_deviceptr (x))
abort ();
}
return 0;

6
libgomp/testsuite/libgomp.oacc-c-c++-common/host_data-6.c → gcc/testsuite/c-c++-common/goacc/host_data-6.c
View File

@ -1,8 +1,5 @@
/* { dg-do compile } */
#include <openacc.h>
#include <stdlib.h>
#define N 1024
int main (int argc, char* argv[])
@ -22,9 +19,6 @@ int main (int argc, char* argv[])
xp = x; /* { dg-error "variable 'x' declared in enclosing 'host_data' region" } */
}
}
if (xp != acc_deviceptr (x))
abort ();
}
return 0;

8
gcc/testsuite/gfortran.dg/goacc/coarray.f95
View File

@ -1,7 +1,9 @@
! { dg-do compile }
! { dg-additional-options "-fcoarray=single" }
! TODO: These cases must fail
!
! PR fortran/63861
! { dg-xfail-if "<http://gcc.gnu.org/PR63861>" { *-*-* } }
! { dg-excess-errors "TODO" }
module test
contains
@ -9,7 +11,6 @@ contains
implicit none
integer :: i
integer, codimension[*] :: a
! { dg-excess-errors "sorry, unimplemented: directive not yet implemented" }
!$acc declare device_resident (a)
!$acc data copy (a)
!$acc end data
@ -17,7 +18,6 @@ contains
!$acc end data
!$acc parallel private (a)
!$acc end parallel
! { dg-excess-errors "sorry, unimplemented: directive not yet implemented" }
!$acc host_data use_device (a)
!$acc end host_data
!$acc parallel loop reduction(+:a)

2
gcc/testsuite/gfortran.dg/goacc/coarray_2.f90
View File

@ -3,6 +3,7 @@
!
! PR fortran/63861
! { dg-xfail-if "<http://gcc.gnu.org/PR63861>" { *-*-* } }
! { dg-excess-errors "TODO" }
module test
contains
@ -106,4 +107,3 @@ contains
!$acc update self (a)
end subroutine oacc4
end module test
! { dg-excess-errors "sorry, unimplemented: directive not yet implemented" }

1
gcc/testsuite/gfortran.dg/goacc/host_data-tree.f95
View File

@ -8,5 +8,4 @@ program test
!$acc host_data use_device(i)
!$acc end host_data
end program test
! { dg-prune-output "unimplemented" }
! { dg-final { scan-tree-dump-times "pragma acc host_data use_device\\(i\\)" 1 "original" } }

9
libgomp/ChangeLog
View File

@ -1,3 +1,12 @@
2015-12-02 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/libgomp.oacc-c-c++-common/host_data-2.c: Restrict to
target openacc_nvidia_accel_selected.
* testsuite/libgomp.oacc-c-c++-common/host_data-4.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/host_data-5.c: Likewise.
* testsuite/libgomp.oacc-c-c++-common/host_data-3.c: Remove file.
* testsuite/libgomp.oacc-c-c++-common/host_data-6.c: Remove file.
2015-12-01 Julian Brown <julian@codesourcery.com>
James Norris <James_Norris@mentor.com>

2
libgomp/testsuite/libgomp.oacc-c-c++-common/host_data-2.c
View File

@ -1,4 +1,4 @@
/* { dg-do run } */
/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <stdlib.h>
#include <openacc.h>

2
libgomp/testsuite/libgomp.oacc-c-c++-common/host_data-4.c
View File

@ -1,4 +1,4 @@
/* { dg-do run } */
/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <openacc.h>
#include <stdlib.h>

2
libgomp/testsuite/libgomp.oacc-c-c++-common/host_data-5.c
View File

@ -1,4 +1,4 @@
/* { dg-do run } */
/* { dg-do run { target openacc_nvidia_accel_selected } } */
#include <openacc.h>
#include <stdlib.h>