From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id 6C5183857BA6; Thu, 6 Oct 2022 09:08:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C5183857BA6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665047309; bh=k4JiLxulA4l0tf7GfCDxZWmbCdUod0A9YHb0phW01QA=; h=From:To:Subject:Date:From; b=r1NzhBrOhcrqJRmPkpbRe1h7o1TS01RPcFeBXziOmEmBEZkWZOpbJevWWM6XLlEE8 sX1zjiUEk4+Y70vUETiUXcn9d7kypzKxlQMcEg5gfR+RpKsQujcLt1ra9kBXwiJ8f9 9lYQ4DJpbb5dPmTC0RAgKBKiYKrEvFr/jZ+5XzBc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-12] gfortran.dg/gomp/{depend-5, scope-6}.f90: Update scan-tree-dump X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/devel/omp/gcc-12 X-Git-Oldrev: 014fc7cd451b59c1ce36ed0c1791b86f85162ea0 X-Git-Newrev: 21c806f73fcda7dc8c6461b29bc9f66ce4bf659c Message-Id: <20221006090829.6C5183857BA6@sourceware.org> Date: Thu, 6 Oct 2022 09:08:29 +0000 (GMT) List-Id: https://gcc.gnu.org/g:21c806f73fcda7dc8c6461b29bc9f66ce4bf659c commit 21c806f73fcda7dc8c6461b29bc9f66ce4bf659c Author: Tobias Burnus Date: Thu Oct 6 10:58:23 2022 +0200 gfortran.dg/gomp/{depend-5,scope-6}.f90: Update scan-tree-dump gcc/testsuite/ * gfortran.dg/gomp/depend-5.f90: Update scan-tree-dump. * gfortran.dg/gomp/scope-6.f90: Likewise. Diff: --- gcc/testsuite/ChangeLog.omp | 11 +++++++++++ gcc/testsuite/gfortran.dg/gomp/depend-5.f90 | 13 ++++++++----- gcc/testsuite/gfortran.dg/gomp/scope-6.f90 | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index 0fad6f7d103..f9cd0ba390e 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,14 @@ +2022-10-06 Tobias Burnus + + * gfortran.dg/gomp/depend-5.f90: Update scan-tree-dump. + * gfortran.dg/gomp/scope-6.f90: Likewise. + +2022-10-05 Tobias Burnus + + * gfortran.dg/gomp/affinity-clause-1.f90: Update pattern for + different array-reference handling in OG12. + * gfortran.dg/gomp/uses_allocators-3.f90: Fix dg-error string. + 2022-10-05 Tobias Burnus Backport from mainline: diff --git a/gcc/testsuite/gfortran.dg/gomp/depend-5.f90 b/gcc/testsuite/gfortran.dg/gomp/depend-5.f90 index 4cbe3d47d02..820b260f615 100644 --- a/gcc/testsuite/gfortran.dg/gomp/depend-5.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/depend-5.f90 @@ -72,11 +72,14 @@ end ! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\*dosa\\)" 1 "original" } } ! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:aa\\\[1\\\]\\)" 1 "original" } } -! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=\[0-9\]+\\)\\\[0:\\\] \\* restrict\\) aaa.data\\)\\\[aaa.offset \\+ 2\\\]\\)" 1 "original" } } +! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(\\(integer\\(kind=\[0-9\]+\\) \\*\\) aaa.data \\+ \\(sizetype\\) \\(\\(aaa.offset \\+ 2\\\) \\* (?:8|16)\\)" 1 "original" } } ! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=\[0-9\]+\\) \\*\\) \\(aap.data \\+ \\(sizetype\\) \\(\\(aap.offset \\+ aap.dim\\\[0\\\].stride \\* 2\\) \\* aap.span\\)\\)\\)" 1 "original" } } -! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*daa\\)\\\[1\\\]\\)" 1 "original" } } -! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=\[0-9\]+\\)\\\[0:\\\] \\* restrict\\) daaa->data\\)\\\[daaa->offset \\+ 2\\\]\\)" 1 "original" } } +! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(\\(integer\\(kind=\[0-9\]+\\) \\*\\) daa \\+ (?:8|16)\\)\\)" 1 "original" } } + + +! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(\\(integer\\(kind=\[0-9\]+\\) \\*\\) daaa->data \\+ \\(sizetype\\) \\(\\(daaa->offset \\+ 2\\\) \\* (?:8|16)\\)" 1 "original" } } ! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=\[0-9\]+\\) \\*\\) \\(daap->data \\+ \\(sizetype\\) \\(\\(daap->offset \\+ daap->dim\\\[0\\\].stride \\* 2\\) \\* daap->span\\)\\)\\)" 1 "original" } } -! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*doaa\\)\\\[1\\\]\\)" 1 "original" } } -! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\(\\*\\(integer\\(kind=\[0-9\]+\\)\\\[0:\\\] \\* restrict\\) doaaa->data\\)\\\[doaaa->offset \\+ 2\\\]\\)" 1 "original" } } +! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(\\(integer\\(kind=\[0-9\]+\\) \\*\\) doaa \\+ (?:8|16)\\)\\)" 1 "original" } } +! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(\\(integer\\(kind=\[0-9\]+\\) \\*\\) doaaa->data \\+ \\(sizetype\\) \\(\\(doaaa->offset \\+ 2\\\) \\* (?:8|16)\\)" 1 "original" } } + ! { dg-final { scan-tree-dump-times "#pragma omp task depend\\(depobj:\\*\\(integer\\(kind=\[0-9\]+\\) \\*\\) \\(doaap->data \\+ \\(sizetype\\) \\(\\(doaap->offset \\+ doaap->dim\\\[0\\\].stride \\* 2\\) \\* doaap->span\\)\\)\\)" 1 "original" } } diff --git a/gcc/testsuite/gfortran.dg/gomp/scope-6.f90 b/gcc/testsuite/gfortran.dg/gomp/scope-6.f90 index 4c4f5e034f7..39a65904c33 100644 --- a/gcc/testsuite/gfortran.dg/gomp/scope-6.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/scope-6.f90 @@ -20,4 +20,4 @@ contains end end -! { dg-final { scan-tree-dump "omp scope private\\(a\\) firstprivate\\(b\\) reduction\\(\\+:c\\) allocate\\(allocator\\(D\\.\[0-9\]+\\):a\\) allocate\\(allocator\\(D\\.\[0-9\]+\\):b\\) allocate\\(allocator\\(D\\.\[0-9\]+\\):c\\)" "original" } } +! { dg-final { scan-tree-dump "omp scope private\\(a\\) firstprivate\\(b\\) reduction\\(\\+:c\\) allocate\\(allocator\\(h\\):a\\) allocate\\(allocator\\(h\\):b\\) allocate\\(allocator\\(h\\):c\\)" "original" } }