Hi! On 2018-12-09T13:56:40+0100, I wrote: > Committed to trunk in r266921:
> Split up "gfortran.dg/goacc/loop-2.f95" > > gcc/testsuite/ > * gfortran.dg/goacc/loop-2.f95: Split into... > * gfortran.dg/goacc/loop-2-kernels-nested.f95: ... this new > file... > * gfortran.dg/goacc/loop-2-kernels-tile.f95: ..., and this new > file... > * gfortran.dg/goacc/loop-2-kernels.f95: ..., and this new file... > * gfortran.dg/goacc/loop-2-parallel-3.f95: ..., and this new > file... > * gfortran.dg/goacc/loop-2-parallel-nested.f95: ..., and this new > file... > * gfortran.dg/goacc/loop-2-parallel-tile.f95: ..., and this new > file... > * gfortran.dg/goacc/loop-2-parallel.f95: ..., and this new file. I recently noticed that we've got some duplication of testing here. As the above is in a more well-structured form, I've pushed "Remove 'gfortran.dg/goacc/loop-5.f95'" and "Remove 'gfortran.dg/goacc/loop-6.f95'" to master branch in commit 4dfa1789ab6560a69de22afe7982f372f598c5b8 and commit 52b74462176e4741ce1248c055e6bb1cb902c025, and backported to releases/gcc-10 branch in commit 1288da82c0f239e81cc8474d320edb517a5754d1 and commit 594672c89dd4279fcf3b5a824d69b206ebf4b700, see attached. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
>From 4dfa1789ab6560a69de22afe7982f372f598c5b8 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> Date: Tue, 27 Oct 2020 10:16:29 +0100 Subject: [PATCH 1/2] Remove 'gfortran.dg/goacc/loop-5.f95' What it's testing is adequately covered in other 'gfortran.dg/goacc/loop-2-*-tile.f95' testcases. gcc/testsuite/ * gfortran.dg/goacc/loop-5.f95: Remove. --- gcc/testsuite/gfortran.dg/goacc/loop-5.f95 | 357 --------------------- 1 file changed, 357 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/goacc/loop-5.f95 diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-5.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-5.f95 deleted file mode 100644 index d059cf7f377..00000000000 --- a/gcc/testsuite/gfortran.dg/goacc/loop-5.f95 +++ /dev/null @@ -1,357 +0,0 @@ -program test - implicit none - integer :: i, j - - !$acc kernels - !$acc loop auto - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - ENDDO - !$acc loop gang(5) - DO i = 1,10 - ENDDO - !$acc loop gang(num:5) - DO i = 1,10 - ENDDO - !$acc loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - !$acc loop worker - DO j = 1,10 - ENDDO - ENDDO - - !$acc loop worker - DO i = 1,10 - ENDDO - !$acc loop worker(5) - DO i = 1,10 - ENDDO - !$acc loop worker(num:5) - DO i = 1,10 - ENDDO - !$acc loop worker - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - ENDDO - !$acc loop gang worker - DO i = 1,10 - ENDDO - - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop vector(5) - DO i = 1,10 - ENDDO - !$acc loop vector(length:5) - DO i = 1,10 - ENDDO - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop gang vector - DO i = 1,10 - ENDDO - !$acc loop worker vector - DO i = 1,10 - ENDDO - - !$acc loop auto - DO i = 1,10 - ENDDO - - !$acc loop tile(1) - DO i = 1,10 - ENDDO - !$acc loop tile(2) - DO i = 1,10 - ENDDO - !$acc loop tile(6-2) - DO i = 1,10 - ENDDO - !$acc loop tile(6+2) - DO i = 1,10 - ENDDO - !$acc loop tile(*) - DO i = 1,10 - ENDDO - !$acc loop tile(*, 1) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang worker tile(*) - DO i = 1,10 - ENDDO - !$acc end kernels - - - !$acc parallel - !$acc loop tile(1) - DO i = 1,10 - ENDDO - !$acc loop tile(*) - DO i = 1,10 - ENDDO - !$acc loop tile(2) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang worker tile(*) - DO i = 1,10 - ENDDO - !$acc end parallel - - !$acc kernels loop auto - DO i = 1,10 - ENDDO - !$acc kernels loop gang - DO i = 1,10 - ENDDO - !$acc kernels loop gang(5) - DO i = 1,10 - ENDDO - !$acc kernels loop gang(num:5) - DO i = 1,10 - ENDDO - !$acc kernels loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc kernels loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc kernels loop gang - DO i = 1,10 - !$acc kernels loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - - !$acc kernels loop worker - DO i = 1,10 - ENDDO - !$acc kernels loop worker(5) - DO i = 1,10 - ENDDO - !$acc kernels loop worker(num:5) - DO i = 1,10 - ENDDO - !$acc kernels loop worker - DO i = 1,10 - !$acc kernels loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc kernels loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc kernels loop gang worker - DO i = 1,10 - ENDDO - - !$acc kernels loop vector - DO i = 1,10 - ENDDO - !$acc kernels loop vector(5) - DO i = 1,10 - ENDDO - !$acc kernels loop vector(length:5) - DO i = 1,10 - ENDDO - !$acc kernels loop vector - DO i = 1,10 - !$acc kernels loop vector ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc kernels loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc kernels loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc kernels loop gang vector - DO i = 1,10 - ENDDO - !$acc kernels loop worker vector - DO i = 1,10 - ENDDO - - !$acc kernels loop auto - DO i = 1,10 - ENDDO - - !$acc kernels loop tile(1) - DO i = 1,10 - ENDDO - !$acc kernels loop tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop tile(*, 1) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc kernels loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc kernels loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop gang worker tile(*) - DO i = 1,10 - ENDDO - - !$acc parallel loop auto - DO i = 1,10 - ENDDO - !$acc parallel loop gang - DO i = 1,10 - ENDDO - !$acc parallel loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc parallel loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc parallel loop gang - DO i = 1,10 - !$acc parallel loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - - !$acc parallel loop worker - DO i = 1,10 - ENDDO - !$acc parallel loop worker - DO i = 1,10 - !$acc parallel loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc parallel loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc parallel loop gang worker - DO i = 1,10 - ENDDO - - !$acc parallel loop vector - DO i = 1,10 - !$acc parallel loop vector ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc parallel loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc parallel loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc parallel loop gang vector - DO i = 1,10 - ENDDO - !$acc parallel loop worker vector - DO i = 1,10 - ENDDO - - !$acc parallel loop auto - DO i = 1,10 - ENDDO - - !$acc parallel loop tile(1) - DO i = 1,10 - ENDDO - !$acc parallel loop tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop tile(*, 1) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc parallel loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc parallel loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop gang worker tile(*) - DO i = 1,10 - ENDDO -end -- 2.17.1
>From 52b74462176e4741ce1248c055e6bb1cb902c025 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> Date: Tue, 27 Oct 2020 07:26:24 +0100 Subject: [PATCH 2/2] Remove 'gfortran.dg/goacc/loop-6.f95' What it's testing is adequately covered in other 'gfortran.dg/goacc/loop-2-parallel-*.f95' testcases. gcc/testsuite/ * gfortran.dg/goacc/loop-6.f95: Remove. --- gcc/testsuite/gfortran.dg/goacc/loop-6.f95 | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/goacc/loop-6.f95 diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-6.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-6.f95 deleted file mode 100644 index d0855b4fa95..00000000000 --- a/gcc/testsuite/gfortran.dg/goacc/loop-6.f95 +++ /dev/null @@ -1,74 +0,0 @@ -program test - implicit none - integer :: i, j - - !$acc parallel - !$acc loop auto - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - ENDDO - !$acc loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - !$acc loop worker - DO j = 1,10 - ENDDO - ENDDO - - !$acc loop worker - DO i = 1,10 - ENDDO - !$acc loop worker - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - ENDDO - !$acc loop gang worker - DO i = 1,10 - ENDDO - - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop vector(5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO - !$acc loop vector(length:5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop gang vector - DO i = 1,10 - ENDDO - !$acc loop worker vector - DO i = 1,10 - ENDDO - - !$acc loop auto - DO i = 1,10 - ENDDO - !$acc end parallel - - !$acc parallel loop vector - DO i = 1,10 - ENDDO - !$acc parallel loop vector(5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO - !$acc parallel loop vector(length:5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO -end -- 2.17.1
>From 1288da82c0f239e81cc8474d320edb517a5754d1 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> Date: Tue, 27 Oct 2020 10:16:29 +0100 Subject: [PATCH 1/2] Remove 'gfortran.dg/goacc/loop-5.f95' What it's testing is adequately covered in other 'gfortran.dg/goacc/loop-2-*-tile.f95' testcases. gcc/testsuite/ * gfortran.dg/goacc/loop-5.f95: Remove. (cherry picked from commit 4dfa1789ab6560a69de22afe7982f372f598c5b8) --- gcc/testsuite/gfortran.dg/goacc/loop-5.f95 | 357 --------------------- 1 file changed, 357 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/goacc/loop-5.f95 diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-5.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-5.f95 deleted file mode 100644 index d059cf7f377..00000000000 --- a/gcc/testsuite/gfortran.dg/goacc/loop-5.f95 +++ /dev/null @@ -1,357 +0,0 @@ -program test - implicit none - integer :: i, j - - !$acc kernels - !$acc loop auto - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - ENDDO - !$acc loop gang(5) - DO i = 1,10 - ENDDO - !$acc loop gang(num:5) - DO i = 1,10 - ENDDO - !$acc loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - !$acc loop worker - DO j = 1,10 - ENDDO - ENDDO - - !$acc loop worker - DO i = 1,10 - ENDDO - !$acc loop worker(5) - DO i = 1,10 - ENDDO - !$acc loop worker(num:5) - DO i = 1,10 - ENDDO - !$acc loop worker - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - ENDDO - !$acc loop gang worker - DO i = 1,10 - ENDDO - - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop vector(5) - DO i = 1,10 - ENDDO - !$acc loop vector(length:5) - DO i = 1,10 - ENDDO - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop gang vector - DO i = 1,10 - ENDDO - !$acc loop worker vector - DO i = 1,10 - ENDDO - - !$acc loop auto - DO i = 1,10 - ENDDO - - !$acc loop tile(1) - DO i = 1,10 - ENDDO - !$acc loop tile(2) - DO i = 1,10 - ENDDO - !$acc loop tile(6-2) - DO i = 1,10 - ENDDO - !$acc loop tile(6+2) - DO i = 1,10 - ENDDO - !$acc loop tile(*) - DO i = 1,10 - ENDDO - !$acc loop tile(*, 1) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang worker tile(*) - DO i = 1,10 - ENDDO - !$acc end kernels - - - !$acc parallel - !$acc loop tile(1) - DO i = 1,10 - ENDDO - !$acc loop tile(*) - DO i = 1,10 - ENDDO - !$acc loop tile(2) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc loop gang worker tile(*) - DO i = 1,10 - ENDDO - !$acc end parallel - - !$acc kernels loop auto - DO i = 1,10 - ENDDO - !$acc kernels loop gang - DO i = 1,10 - ENDDO - !$acc kernels loop gang(5) - DO i = 1,10 - ENDDO - !$acc kernels loop gang(num:5) - DO i = 1,10 - ENDDO - !$acc kernels loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc kernels loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc kernels loop gang - DO i = 1,10 - !$acc kernels loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - - !$acc kernels loop worker - DO i = 1,10 - ENDDO - !$acc kernels loop worker(5) - DO i = 1,10 - ENDDO - !$acc kernels loop worker(num:5) - DO i = 1,10 - ENDDO - !$acc kernels loop worker - DO i = 1,10 - !$acc kernels loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc kernels loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc kernels loop gang worker - DO i = 1,10 - ENDDO - - !$acc kernels loop vector - DO i = 1,10 - ENDDO - !$acc kernels loop vector(5) - DO i = 1,10 - ENDDO - !$acc kernels loop vector(length:5) - DO i = 1,10 - ENDDO - !$acc kernels loop vector - DO i = 1,10 - !$acc kernels loop vector ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc kernels loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc kernels loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc kernels loop gang vector - DO i = 1,10 - ENDDO - !$acc kernels loop worker vector - DO i = 1,10 - ENDDO - - !$acc kernels loop auto - DO i = 1,10 - ENDDO - - !$acc kernels loop tile(1) - DO i = 1,10 - ENDDO - !$acc kernels loop tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop tile(*, 1) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc kernels loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc kernels loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc kernels loop gang worker tile(*) - DO i = 1,10 - ENDDO - - !$acc parallel loop auto - DO i = 1,10 - ENDDO - !$acc parallel loop gang - DO i = 1,10 - ENDDO - !$acc parallel loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc parallel loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc parallel loop gang - DO i = 1,10 - !$acc parallel loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - - !$acc parallel loop worker - DO i = 1,10 - ENDDO - !$acc parallel loop worker - DO i = 1,10 - !$acc parallel loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc parallel loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc parallel loop gang worker - DO i = 1,10 - ENDDO - - !$acc parallel loop vector - DO i = 1,10 - !$acc parallel loop vector ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc parallel loop worker ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - !$acc parallel loop gang ! { dg-error "OpenACC construct inside of non-OpenACC region" } - DO j = 1,10 - ENDDO - ENDDO - !$acc parallel loop gang vector - DO i = 1,10 - ENDDO - !$acc parallel loop worker vector - DO i = 1,10 - ENDDO - - !$acc parallel loop auto - DO i = 1,10 - ENDDO - - !$acc parallel loop tile(1) - DO i = 1,10 - ENDDO - !$acc parallel loop tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop tile(*, 1) - DO i = 1,10 - DO j = 1,10 - ENDDO - ENDDO - !$acc parallel loop tile(-1) ! { dg-warning "must be positive" } - do i = 1,10 - enddo - !$acc parallel loop vector tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop worker tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop gang tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop vector gang tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop vector worker tile(*) - DO i = 1,10 - ENDDO - !$acc parallel loop gang worker tile(*) - DO i = 1,10 - ENDDO -end -- 2.17.1
>From 594672c89dd4279fcf3b5a824d69b206ebf4b700 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> Date: Tue, 27 Oct 2020 07:26:24 +0100 Subject: [PATCH 2/2] Remove 'gfortran.dg/goacc/loop-6.f95' What it's testing is adequately covered in other 'gfortran.dg/goacc/loop-2-parallel-*.f95' testcases. gcc/testsuite/ * gfortran.dg/goacc/loop-6.f95: Remove. (cherry picked from commit 52b74462176e4741ce1248c055e6bb1cb902c025) --- gcc/testsuite/gfortran.dg/goacc/loop-6.f95 | 74 ---------------------- 1 file changed, 74 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/goacc/loop-6.f95 diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-6.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-6.f95 deleted file mode 100644 index d0855b4fa95..00000000000 --- a/gcc/testsuite/gfortran.dg/goacc/loop-6.f95 +++ /dev/null @@ -1,74 +0,0 @@ -program test - implicit none - integer :: i, j - - !$acc parallel - !$acc loop auto - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - ENDDO - !$acc loop gang(static:5) - DO i = 1,10 - ENDDO - !$acc loop gang(static:*) - DO i = 1,10 - ENDDO - !$acc loop gang - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - !$acc loop worker - DO j = 1,10 - ENDDO - ENDDO - - !$acc loop worker - DO i = 1,10 - ENDDO - !$acc loop worker - DO i = 1,10 - !$acc loop vector - DO j = 1,10 - ENDDO - ENDDO - !$acc loop gang worker - DO i = 1,10 - ENDDO - - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop vector(5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO - !$acc loop vector(length:5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO - !$acc loop vector - DO i = 1,10 - ENDDO - !$acc loop gang vector - DO i = 1,10 - ENDDO - !$acc loop worker vector - DO i = 1,10 - ENDDO - - !$acc loop auto - DO i = 1,10 - ENDDO - !$acc end parallel - - !$acc parallel loop vector - DO i = 1,10 - ENDDO - !$acc parallel loop vector(5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO - !$acc parallel loop vector(length:5) ! { dg-error "length arguments" } - DO i = 1,10 - ENDDO -end -- 2.17.1