From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1534) id A12BD3858D20; Fri, 27 Jan 2023 08:20:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A12BD3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674807654; bh=Xwffazk5aNGx7bTLtP5eJwtBn05IZimOVlQ++C6ABOk=; h=From:To:Subject:Date:From; b=LSEKkAP7fccaGut7VuDHhyFoM4pw8IHYER7I3WBSEZlcaTzdbNfKvE1AOiVVaZm62 nFKKw3ltKFv3Wodq3mzHDhuhn/evpxN0jLPV3HsJwLAE2Bs4nRzXOm/xqcTR5nyx8U ydCPTLs1p9cKEF5xW4MlrT2/wR2PiBYG/kJYRRrc= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tobias Burnus To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5425] gomp/declare-variant-1*.f90: Update for Windows X-Act-Checkin: gcc X-Git-Author: Tobias Burnus X-Git-Refname: refs/heads/master X-Git-Oldrev: 476efe839e069e556b4b03cf6ec8c18870867960 X-Git-Newrev: d1e0575fdc9216f96c4f88f9f41a25b854300c0b Message-Id: <20230127082054.A12BD3858D20@sourceware.org> Date: Fri, 27 Jan 2023 08:20:54 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d1e0575fdc9216f96c4f88f9f41a25b854300c0b commit r13-5425-gd1e0575fdc9216f96c4f88f9f41a25b854300c0b Author: Tobias Burnus Date: Fri Jan 27 09:13:16 2023 +0100 gomp/declare-variant-1*.f90: Update for Windows Replace target selector 'lp64' by '! ilp32' to handle Windows which uses 32bit long (and vice versa for '! lp64'). gcc/testsuite/ChangeLog: * gfortran.dg/gomp/declare-variant-10.f90: Update scan-tree's target selector to handle Windows. * gfortran.dg/gomp/declare-variant-11.f90: Likewise. * gfortran.dg/gomp/declare-variant-12.f90: Likewise. Diff: --- gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 | 4 ++-- gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 | 4 ++-- gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 index d6d2c8c262b..2f09146a10d 100644 --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-10.f90 @@ -69,8 +69,8 @@ contains #endif subroutine test2 () !$omp target - call f04 () ! { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } - ! { dg-final { scan-tree-dump-times "f04 \\\(\\\);" 1 "gimple" { target { { ! lp64 } || { ! { i?86-*-* x86_64-*-* } } } } } } + call f04 () ! { dg-final { scan-tree-dump-times "f03 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } } + ! { dg-final { scan-tree-dump-times "f04 \\\(\\\);" 1 "gimple" { target { { ilp32 } || { ! { i?86-*-* x86_64-*-* } } } } } } !$omp end target !$omp target call f16 () ! { dg-final { scan-tree-dump-times "f15 \\\(\\\);" 1 "gimple" { target ia32 } } } diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 index 60aa0fcb3b0..3593c9a5bb3 100644 --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-11.f90 @@ -126,8 +126,8 @@ contains end do !$omp end parallel do - call f27 () ! { dg-final { scan-tree-dump-times "f25 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } - ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! lp64 } } } } } + call f27 () ! { dg-final { scan-tree-dump-times "f25 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } } + ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ilp32 } } } } } ! { dg-final { scan-tree-dump-times "f24 \\\(\\\);" 1 "gimple" { target { ! { nvptx*-*-* amdgcn*-*-* i?86-*-* x86_64-*-* } } } } } ! { dg-final { scan-tree-dump-times "f27 \\\(\\\);" 1 "gimple" { target { nvptx*-*-* amdgcn*-*-* } } } } end subroutine diff --git a/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 b/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 index 610693e9807..2fd8abd0dc7 100644 --- a/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/declare-variant-12.f90 @@ -133,8 +133,8 @@ contains do i = 1, 2 !$omp parallel do ! 5 constructs in OpenMP context, arch is 2^6, isa 2^7. do j = 1, 2 - call f13 () ! { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && lp64 } } } } - ! { dg-final { scan-tree-dump-times "f11 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! lp64 } } } } } + call f13 () ! { dg-final { scan-tree-dump-times "f09 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } } + ! { dg-final { scan-tree-dump-times "f11 \\\(\\\);" 1 "gimple" { target { { i?86-*-* x86_64-*-* } && { ilp32 } } } } } ! { dg-final { scan-tree-dump-times "f10 \\\(\\\);" 1 "gimple" { target { ! { i?86-*-* x86_64-*-* } } } } } call f17 () ! { dg-final { scan-tree-dump-times "f14 \\\(\\\);" 1 "gimple" } } call f21 () ! { dg-final { scan-tree-dump-times "f19 \\\(\\\);" 1 "gimple" } }