From patchwork Wed Jan 26 14:49:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 50452 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 27A3E3865C20 for ; Wed, 26 Jan 2022 14:49:50 +0000 (GMT) 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 7BAD83858411 for ; Wed, 26 Jan 2022 14:49:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BAD83858411 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz 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 358F621112; Wed, 26 Jan 2022 14:49:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1643208571; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mUra9WXgp3sUXjzD1XyPpW9zPdgIbZIltIhvcOLEW0=; b=2NLeLblAmig/zofgtZuze6pXeN5qlCFefuGJJvDiHseG0T/4XVAAJY5L7MRMHxlvP0MJtX zMuCsDdlJ4TMSquHihSdz3Nvf74FL0bhUfCZ/zfx0MXb5I4Aq1LGFz5459FQgKmsuHkkkE rlX4MFXgezmNCg/jDwr8tmxL5pb8iTY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1643208571; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mUra9WXgp3sUXjzD1XyPpW9zPdgIbZIltIhvcOLEW0=; b=FJFzcBhskfQ+P7+H9ToCWtfzPB1lmp8WgWzxCQ2LsNrIAIdoCYBauh5aGDeR9Myb8UsqAB FVO6Lh8cDoKrSxAQ== 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 1FB2E13A67; Wed, 26 Jan 2022 14:49:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8WVaBntf8WFnCgAAMHmgww (envelope-from ); Wed, 26 Jan 2022 14:49:31 +0000 Message-ID: <0adb07f4-1334-468d-f688-c8f2732c8ad5@suse.cz> Date: Wed, 26 Jan 2022 15:49:30 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH] IPA mod-ref: fix usage of --param names in dump messages. To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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: , Cc: Jan Hubicka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The patch fixed bad --param param=foo names. Patch can bootstrap on x86_64-linux-gnu and survives regression tests. Ready to be installed? Thanks, Martin gcc/ChangeLog: * ipa-modref-tree.cc (modref_access_node::update): Remove "--param param=foo" with "--param foo". (modref_access_node::insert): Likewise. (modref_access_node::insert_kill): Likewise. * ipa-modref-tree.h (struct modref_ref_node): Likewise. (struct modref_base_node): Likewise. (struct modref_tree): Likewise. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/modref-7.c: Update scanned patterns. * gcc.dg/tree-ssa/modref-8.c: Likewise. --- gcc/ipa-modref-tree.cc | 10 ++++------ gcc/ipa-modref-tree.h | 9 ++++----- gcc/testsuite/gcc.dg/tree-ssa/modref-7.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/modref-8.c | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gcc/ipa-modref-tree.cc b/gcc/ipa-modref-tree.cc index 97e497accf2..828994f3536 100644 --- a/gcc/ipa-modref-tree.cc +++ b/gcc/ipa-modref-tree.cc @@ -130,8 +130,7 @@ modref_access_node::update (poly_int64 parm_offset1, else { if (dump_file) - fprintf (dump_file, - "--param param=modref-max-adjustments limit reached:"); + fprintf (dump_file, "--param modref-max-adjustments limit reached:"); if (!known_eq (parm_offset, parm_offset1)) { if (dump_file) @@ -594,11 +593,11 @@ modref_access_node::insert (vec *&accesses, return -1; if (dump_file && best2 >= 0) fprintf (dump_file, - "--param param=modref-max-accesses limit reached;" + "--param modref-max-accesses limit reached;" " merging %i and %i\n", best1, best2); else if (dump_file) fprintf (dump_file, - "--param param=modref-max-accesses limit reached;" + "--param modref-max-accesses limit reached;" " merging with %i\n", best1); modref_access_node::try_merge_with (accesses, best1); if (best2 >= 0) @@ -825,8 +824,7 @@ modref_access_node::insert_kill (vec &kills, if ((int)kills.length () >= param_modref_max_accesses) { if (dump_file) - fprintf (dump_file, - "--param param=modref-max-accesses limit reached:"); + fprintf (dump_file, "--param modref-max-accesses limit reached:"); return false; } a.adjustments = 0; diff --git a/gcc/ipa-modref-tree.h b/gcc/ipa-modref-tree.h index edb3b49374a..fdaa9612e9a 100644 --- a/gcc/ipa-modref-tree.h +++ b/gcc/ipa-modref-tree.h @@ -197,8 +197,7 @@ struct GTY((user)) modref_ref_node { if (dump_file) fprintf (dump_file, - "--param param=modref-max-accesses limit reached;" - " collapsing\n"); + "--param modref-max-accesses limit reached; collapsing\n"); collapse (); } return ret != 0; @@ -252,7 +251,7 @@ struct GTY((user)) modref_base_node if (ref && refs && refs->length () >= max_refs) { if (dump_file) - fprintf (dump_file, "--param param=modref-max-refs limit reached;" + fprintf (dump_file, "--param modref-max-refs limit reached;" " using 0\n"); ref = 0; ref_node = search (ref); @@ -344,12 +343,12 @@ struct GTY((user)) modref_tree if (base_node) { if (dump_file) - fprintf (dump_file, "--param param=modref-max-bases" + fprintf (dump_file, "--param modref-max-bases" " limit reached; using ref\n"); return base_node; } if (dump_file) - fprintf (dump_file, "--param param=modref-max-bases" + fprintf (dump_file, "--param modref-max-bases" " limit reached; using 0\n"); base = 0; base_node = search (base); diff --git a/gcc/testsuite/gcc.dg/tree-ssa/modref-7.c b/gcc/testsuite/gcc.dg/tree-ssa/modref-7.c index 53ffa1c394c..b55d7066b22 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/modref-7.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/modref-7.c @@ -10,4 +10,4 @@ int test(struct a *a, int p) a->array[0] = 1; } /* All three accesses combine to one bigger access. */ -/* { dg-final { scan-tree-dump-not "param=modref-max-accesses" "modref1" } } */ +/* { dg-final { scan-tree-dump-not "--param modref-max-accesses" "modref1" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/modref-8.c b/gcc/testsuite/gcc.dg/tree-ssa/modref-8.c index 4a18e34cd16..c51590ff0ba 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/modref-8.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/modref-8.c @@ -17,8 +17,8 @@ recurse (char *p, int n) if (n) recurse (p+1,n-1); } -/* { dg-final { scan-tree-dump-not "param=modref-max-accesses" "modref1" } } */ -/* { dg-final { scan-tree-dump "param=modref-max-adjustments" "modref1" } } */ +/* { dg-final { scan-tree-dump-not "--param modref-max-accesses" "modref1" } } */ +/* { dg-final { scan-tree-dump "--param modref-max-adjustments" "modref1" } } */ /* In set all accesses should merge together. */ /* { dg-final { scan-tree-dump "access: Parm 0 param offset:0 offset:0 size:8 max_size:40" "modref1" } } */ /* In recurse we should cap the recrusion after 8 attempts and set max_size to -1. */