From patchwork Fri Feb 4 13:49:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1588414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=jKu8uM0f; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JqxlD0BQtz9s9c for ; Sat, 5 Feb 2022 00:51:04 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9B8BF385841C for ; Fri, 4 Feb 2022 13:51:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B8BF385841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1643982661; bh=sdxoWhXD0vCeDbLDn4aC72dRHASicZ5Gq0V4zl6z09c=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jKu8uM0fKrZGZY4y0AWzw/+LB//9VpqB51BzRjyRco2734MQnbsQLCDfpyuWMuk34 1EqmEiiUxCjQoqL2q7yrui2w81YvOVULi/723IfEZmDqrQzIThuo/FjIhh3D98D5m0 CBj9L8OrJvlmhzMQZOjsKx+PXnZMuf32N1hoTiQE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id D15483858403 for ; Fri, 4 Feb 2022 13:49:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D15483858403 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 05925210F8 for ; Fri, 4 Feb 2022 13:49:20 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E5D3013A96 for ; Fri, 4 Feb 2022 13:49:19 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id HWX/Nt8u/WGvegAAMHmgww (envelope-from ) for ; Fri, 04 Feb 2022 13:49:19 +0000 Date: Fri, 4 Feb 2022 14:49:19 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/4] Testcase adjustments for birth CLOBBERs MIME-Version: 1.0 Message-Id: <20220204134919.E5D3013A96@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Mostly decl shuffling, using patterns to make the scans less error-prone and adjustments for now appearing birth CLOBBERs. 2022-02-02 Richard Biener * gcc.dg/pr87052.c: Adjust. * gcc.dg/tm/memopt-3.c: Likewise. * gcc.dg/torture/pta-ptrarith-1.c: Likewise. * gcc.dg/torture/pta-ptrarith-2.c: Likewise. * gcc.dg/tree-ssa/20031015-1.c: Likewise. * gcc.dg/tree-ssa/alias-19.c: Likewise. * gcc.dg/tree-ssa/dse-points-to.c: Likewise. * gcc.dg/tree-ssa/pta-callused.c: Likewise. --- gcc/testsuite/gcc.dg/pr87052.c | 3 ++- gcc/testsuite/gcc.dg/tm/memopt-3.c | 2 +- gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c | 2 +- gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c | 6 ++++-- gcc/testsuite/gcc.dg/tree-ssa/alias-19.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/dse-points-to.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/gcc.dg/pr87052.c b/gcc/testsuite/gcc.dg/pr87052.c index 18e092c4674..c67d9ae02f8 100644 --- a/gcc/testsuite/gcc.dg/pr87052.c +++ b/gcc/testsuite/gcc.dg/pr87052.c @@ -37,5 +37,6 @@ void test (void) { dg-final { scan-tree-dump-times "b = \"a\\\\x00bc\";" 1 "gimple" } } { dg-final { scan-tree-dump-times "c = \"\";" 1 "gimple" } } { dg-final { scan-tree-dump-times "d = { *};" 1 "gimple" } } - { dg-final { scan-tree-dump-times "e = " 1 "gimple" } } + { dg-final { scan-tree-dump-times "e = " 3 "gimple" } } + { dg-final { scan-tree-dump-times "e = {CLOBBER\\(birth\\)}" 2 "gimple" } } { dg-final { scan-tree-dump-times "e = {CLOBBER\\(eol\\)}" 1 "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/tm/memopt-3.c b/gcc/testsuite/gcc.dg/tm/memopt-3.c index 5316f9cae20..299494a1d2b 100644 --- a/gcc/testsuite/gcc.dg/tm/memopt-3.c +++ b/gcc/testsuite/gcc.dg/tm/memopt-3.c @@ -17,4 +17,4 @@ int f() return lala.x[0]; } -/* { dg-final { scan-tree-dump-times "logging: lala.x\\\[i_4\\\]" 1 "tmmark" } } */ +/* { dg-final { scan-tree-dump-times "logging: lala.x\\\[i_\[0-9\]+\\\]" 1 "tmmark" } } */ diff --git a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c index 85b68068b12..4e272222b12 100644 --- a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c +++ b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-1.c @@ -32,4 +32,4 @@ int main() return 0; } -/* { dg-final { scan-tree-dump "ESCAPED = {\[^\n\}\]* i f \[^\n\}\]*}" "alias" } } */ +/* { dg-final { scan-tree-dump "ESCAPED = {\[^\n\}\]* (i f|f i) \[^\n\}\]*}" "alias" } } */ diff --git a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c index 4f5556acc93..5083d6367fa 100644 --- a/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c +++ b/gcc/testsuite/gcc.dg/torture/pta-ptrarith-2.c @@ -32,4 +32,4 @@ int main() /* In theory = { i } is the correct solution. But it's not easy to scan for that reliably, so just use what we create now. */ -/* { dg-final { scan-tree-dump "= { i j }" "alias" } } */ +/* { dg-final { scan-tree-dump "= { (i j|j i) }" "alias" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c index faa6853f571..b97b4475132 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/20031015-1.c @@ -13,5 +13,7 @@ main(void) return 0; } -/* The VDEF comes from the initial assignment, the asm, and the clobber. */ -/* { dg-final { scan-tree-dump-times "DEF" 3 "alias" } } */ +/* The VDEF comes from the birth clobber, initial assignment, the asm, and + the clobber. + ??? The birth clobber is duplicate. */ +/* { dg-final { scan-tree-dump-times "DEF" 5 "alias" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c b/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c index 330ec001705..15f44a1c284 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/alias-19.c @@ -25,4 +25,4 @@ int main() return 0; } -/* { dg-final { scan-tree-dump "q_. = { a b }" "alias" } } */ +/* { dg-final { scan-tree-dump "q_. = { (a b|b a) }" "alias" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/dse-points-to.c b/gcc/testsuite/gcc.dg/tree-ssa/dse-points-to.c index 762d6720143..fced53fe50b 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/dse-points-to.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/dse-points-to.c @@ -11,4 +11,4 @@ f () return a; } -/* { dg-final { scan-tree-dump-times "Deleted dead store.*p_1" 1 "dse1"} } */ +/* { dg-final { scan-tree-dump-times "Deleted dead store: \\*p_\[0-9\]+ = 1" 1 "dse1"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c b/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c index b9a57d8d135..45826415d56 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pta-callused.c @@ -22,5 +22,5 @@ int bar (int b) return *foo (&q); } -/* { dg-final { scan-tree-dump "CALLUSED\\(\[0-9\]+\\) = { ESCAPED NONLOCAL f.* i q }" "alias" } } */ +/* { dg-final { scan-tree-dump "CALLUSED\\(\[0-9\]+\\) = { ESCAPED NONLOCAL (i f.*|f.* i) q }" "alias" } } */