From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id DB0DB386CE40; Thu, 30 Jun 2022 08:39:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB0DB386CE40 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1361] Avoid computing RPO for update_ssa X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: 721aa2cc44d143e49a704bc8238b3d0d5f750a49 X-Git-Newrev: aea329432b8e405668861bbe0cd2662a80508c45 Message-Id: <20220630083928.DB0DB386CE40@sourceware.org> Date: Thu, 30 Jun 2022 08:39:28 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2022 08:39:29 -0000 https://gcc.gnu.org/g:aea329432b8e405668861bbe0cd2662a80508c45 commit r13-1361-gaea329432b8e405668861bbe0cd2662a80508c45 Author: Richard Biener Date: Wed Jun 29 14:55:43 2022 +0200 Avoid computing RPO for update_ssa 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. * 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. Diff: --- 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;