From patchwork Tue Apr 11 11:22:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 81898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2494178vqo; Tue, 11 Apr 2023 04:23:08 -0700 (PDT) X-Google-Smtp-Source: AKy350anad/ZrlpPzeobXMpGKTT92o5LOdmclxT56v+m9W/SxUc0GQngnUqaJxhuClPG6/7mMvzR X-Received: by 2002:a05:6402:1857:b0:4fc:725:e670 with SMTP id v23-20020a056402185700b004fc0725e670mr11091287edy.11.1681212187803; Tue, 11 Apr 2023 04:23:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681212187; cv=none; d=google.com; s=arc-20160816; b=BIE08nNGJohp+qpYo8Ybaus4w1iyHccq0spfSzQAOHmxb2cKC4+ReUHF8Nnz8LLH0r kMhYFgEL4iqjGwgPZEPLU7ADHN+qX3+AtTLsYV9M8c76vBJpMT6k1s481PecYUKCGfWP gEwoD97SoVX22aWh3p4lRGftlZTD6CncQjbdVqGbYMjN4zL0049Sdw8dLkFYJJ2xYhym 5uHCgQyNjF9E/Gch/rTUiSO9FZAEU1EYSgaoCE199AVPgiHyyUzsYYyuHraMTTDsR/VK cJUF0a256v55yTMIS+LT6RbzM07rYClZDEOnotk0kps9LBanGlwjAFDNJfQYlVjKIHoE 3F+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to:from:cc:references :to:content-language:subject:user-agent:mime-version:date:message-id :ironport-sdr:dmarc-filter:delivered-to; bh=1HJDgNikrcw407EDMKk1/IXPiMm75GBSfMmnoY5VwhA=; b=CMK8Ya/pjtlP36OZ4ODHS/1YXYibXIlcI4Fuf7Liata2pje7IqUdP3SwOeIzPfrfcl qtakMoNi9TClrku5EQ/vX0Ro1TvpIyUz3c+YTYJnek7rqbk/8tu7q6aXkM/yZzz2d9BR poxrhaGGyAU3BqlCEchCzrY2MNFQApk2bbk/7gJdBTGLYFNcAUNslJzK3PZvqUMwYMEz V1/ZcGQ0O5pgxEKTmdKCoDvTrcGep5psRIjWWiiggN+WNto9HqXUD/0joAI2J/kMpjrv S0v9FjPhLzsOhf32LCGxxSt0u9sZjbSBiJgc6eWUyZrkypdBjr5TCb3Sln+KxGTYfoCI DpZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y21-20020a50e615000000b00504564d26d4si10877531edm.556.2023.04.11.04.23.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 04:23:07 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B787E385700B for ; Tue, 11 Apr 2023 11:22:49 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 8C6893858D20; Tue, 11 Apr 2023 11:22:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C6893858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.98,336,1673942400"; d="diff'?scan'208";a="2083659" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 11 Apr 2023 03:22:20 -0800 IronPort-SDR: pZ3ERKN+6Umx2zrBwcLycCnSZa/rTwB/qFX3AxYz8Gl7Cp1ehPuv5NtoMWgP41fR6Y+7XmJ3fP gUEFg1Zwiue7vk1KmTR3orZJUbTMZ74CnBz3USX0VswyCUZHb8PousKirN5uMoymvTOzcNQfnm 2jJp/1liUWPPJyHnjpFoIHAPe7R4t2usIe9E465NuYownvPCfMvFa533mvFyAGzuJXBzSfToy6 +UpwHeRN0O0I+xQzjmKXQT8c5Kv221FY8IlXj9WkYqJPoDwBD4wXAllHKeVgU8gaSTCTn5FlxO vl4= Message-ID: <95ba7882-b47b-0584-68cb-21cc0a7bfc77@codesourcery.com> Date: Tue, 11 Apr 2023 13:22:15 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [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\\[\\(.* ? \\+ -1\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.[0-9]+:5:1\\):d\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\]\\)" 1 on Linux/x86_64) Content-Language: en-US To: , fortran References: <202304082211.338MBjTn3654578@shliclel4214.sh.intel.com> CC: From: Tobias Burnus In-Reply-To: <202304082211.338MBjTn3654578@shliclel4214.sh.intel.com> X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762878751200136558?= X-GMAIL-MSGID: =?utf-8?q?1762878751200136558?= 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\\[\\(.* ? \\+ -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 commit b8e32978e3d9e3b88cd4f441edfdebfa395a5c26 Author: Tobias Burnus 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\\\[\\(.* ? \\+ -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\\\[.* ? \\+ -1\\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):d\\\[\\(.*i \\+ -1\\) \\* 6\\\]\\)" 1 "original" } }