bestack: Fetch the start block only once.

[libfirm] / ir / be / beschedregpress.c

diff --git a/ir/be/beschedregpress.c b/ir/be/beschedregpress.c
index 1277f48..e7d8eb6 100644 (file)
--- a/ir/be/beschedregpress.c
+++ b/ir/be/beschedregpress.c
@@ -54,34 +54,6 @@ typedef struct {
 } reg_pressure_selector_env_t;
 
 
-#if 0
-/*
-* Ugly global variable for the compare function
-* since qsort(3) does not pass an extra pointer.
-*/
-static ir_node *curr_bl = NULL;
-
-static int cmp_usage(const void *a, const void *b)
-{
-       struct trivial_sched_env *env;
-       const ir_node *p = a;
-       const ir_node *q = b;
-       int res = 0;
-
-       res = is_live_end(env->curr_bl, a) - is_live_end(env->curr_bl, b);
-
-       /*
-       * One of them is live at the end of the block.
-       * Then, that one shall be scheduled at after the other
-       */
-       if (res != 0)
-               return res;
-
-
-       return res;
-}
-#endif
-
 static inline usage_stats_t *get_or_set_usage_stats(reg_pressure_selector_env_t *env, ir_node *irn)
 {
        usage_stats_t *us = (usage_stats_t*)get_irn_link(irn);
@@ -174,7 +146,6 @@ static void *reg_pressure_graph_init(ir_graph *irg)
 
 static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
 {
-       ir_node *irn;
        reg_pressure_selector_env_t *env = XMALLOC(reg_pressure_selector_env_t);
        (void) graph_env;
 
@@ -186,19 +157,9 @@ static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
        * Collect usage statistics.
        */
        sched_foreach(bl, irn) {
-               int i, n;
-               if (is_Proj(irn)
-                               || (arch_get_irn_flags(irn) & arch_irn_flags_not_scheduled))
-                       continue;
-
-               for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
+               for (int i = 0, n = get_irn_arity(irn); i < n; ++i) {
                        usage_stats_t *us = get_or_set_usage_stats(env, irn);
-#if 0 /* Liveness is not computed here! */
-                       if (is_live_end(bl, op))
-                               us->uses_in_block = 99999;
-                       else
-#endif
-                               us->uses_in_block++;
+                       us->uses_in_block++;
                }
        }
 
@@ -255,10 +216,9 @@ static inline int reg_pr_costs(reg_pressure_selector_env_t *env, ir_node *irn)
 
 static ir_node *reg_pressure_select(void *block_env, ir_nodeset_t *ready_set)
 {
-       ir_nodeset_iterator_t iter;
        reg_pressure_selector_env_t *env = (reg_pressure_selector_env_t*)block_env;
-       ir_node *irn, *res     = NULL;
-       int curr_cost          = INT_MAX;
+       ir_node *res       = NULL;
+       int      curr_cost = INT_MAX;
 
        assert(ir_nodeset_size(ready_set) > 0);