- moved the imul mem,imm32 splitting into peephole optimizations

[libfirm] / ir / be / beschednormal.c

diff --git a/ir/be/beschednormal.c b/ir/be/beschednormal.c
index aa8ad83..00f2a9e 100644 (file)
--- a/ir/be/beschednormal.c
+++ b/ir/be/beschednormal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -38,7 +38,13 @@
 
 
 // XXX there is no one time init for schedulers
-//#define NORMAL_DBG
+#define NORMAL_DBG
+
+
+static int must_be_scheduled(const ir_node* const irn)
+{
+       return !is_Proj(irn) && !is_Sync(irn);
+}
 
 
 static const arch_env_t *cur_arch_env;
@@ -84,9 +90,21 @@ typedef struct irn_cost_pair {
 
 static int cost_cmp(const void* a, const void* b)
 {
-       const irn_cost_pair* a1 = a;
-       const irn_cost_pair* b1 = b;
-       return b1->cost - a1->cost;
+       const irn_cost_pair* const a1 = a;
+       const irn_cost_pair* const b1 = b;
+       int ret;
+       if (is_irn_forking(a1->irn)) {
+               ret = 1;
+       } else if (is_irn_forking(b1->irn)) {
+               ret = -1;
+       } else {
+               ret = b1->cost - a1->cost;
+               //ret = a1->cost - b1->cost;
+       }
+#if defined NORMAL_DBG
+       ir_fprintf(stderr, "%+F %s %+F\n", a1->irn, ret < 0 ? "<" : ret > 0 ? ">" : "=", b1->irn);
+#endif
+       return ret;
 }
 
 
@@ -115,13 +133,15 @@ static int normal_tree_cost(ir_node* irn)
        flag_and_cost* fc    = get_irn_link(irn);
        ir_node*       block = get_nodes_block(irn);
        int            arity = get_irn_arity(irn);
-       int            cost_max  = 0;
-       int            count_max = 0;
        int            n_res;
        int            cost;
        int            n_op_res = 0;
        int            i;
 
+       if (is_Proj(irn)) {
+               return normal_tree_cost(get_Proj_pred(irn));
+       }
+
        if (fc == NULL) {
                irn_cost_pair* costs;
                int            i;
@@ -140,41 +160,24 @@ static int normal_tree_cost(ir_node* irn)
                                cost = 1;
                        } else {
                                flag_and_cost* pred_fc;
+                               ir_node*       real_pred;
 
                                cost = normal_tree_cost(pred);
                                if (be_is_Barrier(pred)) cost = 1; // XXX hack: the barrier causes all users to have a reguse of #regs
-                               pred_fc = get_irn_link(pred);
+                               real_pred = (is_Proj(pred) ? get_Proj_pred(pred) : pred);
+                               pred_fc = get_irn_link(real_pred);
                                pred_fc->no_root = 1;
 #if defined NORMAL_DBG
-                               ir_fprintf(stderr, "%+F says that %+F is no root\n", irn, pred);
+                               ir_fprintf(stderr, "%+F says that %+F is no root\n", irn, real_pred);
 #endif
                        }
 
                        costs[i].irn  = pred;
                        costs[i].cost = cost;
-
-                       if (cost > cost_max) {
-                               cost_max  = cost;
-                               count_max = 1;
-                       } else if (cost == cost_max) {
-                               ++count_max;
-                       }
                }
 
                qsort(costs, arity, sizeof(*costs), cost_cmp);
                set_irn_link(irn, fc);
-       } else {
-               irn_cost_pair* costs = fc->costs;
-               int            i;
-
-               if (arity > 0) {
-                       cost_max = costs[0].cost;
-
-                       for (i = 0; i < arity; ++i) {
-                               if (costs[i].cost < cost_max) break;
-                               ++count_max;
-                       }
-               }
        }
 
        cost = 0;
@@ -203,6 +206,7 @@ static void normal_cost_walker(ir_node* irn, void* env)
        ir_fprintf(stderr, "cost walking node %+F\n", irn);
 #endif
        if (is_Block(irn)) return;
+       if (!must_be_scheduled(irn)) return;
        normal_tree_cost(irn);
 }
 
@@ -214,6 +218,7 @@ static void collect_roots(ir_node* irn, void* env)
        (void)env;
 
        if (is_Block(irn)) return;
+       if (!must_be_scheduled(irn)) return;
 
        fc = get_irn_link(irn);
 
@@ -242,14 +247,14 @@ static ir_node** sched_node(ir_node** sched, ir_node* irn)
        int            i;
 
        if (irn_visited(irn)) return sched;
-
-       if (is_End(irn)) return sched;
+       if (is_End(irn))      return sched;
 
        if (!is_Phi(irn)) {
                for (i = 0; i < arity; ++i) {
                        ir_node* pred = irns[i].irn;
                        if (get_nodes_block(pred) != block) continue;
                        if (get_irn_mode(pred) == mode_M) continue;
+                       if (is_Proj(pred)) pred = get_Proj_pred(pred);
                        sched = sched_node(sched, pred);
                }
        }
@@ -288,10 +293,23 @@ static void normal_sched_block(ir_node* block, void* env)
                root_costs[i].cost = normal_tree_cost(roots[i]);
        }
        qsort(root_costs, root_count, sizeof(*root_costs), cost_cmp);
+#if defined NORMAL_DBG
+       {
+               int n = root_count;
+               int i;
+
+               ir_fprintf(stderr, "Root Scheduling of %+F:\n", block);
+               for (i = 0; i < n; ++i) {
+                       ir_fprintf(stderr, "  %+F\n", root_costs[i].irn);
+               }
+               fprintf(stderr, "\n");
+       }
+#endif
 
        sched = NEW_ARR_F(ir_node*, 0);
        for (i = 0; i < root_count; ++i) {
                ir_node* irn = root_costs[i].irn;
+               assert(must_be_scheduled(irn));
                sched = sched_node(sched, irn);
        }
        set_irn_link(block, sched);