From patchwork Wed Apr 3 11:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1919211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=maI5eXlg; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ndshQ8o7; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V8hn62vdJz23tf for ; Wed, 3 Apr 2024 22:08:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5C10E384641E for ; Wed, 3 Apr 2024 11:08:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 5FB3C3847700 for ; Wed, 3 Apr 2024 11:07:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5FB3C3847700 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5FB3C3847700 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712142464; cv=none; b=NYSZlzexmD2tGtwT3sV714aHb7ua/xLTPY7a/OhxMlPSNNh01KJZUCNhqNbImnmMukI7h0QY+fuvE2Wfk8YscwG5snkAs0B6beDMJ5YYOXDcivuvchGZDF84MTKMABwm/bV+gVXF4EOUjAEuw7Nzt57oFMrX0WgA4G8SFK30+JY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712142464; c=relaxed/simple; bh=ejPFyH1PktN+ILvXZ04PtTeMXWIQWfgCMPfPAQi1bU0=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:MIME-Version; b=WBaNb/B280mzk0mBIAyL3cOjfEWtt9SL4uZklbi9W6qndJxqB74OaMJzL4LWgSARsm7+6IUb/ql49pBj31OOCoCY7jJ4LjA1J5Dv4yDTxwVnK/99xMOr/UXzmlgMlqSfyPposqfHgB0zT9WBYdeP6KeBRW9BlgQmDd1Yt86XTjs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.5.241] (unknown [10.168.5.241]) (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 smtp-out2.suse.de (Postfix) with ESMTPS id 414BD5CB78; Wed, 3 Apr 2024 11:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1712142461; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=gbQCBngwE5zeUYor4tua9QVSqLg2PZix54sraFDVI4Q=; b=maI5eXlgZF2DLrwG4gKnD6UtfOY/r60LUuNvL0vTe6Hlrta9vqLCEGGudR/KNr9/bxvOF2 D+sQx1uxtKsfOBUjia6NMoshyocltcZvkAVY9i4AG7+Dw8jaAnwCN6othzGnzkTjOavBVy piaNBWuVHnZ4oGn3uE04ulswjC5RO/o= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1712142461; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=gbQCBngwE5zeUYor4tua9QVSqLg2PZix54sraFDVI4Q=; b=ndshQ8o7i0UgAnQV8XGHmXe6bWkujkFo7osoLbw00AEw33H41yU5nGYIUNPDREZHDAUZ/h v8lDGLhQR7bBQsDA== Authentication-Results: smtp-out2.suse.de; none Date: Wed, 3 Apr 2024 13:07:41 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek , segher@kernel.crashing.org, jeffreyalaw@gmail.com Subject: [PATCH] rtl-optimization/101523 - avoid re-combine after noop 2->2 combination MIME-Version: 1.0 X-Spam-Score: 5.08 X-Spamd-Result: default: False [5.08 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(3.00)[0.999]; NEURAL_HAM_LONG(-0.30)[-0.300]; TO_DN_SOME(0.00)[]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[redhat.com,kernel.crashing.org,gmail.com]; BAYES_HAM(-0.01)[51.41%] X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Message-Id: <20240403110808.5C10E384641E@sourceware.org> The following avoids re-walking and re-combining the instructions between i2 and i3 when the pattern of i2 doesn't change. Bootstrap and regtest running ontop of a reversal of r14-9692-g839bc42772ba7a. It brings down memory use frmo 9GB to 400MB and compile-time from 80s to 3.5s. r14-9692-g839bc42772ba7a does better in both metrics but has shown code generation regressions across acrchitectures. OK to revert r14-9692-g839bc42772ba7a? OK to install this instead? Thanks, Richard. PR rtl-optimization/101523 * combine.cc (try_combine): When the pattern of i2 doesn't change do not re-start combining at i2 or an earlier insn which had links or notes added. --- gcc/combine.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gcc/combine.cc b/gcc/combine.cc index a4479f8d836..ff25752cac4 100644 --- a/gcc/combine.cc +++ b/gcc/combine.cc @@ -4186,6 +4186,10 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, adjust_for_new_dest (i3); } + bool i2_unchanged = false; + if (rtx_equal_p (newi2pat, PATTERN (i2))) + i2_unchanged = true; + /* We now know that we can do this combination. Merge the insns and update the status of registers and LOG_LINKS. */ @@ -4752,6 +4756,9 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, combine_successes++; undo_commit (); + if (i2_unchanged) + return i3; + rtx_insn *ret = newi2pat ? i2 : i3; if (added_links_insn && DF_INSN_LUID (added_links_insn) < DF_INSN_LUID (ret)) ret = added_links_insn;