From f508f827b17ecd4673ef9d1c97dca9d1e3b6f17f Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 31 May 2012 05:27:03 +0000 Subject: ira.h (target_ira): Delete x_ira_available_class_regs. gcc/ * ira.h (target_ira): Delete x_ira_available_class_regs. (ira_available_class_regs): Delete. * ira.c (setup_available_class_regs): Delete. (setup_alloc_classes): Don't call it. (setup_pressure_classes): Use ira_class_hard_regs_num instead of ira_available_class_regs. * haifa-sched.c (print_curr_reg_pressure, setup_insn_reg_pressure_info) (model_spill_cost): Likewise. * ira-build.c (low_pressure_loop_node_p): Likewise. * ira-color.c (color_pass): Likewise. * ira-emit.c (change_loop): Likewise. * ira-lives.c (inc_register_pressure, dec_register_pressure) (single_reg_class, ira_implicitly_set_insn_hard_regs) (process_bb_node_lives): Likewise. * loop-invariant.c (gain_for_invariant): Likewise. From-SVN: r188041 --- gcc/haifa-sched.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gcc/haifa-sched.c') diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 869159c..8aac1e3 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -1085,7 +1085,7 @@ print_curr_reg_pressure (void) gcc_assert (curr_reg_pressure[cl] >= 0); fprintf (sched_dump, " %s:%d(%d)", reg_class_names[cl], curr_reg_pressure[cl], - curr_reg_pressure[cl] - ira_available_class_regs[cl]); + curr_reg_pressure[cl] - ira_class_hard_regs_num[cl]); } fprintf (sched_dump, "\n"); } @@ -1634,9 +1634,9 @@ setup_insn_reg_pressure_info (rtx insn) cl = ira_pressure_classes[i]; gcc_assert (curr_reg_pressure[cl] >= 0); change = (int) pressure_info[i].set_increase - death[cl]; - before = MAX (0, max_reg_pressure[i] - ira_available_class_regs[cl]); + before = MAX (0, max_reg_pressure[i] - ira_class_hard_regs_num[cl]); after = MAX (0, max_reg_pressure[i] + change - - ira_available_class_regs[cl]); + - ira_class_hard_regs_num[cl]); hard_regno = ira_class_hard_regs[cl][0]; gcc_assert (hard_regno >= 0); mode = reg_raw_mode[hard_regno]; @@ -2227,7 +2227,7 @@ model_recompute (rtx insn) /* Return the cost of increasing the pressure in class CL from FROM to TO. Here we use the very simplistic cost model that every register above - ira_available_class_regs[CL] has a spill cost of 1. We could use other + ira_class_hard_regs_num[CL] has a spill cost of 1. We could use other measures instead, such as one based on MEMORY_MOVE_COST. However: (1) In order for an instruction to be scheduled, the higher cost @@ -2251,7 +2251,7 @@ model_recompute (rtx insn) static int model_spill_cost (int cl, int from, int to) { - from = MAX (from, ira_available_class_regs[cl]); + from = MAX (from, ira_class_hard_regs_num[cl]); return MAX (to, from) - from; } -- cgit v1.1