Added beinsn.c
[libfirm] / ir / be / bechordal.c
index 7beab1b..d172253 100644 (file)
@@ -44,7 +44,9 @@
 #include "belive_t.h"
 #include "benode_t.h"
 #include "bearch.h"
+#include "beirgmod.h"
 #include "beifg.h"
+#include "beinsn_t.h"
 
 #include "bechordal_t.h"
 #include "bechordal_draw.h"
 
 #define NO_COLOR (-1)
 
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#define MIN(x, y) ((x) < (y) ? (x) : (y))
+
 #define DUMP_INTERVALS
 
 typedef struct _be_chordal_alloc_env_t {
        be_chordal_env_t *chordal_env;
 
-       pset *pre_colored;    /**< Set of precolored nodes. */
-       bitset_t *live;                         /**< A liveness bitset. */
-       bitset_t *colors;                       /**< The color mask. */
-       bitset_t *in_colors;        /**< Colors used by live in values. */
-       int colors_n;               /**< The number of colors. */
+       pset *pre_colored;              /**< Set of precolored nodes. */
+       bitset_t *live;                             /**< A liveness bitset. */
+       bitset_t *tmp_colors;           /**< An auxiliary bitset which is as long as the number of colors in the class. */
+       bitset_t *colors;                           /**< The color mask. */
+       bitset_t *in_colors;            /**< Colors used by live in values. */
+       int colors_n;                   /**< The number of colors. */
+       DEBUG_ONLY(firm_dbg_module_t *constr_dbg;)  /**< Debug output for the constraint handler. */
 } be_chordal_alloc_env_t;
 
 #include "fourcc.h"
@@ -167,132 +174,234 @@ static INLINE int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
 #define has_limited_constr(req, irn) \
        (arch_get_register_req(arch_env, (req), irn, -1) && (req)->type == arch_register_req_type_limited)
 
-typedef struct _operand_t operand_t;
-
-struct _operand_t {
-       ir_node *irn;
-       ir_node *carrier;
-       operand_t *partner;
-       int pos;
-       arch_register_req_t req;
-};
-
-typedef struct {
-       operand_t *ops;
-       int n_ops;
-       int use_start;
-       ir_node *next_insn;
-       unsigned has_constraints : 1;
-} insn_t;
-
-static insn_t *scan_insn(be_chordal_env_t *env, ir_node *irn, struct obstack *obst)
+static int get_next_free_reg(const be_chordal_alloc_env_t *alloc_env, bitset_t *colors)
 {
-       const arch_env_t *arch_env = env->birg->main_env->arch_env;
-       operand_t o;
-       insn_t *insn;
-       int i, n;
+       bitset_t *tmp = alloc_env->tmp_colors;
+       bitset_copy(tmp, colors);
+       bitset_or(tmp, alloc_env->chordal_env->ignore_colors);
+       return bitset_next_clear(tmp, 0);
+}
 
