fixed remat flag for load nodes

[libfirm] / ir / be / belistsched.c

diff --git a/ir/be/belistsched.c b/ir/be/belistsched.c
index 3aedf5b..aff47e0 100644 (file)
--- a/ir/be/belistsched.c
+++ b/ir/be/belistsched.c
@@ -138,12 +138,12 @@ static void *trivial_init_block(void *graph_env, ir_node *bl)
 
 static INLINE int must_appear_in_schedule(const list_sched_selector_t *sel, void *block_env, const ir_node *irn)
 {
-       int res = 0;
+       int res = -1;
 
        if(sel->to_appear_in_schedule)
                res = sel->to_appear_in_schedule(block_env, irn);
 
-       return res || to_appear_in_schedule(irn) || be_is_Keep(irn) || be_is_RegParams(irn);
+       return res >= 0 ? res : (to_appear_in_schedule(irn) || be_is_Keep(irn) || be_is_RegParams(irn));
 }
 
 static const list_sched_selector_t trivial_selector_struct = {
@@ -294,12 +294,14 @@ static void *reg_pressure_block_init(void *graph_env, ir_node *bl)
                        int i, n;
 
                        for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                               ir_node *op = get_irn_n(irn, i);
+                               //ir_node *op = get_irn_n(irn, i);
                                if(must_appear_in_schedule(env->main_env->vtab, env, irn)) {
                                        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++;
                                }
                        }
@@ -598,17 +600,6 @@ static INLINE void make_users_ready(block_sched_env_t *env, ir_node *irn)
        }
 }
 
-/**
- * Compare to nodes using pointer equality.
- * @param p1 Node one.
- * @param p2 Node two.
- * @return 0 if they are identical.
- */
-static int node_cmp_func(const void *p1, const void *p2)
-{
-    return p1 != p2;
-}
-
 /**
  * Append an instruction to a schedule.
  * @param env The block scheduling environment.
@@ -712,6 +703,8 @@ static int is_root(ir_node *root, ir_node *block) {
 static char _mark;
 #define MARK   &_mark
 
+static firm_dbg_module_t *xxxdbg;
+
 /**
  * descent into a dag and create a pre-order list.
  */
@@ -723,6 +716,7 @@ static void descent(ir_node *root, ir_node *block, ir_node **list) {
                for (i = get_irn_arity(root) - 1; i >= 0; --i) {
                        ir_node *pred = get_irn_n(root, i);
 
+                       DBG((xxxdbg, LEVEL_3, "   node %+F\n", pred));
                        /* Blocks may happen as predecessors of End nodes */
                        if (is_Block(pred))
                                continue;
@@ -735,6 +729,8 @@ static void descent(ir_node *root, ir_node *block, ir_node **list) {
                        if (get_nodes_block(pred) != block)
                                continue;
 
+                       set_irn_link(pred, NULL);
+
                        descent(pred, block, list);
                }
        }
@@ -779,6 +775,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
        be.selector          = selector;
        be.sched_env         = env;
        FIRM_DBG_REGISTER(be.dbg, "firm.be.sched");
+       FIRM_DBG_REGISTER(xxxdbg, "firm.be.sched");
 
 //     firm_dbg_set_mask(be.dbg, SET_LEVEL_3);
 
@@ -804,6 +801,7 @@ static void list_sched_block(ir_node *block, void *env_ptr)
        preord = NULL;
        for (curr = root; curr; curr = irn) {
                irn = get_irn_link(curr);
+               DBG((be.dbg, LEVEL_2, "   DAG root %+F\n", curr));
                descent(curr, block, &preord);
        }
        root = preord;