Hi Kwok!
On 2020-07-22T15:17:13+0100, Kwok Cheung Yeung <k...@codesourcery.com> wrote:
> gcc.dg/goacc/loop-processing-1.c fails mainly because the dg-final directive
> at
> the end has been incorrectly split into two lines, which breaks it completely.
> The pass that emits the tested tree output is now oaccloops, not oaccdevlow.
>
> '.UNIQUE (OACC_HEAD_MARK, 0, 1, 36)' is also changed to '.UNIQUE
> (OACC_HEAD_MARK, 0, 1, 68)'. This is due to OLF_DIM_BASE being raised from 5
> to
> 6 in the patch 'Various OpenACC reduction enhancements - ME and nvptx changes'
> (commit 59399e6736d18ded9ce91dbd3ca44c1f8280d452).
>
> This patch fixes these issues. Okay for OG10?
Thanks, OK.
> From 22e91315f3ce7c486017c6b9245dc1ea2d6bdede Mon Sep 17 00:00:00 2001
> From: Kwok Cheung Yeung <k...@codesourcery.com>
> Date: Fri, 19 Jun 2020 06:58:40 -0700
> Subject: [PATCH 3/6] Fix broken testcase gcc.dg/goacc/loop-processing-1.c
>
> 2020-07-21 Kwok Cheung Yeung <k...@codesourcery.com>
>
> gcc/testsuite/
> * gcc.dg/goacc/loop-processing-1.c: Remove erroneous line-break.
> Specify correct tree pass for output. Fix expected constant values.
The commit log should note that this fixes the spurious linebreak
introduced in og10 commit 6a0b5806b24bfdefe0b0f3ccbcc51299e5195dca
"Various OpenACC reduction enhancements - test cases", and similar for
the other adjustments. Or leave that out if that's too much effort for
too little gain.
> gcc/testsuite/gcc.dg/goacc/loop-processing-1.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/gcc/testsuite/gcc.dg/goacc/loop-processing-1.c
> b/gcc/testsuite/gcc.dg/goacc/loop-processing-1.c
> index 296b61d..9a64f1a 100644
> --- a/gcc/testsuite/gcc.dg/goacc/loop-processing-1.c
> +++ b/gcc/testsuite/gcc.dg/goacc/loop-processing-1.c
> @@ -1,5 +1,5 @@
> /* Make sure that OpenACC loop processing happens. */
> -/* { dg-additional-options "-O2 -fdump-tree-oaccdevlow" } */
> +/* { dg-additional-options "-O2 -fdump-tree-oaccloops" } */
>
> extern int place ();
>
> @@ -15,5 +15,4 @@ void vector_1 (int *ary, int size)
> }
> }
>
> -/* { dg-final { scan-tree-dump {
> -OpenACC loops.*Loop 0\(0\).*Loop [0-9]{2}\(1\).*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_HEAD_MARK, 0, 1, 36\);.*Head-0:.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_HEAD_MARK, 0, 1, 36\);.*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_FORK, \.data_dep\.[0-9_]+, 0\);.*Tail-0:.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_TAIL_MARK, \.data_dep\.[0-9_]+, 1\);.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_JOIN, \.data_dep\.[0-9_]+, 0\);.*Loop
> 6\(6\).*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_HEAD_MARK, 0, 2,
> 6\);.*Head-0:.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_HEAD_MARK, 0, 2,
> 6\);.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_FORK, \.data_dep\.[0-9_]+,
> 1\);.*Head-1:.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_HEAD_MARK,
> \.data_dep\.[0-9_]+, 1\);.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_FORK,
> \.data_dep\.[0-9_]+, 2\);.*Tail-1:.*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_TAIL_MARK, \.data_dep\.[0-9_]+, 2\);.*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_JOIN, \.data_dep\.[0-9_]+, 2\);.*Tail-0:.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_TAIL_MARK, \.data_dep\.[0-9_]+, 1\);.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_JOIN, \.data_dep\.[0-9_]+, 1\);} "oaccdevlow" } } */
> +/* { dg-final { scan-tree-dump {OpenACC loops.*Loop 0\(0\).*Loop
> [0-9]{2}\(1\).*.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_HEAD_MARK, 0, 1,
> 68\);.*Head-0:.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_HEAD_MARK, 0, 1,
> 68\);.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_FORK, \.data_dep\.[0-9_]+,
> 0\);.*Tail-0:.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_TAIL_MARK,
> \.data_dep\.[0-9_]+, 1\);.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_JOIN,
> \.data_dep\.[0-9_]+, 0\);.*Loop 6\(6\).*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_HEAD_MARK, 0, 2, 6\);.*Head-0:.*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_HEAD_MARK, 0, 2, 6\);.*\.data_dep\.[0-9_]+ = \.UNIQUE \(OACC_FORK,
> \.data_dep\.[0-9_]+, 1\);.*Head-1:.*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_HEAD_MARK, \.data_dep\.[0-9_]+, 1\);.*\.data_dep\.[0-9_]+ = \.UNIQUE
> \(OACC_FORK, \.data_dep\.[0-9_]+, 2\);.*Tail-1:.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_TAIL_MARK, \.data_dep\.[0-9_]+, 2\);.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_JOIN, \.data_dep\.[0-9_]+, 2\);.*Tail-0:.*\.data_dep\.[0-9_]+
> = \.UNIQUE \(OACC_TAIL_MARK, \.data_dep\.[0-9_]+, 1\);.*\.data_dep\.[0-9_]+ =
> \.UNIQUE \(OACC_JOIN, \.data_dep\.[0-9_]+, 1\);} "oaccloops" } } */
> \ No newline at end of file
Please add that "newline at end of file".
Grüße
Thomas
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander
Walter
