[committed] gfortran.dg/gomp/affinity-clause-1.f90: Fix scan-tree-dump (was: [r13-7120 Regression] FAIL: gfortran.dg/gomp/affinity-clause-1.f90 -O scan-tree-dump-times original "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):b\\[\\(.* <?i>? \\+ -1\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):d\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\]\\)" 1 on Linux/x86_64)

[committed] gfortran.dg/gomp/affinity-clause-1.f90: Fix scan-tree-dump (was: [r13-7120 Regression] FAIL: gfortran.dg/gomp/affinity-clause-1.f90 -O scan-tree-dump-times original "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):b\\[\\(.* <?i>? \\+ -1\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):d\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\]\\)" 1 on Linux/x86_64)

[Tobias Burnus]

[-- Attachment #1: Type: text/plain, Size: 813 bytes --]

Commit r13-7137 fixes thethe dump issue with -m32, cf. attachment.

Tobias

On 09.04.23 00:11, haochen.jiang via Gcc-patches wrote:
>      Fortran: Fix dg directives and remove trailing whitespaces in testsuite
> caused
> FAIL: gfortran.dg/gomp/affinity-clause-1.f90   -O   scan-tree-dump-times original "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):b\\[\\(.* <?i>? \\+ -1\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):d\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\]\\)" 1
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Attachment #2: committed.diff --]
[-- Type: text/x-patch, Size: 1337 bytes --]

commit b8e32978e3d9e3b88cd4f441edfdebfa395a5c26
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Tue Apr 11 13:15:39 2023 +0200

    gfortran.dg/gomp/affinity-clause-1.f90: Fix scan-tree-dump
    
    Commit r13-7120-g46fe32cb4d887d44a62f9c4ff2a72532d4eb5a19 added the
    missing hyphen to 'dg-final', which exposed an -m32 pattern mismatch.
    
    gcc/testsuite/
    
            * gfortran.dg/gomp/affinity-clause-1.f90: Update scan-tree pattern
            for -m32.

diff --git a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90 b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90
index b8c7b5d68ad..32c9acef070 100644
--- a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90
@@ -27,2 +27 @@ end
-! { dg-final { scan-tree-dump-times "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):b\\\[\\(.* <?i>? \\+ -1\\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):d\\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\\]\\)"  1 "original" } }
-
+! { dg-final { scan-tree-dump-times "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):b\\\[.* <?i>? \\+ -1\\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):d\\\[\\(.*i \\+ -1\\) \\* 6\\\]\\)"  1 "original" } }

Re: [committed] gfortran.dg/gomp/affinity-clause-1.f90: Fix scan-tree-dump (was: [r13-7120 Regression] FAIL: gfortran.dg/gomp/affinity-clause-1.f90 -O scan-tree-dump-times original "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):b\\[\\(.* <?i>? \\+ -1\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):d\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\]\\)" 1 on Linux/x86_64)

[Paul Richard Thomas]

[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]

Hi Tobias,

I started applying my poor knowledge of regular expressions to fix this
last night and timed out. Thanks for doing it for me. I will look carefully
and learn from the master :-)

Is it really a regression, when a change exposes a latent bug? Never mind,
though, it's fixed.

Cheers

Paul


On Tue, 11 Apr 2023 at 12:22, Tobias Burnus <tobias@codesourcery.com> wrote:

> Commit r13-7137 fixes thethe dump issue with -m32, cf. attachment.
>
> Tobias
>
> On 09.04.23 00:11, haochen.jiang via Gcc-patches wrote:
> >      Fortran: Fix dg directives and remove trailing whitespaces in
> testsuite
> > caused
> > FAIL: gfortran.dg/gomp/affinity-clause-1.f90   -O   scan-tree-dump-times
> original "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\)
> i=D\\.[0-9]+:5:1\\):b\\[\\(.* <?i>? \\+ -1\\]\\)
> affinity\\(iterator\\(integer\\(kind=4\\)
> i=D\\.[0-9]+:5:1\\):d\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\*
> 6\\]\\)" 1
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201,
> 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer:
> Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München;
> Registergericht München, HRB 106955
>


-- 
"If you can't explain it simply, you don't understand it well enough" -
Albert Einstein