From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 7B660386CE40 for ; Thu, 30 Jun 2022 08:38:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7B660386CE40 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 439C31F8DD for ; Thu, 30 Jun 2022 08:38:26 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 3DC212C142 for ; Thu, 30 Jun 2022 08:38:26 +0000 (UTC) Date: Thu, 30 Jun 2022 08:38:26 +0000 (UTC) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Avoid computing RPO for update_ssa User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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, T_SCC_BODY_TEXT_LINE 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: , X-List-Received-Date: Thu, 30 Jun 2022 08:38:28 -0000 Message-ID: <20220630083826.XHS5KmAJ8c25j1pf2rX7lZUuLpae2utPMeBtP1NQQ_4@z> At some point when domwalk got the ability to use RPO for ordering dominator children we carefully avoided update_ssa eating the cost of RPO compute. Unfortunately some later consolidation of CTORs lost this again so the following makes this explicit via a special value to the bb_index_to_rpo argument of domwalk, speeding up update_ssa again. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. * domwalk.h (dom_walker::dom_walker): Update comment to reflect reality and new special argument value for bb_index_to_rpo. * domwalk.cc (dom_walker::dom_walker): Recognize -1 bb_index_to_rpo. * tree-into-ssa.cc (rewrite_update_dom_walker::rewrite_update_dom_walker): Tell dom_walker to not use RPO. --- gcc/domwalk.cc | 6 ++++-- gcc/domwalk.h | 5 +++-- gcc/tree-into-ssa.cc | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gcc/domwalk.cc b/gcc/domwalk.cc index d633088dff3..e36e9eb8b55 100644 --- a/gcc/domwalk.cc +++ b/gcc/domwalk.cc @@ -191,7 +191,8 @@ dom_walker::dom_walker (cdi_direction direction, m_reachability (reachability), m_user_bb_to_rpo (bb_index_to_rpo != NULL), m_unreachable_dom (NULL), - m_bb_to_rpo (bb_index_to_rpo) + m_bb_to_rpo (bb_index_to_rpo == (int *)(uintptr_t)-1 + ? NULL : bb_index_to_rpo) { } @@ -272,7 +273,8 @@ void dom_walker::walk (basic_block bb) { /* Compute the basic-block index to RPO mapping lazily. */ - if (!m_bb_to_rpo + if (!m_user_bb_to_rpo + && !m_bb_to_rpo && m_dom_direction == CDI_DOMINATORS) { int *postorder = XNEWVEC (int, n_basic_blocks_for_fn (cfun)); diff --git a/gcc/domwalk.h b/gcc/domwalk.h index 17ddc1b83df..b71d29400ad 100644 --- a/gcc/domwalk.h +++ b/gcc/domwalk.h @@ -62,8 +62,9 @@ public: /* You can provide a mapping of basic-block index to RPO if you have that readily available or you do multiple walks. If you - specify NULL as BB_INDEX_TO_RPO dominator children will not be - walked in RPO order. */ + specify NULL as BB_INDEX_TO_RPO this mapping will be computed + lazily at walk time. If you specify -1 dominator children will + not be walked in RPO order. */ dom_walker (cdi_direction direction, enum reachability = ALL_BLOCKS, int *bb_index_to_rpo = NULL); diff --git a/gcc/tree-into-ssa.cc b/gcc/tree-into-ssa.cc index f9655ce1a28..c4e40e8fb08 100644 --- a/gcc/tree-into-ssa.cc +++ b/gcc/tree-into-ssa.cc @@ -2146,7 +2146,7 @@ class rewrite_update_dom_walker : public dom_walker { public: rewrite_update_dom_walker (cdi_direction direction) - : dom_walker (direction, ALL_BLOCKS, NULL) {} + : dom_walker (direction, ALL_BLOCKS, (int *)(uintptr_t)-1) {} edge before_dom_children (basic_block) final override; void after_dom_children (basic_block) final override; -- 2.35.3