typo fixed

[libfirm] / ir / be / becopyheur.c

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index 4a98c06..022fe85 100644 (file)
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -6,10 +6,11 @@
 
  * Heuristic for minimizing copies using a queue which holds 'qnodes' not yet
  * examined. A qnode has a 'target color', nodes out of the opt unit and
- * a 'conflict graph'. A 'max indep set' is determined form these. We try to
- * color this mis using a color-exchanging mechanism. Occuring conflicts are
- * modeled with 'conflict edges' and the qnode is reinserted in the queue. The
- * first qnode colored without conflicts is the best one.
+ * a 'conflict graph'. 'Conflict graph' = "Interference graph' + 'conflict edges'
+ * A 'max indep set' is determined form these. We try to color this mis using a
+ * color-exchanging mechanism. Occuring conflicts are modeled with 'conflict edges'
+ * and the qnode is reinserted in the queue. The first qnode colored without
+ * conflicts is the best one.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -99,7 +100,7 @@ static INLINE void qnode_add_conflict(const qnode_t *qn, const ir_node *n1, cons
 static INLINE int qnode_are_conflicting(const qnode_t *qn, const ir_node *n1, const ir_node *n2) {
        conflict_t c;
        /* search for live range interference */
-       if (n1!=n2 && values_interfere(n1, n2))
+       if (n1!=n2 && nodes_interfere(qn->ou->co->chordal_env, n1, n2))
                return 1;
        /* search for recoloring conflicts */
        if ((int)n1 < (int)n2) {
@@ -205,6 +206,9 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
        struct obstack confl_ob;
        ir_node **confl, *cn;
        int i, irn_col;
+       const be_chordal_env_t *chordal_env = qn->ou->co->chordal_env;
+       const arch_env_t *arch_env = chordal_env->arch_env;
+       const arch_register_class_t *cls = chordal_env->cls;
 
        DBG((dbg, LEVEL_3, "\t      %n \tcaused col(%n) \t%2d --> %2d\n", trigger, irn, qnode_get_new_color(qn, irn), col));
        obstack_init(&confl_ob);
@@ -216,10 +220,10 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
                res = irn;
                goto ret_confl;
        }
-       if (!arch_reg_is_allocatable(qn->ou->co->env,
+       if (!arch_reg_is_allocatable(arch_env,
                                                                 irn,
                                                                 arch_pos_make_out(0),
-                                                                arch_register_for_index(qn->ou->co->cls, col)))
+                                                                arch_register_for_index(cls, col)))
                goto ret_imposs;
 
        /* get all nodes which would conflict with this change */
@@ -235,7 +239,10 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
                        ir_node *n;
                        pset *live_ins = get_live_in(irn_bl);
                        for (n = pset_first(live_ins); n; n = pset_next(live_ins))
-                               if (is_allocatable_irn(n) && n != trigger && qnode_get_new_color(qn, n) == col && values_interfere(irn, n)) {
+                               if (arch_irn_has_reg_class(arch_env, n, arch_pos_make_out(0), cls)
+            && n != trigger && qnode_get_new_color(qn, n) == col
+            && nodes_interfere(chordal_env, irn, n)) {
+
                                        DBG((dbg, LEVEL_4, "\t        %n\ttroubles\n", n));
                                        obstack_ptr_grow(&confl_ob, n);
                                        pset_break(live_ins);
@@ -262,7 +269,10 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
                         * the target color and interfere with the irn */
                        for (i = 0, max = get_irn_n_outs(curr_bl); i < max; ++i) {
                                ir_node *n = get_irn_out(curr_bl, i);
-                               if (is_allocatable_irn(n) && n != trigger && qnode_get_new_color(qn, n) == col && values_interfere(irn, n)) {
+                               if (arch_irn_has_reg_class(arch_env, n, arch_pos_make_out(0), cls)
+            && n != trigger && qnode_get_new_color(qn, n) == col
+            && nodes_interfere(chordal_env, irn, n)) {
+
                                        DBG((dbg, LEVEL_4, "\t        %n\ttroubles\n", n));
                                        obstack_ptr_grow(&confl_ob, n);
                                }
@@ -458,11 +468,6 @@ static INLINE void ou_insert_qnode(unit_t *ou, qnode_t *qn) {
        }
 
        qnode_max_ind_set(qn, ou);
-
-       /* set ou->mis_size for lower bound compution */
-       if (ou->mis_size < qn->mis_size)
-               ou->mis_size = qn->mis_size;
-
        /* do the insertion */
        DBG((dbg, LEVEL_4, "\t  Insert qnode color %d with size %d\n", qn->color, qn->mis_size));
        lh = &ou->queue;
@@ -485,7 +490,7 @@ static INLINE void ou_insert_qnode(unit_t *ou, qnode_t *qn) {
 static void ou_optimize(unit_t *ou) {
        int i;
        qnode_t *curr, *tmp;
-       bitset_t *pos_regs = bitset_alloca(ou->co->cls->n_regs);
+       bitset_t *pos_regs = bitset_alloca(ou->co->chordal_env->cls->n_regs);
 
        DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
        for (i=0; i<ou->node_count; ++i)
@@ -493,7 +498,7 @@ static void ou_optimize(unit_t *ou) {
 
        /* init queue */
        INIT_LIST_HEAD(&ou->queue);
-       arch_get_allocatable_regs(ou->co->env, ou->nodes[0], arch_pos_make_out(0), ou->co->cls, pos_regs);
+       arch_get_allocatable_regs(ou->co->chordal_env->arch_env, ou->nodes[0], arch_pos_make_out(0), ou->co->chordal_env->cls, pos_regs);
        bitset_foreach(pos_regs, i)
                ou_insert_qnode(ou, new_qnode(ou, i));
 
@@ -548,7 +553,9 @@ void co_heur_opt(copy_opt_t *co) {
        dbg = firm_dbg_register("ir.be.copyoptheur");
        firm_dbg_set_mask(dbg, DEBUG_LVL);
        if (!strcmp(co->name, DEBUG_IRG))
-               firm_dbg_set_mask(dbg, -1);
+               firm_dbg_set_mask(dbg, DEBUG_LVL_HEUR);
+       else
+               firm_dbg_set_mask(dbg, DEBUG_LVL);
 
        pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
        list_for_each_entry(unit_t, curr, &co->units, units)