-       insn = obstack_alloc(obst, sizeof(insn[0]));
-       memset(insn, 0, sizeof(insn[0]));
-
-       insn->next_insn = sched_next(irn);
-       if(get_irn_mode(irn) == mode_T) {
-               ir_node *p;
-
-               for(p = sched_next(irn); is_Proj(p); p = sched_next(p)) {
-                       if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
-                               o.carrier = p;
-                               o.irn     = irn;
-                               o.pos     = -(get_Proj_proj(p) + 1);
-                               o.partner = NULL;
-                               arch_get_register_req(arch_env, &o.req, p, -1);
-                               obstack_grow(obst, &o, sizeof(o));
-                               insn->n_ops++;
-                               insn->has_constraints |= arch_register_req_is(&o.req, limited);
-                       }
-               }
+static bitset_t *get_decisive_partner_regs(bitset_t *bs, const be_operand_t *o1, const be_operand_t *o2)
+{
+       bitset_t *res = bs;
 
-               insn->next_insn = p;
+       if(!o1) {
+               bitset_copy(bs, o2->regs);
+               return bs;
        }
 
-       else if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
-               o.carrier = irn;
-               o.irn     = irn;
-               o.pos     = -1;
-               o.partner = NULL;
-               arch_get_register_req(arch_env, &o.req, irn, -1);
-               obstack_grow(obst, &o, sizeof(o));
-               insn->n_ops++;
-               insn->has_constraints |= arch_register_req_is(&o.req, limited);
+       if(!o2) {
+               bitset_copy(bs, o1->regs);
+               return bs;
        }
 
-       insn->use_start = insn->n_ops;
+       assert(o1->req.cls == o2->req.cls);
 
-       for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-               ir_node *op = get_irn_n(irn, i);
+       if(bitset_contains(o1->regs, o2->regs))
+               bitset_copy(bs, o1->regs);
+       else if(bitset_contains(o2->regs, o1->regs))
+               bitset_copy(bs, o2->regs);
+       else
+               res = NULL;
 
-               if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, op)) {
-                       o.carrier = op;
-                       o.irn     = irn;
-                       o.pos     = i;
-                       o.partner = NULL;
-                       arch_get_register_req(arch_env, &o.req, irn, i);
-                       obstack_grow(obst, &o, sizeof(o));
-                       insn->n_ops++;
-                       insn->has_constraints |= arch_register_req_is(&o.req, limited);
-               }
-       }
+       return res;
+}
 
-       insn->ops = obstack_finish(obst);
-       return insn;
+static be_insn_t *chordal_scan_insn(be_chordal_alloc_env_t *env, ir_node *irn)
+{
+       be_insn_env_t ie;
+
+       ie.ignore_colors = env->chordal_env->ignore_colors;
+       ie.aenv          = env->chordal_env->birg->main_env->arch_env;
+       ie.obst          = &env->chordal_env->obst;
+       ie.cls           = env->chordal_env->cls;
+       return be_scan_insn(&ie, irn);
 }
 
-static operand_t *find_unpaired_use(insn_t *insn, const operand_t *op, int can_be_constrained)
+static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t *insn)
 {
-       int i;
-       operand_t *res = NULL;
+       const be_chordal_env_t *env = alloc_env->chordal_env;
 
-       for(i = insn->use_start; i < insn->n_ops; ++i) {
-               operand_t *op = &insn->ops[i];
-               int has_constraint = arch_register_req_is(&op->req, limited);
-
-               if(!values_interfere(op->carrier, op->irn) && !op->partner && (!has_constraint || can_be_constrained)) {
-                       if(arch_register_req_is(&op->req, should_be_same) && op->req.other_same == op->carrier)
-                               return op;
-                       else
-                               res = op;
+       int n_uses         = be_insn_n_uses(insn);
+       int n_defs         = be_insn_n_defs(insn);
+       bitset_t *bs       = bitset_alloca(env->cls->n_regs);
+       bipartite_t *bp    = bipartite_new(n_defs, n_uses);
+       int *pairing       = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0]));
+
+       int i, j;
+
+       /*
+               For each out operand, try to find an in operand which can be assigned the
+               same register as the out operand.
+       */
+       for(j = 0; j < insn->use_start; ++j) {
+               be_operand_t *out_op = &insn->ops[j];
+
+               /* Try to find an in operand which has ... */
+               for(i = insn->use_start; i < insn->n_ops; ++i) {
+                       const be_operand_t *op = &insn->ops[i];
+
+                       /*
+                       The in operand can only be paired with a def, if the node defining the
+                       operand's value does not interfere with the instruction itself. That
+                       would mean, that it is live at the instruction, so no result of the instruction
+                       can have the same register as the operand.
+
+                       Furthermore, tow operands can be paired, if the admissible registers
+                       of one are a subset of the other's. We record the operand whose constraints
+                       count in the decisive array.
+                       */
+                       if(!values_interfere(op->irn, op->carrier)) {
+                               if(get_decisive_partner_regs(bs, out_op, op))
+                                       bipartite_add(bp, j, i - insn->use_start);
+                       }
                }
        }
 
