From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 118663 invoked by alias); 17 Sep 2019 17:22:18 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 118585 invoked by uid 89); 17 Sep 2019 17:22:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.1 spammy=gang, partitioned X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 Sep 2019 17:22:13 +0000 IronPort-SDR: eBBuXJ09v4dOjQvNBtp5ryIgg/8SXjMPuY1RhRFayTZjfVBjAhFeqzP0GAgDLyizuqCZWcPy1m jj9InVESw+lS/QmineuQwbdKrAHdwKOL6CeKM9XAThaS76MEhdNsX2Rn/a6p7FxanZy8oIXE5O xnQfsMKg99ZgCtwSIWFWsa3LswmywaqotCHoEOqCqmCewxK4tsn4Q5pPROM6/otyEI5+N5cOlc eacAXTrt0frpsAS1Xw1ONnHm6DYjiBhN1363P945XMw4DGXW/HR9safnGn0sL0SvLNaJoBbhP1 y9M= Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 17 Sep 2019 09:22:12 -0800 IronPort-SDR: mvx4uLLtbvJz+8V0Cy4z+mrw6khToyoYfAuaLxaeatWAeEWA9hGVw2VXOE4CODpGsqUmTVghgP OGEf+JIKbBBNkcwVx8oYfCaunh5EV/YShr2cDEB75UYodmQ+QfqooMT3p2UXoiFwUtsInjc05U jHJhg5ARKFSoSGKqkJlAzG+pPwTaxHwM53Flt7qEwfxWSwLitJph8JlFlCSToBzOwLTWfwfGz7 rT345JPnYTbGU9N8yAKZ856CrxlRAYHG7bfnc/ZMbBo0JzVV3QL8CJ4Vpz/GWf3wl6MdmdsTQp LGU= From: Julian Brown To: CC: Andrew Stubbs , Thomas Schwinge Subject: [PATCH] [og9] Update expected messages, errors and warnings for "kernels" tests Date: Tue, 17 Sep 2019 17:22:00 -0000 Message-ID: <20190917172156.111727-2-julian@codesourcery.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: julian@codesourcery.com X-IsSubscribed: yes X-SW-Source: 2019-09/txt/msg01022.txt.bz2 This patch updates some expected message/warning/error output in OpenACC tests, mostly those testing "kernels" functionality. I will apply to the openacc-gcc-9-branch shortly. Julian ChangeLog gcc/testsuite/ * c-c++-common/goacc/classify-kernels-unparallelized.c: Update expected message/warning/error output. * c-c++-common/goacc/classify-kernels.c: Likewise. * c-c++-common/goacc/kernels-decompose.c: Likewise. * c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c: Likewise. * c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c: Likewise. * c-c++-common/goacc/note-parallelism-kernels-loop-auto.c: Likewise. * c-c++-common/goacc/routine-1.c: Likewise. * c-c++-common/goacc/routine-4-extern.c: Likewise. --- gcc/testsuite/ChangeLog.openacc | 13 +++++++ .../goacc/classify-kernels-unparallelized.c | 2 +- .../c-c++-common/goacc/classify-kernels.c | 2 +- .../c-c++-common/goacc/kernels-decompose-1.c | 12 +++---- .../note-parallelism-1-kernels-loop-auto.c | 36 +++++++++---------- ...note-parallelism-1-kernels-straight-line.c | 2 +- ...e-parallelism-combined-kernels-loop-auto.c | 20 +++++------ .../note-parallelism-kernels-loop-auto.c | 36 +++++++++---------- gcc/testsuite/c-c++-common/goacc/routine-1.c | 2 +- .../c-c++-common/goacc/routine-4-extern.c | 8 ++--- 10 files changed, 73 insertions(+), 60 deletions(-) diff --git a/gcc/testsuite/ChangeLog.openacc b/gcc/testsuite/ChangeLog.openacc index 899b9cf1783..6faedb6866a 100644 --- a/gcc/testsuite/ChangeLog.openacc +++ b/gcc/testsuite/ChangeLog.openacc @@ -1,3 +1,16 @@ +2019-09-17 Julian Brown + + * c-c++-common/goacc/classify-kernels-unparallelized.c: Update expected + message/warning/error output. + * c-c++-common/goacc/classify-kernels.c: Likewise. + * c-c++-common/goacc/kernels-decompose.c: Likewise. + * c-c++-common/goacc/note-parallelism-1-kernels-loop-auto.c: Likewise. + * c-c++-common/goacc/note-parallelism-combined-kernels-loop-auto.c: + Likewise. + * c-c++-common/goacc/note-parallelism-kernels-loop-auto.c: Likewise. + * c-c++-common/goacc/routine-1.c: Likewise. + * c-c++-common/goacc/routine-4-extern.c: Likewise. + 2019-09-05 Julian Brown * c-c++-common/goacc/classify-kernels-unparallelized.c, 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 f05fba9d31b..32af5330e44 100644 --- a/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized.c +++ b/gcc/testsuite/c-c++-common/goacc/classify-kernels-unparallelized.c @@ -19,7 +19,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++) + for (unsigned int i = 0; i < N; i++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ /* 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 009db79b018..93e64066b92 100644 --- a/gcc/testsuite/c-c++-common/goacc/classify-kernels.c +++ b/gcc/testsuite/c-c++-common/goacc/classify-kernels.c @@ -16,7 +16,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++) + for (unsigned int i = 0; i < N; i++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ c[i] = a[i] + b[i]; } diff --git a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-1.c b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-1.c index 076d7611980..feee09e9e39 100644 --- a/gcc/testsuite/c-c++-common/goacc/kernels-decompose-1.c +++ b/gcc/testsuite/c-c++-common/goacc/kernels-decompose-1.c @@ -36,30 +36,30 @@ main () ; } -#pragma acc kernels +#pragma acc kernels /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ for (int i = 0; i < N; i++) /* { dg-message "optimized: beginning .parloops. region in OpenACC .kernels. construct" } */ a[i] = 0; -#pragma acc kernels loop +#pragma acc kernels loop /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (int i = 0; i < N; i++) b[i] = a[N - i - 1]; #pragma acc kernels { -#pragma acc loop +#pragma acc loop /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (int i = 0; i < N; i++) b[i] = a[N - i - 1]; -#pragma acc loop +#pragma acc loop /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (int i = 0; i < N; i++) c[i] = a[i] * b[i]; a[z] = 0; /* { dg-message "optimized: beginning .gang-single. region in OpenACC .kernels. construct" } */ -#pragma acc loop +#pragma acc loop /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (int i = 0; i < N; i++) c[i] += a[i]; @@ -70,7 +70,7 @@ main () c[i] += c[i - 1]; } -#pragma acc kernels +#pragma acc kernels /* { dg-message "optimized: assigned OpenACC worker vector loop parallelism" } */ { #pragma acc loop independent /* { dg-message "optimized: assigned OpenACC gang loop parallelism" } */ /* { dg-message "optimized: parallelized loop nest in OpenACC .kernels. construct" "" { target *-*-* } .-1 } */ 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 41352e814e9..5268fd1586e 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 @@ -15,68 +15,68 @@ main () #pragma acc kernels /* Strangely indented to keep this similar to other test cases. */ { -#pragma acc loop /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto gang /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto worker /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto gang vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto gang worker /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto worker vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto gang worker vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto gang /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) -#pragma acc loop auto worker +#pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (y = 0; y < 10; y++) -#pragma acc loop auto vector +#pragma acc loop auto vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (z = 0; z < 10; z++) ; -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct 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: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -85,7 +85,7 @@ main () for (z = 0; z < 10; z++) ; -#pragma acc loop /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -94,7 +94,7 @@ main () for (z = 0; z < 10; z++) ; -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop @@ -103,7 +103,7 @@ main () for (z = 0; z < 10; z++) ; -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -112,7 +112,7 @@ main () for (z = 0; z < 10; z++) ; -#pragma acc loop /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto 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 581068391f2..09b58e22f2f 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 @@ -27,7 +27,7 @@ main () { int x, y, z; -#pragma acc kernels /* { dg-warning "region contains gang partitoned code but is not gang partitioned" } */ +#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" } */ y = x < 10; 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 0a35f9597d2..806ccc793fb 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 @@ -16,47 +16,47 @@ main () for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto gang /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto worker /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto gang vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto gang worker /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto worker vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto gang worker vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; -#pragma acc kernels loop auto gang /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) -#pragma acc loop auto worker +#pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (y = 0; y < 10; y++) -#pragma acc loop auto vector +#pragma acc loop auto vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (z = 0; z < 10; z++) ; 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 b7593d36dbf..1fe1f2900ce 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 @@ -13,71 +13,71 @@ main () int x, y, z; #pragma acc kernels -#pragma acc loop /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto gang /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto worker /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto gang vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto gang worker /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto worker vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto gang worker vector /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto gang /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#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 } */ for (x = 0; x < 10; x++) -#pragma acc loop auto worker +#pragma acc loop auto worker /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (y = 0; y < 10; y++) -#pragma acc loop auto vector +#pragma acc loop auto vector /* { dg-error ".auto. conflicts with other OpenACC loop specifiers" } */ for (z = 0; z < 10; z++) ; #pragma acc kernels -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) ; #pragma acc kernels -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -85,7 +85,7 @@ main () ; #pragma acc kernels -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -95,7 +95,7 @@ main () ; #pragma acc kernels -#pragma acc loop /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -105,7 +105,7 @@ main () ; #pragma acc kernels -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop @@ -115,7 +115,7 @@ main () ; #pragma acc kernels -#pragma acc loop auto /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop auto /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto @@ -125,7 +125,7 @@ main () ; #pragma acc kernels -#pragma acc loop /* { dg-message "optimized: assigned OpenACC seq loop parallelism" } */ +#pragma acc loop /* { dg-message "optimized: forwarded loop nest in OpenACC .kernels. construct to .parloops. for analysis" "" { target *-*-* } .-1 } */ for (x = 0; x < 10; x++) #pragma acc loop auto diff --git a/gcc/testsuite/c-c++-common/goacc/routine-1.c b/gcc/testsuite/c-c++-common/goacc/routine-1.c index d68daaaa1dd..e32398d3649 100644 --- a/gcc/testsuite/c-c++-common/goacc/routine-1.c +++ b/gcc/testsuite/c-c++-common/goacc/routine-1.c @@ -27,7 +27,7 @@ void nohost (void) int main () { -#pragma acc kernels num_gangs (32) num_workers (32) vector_length (32) /* { dg-warning "region contains gang partitoned code but is not gang partitioned" } */ +#pragma acc kernels num_gangs (32) num_workers (32) vector_length (32) /* { dg-warning "region contains gang partitioned code but is not gang partitioned" } */ { gang (); worker (); diff --git a/gcc/testsuite/c-c++-common/goacc/routine-4-extern.c b/gcc/testsuite/c-c++-common/goacc/routine-4-extern.c index ec21db1c319..c23ddcf784e 100644 --- a/gcc/testsuite/c-c++-common/goacc/routine-4-extern.c +++ b/gcc/testsuite/c-c++-common/goacc/routine-4-extern.c @@ -32,7 +32,7 @@ void seq (void) for (int i = 0; i < 10; i++) red ++; -#pragma acc loop gang reduction (+:red) // { dg-error "disallowed by containing routine" } +#pragma acc loop gang reduction (+:red) // { dg-error "gang reduction on an orphan loop" } for (int i = 0; i < 10; i++) red ++; @@ -58,7 +58,7 @@ void vector (void) for (int i = 0; i < 10; i++) red ++; -#pragma acc loop gang reduction (+:red) // { dg-error "disallowed by containing routine" } +#pragma acc loop gang reduction (+:red) // { dg-error "gang reduction on an orphan loop" } for (int i = 0; i < 10; i++) red ++; @@ -84,7 +84,7 @@ void worker (void) for (int i = 0; i < 10; i++) red ++; -#pragma acc loop gang reduction (+:red) // { dg-error "disallowed by containing routine" } +#pragma acc loop gang reduction (+:red) // { dg-error "gang reduction on an orphan loop" } for (int i = 0; i < 10; i++) red ++; @@ -110,7 +110,7 @@ void gang (void) for (int i = 0; i < 10; i++) red ++; -#pragma acc loop gang reduction (+:red) +#pragma acc loop gang reduction (+:red) /* { dg-error "gang reduction on an orphan loop" } */ for (int i = 0; i < 10; i++) red ++; -- 2.22.0