From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 3CD623858429 for ; Thu, 11 Aug 2022 11:42:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3CD623858429 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id F379C33A28; Thu, 11 Aug 2022 11:42:16 +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 07AFE2C22A; Thu, 11 Aug 2022 11:42:11 +0000 (UTC) Date: Thu, 11 Aug 2022 11:42:16 +0000 (UTC) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Tame path_range_query::compute_imports 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.6 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, 11 Aug 2022 11:42:19 -0000 Message-ID: <20220811114216.iLY8v_DM7i4aMIoiuZ_UaAT-H8YNgBAVQcH5fecJAT8@z> This avoids going BBs outside of the path when adding def chains to the set of imports. It also syncs the code with range_def_chain::get_def_chain to not miss out on some imports this function would identify. Bootstrap / regtest pending on x86_64-unknown-linux-gnu. The question still stands on what the path_range_query::compute_ranges actually needs in its m_imports - at least I don't easily see how the range-folds will use the path range cache or be path sensitive at all. OK? Thanks, Richard. * gimple-range-path.cc (path_range_query::compute_imports): Restrict walking SSA defs to blocks inside the path. Track the same operands as range_def_chain::get_def_chain does. --- gcc/gimple-range-path.cc | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc index 5ae374df3a2..5ff2c733b4e 100644 --- a/gcc/gimple-range-path.cc +++ b/gcc/gimple-range-path.cc @@ -575,18 +575,11 @@ path_range_query::compute_imports (bitmap imports, const vec &path) { tree name = worklist.pop (); gimple *def_stmt = SSA_NAME_DEF_STMT (name); + if (SSA_NAME_IS_DEFAULT_DEF (name) + || !path.contains (gimple_bb (def_stmt))) + continue; - if (is_gimple_assign (def_stmt)) - { - add_to_imports (gimple_assign_rhs1 (def_stmt), imports); - tree rhs = gimple_assign_rhs2 (def_stmt); - if (rhs && add_to_imports (rhs, imports)) - worklist.safe_push (rhs); - rhs = gimple_assign_rhs3 (def_stmt); - if (rhs && add_to_imports (rhs, imports)) - worklist.safe_push (rhs); - } - else if (gphi *phi = dyn_cast (def_stmt)) + if (gphi *phi = dyn_cast (def_stmt)) { for (size_t i = 0; i < gimple_phi_num_args (phi); ++i) { @@ -599,6 +592,30 @@ path_range_query::compute_imports (bitmap imports, const vec &path) worklist.safe_push (arg); } } + else if (gassign *ass = dyn_cast (def_stmt)) + { + tree ssa[3]; + if (range_op_handler (ass)) + { + ssa[0] = gimple_range_ssa_p (gimple_range_operand1 (ass)); + ssa[1] = gimple_range_ssa_p (gimple_range_operand2 (ass)); + ssa[2] = NULL_TREE; + } + else if (gimple_assign_rhs_code (ass) == COND_EXPR) + { + ssa[0] = gimple_range_ssa_p (gimple_assign_rhs1 (ass)); + ssa[1] = gimple_range_ssa_p (gimple_assign_rhs2 (ass)); + ssa[2] = gimple_range_ssa_p (gimple_assign_rhs3 (ass)); + } + else + continue; + for (unsigned j = 0; j < 3; ++j) + { + tree rhs = ssa[j]; + if (rhs && add_to_imports (rhs, imports)) + worklist.safe_push (rhs); + } + } } // Exported booleans along the path, may help conditionals. if (m_resolve) -- 2.35.3