Simplify control flow.
[libfirm] / ir / be / beprefalloc.c
index 5a80f9c..96640cd 100644 (file)
@@ -22,7 +22,6 @@
  * @brief       Preference Guided Register Assignment
  * @author      Matthias Braun
  * @date        14.2.2009
- * @version     $Id$
  *
  * The idea is to allocate registers in 2 passes:
  * 1. A first pass to determine "preferred" registers for live-ranges. This
@@ -42,6 +41,7 @@
 #include <float.h>
 #include <stdbool.h>
 #include <math.h>
+#include "lpp.h"
 
 #include "error.h"
 #include "execfreq.h"
@@ -53,6 +53,8 @@
 #include "irnode_t.h"
 #include "irprintf.h"
 #include "irdump.h"
+#include "irtools.h"
+#include "util.h"
 #include "obst.h"
 #include "raw_bitset.h"
 #include "unionfind.h"
@@ -88,7 +90,6 @@ static struct obstack               obst;
 static ir_graph                    *irg;
 static const arch_register_class_t *cls;
 static be_lv_t                     *lv;
-static const ir_exec_freq          *execfreqs;
 static unsigned                     n_regs;
 static unsigned                    *normal_regs;
 static int                         *congruence_classes;
@@ -117,7 +118,7 @@ struct allocation_info_t {
        unsigned  last_uses[2];   /**< bitset indicating last uses (input pos) */
        ir_node  *current_value;  /**< copy of the value that should be used */
        ir_node  *original_value; /**< for copies point to original value */
-       float     prefs[0];       /**< register preferences */
+       float     prefs[];        /**< register preferences */
 };
 typedef struct allocation_info_t allocation_info_t;
 
@@ -131,7 +132,7 @@ typedef struct reg_pref_t reg_pref_t;
 /** per basic-block information */
 struct block_info_t {
        bool     processed;       /**< indicate whether block is processed */
-       ir_node *assignments[0];  /**< register assignments at end of block */
+       ir_node *assignments[];   /**< register assignments at end of block */
 };
 typedef struct block_info_t block_info_t;
 