-       return res;
+       /* Compute the pairing. */
+       bipartite_matching(bp, pairing);
+       for(i = 0; i < insn->use_start; ++i) {
+               int p = pairing[i] + insn->use_start;
+
+               if(p >= insn->use_start) {
+                       insn->ops[i].partner = &insn->ops[p];
+                       insn->ops[p].partner = &insn->ops[i];
+               }
+       }
+
+       bipartite_free(bp);
 }
 
-static void pair_up_operands(insn_t *insn)
+
+static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_insn_t **the_insn)
 {
-       firm_dbg_module_t *dbg = firm_dbg_register("firm.be.chordal.constr");
+       be_chordal_env_t *env       = alloc_env->chordal_env;
+       const arch_env_t *aenv      = env->birg->main_env->arch_env;
+       be_insn_t *insn             = *the_insn;
+       ir_node *bl                 = get_nodes_block(insn->irn);
+       ir_node *copy               = NULL;
+       ir_node *perm               = NULL;
+       bitset_t *out_constr        = bitset_alloca(env->cls->n_regs);
+       bitset_t *bs                = bitset_alloca(env->cls->n_regs);
+       DEBUG_ONLY(firm_dbg_module_t *dbg      = alloc_env->constr_dbg;)
+
        int i;
 
+       assert(insn->has_constraints && "only do this for constrained nodes");
+
+       /*
+               Collect all registers that occur in output constraints.
+               This is necessary, since if the insn has one of these as an input constraint
+               and the corresponding operand interferes with the insn, the operand must
+               be copied.
+       */
        for(i = 0; i < insn->use_start; ++i) {
-               operand_t *op      = &insn->ops[i];
-               int has_constraint = arch_register_req_is(&op->req, limited);
-               operand_t *partner = find_unpaired_use(insn, op, !has_constraint);
+               be_operand_t *op = &insn->ops[i];
+               if(op->has_constraints)
+                       bitset_or(out_constr, op->regs);
+       }
 
-               if(partner) {
-                       op->partner = partner;
-                       partner->partner = op;
+       /*
+               Now, figure out which input operand must be copied since it has input
+               constraints which are also output constraints.
+       */
+       for(i = insn->use_start; i < insn->n_ops; ++i) {
+               be_operand_t *op = &insn->ops[i];
+               if(op->has_constraints && (values_interfere(op->carrier, insn->irn) || arch_irn_is(aenv, op->carrier, ignore))) {
+                       bitset_copy(bs, op->regs);
+                       bitset_and(bs, out_constr);
+
+                       /*
+                               The operand (interfering with the node) has input constraints
+                               which also occur as output constraints, so insert a copy.
+                       */
+                       if(bitset_popcnt(bs) > 0) {
+                               copy                 = be_new_Copy(op->req.cls, env->irg, bl, op->carrier);
+                               insn->ops[i].carrier = copy;
+                               sched_add_before(insn->irn, copy);
+
+                               DBG((dbg, LEVEL_2, "adding copy for interfering and constrained op %+F\n", op->carrier));
+                       }
                }
        }
+
+       /*
+               Make the Perm, recompute liveness and re-scan the insn since the
+               in operands are now the Projs of the Perm.
+       */
+       perm = insert_Perm_after(aenv, env->cls, env->dom_front, sched_prev(insn->irn));
+
+       /* Registers are propagated by insert_Perm_after(). Clean them here! */
+       if(perm) {
+               const ir_edge_t *edge;
+
+               foreach_out_edge(perm, edge) {
+                       ir_node *proj = get_edge_src_irn(edge);
+                       arch_set_irn_register(aenv, proj, NULL);
+               }
+
+               /*
+                       We also have to re-build the insn since the input operands are now the Projs of
+                       the Perm. Recomputing liveness is also a good idea if a Perm is inserted, since
+                       the live sets may change.
+               */
+               be_liveness(env->irg);
+               obstack_free(&env->obst, insn);
+               *the_insn = insn = chordal_scan_insn(alloc_env, insn->irn);
+
+               /*
+                       Copy the input constraints of the insn to the Perm as output
+                       constraints. Succeeding phases (coalescing will need that).
+               */
+               for(i = insn->use_start; i < insn->n_ops; ++i) {
+                       be_operand_t *op = &insn->ops[i];
+                       ir_node *proj = op->carrier;
+                       /*
+                               Note that the predecessor must not be a Proj of the Perm,
+                               since ignore-nodes are not Perm'ed.
+                       */
+                       if(op->has_constraints &&  is_Proj(proj) && get_Proj_pred(proj) == perm) {
+                               be_set_constr_limited(perm, BE_OUT_POS(get_Proj_proj(proj)), &op->req);
+                       }
+               }
+       }
+
+       return perm;
 }
 
-static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn)
+static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn, int *silent)
 {
        be_chordal_env_t *env  = alloc_env->chordal_env;
        void *base             = obstack_base(&env->obst);
-       insn_t *insn           = scan_insn(env, irn, &env->obst);
+       be_insn_t *insn        = chordal_scan_insn(alloc_env, irn);
        ir_node *res           = insn->next_insn;
+       int be_silent          = *silent;
 
+       if(insn->pre_colored) {
+               int i;
+               for(i = 0; i < insn->use_start; ++i)
+                       pset_insert_ptr(alloc_env->pre_colored, insn->ops[i].carrier);
+       }
+
+       /*
+               If the current node is a barrier toggle the silent flag.
+               If we are in the start block, we are ought to be silent at the beginning,
+               so the toggling activates the constraint handling but skips the barrier.
+               If we are in the end block we handle the in requirements of the barrier
+               and set the rest to silent.
+       */
+       if(be_is_Barrier(irn))
+               *silent = !*silent;
+
+       if(be_silent)
+               goto end;
+
+       /*
+               Perms inserted before the constraint handling phase are considered to be
+               correctly precolored. These Perms arise during the ABI handling phase.
+       */
        if(insn->has_constraints) {
-               firm_dbg_module_t *dbg = firm_dbg_register("firm.be.chordal.constr");
                const arch_env_t *aenv = env->birg->main_env->arch_env;
                int n_regs             = env->cls->n_regs;
                bitset_t *bs           = bitset_alloca(n_regs);
@@ -300,44 +409,45 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                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;)
 
                int i, n_alloc;
                long col;
                const ir_edge_t *edge;
-               ir_node *perm = insert_Perm_after(aenv, env->cls, env->dom_front, sched_prev(irn));
+               ir_node *perm = NULL;
 
-               /* Registers are propagated by insert_Perm_after(). Clean them here! */
-               if(perm) {
-                       foreach_out_edge(perm, edge) {
-                               ir_node *proj = get_edge_src_irn(edge);
-                               arch_set_irn_register(aenv, proj, NULL);
-                       }
-               }
-
-
-               be_liveness(env->irg);
-               insn = scan_insn(env, irn, &env->obst);
+               /*
+                       prepare the constraint handling of this node.
+                       Perms are constructed and Copies are created for constrained values
+                       interfering with the instruction.
+               */
+               perm = pre_process_constraints(alloc_env, &insn);
 
-               DBG((dbg, LEVEL_1, "handling constraints for %+F\n", irn));
+               /* find suitable in operands to the out operands of the node. */
+               pair_up_operands(alloc_env, insn);
 
                /*
-                * If there was no Perm made, nothing was alive in this register class.
-                * This means, that the node has no operands, thus no input constraints.
-                * so it had output constraints. The other results then can be assigned freeliy.
-                */
+                       look at the in/out operands and add each operand (and its possible partner)
+                       to a bipartite graph (left: nodes with partners, right: admissible colors).
+               */
+               for(i = 0, n_alloc = 0; i < insn->n_ops; ++i) {
+                       be_operand_t *op = &insn->ops[i];
 
-               pair_up_operands(insn);
+                       /*
+                               If the operand has no partner or the partner has not been marked
+                               for allocation, determine the admissible registers and mark it
+                               for allocation by associating the node and its partner with the
+                               set of admissible registers via a bipartite graph.
+                       */
+                       if(!op->partner || !pmap_contains(partners, op->partner->carrier)) {
 
-               for(i = 0, n_alloc = 0; i < insn->n_ops; ++i) {
-                       operand_t *op = &insn->ops[i];
-                       if(arch_register_req_is(&op->req, limited)) {
                                pmap_insert(partners, op->carrier, op->partner ? op->partner->carrier : NULL);
                                alloc_nodes[n_alloc] = op->carrier;
 
-                               DBG((dbg, LEVEL_2, "\tassociating %+F and %+F\n", op->carrier, pmap_get(partners, op->carrier)));
+                               DBG((dbg, LEVEL_2, "\tassociating %+F and %+F\n", op->carrier, op->partner ? op->partner->carrier : NULL));
 
-                               bitset_clear_all(bs);
-                               op->req.limited(op->req.limited_env, bs);
+                               bitset_clear_all(bs);
+                               get_decisive_partner_regs(bs, op, op->partner);
 
                                DBG((dbg, LEVEL_2, "\tallowed registers for %+F: %B\n", op->carrier, bs));
 
@@ -348,19 +458,23 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                        }
                }
 
+               /*
+                       Put all nodes which live by the constrained instruction also to the
+                       allocation bipartite graph. They are considered unconstrained.
+               */
                if(perm) {
                        foreach_out_edge(perm, edge) {
                                ir_node *proj = get_edge_src_irn(edge);
 
                                assert(is_Proj(proj));
 
-                               if(values_interfere(proj, irn)) {
+                               if(values_interfere(proj, irn) && !pmap_contains(partners, proj)) {
                                        assert(n_alloc < n_regs);
                                        alloc_nodes[n_alloc] = proj;
                                        pmap_insert(partners, proj, NULL);
 
                                        bitset_clear_all(bs);
-                                       arch_get_allocatable_regs(aenv, proj, -1, bs);
+                                       arch_put_non_ignore_regs(aenv, env->cls, bs);
                                        bitset_foreach(bs, col)
                                                bipartite_add(bp, n_alloc, col);
 
@@ -369,12 +483,14 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                        }
                }
 
+               /* Compute a valid register allocation. */
                bipartite_matching(bp, assignment);
 
+               /* Assign colors obtained from the matching. */
                for(i = 0; i < n_alloc; ++i) {
-                       int j;
-                       ir_node *nodes[2];
                        const arch_register_t *reg;
+                       ir_node *nodes[2];
+                       int j;
 
                        assert(assignment[i] >= 0 && "there must have been a register assigned");
                        reg = arch_register_for_index(env->cls, assignment[i]);
@@ -393,8 +509,12 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                }
 
 
+               /* Allocate the non-constrained Projs of the Perm. */
                if(perm) {
+
                        bitset_clear_all(bs);
+
+                       /* Put the colors of all Projs in a bitset. */
                        foreach_out_edge(perm, edge) {
                                ir_node *proj              = get_edge_src_irn(edge);
                                const arch_register_t *reg = arch_get_irn_register(aenv, proj);
@@ -403,7 +523,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                                        bitset_set(bs, reg->index);
                        }
 
-                       // bitset_or(bs, alloc_env->ignore_colors);
+                       /* Assign the not yet assigned Projs of the Perm a suitable color. */
                        foreach_out_edge(perm, edge) {
                                ir_node *proj              = get_edge_src_irn(edge);
                                const arch_register_t *reg = arch_get_irn_register(aenv, proj);
@@ -411,7 +531,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                                DBG((dbg, LEVEL_2, "\tchecking reg of %+F: %s\n", proj, reg ? reg->name : "<none>"));
 
                                if(reg == NULL) {
-                                       col = bitset_next_clear(bs, 0);
+                                       col = get_next_free_reg(alloc_env, bs);
                                        reg = arch_register_for_index(env->cls, col);
                                        bitset_set(bs, reg->index);
                                        arch_set_irn_register(aenv, proj, reg);
@@ -424,26 +544,37 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
                pmap_destroy(partners);
        }
 
+end:
        obstack_free(&env->obst, base);
        return res;
 }
 
 /**
  * Handle constraint nodes in each basic block.
- * be_insert_constr_perms() inserts Perm nodes which perm
+ * handle_constraints() inserts Perm nodes which perm
  * over all values live at the constrained node right in front
  * of the constrained node. These Perms signal a constrained node.
- * For further comments, refer to handle_constraints_at_perm().
+ * For further comments, refer to handle_constraints().
  */
 static void constraints(ir_node *bl, void *data)
 {
-       firm_dbg_module_t *dbg      = firm_dbg_register("firm.be.chordal.constr");
        be_chordal_alloc_env_t *env = data;
-       arch_env_t *arch_env        = env->chordal_env->birg->main_env->arch_env;
+
+       /*
+               Start silent in the start block.
+               The silence remains until the first barrier is seen.
+               Each other block is begun loud.
+       */
+       int silent                  = bl == get_irg_start_block(get_irn_irg(bl));
        ir_node *irn;
 
+       /*
+               If the block is the start block search the barrier and
+               start handling constraints from there.
+       */
+
        for(irn = sched_first(bl); !sched_is_end(irn);) {
-               irn = handle_constraints(env, irn);
+               irn = handle_constraints(env, irn, &silent);
        }
 }
 
@@ -465,10 +596,9 @@ static void pressure(ir_node *block, void *env_ptr)
 
        be_chordal_alloc_env_t *alloc_env = env_ptr;
        be_chordal_env_t *env             = alloc_env->chordal_env;
-       const arch_env_t *arch_env        = env->birg->main_env->arch_env;
        bitset_t *live                    = alloc_env->live;
-       firm_dbg_module_t *dbg            = env->dbg;
        ir_node *irn;
+       DEBUG_ONLY(firm_dbg_module_t *dbg            = env->dbg;)
 
        int i, n;
        unsigned step = 0;
@@ -563,11 +693,11 @@ static void assign(ir_node *block, void *env_ptr)
 {
        be_chordal_alloc_env_t *alloc_env = env_ptr;
        be_chordal_env_t *env       = alloc_env->chordal_env;
-       firm_dbg_module_t *dbg      = env->dbg;
        bitset_t *live              = alloc_env->live;
        bitset_t *colors            = alloc_env->colors;
        bitset_t *in_colors         = alloc_env->in_colors;
        const arch_env_t *arch_env  = env->birg->main_env->arch_env;
+       DEBUG_ONLY(firm_dbg_module_t *dbg      = env->dbg;)
 
        const ir_node *irn;
        border_t *b;
@@ -632,9 +762,10 @@ static void assign(ir_node *block, void *env_ptr)
                        }
 
                        else {
-                               col = bitset_next_clear(colors, 0);
+                               col = get_next_free_reg(alloc_env, colors);
                                reg = arch_register_for_index(env->cls, col);
                                assert(arch_get_irn_register(arch_env, irn) == NULL && "This node must not have been assigned a register yet");
+                               assert(!arch_register_type_is(reg, ignore) && "Must not assign ignore register");
                        }
 
                        bitset_set(colors, col);
@@ -679,16 +810,19 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 
        env.chordal_env   = chordal_env;
        env.colors_n      = colors_n;
-       env.colors        = bitset_malloc(colors_n);
-       env.in_colors     = bitset_malloc(colors_n);
+       env.colors        = bitset_alloca(colors_n);
+       env.tmp_colors    = bitset_alloca(colors_n);
+       env.in_colors     = bitset_alloca(colors_n);
        env.pre_colored   = pset_new_ptr_default();
+       FIRM_DBG_REGISTER(env.constr_dbg, "firm.be.chordal.constr");
+
 
        /* Handle register targeting constraints */
        dom_tree_walk_irg(irg, constraints, NULL, &env);
 
        if(chordal_env->opts->dump_flags & BE_CH_DUMP_CONSTR) {
                snprintf(buf, sizeof(buf), "-%s-constr", chordal_env->cls->name);
-               dump_ir_block_graph_sched(chordal_env->irg, buf);
+               be_dump(chordal_env->irg, buf, dump_ir_block_graph_sched);
        }
 
        be_numbering(irg);
@@ -710,8 +844,5 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
        plotter_free(plotter);
        }
 
-       free(env.live);
-       free(env.colors);
-       free(env.in_colors);
        del_pset(env.pre_colored);
 }