From a8f5e932a0955194cef4009713014cbf3f74c8ce Mon Sep 17 00:00:00 2001 From: krebbel Date: Fri, 20 Sep 2019 12:18:26 +0000 Subject: Fix PR88751 This patch implements a small improvement for the heuristic in lra which decides when it has to activate the simpler register allocation algorithm. gcc/ChangeLog: 2019-09-20 Andreas Krebbel Backport from mainline 2019-06-06 Andreas Krebbel PR rtl-optimization/88751 * ira.c (ira): Use the number of the actually referenced registers when calculating the threshold. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@276000 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 9 +++++++++ gcc/ira.c | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f1f923a06dd..628a5fe3312 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2019-09-20 Andreas Krebbel + + Backport from mainline + 2019-06-06 Andreas Krebbel + + PR rtl-optimization/88751 + * ira.c (ira): Use the number of the actually referenced registers + when calculating the threshold. + 2019-09-20 Kito Cheng Backport from mainline diff --git a/gcc/ira.c b/gcc/ira.c index fd481d6e0e2..b330f2a287b 100644 --- a/gcc/ira.c +++ b/gcc/ira.c @@ -5198,6 +5198,8 @@ ira (FILE *f) int ira_max_point_before_emit; bool saved_flag_caller_saves = flag_caller_saves; enum ira_region saved_flag_ira_region = flag_ira_region; + unsigned int i; + int num_used_regs = 0; clear_bb_flags (); @@ -5213,12 +5215,17 @@ ira (FILE *f) ira_conflicts_p = optimize > 0; + /* Determine the number of pseudos actually requiring coloring. */ + for (i = FIRST_PSEUDO_REGISTER; i < DF_REG_SIZE (df); i++) + num_used_regs += !!(DF_REG_USE_COUNT (i) + DF_REG_DEF_COUNT (i)); + /* If there are too many pseudos and/or basic blocks (e.g. 10K pseudos and 10K blocks or 100K pseudos and 1K blocks), we will use simplified and faster algorithms in LRA. */ lra_simple_p = (ira_use_lra_p - && max_reg_num () >= (1 << 26) / last_basic_block_for_fn (cfun)); + && num_used_regs >= (1 << 26) / last_basic_block_for_fn (cfun)); + if (lra_simple_p) { /* It permits to skip live range splitting in LRA. */ -- cgit v1.2.3