From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2136) id D1A303858D35; Thu, 25 Nov 2021 16:34:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1A303858D35 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Aldy Hernandez To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5526] path solver: Revert computation of ranges in gimple order. X-Act-Checkin: gcc X-Git-Author: Aldy Hernandez X-Git-Refname: refs/heads/master X-Git-Oldrev: 58d50a5dd6344179eebaeb6fd2f895e59463cf74 X-Git-Newrev: 415f9ee404dc9e8ae1cade160a33400b10abb18a Message-Id: <20211125163450.D1A303858D35@sourceware.org> Date: Thu, 25 Nov 2021 16:34:50 +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, 25 Nov 2021 16:34:50 -0000 https://gcc.gnu.org/g:415f9ee404dc9e8ae1cade160a33400b10abb18a commit r12-5526-g415f9ee404dc9e8ae1cade160a33400b10abb18a Author: Aldy Hernandez Date: Thu Nov 25 17:30:07 2021 +0100 path solver: Revert computation of ranges in gimple order. Revert the patch below, as it may slow down compilation with large CFGs. commit 8acbd7bef6edbf537e3037174907029b530212f6 Author: Aldy Hernandez Date: Wed Nov 24 09:43:36 2021 +0100 path solver: Compute ranges in path in gimple order. gcc/ChangeLog: * gimple-range-path.cc (path_range_query::compute_ranges_defined): Remove. (path_range_query::compute_ranges_in_block): Revert to bitmap order. * gimple-range-path.h: Remove compute_ranges_defined. Diff: --- gcc/gimple-range-path.cc | 33 +++++++++++---------------------- gcc/gimple-range-path.h | 1 - 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc index 806bce9ff11..b9c71226c1c 100644 --- a/gcc/gimple-range-path.cc +++ b/gcc/gimple-range-path.cc @@ -401,27 +401,6 @@ path_range_query::compute_ranges_in_phis (basic_block bb) } } -// Compute ranges defined in block. - -void -path_range_query::compute_ranges_defined (basic_block bb) -{ - int_range_max r; - - compute_ranges_in_phis (bb); - - // Iterate in gimple order to minimize recursion. - for (auto gsi = gsi_start_nondebug_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) - if (gimple_has_lhs (gsi_stmt (gsi))) - { - tree name = gimple_get_lhs (gsi_stmt (gsi)); - if (TREE_CODE (name) == SSA_NAME - && bitmap_bit_p (m_imports, SSA_NAME_VERSION (name)) - && range_defined_in_block (r, name, bb)) - set_cache (r, name); - } -} - // Compute ranges defined in the current block, or exported to the // next block. @@ -444,7 +423,17 @@ path_range_query::compute_ranges_in_block (basic_block bb) clear_cache (name); } - compute_ranges_defined (bb); + // Solve imports defined in this block, starting with the PHIs... + compute_ranges_in_phis (bb); + // ...and then the rest of the imports. + EXECUTE_IF_SET_IN_BITMAP (m_imports, 0, i, bi) + { + tree name = ssa_name (i); + + if (gimple_code (SSA_NAME_DEF_STMT (name)) != GIMPLE_PHI + && range_defined_in_block (r, name, bb)) + set_cache (r, name); + } if (at_exit ()) return; diff --git a/gcc/gimple-range-path.h b/gcc/gimple-range-path.h index 81c87d475dd..57a9ae9bdcd 100644 --- a/gcc/gimple-range-path.h +++ b/gcc/gimple-range-path.h @@ -58,7 +58,6 @@ private: // Methods to compute ranges for the given path. bool range_defined_in_block (irange &, tree name, basic_block bb); void compute_ranges_in_block (basic_block bb); - void compute_ranges_defined (basic_block bb); void compute_ranges_in_phis (basic_block bb); void adjust_for_non_null_uses (basic_block bb); void ssa_range_in_phi (irange &r, gphi *phi);