@@ -216,11 +217,9 @@ static void give_penalties_for_limits(const ir_nodeset_t *live_nodes,
                                       float penalty, const unsigned* limited,
                                       ir_node *node)
 {
-       ir_nodeset_iterator_t iter;
-       unsigned              r;
-       size_t                n_allowed;
-       allocation_info_t     *info = get_allocation_info(node);
-       ir_node               *neighbor;
+       unsigned           r;
+       size_t             n_allowed;
+       allocation_info_t *info = get_allocation_info(node);
 
        /* give penalty for all forbidden regs */
        for (r = 0; r < n_regs; ++r) {
@@ -270,7 +269,7 @@ static void give_penalties_for_limits(const ir_nodeset_t *live_nodes,
 static void check_defs(const ir_nodeset_t *live_nodes, float weight,
                        ir_node *node)
 {
-       const arch_register_req_t *req = arch_get_register_req_out(node);
+       const arch_register_req_t *req = arch_get_irn_register_req(node);
        if (req->type & arch_register_req_type_limited) {
                const unsigned *limited = req->limited;
                float           penalty = weight * DEF_FACTOR;
@@ -314,9 +313,8 @@ static void check_defs(const ir_nodeset_t *live_nodes, float weight,
  */
 static void analyze_block(ir_node *block, void *data)
 {
-       float         weight = (float)get_block_execfreq(execfreqs, block);
-       ir_nodeset_t  live_nodes;
-       ir_node      *node;
+       float        weight = (float)get_block_execfreq(block);
+       ir_nodeset_t live_nodes;
        (void) data;
 
        ir_nodeset_init(&live_nodes);
@@ -351,7 +349,7 @@ static void analyze_block(ir_node *block, void *data)
                info = get_allocation_info(node);
                for (i = 0; i < arity; ++i) {
                        ir_node                   *op  = get_irn_n(node, i);
-                       const arch_register_req_t *req = arch_get_register_req_out(op);
+                       const arch_register_req_t *req = arch_get_irn_register_req(op);
                        if (req->cls != cls)
                                continue;
 
@@ -373,7 +371,7 @@ static void analyze_block(ir_node *block, void *data)
                                if (!arch_irn_consider_in_reg_alloc(cls, op))
                                        continue;
 
-                               req = arch_get_register_req(node, i);
+                               req = arch_get_irn_register_req_in(node, i);
                                if (!(req->type & arch_register_req_type_limited))
                                        continue;
 
@@ -389,7 +387,7 @@ static void analyze_block(ir_node *block, void *data)
 
 static void congruence_def(ir_nodeset_t *live_nodes, const ir_node *node)
 {
-       const arch_register_req_t *req = arch_get_register_req_out(node);
+       const arch_register_req_t *req = arch_get_irn_register_req(node);
 
        /* should be same constraint? */
        if (req->type & arch_register_req_type_should_be_same) {
@@ -400,11 +398,9 @@ static void congruence_def(ir_nodeset_t *live_nodes, const ir_node *node)
                node_idx          = uf_find(congruence_classes, node_idx);
 
                for (i = 0; i < arity; ++i) {
-                       ir_node               *live;
-                       ir_node               *op;
-                       int                    op_idx;
-                       ir_nodeset_iterator_t  iter;
-                       bool                   interferes = false;
+                       ir_node *op;
+                       int      op_idx;
+                       bool     interferes = false;
 
                        if (!rbitset_is_set(&req->other_same, i))
                                continue;
@@ -437,50 +433,51 @@ static void congruence_def(ir_nodeset_t *live_nodes, const ir_node *node)
 
 static void create_congruence_class(ir_node *block, void *data)
 {
-       ir_nodeset_t  live_nodes;
-       ir_node      *node;
+       ir_nodeset_t live_nodes;
 
        (void) data;
        ir_nodeset_init(&live_nodes);
        be_liveness_end_of_block(lv, cls, block, &live_nodes);
 
        /* check should be same constraints */
+       ir_node *last_phi = NULL;
        sched_foreach_reverse(block, node) {
                ir_node *value;
-               if (is_Phi(node))
+               if (is_Phi(node)) {
+                       last_phi = node;
                        break;
+               }
 
                be_foreach_definition(node, cls, value,
                        congruence_def(&live_nodes, value);
                );
                be_liveness_transfer(cls, node, &live_nodes);
        }
+       if (!last_phi)
+               return;
 
        /* check phi congruence classes */
-       sched_foreach_reverse_from(node, node) {
+       sched_foreach_reverse_from(last_phi, phi) {
                int i;
                int arity;
                int node_idx;
-               assert(is_Phi(node));
+               assert(is_Phi(phi));
 
-               if (!arch_irn_consider_in_reg_alloc(cls, node))
+               if (!arch_irn_consider_in_reg_alloc(cls, phi))
                        continue;
 
-               node_idx = get_irn_idx(node);
+               node_idx = get_irn_idx(phi);
                node_idx = uf_find(congruence_classes, node_idx);
 
-               arity = get_irn_arity(node);
+               arity = get_irn_arity(phi);
                for (i = 0; i < arity; ++i) {
-                       bool                  interferes = false;
-                       ir_nodeset_iterator_t iter;
-                       unsigned              r;
-                       int                   old_node_idx;
-                       ir_node              *live;
-                       ir_node              *phi;
-                       allocation_info_t    *head_info;
-                       allocation_info_t    *other_info;
-                       ir_node              *op     = get_Phi_pred(node, i);
-                       int                   op_idx = get_irn_idx(op);
+                       bool               interferes = false;
+                       unsigned           r;
+                       int                old_node_idx;
+                       allocation_info_t *head_info;
+                       allocation_info_t *other_info;
+                       ir_node           *op     = get_Phi_pred(phi, i);
+                       int                op_idx = get_irn_idx(op);
                        op_idx = uf_find(congruence_classes, op_idx);
 
                        /* do we interfere with the value */
@@ -520,7 +517,7 @@ static void create_congruence_class(ir_node *block, void *data)
                        old_node_idx = node_idx;
                        node_idx = uf_union(congruence_classes, node_idx, op_idx);
                        DB((dbg, LEVEL_3, "Merge %+F and %+F congruence classes\n",
-                           node, op));
+                           phi, op));
 
                        old_node_idx = node_idx == old_node_idx ? op_idx : old_node_idx;
                        head_info  = get_allocation_info(get_idx_irn(irg, node_idx));
@@ -649,13 +646,13 @@ static bool try_optimistic_split(ir_node *to_split, ir_node *before,
         * (so we don't split away the values produced because of
         *  must_be_different constraints) */
        original_insn = skip_Proj(info->original_value);
-       if (arch_irn_get_flags(original_insn) & arch_irn_flags_dont_spill)
+       if (arch_get_irn_flags(original_insn) & arch_irn_flags_dont_spill)
                return false;
 
        from_reg        = arch_get_irn_register(to_split);
        from_r          = arch_register_get_index(from_reg);
        block           = get_nodes_block(before);
-       split_threshold = (float)get_block_execfreq(execfreqs, block) * SPLIT_DELTA;
+       split_threshold = (float)get_block_execfreq(block) * SPLIT_DELTA;
 
        if (pref_delta < split_threshold*0.5)
                return false;
@@ -720,7 +717,7 @@ static bool try_optimistic_split(ir_node *to_split, ir_node *before,
                return false;
 
        reg  = arch_register_for_index(cls, r);
-       copy = be_new_Copy(cls, block, to_split);
+       copy = be_new_Copy(block, to_split);
        mark_as_copy_of(copy, to_split);
        /* hacky, but correct here */
        if (assignments[arch_register_get_index(from_reg)] == to_split)
@@ -740,25 +737,25 @@ static bool try_optimistic_split(ir_node *to_split, ir_node *before,
 static void assign_reg(const ir_node *block, ir_node *node,
                        unsigned *forbidden_regs)
 {
-       const arch_register_t     *reg;
+       const arch_register_t     *final_reg;
        allocation_info_t         *info;
        const arch_register_req_t *req;
        reg_pref_t                *reg_prefs;
        ir_node                   *in_node;
-       unsigned                   i;
+       unsigned                   r;
        const unsigned            *allowed_regs;
-       unsigned                   r = 0;
+       unsigned                   final_reg_index = 0;
 
        assert(!is_Phi(node));
        /* preassigned register? */
-       reg = arch_get_irn_register(node);
-       if (reg != NULL) {
-               DB((dbg, LEVEL_2, "Preassignment %+F -> %s\n", node, reg->name));
-               use_reg(node, reg);
+       final_reg = arch_get_irn_register(node);
+       if (final_reg != NULL) {
+               DB((dbg, LEVEL_2, "Preassignment %+F -> %s\n", node, final_reg->name));
+               use_reg(node, final_reg);
                return;
        }
 
-       req = arch_get_register_req_out(node);
+       req = arch_get_irn_register_req(node);
        /* ignore reqs must be preassigned */
        assert (! (req->type & arch_register_req_type_ignore));
 
@@ -766,7 +763,7 @@ static void assign_reg(const ir_node *block, ir_node *node,
        info    = get_allocation_info(node);
        in_node = skip_Proj(node);
        if (req->type & arch_register_req_type_should_be_same) {
-               float weight = (float)get_block_execfreq(execfreqs, block);
+               float weight = (float)get_block_execfreq(block);
                int   arity  = get_irn_arity(in_node);
                int   i;
 
@@ -774,21 +771,21 @@ static void assign_reg(const ir_node *block, ir_node *node,
                for (i = 0; i < arity; ++i) {
                        ir_node               *in;
                        const arch_register_t *reg;
-                       unsigned               r;
+                       unsigned               reg_index;
                        if (!rbitset_is_set(&req->other_same, i))
                                continue;
 
                        in  = get_irn_n(in_node, i);
                        reg = arch_get_irn_register(in);
                        assert(reg != NULL);
-                       r = arch_register_get_index(reg);
+                       reg_index = arch_register_get_index(reg);
 
                        /* if the value didn't die here then we should not propagate the
                         * should_be_same info */
-                       if (assignments[r] == in)
+                       if (assignments[reg_index] == in)
                                continue;
 
-                       info->prefs[r] += weight * AFF_SHOULD_BE_SAME;
+                       info->prefs[reg_index] += weight * AFF_SHOULD_BE_SAME;
                }
        }
 
@@ -796,15 +793,14 @@ static void assign_reg(const ir_node *block, ir_node *node,
        DB((dbg, LEVEL_2, "Candidates for %+F:", node));
        reg_prefs = ALLOCAN(reg_pref_t, n_regs);
        fill_sort_candidates(reg_prefs, info);
-       for (i = 0; i < n_regs; ++i) {
-               unsigned num = reg_prefs[i].num;
+       for (r = 0; r < n_regs; ++r) {
+               unsigned num = reg_prefs[r].num;
                const arch_register_t *reg;
 
                if (!rbitset_is_set(normal_regs, num))
                        continue;
-
                reg = arch_register_for_index(cls, num);
-               DB((dbg, LEVEL_2, " %s(%f)", reg->name, reg_prefs[i].pref));
+               DB((dbg, LEVEL_2, " %s(%f)", reg->name, reg_prefs[r].pref));
        }
        DB((dbg, LEVEL_2, "\n"));
 
@@ -813,33 +809,38 @@ static void assign_reg(const ir_node *block, ir_node *node,
                allowed_regs = req->limited;
        }
 
-       for (i = 0; i < n_regs; ++i) {
+       for (r = 0; r < n_regs; ++r) {
                float   pref, delta;
                ir_node *before;
                bool    res;
 
-               r = reg_prefs[i].num;
-               if (!rbitset_is_set(allowed_regs, r))
+               final_reg_index = reg_prefs[r].num;
+               if (!rbitset_is_set(allowed_regs, final_reg_index))
                        continue;
-               if (assignments[r] == NULL)
+               /* alignment constraint? */
+               if (req->width > 1 && (req->type & arch_register_req_type_aligned)
+                               && (final_reg_index % req->width) != 0)
+                       continue;
+
+               if (assignments[final_reg_index] == NULL)
                        break;
-               pref   = reg_prefs[i].pref;
-               delta  = i+1 < n_regs ? pref - reg_prefs[i+1].pref : 0;
+               pref   = reg_prefs[r].pref;
+               delta  = r+1 < n_regs ? pref - reg_prefs[r+1].pref : 0;
                before = skip_Proj(node);
-               res    = try_optimistic_split(assignments[r], before,
+               res    = try_optimistic_split(assignments[final_reg_index], before,
                                              pref, delta, forbidden_regs, 0);
                if (res)
                        break;
        }
-       if (i >= n_regs) {
+       if (r >= n_regs) {
                /* the common reason to hit this panic is when 1 of your nodes is not
                 * register pressure faithful */
                panic("No register left for %+F\n", node);
        }
 
-       reg = arch_register_for_index(cls, r);
-       DB((dbg, LEVEL_2, "Assign %+F -> %s\n", node, reg->name));
-       use_reg(node, reg);
+       final_reg = arch_register_for_index(cls, final_reg_index);
+       DB((dbg, LEVEL_2, "Assign %+F -> %s\n", node, final_reg->name));
+       use_reg(node, final_reg);
 }
 
 /**
@@ -877,7 +878,7 @@ static void assign_reg(const ir_node *block, ir_node *node,
  *                     registers.
  */
 static void permute_values(ir_nodeset_t *live_nodes, ir_node *before,
-                             unsigned *permutation)
+                           unsigned *permutation)
 {
        unsigned  *n_used = ALLOCANZ(unsigned, n_regs);
        ir_node   *block;
@@ -917,7 +918,7 @@ static void permute_values(ir_nodeset_t *live_nodes, ir_node *before,
 
                /* create a copy */
                src  = assignments[old_r];
-               copy = be_new_Copy(cls, block, src);
+               copy = be_new_Copy(block, src);
                sched_add_before(before, copy);
                reg = arch_register_for_index(cls, r);
                DB((dbg, LEVEL_2, "Copy %+F (from %+F, before %+F) -> %s\n",
@@ -1101,6 +1102,149 @@ static void determine_live_through_regs(unsigned *bitset, ir_node *node)
        }
 }
 
+static void solve_lpp(ir_nodeset_t *live_nodes, ir_node *node,
+                      unsigned *forbidden_regs, unsigned *live_through_regs)
+{
+       unsigned *forbidden_edges = rbitset_malloc(n_regs * n_regs);
+       int      *lpp_vars        = XMALLOCNZ(int, n_regs*n_regs);
+       int       arity           = get_irn_arity(node);
+       int       i;
+       unsigned  l;
+       unsigned  r;
+
+       lpp_t *lpp = lpp_new("prefalloc", lpp_minimize);
+       //lpp_set_time_limit(lpp, 20);
+       lpp_set_log(lpp, stdout);
+
+       /** mark some edges as forbidden */
+       for (i = 0; i < arity; ++i) {
+               ir_node                   *op = get_irn_n(node, i);
+               const arch_register_t     *reg;
+               const arch_register_req_t *req;
+               const unsigned            *limited;
+               unsigned                   current_reg;
+
+               if (!arch_irn_consider_in_reg_alloc(cls, op))
+                       continue;
+
+               req = arch_get_irn_register_req_in(node, i);
+               if (!(req->type & arch_register_req_type_limited))
+                       continue;
+
+               limited     = req->limited;
+               reg         = arch_get_irn_register(op);
+               current_reg = arch_register_get_index(reg);
+               for (r = 0; r < n_regs; ++r) {
+                       if (rbitset_is_set(limited, r))
+                               continue;
+
+                       rbitset_set(forbidden_edges, current_reg*n_regs + r);
+               }
+       }
+
+       /* add all combinations, except for not allowed ones */
+       for (l = 0; l < n_regs; ++l) {
+               if (!rbitset_is_set(normal_regs, l)) {
+                       char name[15];
+                       snprintf(name, sizeof(name), "%u_to_%u", l, l);
+                       lpp_vars[l*n_regs+l] = lpp_add_var(lpp, name, lpp_binary, 1);
+                       continue;
+               }
+
+               for (r = 0; r < n_regs; ++r) {
+                       if (!rbitset_is_set(normal_regs, r))
+                               continue;
+                       if (rbitset_is_set(forbidden_edges, l*n_regs + r))
+                               continue;
+                       /* livethrough values may not use constrained output registers */
+                       if (rbitset_is_set(live_through_regs, l)
+                           && rbitset_is_set(forbidden_regs, r))
+                               continue;
+
+                       char name[15];
+                       snprintf(name, sizeof(name), "%u_to_%u", l, r);
+
+                       double costs = l==r ? 9 : 8;
+                       lpp_vars[l*n_regs+r]
+                               = lpp_add_var(lpp, name, lpp_binary, costs);
+                       assert(lpp_vars[l*n_regs+r] > 0);
+               }
+       }
+       /* add constraints */
+       for (l = 0; l < n_regs; ++l) {
+               int constraint;
+               /* only 1 destination per register */
+               constraint = -1;
+               for (r = 0; r < n_regs; ++r) {
+                       int var = lpp_vars[l*n_regs+r];
+                       if (var == 0)
+                               continue;
+                       if (constraint < 0) {
+                               char name[64];
+                               snprintf(name, sizeof(name), "%u_to_dest", l);
+                               constraint = lpp_add_cst(lpp, name, lpp_equal, 1);
+                       }
+                       lpp_set_factor_fast(lpp, constraint, var, 1);
+               }
+               /* each destination used by at most 1 value */
+               constraint = -1;
+               for (r = 0; r < n_regs; ++r) {
+                       int var = lpp_vars[r*n_regs+l];
+                       if (var == 0)
+                               continue;
+                       if (constraint < 0) {
+                               char name[64];
+                               snprintf(name, sizeof(name), "one_to_%u", l);
+                               constraint = lpp_add_cst(lpp, name, lpp_less_equal, 1);
+                       }
+                       lpp_set_factor_fast(lpp, constraint, var, 1);
+               }
+       }
+
+       lpp_dump_plain(lpp, fopen("lppdump.txt", "w"));
+
+       /* solve lpp */
+       {
+               unsigned *assignment;
+               lpp_solve(lpp, be_options.ilp_server, be_options.ilp_solver);
+               if (!lpp_is_sol_valid(lpp))
+                       panic("ilp solution not valid!");
+
+               assignment = ALLOCAN(unsigned, n_regs);
+               for (l = 0; l < n_regs; ++l) {
+                       unsigned dest_reg = (unsigned)-1;
+                       for (r = 0; r < n_regs; ++r) {
+                               int var = lpp_vars[l*n_regs+r];
+                               if (var == 0)
+                                       continue;
+                               double val = lpp_get_var_sol(lpp, var);
+                               if (val == 1) {
+                                       assert(dest_reg == (unsigned)-1);
+                                       dest_reg = r;
+                               }
+                       }
+                       assert(dest_reg != (unsigned)-1);
+                       assignment[dest_reg] = l;
+               }
+
+               fprintf(stderr, "Assignment: ");
+               for (l = 0; l < n_regs; ++l) {
+                       fprintf(stderr, "%u ", assignment[l]);
+               }
+               fprintf(stderr, "\n");
+               fflush(stdout);
+               permute_values(live_nodes, node, assignment);
+       }
+       lpp_free(lpp);
+}
+
+static bool is_aligned(unsigned num, unsigned alignment)
+{
+       unsigned mask = alignment-1;
+       assert(is_po2(alignment));
+       return (num&mask) == 0;
+}
+
 /**
  * Enforce constraints at a node by live range splits.
  *
@@ -1120,35 +1264,47 @@ static void enforce_constraints(ir_nodeset_t *live_nodes, ir_node *node,
        /* construct a list of register occupied by live-through values */
        unsigned *live_through_regs = NULL;
 
-       /* see if any use constraints are not met */
+       /* see if any use constraints are not met and whether double-width
+        * values are involved */
+       bool double_width = false;
        bool good = true;
        for (i = 0; i < arity; ++i) {
                ir_node                   *op = get_irn_n(node, i);
                const arch_register_t     *reg;
                const arch_register_req_t *req;
                const unsigned            *limited;
-               unsigned                  r;
+               unsigned                   reg_index;
 
                if (!arch_irn_consider_in_reg_alloc(cls, op))
                        continue;
 
                /* are there any limitations for the i'th operand? */
-               req = arch_get_register_req(node, i);
+               req = arch_get_irn_register_req_in(node, i);
+               if (req->width > 1)
+                       double_width = true;
+               reg       = arch_get_irn_register(op);
+               reg_index = arch_register_get_index(reg);
+               if (req->type & arch_register_req_type_aligned) {
+                       if (!is_aligned(reg_index, req->width)) {
+                               good = false;
+                               continue;
+                       }
+               }
                if (!(req->type & arch_register_req_type_limited))
                        continue;
 
-               limited = req->limited;
-               reg     = arch_get_irn_register(op);
-               r       = arch_register_get_index(reg);
-               if (!rbitset_is_set(limited, r)) {
+               limited   = req->limited;
+               if (!rbitset_is_set(limited, reg_index)) {
                        /* found an assignment outside the limited set */
                        good = false;
-                       break;
+                       continue;
                }
        }
 
        /* is any of the live-throughs using a constrained output register? */
        be_foreach_definition(node, cls, value,
+               if (req_->width > 1)
+                       double_width = true;
                if (! (req_->type & arch_register_req_type_limited))
                        continue;
                if (live_through_regs == NULL) {
@@ -1168,6 +1324,12 @@ static void enforce_constraints(ir_nodeset_t *live_nodes, ir_node *node,
                rbitset_alloca(live_through_regs, n_regs);
        }
 
+       if (double_width) {
+               /* only the ILP variant can solve this yet */
+               solve_lpp(live_nodes, node, forbidden_regs, live_through_regs);
+               return;
+       }
+
        /* at this point we have to construct a bipartite matching problem to see
         * which values should go to which registers
         * Note: We're building the matrix in "reverse" - source registers are
@@ -1205,7 +1367,7 @@ static void enforce_constraints(ir_nodeset_t *live_nodes, ir_node *node,
                if (!arch_irn_consider_in_reg_alloc(cls, op))
                        continue;
 
-               req = arch_get_register_req(node, i);
+               req = arch_get_irn_register_req_in(node, i);
                if (!(req->type & arch_register_req_type_limited))
                        continue;
 
@@ -1261,9 +1423,9 @@ static bool is_copy_of(ir_node *value, ir_node *test_value)
 static int find_value_in_block_info(block_info_t *info, ir_node *value)
 {
        unsigned   r;
-       ir_node  **assignments = info->assignments;
+       ir_node  **end_assignments = info->assignments;
        for (r = 0; r < n_regs; ++r) {
-               ir_node *a_value = assignments[r];
+               ir_node *a_value = end_assignments[r];
 
                if (a_value == NULL)
                        continue;
@@ -1391,7 +1553,7 @@ static void adapt_phi_prefs(ir_node *phi)
                        continue;
 
                /* give bonus for already assigned register */
-               weight = (float)get_block_execfreq(execfreqs, pred_block);
+               weight = (float)get_block_execfreq(pred_block);
                r      = arch_register_get_index(reg);
                info->prefs[r] += weight * AFF_PHI;
        }
@@ -1413,7 +1575,7 @@ static void propagate_phi_register(ir_node *phi, unsigned assigned_r)
                ir_node           *pred_block = get_Block_cfgpred_block(block, i);
                unsigned           r;
                float              weight
-                       = (float)get_block_execfreq(execfreqs, pred_block) * AFF_PHI;
+                       = (float)get_block_execfreq(pred_block) * AFF_PHI;
 
                if (info->prefs[assigned_r] >= weight)
                        continue;
@@ -1437,7 +1599,6 @@ static void assign_phi_registers(ir_node *block)
        int                  n;
        int                  res;
        unsigned            *assignment;
-       ir_node             *node;
        hungarian_problem_t *bp;
 
        /* count phi nodes */
@@ -1523,9 +1684,7 @@ static void assign_phi_registers(ir_node *block)
  */
 static void allocate_coalesce_block(ir_node *block, void *data)
 {
-       int            i;
        ir_nodeset_t   live_nodes;
-       ir_node       *node;
        int            n_preds;
        block_info_t  *block_info;
        block_info_t **pred_block_infos;
@@ -1545,7 +1704,7 @@ static void allocate_coalesce_block(ir_node *block, void *data)
        /* gather regalloc infos of predecessor blocks */
        n_preds          = get_Block_n_cfgpreds(block);
        pred_block_infos = ALLOCAN(block_info_t*, n_preds);
-       for (i = 0; i < n_preds; ++i) {
+       for (int i = 0; i < n_preds; ++i) {
                ir_node      *pred      = get_Block_cfgpred_block(block, i);
                block_info_t *pred_info = get_block_info(pred);
                pred_block_infos[i]     = pred_info;
@@ -1554,14 +1713,13 @@ static void allocate_coalesce_block(ir_node *block, void *data)
        phi_ins = ALLOCAN(ir_node*, n_preds);
 
        /* collect live-in nodes and preassigned values */
-       be_lv_foreach(lv, block, be_lv_state_in, i) {
+       be_lv_foreach(lv, block, be_lv_state_in, node) {
                bool                       need_phi = false;
                const arch_register_req_t *req;
                const arch_register_t     *reg;
                int                        p;
 
-               node = be_lv_get_irn(lv, block, i);
-               req  = arch_get_register_req_out(node);
+               req  = arch_get_irn_register_req(node);
                if (req->cls != cls)
                        continue;
 
@@ -1600,14 +1758,15 @@ static void allocate_coalesce_block(ir_node *block, void *data)
 
                if (need_phi) {
                        ir_mode *mode = get_irn_mode(node);
-                       ir_node *phi  = be_new_Phi(block, n_preds, phi_ins, mode, cls);
+                       ir_node *phi  = be_new_Phi(block, n_preds, phi_ins, mode,
+                                                  cls->class_req);
 
                        DB((dbg, LEVEL_3, "Create Phi %+F (for %+F) -", phi, node));
 #ifdef DEBUG_libfirm
                        {
-                               int i;
-                               for (i = 0; i < n_preds; ++i) {
-                                       DB((dbg, LEVEL_3, " %+F", phi_ins[i]));
+                               int pi;
+                               for (pi = 0; pi < n_preds; ++pi) {
+                                       DB((dbg, LEVEL_3, " %+F", phi_ins[pi]));
                                }
                                DB((dbg, LEVEL_3, "\n"));
                        }
@@ -1643,18 +1802,14 @@ static void allocate_coalesce_block(ir_node *block, void *data)
 
        /* all live-ins must have a register */
 #ifdef DEBUG_libfirm
-       {
-               ir_nodeset_iterator_t  iter;
-               foreach_ir_nodeset(&live_nodes, node, iter) {
-                       const arch_register_t *reg = arch_get_irn_register(node);
-                       assert(reg != NULL);
-               }
+       foreach_ir_nodeset(&live_nodes, node, iter) {
+               const arch_register_t *reg = arch_get_irn_register(node);
+               assert(reg != NULL);
        }
 #endif
 
        /* assign instructions in the block */
        sched_foreach(block, node) {
-               int i;
                int arity;
                ir_node *value;
 
@@ -1672,7 +1827,7 @@ static void allocate_coalesce_block(ir_node *block, void *data)
 
                /* we may not use registers used for inputs for optimistic splits */
                arity = get_irn_arity(node);
-               for (i = 0; i < arity; ++i) {
+               for (int i = 0; i < arity; ++i) {
                        ir_node *op = get_irn_n(node, i);
                        const arch_register_t *reg;
                        if (!arch_irn_consider_in_reg_alloc(cls, op))
@@ -1736,7 +1891,7 @@ static int cmp_block_costs(const void *d1, const void *d2)
 
 static void determine_block_order(void)
 {
-       size_t    i;
+       size_t    p;
        ir_node **blocklist = be_get_cfgpostorder(irg);
        size_t    n_blocks  = ARR_LEN(blocklist);
        int       dfs_num   = 0;
@@ -1745,24 +1900,24 @@ static void determine_block_order(void)
        size_t    order_p   = 0;
 
        /* clear block links... */
-       for (i = 0; i < n_blocks; ++i) {
-               ir_node *block = blocklist[i];
+       for (p = 0; p < n_blocks; ++p) {
+               ir_node *block = blocklist[p];
                set_irn_link(block, NULL);
        }
 
        /* walk blocks in reverse postorder, the costs for each block are the
         * sum of the costs of its predecessors (excluding the costs on backedges
         * which we can't determine) */
-       for (i = n_blocks; i > 0;) {
+       for (p = n_blocks; p > 0;) {
                block_costs_t *cost_info;
-               ir_node *block = blocklist[--i];
+               ir_node *block = blocklist[--p];
 
-               float execfreq   = (float)get_block_execfreq(execfreqs, block);
+               float execfreq   = (float)get_block_execfreq(block);
                float costs      = execfreq;
                int   n_cfgpreds = get_Block_n_cfgpreds(block);
-               int   p;
-               for (p = 0; p < n_cfgpreds; ++p) {
-                       ir_node       *pred_block = get_Block_cfgpred_block(block, p);
+               int   p2;
+               for (p2 = 0; p2 < n_cfgpreds; ++p2) {
+                       ir_node       *pred_block = get_Block_cfgpred_block(block, p2);
                        block_costs_t *pred_costs = (block_costs_t*)get_irn_link(pred_block);
                        /* we don't have any info for backedges */
                        if (pred_costs == NULL)
@@ -1782,8 +1937,8 @@ static void determine_block_order(void)
        ir_reserve_resources(irg, IR_RESOURCE_BLOCK_VISITED);
        inc_irg_block_visited(irg);
 
-       for (i = 0; i < n_blocks; ++i) {
-               ir_node       *block = blocklist[i];
+       for (p = 0; p < n_blocks; ++p) {
+               ir_node       *block = blocklist[p];
                if (Block_block_visited(block))
                        continue;
 
@@ -1842,8 +1997,8 @@ static void be_pref_alloc_cls(void)
 {
        size_t i;
 
-       lv = be_assure_liveness(irg);
-       be_liveness_assure_sets(lv);
+       be_assure_live_sets(irg);
+       lv = be_get_irg_liveness(irg);
 
        ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
 
@@ -1865,7 +2020,7 @@ static void be_pref_alloc_cls(void)
 
 static void dump(int mask, ir_graph *irg, const char *suffix)
 {
-       if (be_get_irg_options(irg)->dump_flags & mask)
+       if (be_options.dump_flags & mask)
                dump_ir_graph(irg, suffix);
 }
 
@@ -1879,7 +2034,7 @@ static void spill(void)
        be_pre_spill_prepare_constr(irg, cls);
        be_timer_pop(T_RA_CONSTR);
 
-       dump(DUMP_RA, irg, "-spillprepare");
+       dump(DUMP_RA, irg, "spillprepare");
 
        /* spill */
        be_timer_push(T_RA_SPILL);
@@ -1890,7 +2045,7 @@ static void spill(void)
        check_for_memory_operands(irg);
        be_timer_pop(T_RA_SPILL_APPLY);
 
-       dump(DUMP_RA, irg, "-spill");
+       dump(DUMP_RA, irg, "spill");
 }
 
 /**
@@ -1904,8 +2059,7 @@ static void be_pref_alloc(ir_graph *new_irg)
 
        obstack_init(&obst);
 
-       irg       = new_irg;
-       execfreqs = be_get_irg_exec_freq(irg);
+       irg = new_irg;
 
        /* determine a good coloring order */
        determine_block_order();
@@ -1925,10 +2079,10 @@ static void be_pref_alloc(ir_graph *new_irg)
 
                /* verify schedule and register pressure */
                be_timer_push(T_VERIFY);
-               if (be_get_irg_options(irg)->verify_option == BE_VERIFY_WARN) {
+               if (be_options.verify_option == BE_VERIFY_WARN) {
                        be_verify_schedule(irg);
                        be_verify_register_pressure(irg, cls);
-               } else if (be_get_irg_options(irg)->verify_option == BE_VERIFY_ASSERT) {
+               } else if (be_options.verify_option == BE_VERIFY_ASSERT) {
                        assert(be_verify_schedule(irg) && "Schedule verification failed");
                        assert(be_verify_register_pressure(irg, cls)
                                && "Register pressure verification failed");
@@ -1941,8 +2095,7 @@ static void be_pref_alloc(ir_graph *new_irg)
 
                /* we most probably constructed new Phis so liveness info is invalid
                 * now */
-               /* TODO: test liveness_introduce */
-               be_liveness_invalidate(lv);
+               be_invalidate_live_sets(irg);
                free(normal_regs);
 
                stat_ev_ctx_pop("regcls");
@@ -1953,9 +2106,9 @@ static void be_pref_alloc(ir_graph *new_irg)
        be_timer_pop(T_RA_SPILL_APPLY);
 
        be_timer_push(T_VERIFY);
-       if (be_get_irg_options(irg)->verify_option == BE_VERIFY_WARN) {
+       if (be_options.verify_option == BE_VERIFY_WARN) {
                be_verify_register_allocation(irg);
-       } else if (be_get_irg_options(irg)->verify_option == BE_VERIFY_ASSERT) {
+       } else if (be_options.verify_option == BE_VERIFY_ASSERT) {
                assert(be_verify_register_allocation(irg)
                       && "Register allocation invalid");
        }