r225514 - in /branches/gomp-4_0-branch/gcc: cp/...

[tschwinge@gcc.gnu.org]

Author: tschwinge
Date: Tue Jul  7 12:56:37 2015
New Revision: 225514

URL: https://gcc.gnu.org/viewcvs?rev=225514&root=gcc&view=rev
Log:
OpenACC: Complete changes to disallow the independent clause after device_type

In r225247, this was done for the C front end, but it likewise applies to C++
and Fortran.  Also, the test cases need to be adjusted to avoid regressions (as
has happened for C):

    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c (test for excess errors)
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop auto private\\(i4\\)" 2
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop collapse\\(1\\) worker private\\(i2\\)" 2
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop private\\(i5\\)" 2
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop seq private\\(i1\\.2\\) private\\(i1\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop seq private\\(i2\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop seq private\\(i4\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop seq private\\(i5\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop seq private\\(i6\\)" 3
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop tile\\(1\\) gang private\\(i1\\.0\\) private\\(i1\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop tile\\(1\\) gang private\\(i1\\.1\\) private\\(i1\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc loop vector private\\(i3\\)" 2
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "acc_parallel wait\\(1\\) vector_length\\(1\\) num_workers\\(1\\) num_gangs\\(1\\) async\\(1\\) wait\\(3\\) vector_length\\(128\\) num_workers\\(300\\) num_gangs\\(300\\) async\\(3" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "oacc_kernels async\\(-1\\) wait\\(0\\) async\\(0\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "oacc_kernels async\\(-1\\) wait\\(2\\) async\\(2\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "oacc_kernels async\\(-1\\)" 4
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "oacc_parallel wait\\(1\\) vector_length\\(1\\) num_workers\\(1\\) num_gangs\\(1\\) async\\(1\\) wait\\(2\\) vector_length\\(64\\) num_workers\\(200\\) num_gangs\\(200\\) async\\(2\\)" 1
    [-PASS:-]{+FAIL:+} c-c++-common/goacc/dtype-1.c scan-tree-dump-times omplower "oacc_parallel wait\\(1\\) vector_length\\(32\\) num_workers\\(100\\) num_gangs\\(100\\) async\\(1\\)" 1

	gcc/cp/
	* parser.c (OACC_LOOP_CLAUSE_DEVICE_TYPE_MASK): Remove
	PRAGMA_OACC_CLAUSE_INDEPENDENT.
	gcc/fortran/
	* openmp.c (OACC_LOOP_CLAUSE_DEVICE_TYPE_MASK): Remove
	OMP_CLAUSE_INDEPENDENT.
	gcc/testsuite/
	* c-c++-common/goacc/dtype-1.c: Don't specify the OpenACC
	independent clause after device_type.
	* gfortran.dg/goacc/dtype-1.f95: Likewise.

Modified:
    branches/gomp-4_0-branch/gcc/cp/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/cp/parser.c
    branches/gomp-4_0-branch/gcc/fortran/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/fortran/openmp.c
    branches/gomp-4_0-branch/gcc/testsuite/ChangeLog.gomp
    branches/gomp-4_0-branch/gcc/testsuite/c-c++-common/goacc/dtype-1.c
    branches/gomp-4_0-branch/gcc/testsuite/gfortran.dg/goacc/dtype-1.f95