===================================================================
@@ -1648,11 +1648,10 @@ check_hard_reg_p (ira_allocno_t a, int h
return j == nregs;
}
-/* Return number of registers needed to be saved and restored at
- function prologue/epilogue if we allocate HARD_REGNO to hold value
- of MODE. */
+/* Return the cost of saving and restoring HARD_REGNO in mode MODE at
+ function prologue and epilogue. */
static int
-calculate_saved_nregs (int hard_regno, machine_mode mode)
+calculate_saved_nregs_cost (int hard_regno, machine_mode mode)
{
int i;
int nregs = 0;
@@ -1663,7 +1662,14 @@ calculate_saved_nregs (int hard_regno, m
&& !TEST_HARD_REG_BIT (call_used_reg_set, hard_regno + i)
&& !LOCAL_REGNO (hard_regno + i))
nregs++;
- return nregs;
+ if (nregs == 0)
+ return 0;
+
+ enum reg_class rclass = REGNO_REG_CLASS (hard_regno);
+ return (ira_memory_move_cost[mode][rclass][0]
+ + ira_memory_move_cost[mode][rclass][1])
+ * nregs
+ * REG_FREQ_FROM_BB (ENTRY_BLOCK_PTR_FOR_FN (cfun));
}
/* Choose a hard register for allocno A. If RETRY_P is TRUE, it means
@@ -1694,14 +1700,11 @@ assign_hard_reg (ira_allocno_t a, bool r
{
HARD_REG_SET conflicting_regs[2], profitable_hard_regs;
int i, j, hard_regno, best_hard_regno, class_size;
- int cost, mem_cost, min_cost, full_cost, min_full_cost, nwords, word;
+ int cost, mem_cost, full_cost, min_full_cost, nwords, word;
int *a_costs;
enum reg_class aclass;
machine_mode mode;
- static int costs[FIRST_PSEUDO_REGISTER], full_costs[FIRST_PSEUDO_REGISTER];
- int saved_nregs;
- enum reg_class rclass;
- int add_cost;
+ static int full_costs[FIRST_PSEUDO_REGISTER];
#ifdef STACK_REGS
bool no_stack_reg_p;
#endif
@@ -1713,9 +1716,7 @@ assign_hard_reg (ira_allocno_t a, bool r
aclass = ALLOCNO_CLASS (a);
class_size = ira_class_hard_regs_num[aclass];
best_hard_regno = -1;
- memset (full_costs, 0, sizeof (int) * class_size);
mem_cost = 0;
- memset (costs, 0, sizeof (int) * class_size);
memset (full_costs, 0, sizeof (int) * class_size);
#ifdef STACK_REGS
no_stack_reg_p = false;
@@ -1733,15 +1734,9 @@ assign_hard_reg (ira_allocno_t a, bool r
cost = ALLOCNO_UPDATED_CLASS_COST (a);
for (i = 0; i < class_size; i++)
if (a_costs != NULL)
- {
- costs[i] += a_costs[i];
- full_costs[i] += a_costs[i];
- }
+ full_costs[i] += a_costs[i];
else
- {
- costs[i] += cost;
- full_costs[i] += cost;
- }
+ full_costs[i] += cost;
nwords = ALLOCNO_NUM_OBJECTS (a);
curr_allocno_process++;
for (word = 0; word < nwords; word++)
@@ -1861,7 +1856,7 @@ assign_hard_reg (ira_allocno_t a, bool r
queue_update_cost (a, NULL, COST_HOP_DIVISOR);
update_conflict_hard_regno_costs (full_costs, aclass, false);
}
- min_cost = min_full_cost = INT_MAX;
+ min_full_cost = INT_MAX;
/* We don't care about giving callee saved registers to allocnos no
living through calls because call clobbered registers are
allocated first (it is usual practice to put them first in
@@ -1878,25 +1873,15 @@ assign_hard_reg (ira_allocno_t a, bool r
if (! check_hard_reg_p (a, hard_regno,
conflicting_regs, profitable_hard_regs))
continue;
- cost = costs[i];
+
full_cost = full_costs[i];
if (!HONOR_REG_ALLOC_ORDER)
{
- if ((saved_nregs = calculate_saved_nregs (hard_regno, mode)) != 0)
- /* We need to save/restore the hard register in
- epilogue/prologue. Therefore we increase the cost. */
- {
- rclass = REGNO_REG_CLASS (hard_regno);
- add_cost = ((ira_memory_move_cost[mode][rclass][0]
- + ira_memory_move_cost[mode][rclass][1])
- * saved_nregs / hard_regno_nregs (hard_regno,
- mode) - 1);
- cost += add_cost;
- full_cost += add_cost;
- }
+ /* If we need to save/restore the hard register in epilogue/prologue,
+ then increase its cost. */
+ full_cost += calculate_saved_nregs_cost (hard_regno, mode);
}
- if (min_cost > cost)
- min_cost = cost;
+
if (min_full_cost > full_cost)
{
min_full_cost = full_cost;
@@ -2971,12 +2956,18 @@ improve_allocation (void)
for (j = 0; j < class_size; j++)
{
hregno = ira_class_hard_regs[aclass][j];
+ int hregno_cost = costs[hregno];
+
+ /* Include the cost of saving and restoring HREGNO in the function
+ prologue/epilogue. */
+ hregno_cost += calculate_saved_nregs_cost (hregno, mode);
+
if (check_hard_reg_p (a, hregno,
conflicting_regs, profitable_hard_regs)
- && min_cost > costs[hregno])
+ && min_cost > hregno_cost)
{
best = hregno;
- min_cost = costs[hregno];
+ min_cost = hregno_cost;
}
}
if (min_cost >= 0)