removed warning for ILP scheduler, as the scheduler can now schedule on it's own

[libfirm] / ir / be / bechordal.c

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index ec0b43d..a132d1e 100644 (file)
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -28,6 +28,7 @@
 #include "bitset.h"
 #include "iterator.h"
 #include "bipartite.h"
+#include "hungarian.h"
 
 #include "irmode_t.h"
 #include "irgraph_t.h"
@@ -230,26 +231,30 @@ static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn)
        be_insn_t *insn;
        int i, j;
 
-       for(i = get_irn_arity(irn) - 1; i >= 0; --i) {
+       for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
                ir_node *op = get_irn_n(irn, i);
 
                const arch_register_t *reg;
                arch_register_req_t req;
 
-               reg = arch_get_irn_register(aenv, op);
+               if (arch_get_irn_reg_class(aenv, irn, i) == env->cls) {
+                       reg = arch_get_irn_register(aenv, op);
 
-               if(reg && arch_register_type_is(reg, ignore)) {
-                       arch_get_register_req(aenv, &req, irn, i);
-                       if(arch_register_req_is(&req, limited)) {
-                               bitset_clear_all(tmp);
-                               req.limited(req.limited_env, tmp);
-                               if(!bitset_is_set(tmp, reg->index)) {
-                                       ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op);
-                                       be_stat_ev("constr_copy", 1);
+                       if (reg && arch_register_type_is(reg, ignore)) {
+                               arch_get_register_req(aenv, &req, irn, i);
+
+                               if (arch_register_req_is(&req, limited)) {
+                                       bitset_clear_all(tmp);
+                                       req.limited(req.limited_env, tmp);
 
-                                       sched_add_before(irn, copy);
-                                       set_irn_n(irn, i, copy);
-                                       DBG((env->dbg, LEVEL_3, "inserting ignore arg copy %+F for %+F pos %d\n", copy, irn, i));
+                                       if (! bitset_is_set(tmp, reg->index)) {
+                                               ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op);
+                                               be_stat_ev("constr_copy", 1);
+
+                                               sched_add_before(irn, copy);
+                                               set_irn_n(irn, i, copy);
+                                               DBG((env->dbg, LEVEL_3, "inserting ignore arg copy %+F for %+F pos %d\n", copy, irn, i));
+                                       }
                                }
                        }
                }
@@ -500,7 +505,8 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                int n_regs             = env->cls->n_regs;
                bitset_t *bs           = bitset_alloca(n_regs);
                ir_node **alloc_nodes  = alloca(n_regs * sizeof(alloc_nodes[0]));
-               bipartite_t *bp        = bipartite_new(n_regs, n_regs);
+               hungarian_problem_t *bp= hungarian_new(n_regs, n_regs, 2, HUNGARIAN_MATCH_PERFECT);
+//             bipartite_t *bp        = bipartite_new(n_regs, n_regs);
                int *assignment        = alloca(n_regs * sizeof(assignment[0]));
                pmap *partners         = pmap_create();
                DEBUG_ONLY(firm_dbg_module_t *dbg = alloc_env->constr_dbg;)
@@ -509,6 +515,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                long col;
                const ir_edge_t *edge;
                ir_node *perm = NULL;
+               int match_res, cost;
 
                /*
                        prepare the constraint handling of this node.
@@ -546,7 +553,8 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                                DBG((dbg, LEVEL_2, "\tallowed registers for %+F: %B\n", op->carrier, bs));
 
                                bitset_foreach(bs, col)
-                                       bipartite_add(bp, n_alloc, col);
+                                       hungarian_add(bp, n_alloc, col, 1);
+//                                     bipartite_add(bp, n_alloc, col);
 
                                n_alloc++;
                        }
@@ -571,7 +579,8 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                                        arch_put_non_ignore_regs(aenv, env->cls, bs);
                                        bitset_andnot(bs, env->ignore_colors);
                                        bitset_foreach(bs, col)
-                                               bipartite_add(bp, n_alloc, col);
+                                               hungarian_add(bp, n_alloc, col, 1);
+//                                             bipartite_add(bp, n_alloc, col);
 
                                        n_alloc++;
                                }
@@ -579,7 +588,10 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                }
 
                /* Compute a valid register allocation. */
-               bipartite_matching(bp, assignment);
+               hungarian_prepare_cost_matrix(bp, HUNGARIAN_MODE_MAXIMIZE_UTIL);
+               match_res = hungarian_solve(bp, assignment, &cost, 1);
+               assert(match_res == 0 && "matching failed");
+               //bipartite_matching(bp, assignment);
 
                /* Assign colors obtained from the matching. */
                for(i = 0; i < n_alloc; ++i) {
@@ -598,7 +610,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                                        continue;
 
                                arch_set_irn_register(aenv, nodes[j], reg);
-                               pset_hinsert_ptr(alloc_env->pre_colored, nodes[j]);
+                               (void) pset_hinsert_ptr(alloc_env->pre_colored, nodes[j]);
                                DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", nodes[j], reg->name));
                        }
                }
@@ -636,7 +648,8 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                        }
                }
 
-               bipartite_free(bp);
+               //bipartite_free(bp);
+               hungarian_free(bp);
                pmap_destroy(partners);
        }