From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1729) id 86F523938380; Thu, 13 May 2021 16:20:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86F523938380 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Kwok Yeung To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-11] Update expected messages in OpenACC tests X-Act-Checkin: gcc X-Git-Author: Kwok Cheung Yeung X-Git-Refname: refs/heads/devel/omp/gcc-11 X-Git-Oldrev: 6da4ffd4a790f5f0abf290147217ca46a36f981e X-Git-Newrev: 0c81d3c19fd0a3bd48b5eb2e78ebb2182c61b98b Message-Id: <20210513162022.86F523938380@sourceware.org> Date: Thu, 13 May 2021 16:20:22 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 16:20:22 -0000 https://gcc.gnu.org/g:0c81d3c19fd0a3bd48b5eb2e78ebb2182c61b98b commit 0c81d3c19fd0a3bd48b5eb2e78ebb2182c61b98b Author: Kwok Cheung Yeung Date: Wed Apr 7 11:48:50 2021 -0700 Update expected messages in OpenACC tests This updates the types of messages expected in the test, and the '-fopt-info' option used to request them. The phrasing of the expected messages has also changed somewhat and has been adjusted to match. 2021-04-07 Kwok Cheung Yeung gcc/testsuite/ * c-c++-common/goacc/classify-kernels-unparallelized.c: Update additional options and expected messages. * c-c++-common/goacc/classify-kernels.c: Likewise. * c-c++-common/goacc/note-parallelism-1-kernels-conditional-loop-independent_seq.c: Likewise. * c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c: Likewise. * c-c++-common/goacc/note-parallelism-1-kernels-loop-independent_seq.c: Likewise. * c-c++-common/goacc/note-parallelism-1-kernels-loops.c: Likewise. * c-c++-common/goacc/note-parallelism-1-kernels-straight-line.c: Likewise. * c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c: Likewise. * c-c++-common/goacc/note-parallelism-combined-kernels-loop-independent_seq.c: Likewise. * c-c++-common/goacc/note-parallelism-kernels-conditional-loop-independent_seq.c: Likewise. * c-c++-common/goacc/note-parallelism-kernels-loop-auto.c: Likewise. * c-c++-common/goacc/note-parallelism-kernels-loop-independent_seq.c: Likewise. * c-c++-common/goacc/note-parallelism-kernels-loops.c: Likewise. * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Likewise. * gfortran.dg/goacc/classify-kernels.f95: Likewise. libgomp/ * testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Update additional options and expected messages. Diff: --- gcc/testsuite/ChangeLog.omp | 26 +++++++++ .../goacc/classify-kernels-unparallelized.c | 4 +- .../c-c++-common/goacc/classify-kernels.c | 4 +- ...sm-1-kernels-conditional-loop-independent_seq.c | 36 ++++++------ .../goacc/note-parallelism-1-kernels-loop-auto.c | 34 +++++------ ...te-parallelism-1-kernels-loop-independent_seq.c | 34 +++++------ .../goacc/note-parallelism-1-kernels-loops.c | 4 +- .../note-parallelism-1-kernels-straight-line.c | 4 +- .../note-parallelism-combined-kernels-loop-auto.c | 34 +++++------ ...llelism-combined-kernels-loop-independent_seq.c | 34 +++++------ ...lism-kernels-conditional-loop-independent_seq.c | 66 +++++++++++----------- .../goacc/note-parallelism-kernels-loop-auto.c | 34 +++++------ ...note-parallelism-kernels-loop-independent_seq.c | 34 +++++------ .../goacc/note-parallelism-kernels-loops.c | 16 +++--- .../goacc/classify-kernels-unparallelized.f95 | 7 +-- .../gfortran.dg/goacc/classify-kernels.f95 | 7 +-- libgomp/ChangeLog.omp | 5 ++ .../kernels-decompose-1.c | 6 +- 18 files changed, 209 insertions(+), 180 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 08634182377..1e201df31a9 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,29 @@ +2021-04-07 Kwok Cheung Yeung + + * c-c++-common/goacc/classify-kernels-unparallelized.c: Update + additional options and expected messages. + * c-c++-common/goacc/classify-kernels.c: Likewise. + * c-c++-common/goacc/note-parallelism-1-kernels-conditional-loop-independent_seq.c: + Likewise. + * c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c: Likewise. + * c-c++-common/goacc/note-parallelism-1-kernels-loop-independent_seq.c: + Likewise. + * c-c++-common/goacc/note-parallelism-1-kernels-loops.c: Likewise. + * c-c++-common/goacc/note-parallelism-1-kernels-straight-line.c: + Likewise. + * c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c: + Likewise. + * c-c++-common/goacc/note-parallelism-combined-kernels-loop-independent_seq.c: + Likewise. + * c-c++-common/goacc/note-parallelism-kernels-conditional-loop-independent_seq.c: + Likewise. + * c-c++-common/goacc/note-parallelism-kernels-loop-auto.c: Likewise. + * c-c++-common/goacc/note-parallelism-kernels-loop-independent_seq.c: + Likewise. + * c-c++-common/goacc/note-parallelism-kernels-loops.c: Likewise. + * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Likewise. + * gfortran.dg/goacc/classify-kernels.f95: Likewise. + 2020-09-28 Tobias Burnus * c-c++-common/gomp/pr94874.c: Update scan-tree-dump. diff --git a/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized.c b/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized.c index 6fe3c0e635e..b438efd4572 100644 --- a/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized.c +++ b/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized.c @@ -3,7 +3,7 @@ /* { dg-additional-options "-O2" } { dg-additional-options "-fno-openacc-kernels-annotate-loops" } - { dg-additional-options "-fopt-info-optimized-omp" } + { dg-additional-options "-fopt-info-note-optimized-omp" } { dg-additional-options "-fdump-tree-ompexp" } { dg-additional-options "-fdump-tree-parloops1-all" } { dg-additional-options "-fdump-tree-oaccloops" } */ @@ -20,7 +20,7 @@ extern unsigned int f (unsigned int); void KERNELS () { #pragma acc kernels copyin (a[0:N], b[0:N]) copyout (c[0:N]) /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (unsigned int i = 0; i < N; i++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (unsigned int i = 0; i < N; i++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ /* An "extern"al mapping of loop iterations/array indices makes the loop unparallelizable. */ c[i] = a[f (i)] + b[f (i)]; diff --git a/gcc/testsuite/c-c++-common/goacc/classify-kernels.c b/gcc/testsuite/c-c++-common/goacc/classify-kernels.c index f61f54157c2..368e6e26566 100644 --- a/gcc/testsuite/c-c++-common/goacc/classify-kernels.c +++ b/gcc/testsuite/c-c++-common/goacc/classify-kernels.c @@ -3,7 +3,7 @@ /* { dg-additional-options "-O2" } { dg-additional-options "-fno-openacc-kernels-annotate-loops" } - { dg-additional-options "-fopt-info-optimized-omp" } + { dg-additional-options "-fopt-info-note-optimized-omp" } { dg-additional-options "-fdump-tree-ompexp" } { dg-additional-options "-fdump-tree-parloops1-all" } { dg-additional-options "-fdump-tree-oaccloops" } */ @@ -17,7 +17,7 @@ extern unsigned int *__restrict c; void KERNELS () { #pragma acc kernels copyin (a[0:N], b[0:N]) copyout (c[0:N]) /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - for (unsigned int i = 0; i < N; i++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (unsigned int i = 0; i < N; i++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ c[i] = a[i] + b[i]; } diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-conditional-loop-independent_seq.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-conditional-loop-independent_seq.c index c21273a8ebc..9e53b249019 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-conditional-loop-independent_seq.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-conditional-loop-independent_seq.c @@ -2,7 +2,7 @@ construct containing conditionally executed 'loop' constructs with 'independent' or 'seq' clauses. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-all-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -16,50 +16,50 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop seq - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent worker - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang worker - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent worker vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang worker vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent worker for (y = 0; y < 10; y++) @@ -68,19 +68,19 @@ main () ; #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) ; #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -89,7 +89,7 @@ main () ; #pragma acc loop seq - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -98,7 +98,7 @@ main () ; #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop seq for (y = 0; y < 10; y++) @@ -107,7 +107,7 @@ main () ; #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -116,7 +116,7 @@ main () ; #pragma acc loop seq - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c index 5268fd1586e..b0313796ade 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c @@ -2,7 +2,7 @@ construct containing 'loop' constructs with explicit or implicit 'auto' clause. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -16,47 +16,47 @@ main () /* Strangely indented to keep this similar to other test cases. */ { #pragma acc loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto gang /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto gang vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto gang worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto worker vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto gang worker vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto gang /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (y = 0; y < 10; y++) @@ -65,19 +65,19 @@ main () ; #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) ; #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -86,7 +86,7 @@ main () ; #pragma acc loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -95,7 +95,7 @@ main () ; #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop for (y = 0; y < 10; y++) @@ -104,7 +104,7 @@ main () ; #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -113,7 +113,7 @@ main () ; #pragma acc loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-independent_seq.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-independent_seq.c index dad1bdb15d3..9eb846325a6 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-independent_seq.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loop-independent_seq.c @@ -2,7 +2,7 @@ construct containing 'loop' constructs with 'independent' or 'seq' clauses. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-all-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -16,47 +16,47 @@ main () /* Strangely indented to keep this similar to other test cases. */ { #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent worker /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent vector /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang vector /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang worker /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent worker vector /* { dg-message "optimized: assigned OpenACC worker vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang worker vector /* { dg-message "optimized: assigned OpenACC gang worker vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent gang /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent worker /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -65,19 +65,19 @@ main () ; #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ for (y = 0; y < 10; y++) ; #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -86,7 +86,7 @@ main () ; #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -95,7 +95,7 @@ main () ; #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ for (y = 0; y < 10; y++) @@ -104,7 +104,7 @@ main () ; #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ for (y = 0; y < 10; y++) @@ -113,7 +113,7 @@ main () ; #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c index 51bd963c863..3c78f2bf291 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-loops.c @@ -2,7 +2,7 @@ construct containing loops. */ /* { dg-additional-options "-fno-openacc-kernels-annotate-loops" } */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-optimized-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -15,7 +15,7 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ { - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ ; for (x = 0; x < 10; x++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-straight-line.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-straight-line.c index 09b58e22f2f..f1bc0c88cae 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-straight-line.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-1-kernels-straight-line.c @@ -1,7 +1,7 @@ /* Test the output of "-fopt-info-optimized-omp" for an OpenACC 'kernels' construct containing straight-line code. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-optimized-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -29,7 +29,7 @@ main () #pragma acc kernels /* { dg-warning "region contains gang partitioned code but is not gang partitioned" } */ { - x = 0; /* { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } */ + x = 0; /* { dg-message "note: beginning .gang-single. part in OpenACC .kernels. region" } */ y = x < 10; z = x++; ; diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c index b1ef3c0e4ac..a4f721067cc 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c @@ -1,7 +1,7 @@ /* Test the output of "-fopt-info-optimized-omp" for combined OpenACC 'kernels loop' constructs with explicit or implicit 'auto' clause. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -12,47 +12,47 @@ main () int x, y, z; #pragma acc kernels loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto gang /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto gang vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto gang worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto worker vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto gang worker vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto gang /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (y = 0; y < 10; y++) @@ -61,19 +61,19 @@ main () ; #pragma acc kernels loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) ; #pragma acc kernels loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -82,7 +82,7 @@ main () ; #pragma acc kernels loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -91,7 +91,7 @@ main () ; #pragma acc kernels loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop for (y = 0; y < 10; y++) @@ -100,7 +100,7 @@ main () ; #pragma acc kernels loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -109,7 +109,7 @@ main () ; #pragma acc kernels loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-independent_seq.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-independent_seq.c index b743636b2e1..54960918d8c 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-independent_seq.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-combined-kernels-loop-independent_seq.c @@ -1,7 +1,7 @@ /* Test the output of "-fopt-info-optimized-omp" for combined OpenACC 'kernels loop' constructs with 'independent' or 'seq' clauses. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-optimized-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -12,47 +12,47 @@ main () int x, y, z; #pragma acc kernels loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent gang /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent worker /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent vector /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent gang vector /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent gang worker /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent worker vector /* { dg-message "optimized: assigned OpenACC worker vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent gang worker vector /* { dg-message "optimized: assigned OpenACC gang worker vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent gang /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent worker /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -61,19 +61,19 @@ main () ; #pragma acc kernels loop independent /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ for (y = 0; y < 10; y++) ; #pragma acc kernels loop independent /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -82,7 +82,7 @@ main () ; #pragma acc kernels loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -91,7 +91,7 @@ main () ; #pragma acc kernels loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ for (y = 0; y < 10; y++) @@ -100,7 +100,7 @@ main () ; #pragma acc kernels loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ for (y = 0; y < 10; y++) @@ -109,7 +109,7 @@ main () ; #pragma acc kernels loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-conditional-loop-independent_seq.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-conditional-loop-independent_seq.c index 21d31c43286..0a3babe7a44 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-conditional-loop-independent_seq.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-conditional-loop-independent_seq.c @@ -2,7 +2,7 @@ constructs containing conditionally executed 'loop' constructs with 'independent' or 'seq' clauses. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-all-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -16,90 +16,90 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop seq - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent gang - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent worker - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent gang vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent gang worker - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent worker vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent gang worker vector - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent gang - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent worker for (y = 0; y < 10; y++) @@ -110,20 +110,20 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; } #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -132,10 +132,10 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -146,10 +146,10 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop seq - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -160,10 +160,10 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop seq for (y = 0; y < 10; y++) @@ -174,10 +174,10 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop independent - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) @@ -188,10 +188,10 @@ main () #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ /* Strangely indented to keep this similar to other test cases. */ - if (c) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + if (c) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ { #pragma acc loop seq - /* { dg-message "optimized: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ + /* { dg-message "missed: unparallelized loop nest in OpenACC .kernels. region: it's executed conditionally" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-auto.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-auto.c index 1fe1f2900ce..4f17204d199 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-auto.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-auto.c @@ -2,7 +2,7 @@ constructs containing 'loop' constructs with explicit or implicit 'auto' clause. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-optimized-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -14,55 +14,55 @@ main () #pragma acc kernels #pragma acc loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto gang /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto gang vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto gang worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto worker vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto gang worker vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto gang /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (y = 0; y < 10; y++) @@ -72,13 +72,13 @@ main () #pragma acc kernels #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -86,7 +86,7 @@ main () #pragma acc kernels #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -96,7 +96,7 @@ main () #pragma acc kernels #pragma acc loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -106,7 +106,7 @@ main () #pragma acc kernels #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop for (y = 0; y < 10; y++) @@ -116,7 +116,7 @@ main () #pragma acc kernels #pragma acc loop auto - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) @@ -126,7 +126,7 @@ main () #pragma acc kernels #pragma acc loop - /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ + /* { dg-message "note: forwarded loop nest in OpenACC .kernels. region to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-independent_seq.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-independent_seq.c index 6824d7050c1..bbdcf1636b1 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-independent_seq.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loop-independent_seq.c @@ -2,7 +2,7 @@ constructs containing 'loop' constructs with 'independent' or 'seq' clauses. */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-optimized-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -14,55 +14,55 @@ main () #pragma acc kernels #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent gang /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent worker /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent vector /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent gang vector /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent gang worker /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent worker vector /* { dg-message "optimized: assigned OpenACC worker vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent gang worker vector /* { dg-message "optimized: assigned OpenACC gang worker vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent gang /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent worker /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -72,13 +72,13 @@ main () #pragma acc kernels #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ for (y = 0; y < 10; y++) @@ -86,7 +86,7 @@ main () #pragma acc kernels #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -96,7 +96,7 @@ main () #pragma acc kernels #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ for (y = 0; y < 10; y++) @@ -106,7 +106,7 @@ main () #pragma acc kernels #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ for (y = 0; y < 10; y++) @@ -116,7 +116,7 @@ main () #pragma acc kernels #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang worker loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC vector loop parallelism" } */ for (y = 0; y < 10; y++) @@ -126,7 +126,7 @@ main () #pragma acc kernels #pragma acc loop seq /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ + /* { dg-message "note: parallelized loop nest in OpenACC .kernels. region" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang vector loop parallelism" } */ for (y = 0; y < 10; y++) diff --git a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c index ee28b964687..5ecd9378ee8 100644 --- a/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c +++ b/gcc/testsuite/c-c++-common/goacc/note-parallelism-kernels-loops.c @@ -2,7 +2,7 @@ construct containing loops. */ /* { dg-additional-options "-fno-openacc-kernels-annotate-loops" } */ -/* { dg-additional-options "-fopt-info-optimized-omp" } */ +/* { dg-additional-options "-fopt-info-note-optimized-omp" } */ //TODO update accordingly /* See also "../../gfortran.dg/goacc/note-parallelism.f90". */ @@ -13,36 +13,36 @@ main () int x, y, z; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ ; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ ; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ for (y = 0; y < 10; y++) for (z = 0; z < 10; z++) ; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ ; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ for (y = 0; y < 10; y++) ; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ for (y = 0; y < 10; y++) for (z = 0; z < 10; z++) ; #pragma acc kernels /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ - for (x = 0; x < 10; x++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ + for (x = 0; x < 10; x++) /* { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } */ for (y = 0; y < 10; y++) for (z = 0; z < 10; z++) ; diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 index 2c705673629..d6126f2b7f1 100644 --- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 @@ -3,7 +3,7 @@ ! { dg-additional-options "-O2" } ! { dg-additional-options "-fno-openacc-kernels-annotate-loops" } -! { dg-additional-options "-fopt-info-optimized-omp" } +! { dg-additional-options "-fopt-info-note-optimized-omp" } ! { dg-additional-options "-fdump-tree-ompexp" } ! { dg-additional-options "-fdump-tree-parloops1-all" } ! { dg-additional-options "-fdump-tree-oaccloops" } @@ -20,9 +20,8 @@ program main call setup(a, b) - !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) - do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC seq loop parallelism" } - ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 24 } + !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) ! { dg-message "optimized: assigned OpenACC seq loop parallelism" } + do i = 0, n - 1 ! { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } c(i) = a(f (i)) + b(f (i)) end do !$acc end kernels diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 index 3d2defd38c2..39516f84cd6 100644 --- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 @@ -3,7 +3,7 @@ ! { dg-additional-options "-O2" } ! { dg-additional-options "-fno-openacc-kernels-annotate-loops" } -! { dg-additional-options "-fopt-info-optimized-omp" } +! { dg-additional-options "-fopt-info-note-optimized-omp" } ! { dg-additional-options "-fdump-tree-ompexp" } ! { dg-additional-options "-fdump-tree-parloops1-all" } ! { dg-additional-options "-fdump-tree-oaccloops" } @@ -16,9 +16,8 @@ program main call setup(a, b) - !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) - do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } - ! { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" "" { target *-*-* } 20 } + !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + do i = 0, n - 1 ! { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" } c(i) = a(i) + b(i) end do !$acc end kernels diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index db1d2bdac3a..6465b96e455 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,3 +1,8 @@ +2021-04-07 Kwok Cheung Yeung + + * testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c: Update + additional options and expected messages. + 2021-03-25 Thomas Schwinge * target.c (__requires_mask_table, __requires_mask_table_end): Add diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c index 02cac4e661e..dd83557b6aa 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-decompose-1.c @@ -24,18 +24,18 @@ int main() #pragma acc kernels { - int c = 234; /* { dg-message "optimized: beginning 'gang-single' part in OpenACC 'kernels' region" } */ + int c = 234; /* { dg-message "note: beginning 'gang-single' part in OpenACC 'kernels' region" } */ /*TODO Hopefully, this is the same issue as '../../../gcc/testsuite/c-c++-common/goacc/kernels-decompose-ice-1.c'. */ (volatile int *) &c; #pragma acc loop independent gang /* { dg-line l_loop_i[incr c_loop_i] } */ - /* { dg-message "optimized: parallelized loop nest in OpenACC 'kernels' region" "" { target *-*-* } l_loop_i$c_loop_i } */ + /* { dg-message "note: parallelized loop nest in OpenACC 'kernels' region" "" { target *-*-* } l_loop_i$c_loop_i } */ /* { dg-optimized "assigned OpenACC gang loop parallelism" "" { target *-*-* } l_loop_i$c_loop_i } */ for (int i = 0; i < N; ++i) b[i] = c; - a = c; /* { dg-message "optimized: beginning 'gang-single' part in OpenACC 'kernels' region" } */ + a = c; /* { dg-message "note: beginning 'gang-single' part in OpenACC 'kernels' region" } */ } for (int i = 0; i < N; ++i)