Added sparse matrix impl. Used by copyopt_ilp
[libfirm] / ir / be / bechordal.c
index 86f2308..5ad8d03 100644 (file)
@@ -3,6 +3,9 @@
  * @author Sebastian Hack
  * @date 8.12.2004
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <ctype.h>
 
@@ -12,9 +15,9 @@
 #include "iterator.h"
 
 #include "irmode_t.h"
+#include "irgraph_t.h"
 #include "irprintf_t.h"
 #include "irgwalk.h"
-#include "irgraph.h"
 #include "irdump.h"
 #include "irdom.h"
 #include "debug.h"
 #include "benumb_t.h"
 #include "besched_t.h"
 #include "belive_t.h"
+#include "bechordal_t.h"
 
 #undef DUMP_INTERVALS
-#define DUMP_PRESSURE
-
-#define TEST_COLORS 2048
+#undef DUMP_PRESSURE
+#undef DUMP_IFG
 
-static firm_dbg_module_t *dbg;
 
-/** An interval border. */
-typedef struct _border_t {
-       struct list_head list;          /**< list head for queuing. */
-       const ir_node *irn;                             /**< The node. */
-       unsigned step;                                          /**< The number equal to the interval border. */
-       unsigned is_def : 1;                    /**< Does this border denote a use or a def. */
-} border_t;
+#ifdef DEBUG_libfirm
+#include "fourcc.h"
 
-typedef struct _if_edge_t {
-       int src, tgt;
-} if_edge_t;
+/* Make a fourcc for border checking. */
+#define BORDER_FOURCC                          FOURCC('B', 'O', 'R', 'D')
 
-#define IF_EDGE_HASH(e) ((e)->src)
+#endif /* DEBUG_libfirm */
 
-static int if_edge_cmp(const void *p1, const void *p2, size_t size)
-{
-       const if_edge_t *e1 = p1;
-       const if_edge_t *e2 = p2;
+#define TEST_COLORS 2048
 
-       return !(e1->src == e2->src && e1->tgt == e2->tgt);
-}
+static firm_dbg_module_t *dbg;
 
+/**
+ * Environment for each of the chordal register allocator phases
+ */
 typedef struct _env_t {
        struct obstack obst;    /**< An obstack for temporary storage. */
-       set *phi_if;                                    /**< The phi interference map. */
-       bitset_t *live;                 /**< A live bitset to use in every block. */
-       bitset_t *processed;    /**< A set marking processed blocks. */
+#ifdef BUILD_GRAPH
+       set *graph;                                             /**< The interference graph. */
+#endif
+
+       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. */
 } env_t;
 
+
 typedef struct _be_chordal_dump_params_t {
        int x_dist;
        int y_dist;
@@ -77,6 +76,7 @@ static const be_chordal_dump_params_t dump_params = {
        4
 };
 
+#ifdef DUMP_INTERVALS
 static void draw_interval_graphs(ir_node *block,
                struct list_head *border_head,
                const be_chordal_dump_params_t *params)
@@ -131,11 +131,11 @@ static void draw_interval_graphs(ir_node *block,
                                int pos = last_pos - seen[nr];
                                int end_pos = last_pos - b->step;
                                int live_in = is_live_in(block, irn);
-                               int live_out = is_live_out(block, irn);
+                               int live_end = is_live_end(block, irn);
                                int y_val = y_dist * col;
 
                                int red = 0;
-                               int green = live_out;
+                               int green = live_end;
                                int blue = live_in;
 
                                fprintf(f, "0 0 0 setrgbcolor\n");
@@ -152,6 +152,128 @@ static void draw_interval_graphs(ir_node *block,
                fclose(f);
        }
 }
+#endif
+
+#if 0
+typedef struct _tree_layout_info_t {
+       ir_node *block;
+       int is_child;
+       int child_slot;
+       unsigned x;
+       unsigned y;
+       int steps;
+} tree_layout_info_t;
+
+typedef struct _tree_layout_params_t {
+       int interval_dist;
+       int x_block_dist;
+       int y_block_dist;
+       int step_len;
+} tree_layout_params_t;
+
+static const tree_layout_params_t tree_layout_params = {
+       10, 20, 20, 5
+};
+
+static void dump_tree_collect(ir_node *block, void *env)
+{
+       ir_block *curr;
+       struct list_head *border_head;
+
+       int pre_num = get_Block_dom_tree_pre_num(block);
+       tree_layout_info_t *info = env;
+       tree_layout_info_t *i = &info[pre_num];
+
+       i->block = block;
+       i->child_slot = -1;
+       i->steps = list_empty(border_head) ? 0 : list_entry(border_head->prev, border_t, list)->step;
+       i->is_child = 1;
+
+       dominates_for_each(block, curr)
+               i->is_child = 0;
+}
+
+static void dump_tree_assign_x(ir_node *block, void *env)
+{
+       unsigned min_x = -1, max_x = 0;
+       int n_childs = 0;
+       ir_block *curr;
+
+       int pre_num = get_Block_dom_tree_pre_num(block);
+       tree_layout_info_t *info = env;
+       tree_layout_info_t *i = &info[pre_num];
+
+       if(i->is_child)
+               return;
+
+       dominates_for_each(block, curr) {
+               tree_layout_info_t *ci = &info[get_Block_dom_tree_pre_num(curr)];
+               max_x = MAX(max_x, ci->x);
+               min_x = MIN(min_x, ci->x);
+               n_childs++;
+       }
+
+       i->x = (max_x - mix_x) / n_childs;
+}
+
+static void dump_tree_assign_y(ir_node *block, void *env)
+{
+       unsigned min_x = -1, max_x = 0;
+       int n_childs = 0;
+       ir_block *curr;
+
+       int pre_num = get_Block_dom_tree_pre_num(block);
+       tree_layout_info_t *info = env;
+       tree_layout_info_t *i = &info[pre_num];
+       ir_block *idom = get_Block_idom(block);
+
+       i->y = 0;
+       if(idom) {
+               tree_layout_info_t *idom_info = &info[get_Block_dom_tree_pre_num(idom)];
+               i->y = idom_info->y + idom_info->steps * params->step_len + params->y_dist;
+       }
+}
+
+static void draw_block(ir_block *bl, void *env)
+{
+}
+
+static void dump_interval_tree(ir_graph *irg, const tree_layout_params_t *params)
+{
+       int i, slot;
+       int n_blocks = get_Block_dom_max_subtree_pre_num(get_irg_start_block(irg));
+       tree_layout_info_t *info = malloc(sizeof(info[0]) * n_blocks);
+
+       /* Fill the info array. */
+       dom_tree_walk_irg(irg, NULL, dump_tree_collect, info);
+
+       /* Assign the child slots. */
+       for(i = 0, slot = 0; i < n_blocks; ++i) {
+               tree_layout_info_t *i = &info[i];
+               if(i->is_child) {
+                       i->child_slot = slot++;
+                       i->x = i->child_slot * params->max_color * params->interval_dist + params->block_dist;
+               }
+       }
+
+       dom_tree_walk_irg(irg, NULL, dump_tree_assign_xy, info);
+
+       free(info);
+}
+#endif
+
+#ifdef BUILD_GRAPH
+
+
+#define IF_EDGE_HASH(e) ((e)->src)
+
+static int if_edge_cmp(const void *p1, const void *p2, size_t size)
+{
+       const if_edge_t *e1 = p1;
+       const if_edge_t *e2 = p2;
+
+       return !(e1->src == e2->src && e1->tgt == e2->tgt);
+}
 
 static INLINE if_edge_t *edge_init(if_edge_t *edge, int src, int tgt)
 {
@@ -171,80 +293,251 @@ static INLINE void add_if(const env_t *env, int src, int tgt)
 {
        if_edge_t edge;
        edge_init(&edge, src, tgt);
-       set_insert(env->phi_if, &edge, sizeof(edge), IF_EDGE_HASH(&edge));
+       set_insert(env->graph, &edge, sizeof(edge), IF_EDGE_HASH(&edge));
 }
 
 static INLINE int are_connected(const env_t *env, int src, int tgt)
 {
        if_edge_t edge;
        edge_init(&edge, src, tgt);
-       return set_find(env->phi_if, &edge, sizeof(edge), IF_EDGE_HASH(&edge)) != NULL;
+       return set_find(env->graph, &edge, sizeof(edge), IF_EDGE_HASH(&edge)) != NULL;
 }
 
+static void dump_ifg(ir_graph *irg, set *edges, const char *filename)
+{
+       static const char *colors[] = {
+               "coral",
+               "azure",
+               "bisque",
+               "aliceblue",
+               "blanchedalmond",
+               "deeppink",
+               "cornsilk",
+               "blueviolet",
+               "floralwhite",
+               "hotpink",
+               "gainsboro",
+               "indianred",
+               "cornflowerblue",
+               "ghostwhite",
+               "lightpink",
+               "palegoldenrod",
+               "darkslateblue",
+               "honeydew",
+               "ivory",
+               "lavender",
+               "mediumvioletred",
+               "indigo",
+               "lavenderblush",
+               "lemonchiffon",
+               "linen",
+               "pink",
+               "mintcream",
+               "red",
+               "mediumblue",
+               "mistyrose",
+               "mediumslateblue",
+               "moccasin",
+               "tomato",
+               "forestgreen",
+               "midnightblue",
+               "navajowhite",
+               "navy",
+               "oldlace",
+               "greenyellow",
+               "navyblue",
+               "papayawhip",
+               "lawngreen",
+               "powderblue",
+               "peachpuff",
+               "seashell",
+               "snow",
+               "thistle",
+               "wheat",
+               "darkkhaki",
+               "mintcream",
+               "khaki",
+               "Magentas",
+               "whitesmoke",
+               "peru",
+               "palegreen",
+               "blueviolet",
+               "rosybrown",
+               "saddlebrown",
+               "springgreen",
+               "darkviolet",
+               "darkslategray",
+               "dimgray",
+               "sienna",
+               "gray",
+               "tan",
+               "gray",
+               "mediumvioletred",
+               "lightgray",
+               "Oranges",
+               "cyan",
+               "lightslategray",
+               "darkorange",
+               "slategray",
+               "orangered",
+               "mediumturquoise",
+               "violet",
+               "paleturquoise"
+       };
+
+       static const int n_colors = sizeof(colors) / sizeof(colors[0]);
+
+       FILE *f;
+
+       if((f = fopen(filename, "wt")) != NULL) {
+               long pos;
+               int n_edges = 0;
+               if_edge_t *edge;
+               bitset_t *bs = bitset_malloc(get_graph_node_count(irg));
+
+               ir_fprintf(f, "graph \"%F\" {\n", irg);
+               fprintf(f, "\tnode [shape=box,style=filled]\n");
+
+               for(edge = set_first(edges); edge; edge = set_next(edges)) {
+                       bitset_set(bs, edge->src);
+                       bitset_set(bs, edge->tgt);
+                       n_edges++;
+               }
+
+               fprintf(f, "\tx [label=\"nodes: %lu, edges: %d\"]\n", bitset_popcnt(bs), n_edges);
+
+               bitset_foreach(bs, pos) {
+                       int nr = (int) pos;
+                       ir_node *irn = get_irn_for_graph_nr(irg, nr);
+                       int color = get_irn_color(irn);
+
+                       ir_fprintf(f, "\tn%d [label=\"%n\",color=\"%s\"]\n", nr, irn,
+                                       color >= 0 && color < n_colors ? colors[color] : "black");
+               }
+
+               for(edge = set_first(edges); edge; edge = set_next(edges)) {
+                       fprintf(f, "\tn%d -- n%d [len=5]\n", edge->src, edge->tgt);
+               }
+
+               fprintf(f, "}\n");
+               fclose(f);
 
+               bitset_free(bs);
+       }
+
+}
 
+#endif /* BUILD_GRAPH */
+
+/**
+ * Add an interval border to the list of a block's list
+ * of interval border.
+ * @note You always have to create the use before the def.
+ * @param env The environment.
+ * @param head The list head to enqueue the borders.
+ * @param irn The node (value) the border belongs to.
+ * @param pressure The pressure at this point in time.
+ * @param step A time step for the border.
+ * @param is_def Is the border a use or a def.
+ * @return The created border.
+ */
 static INLINE border_t *border_add(env_t *env, struct list_head *head,
-                       const ir_node *irn, int step, int is_def)
+                       ir_node *irn, unsigned step, unsigned pressure,
+                       unsigned is_def, unsigned is_real)
 {
-       border_t *b = obstack_alloc(&env->obst, sizeof(*b));
+       border_t *b;
+
+       if(!is_def) {
+               border_t *def;
+
+               b = obstack_alloc(&env->obst, sizeof(*b));
+
+               /* also allocate the def and tie it to the use. */
+               def = obstack_alloc(&env->obst, sizeof(*def));
+               b->other_end = def;
+               def->other_end = b;
+
+               /*
+                * Set the link field of the irn to the def.
+                * This strongly relies on the fact, that the use is always
+                * made before the def.
+                */
+               set_irn_link(irn, def);
+
+#ifdef DEBUG_libfirm
+               b->magic = BORDER_FOURCC;
+               def->magic = BORDER_FOURCC;
+#endif
+       }
+
+       /*
+        * If the def is encountered, the use was made and so was the
+        * the def node (see the code above). It was placed into the
+        * link field of the irn, so we can get it there.
+        */
+       else {
+               b = get_irn_link(irn);
+
+#ifdef DEBUG_libfirm
+               assert(b && b->magic == BORDER_FOURCC && "Illegal border encountered");
+#endif
+       }
+
+       b->pressure = pressure;
        b->is_def = is_def;
+       b->is_real = is_real;
        b->irn = irn;
        b->step = step;
        list_add_tail(&b->list, head);
+       DBG((dbg, LEVEL_5, "\t\t%s adding %n, step: %d\n",
+                               is_def ? "def" : "use", irn, step));
+
        return b;
 }
 
-static void block_alloc(ir_node *block, void *env_ptr)
+/**
+ * Annotate the register pressure to the nodes and compute
+ * the liveness intervals.
+ * @param block The block to do it for.
+ * @param env_ptr The environment.
+ */
+static void pressure(ir_node *block, void *env_ptr)
 {
+/* Convenience macro for a def */
+#define border_def(irn, step, real) \
+       border_add(env, head, irn, step, pressure--, 1, real)
+
+/* Convenience macro for a use */
+#define border_use(irn, step, real) \
+       border_add(env, head, irn, step, ++pressure, 0, real)
+
        env_t *env = env_ptr;
-       struct obstack *obst = &env->obst;
-       void *obstack_level = obstack_base(obst);
        bitset_t *live = env->live;
-       bitset_t *colors = env->colors;
-       bitset_t *used_colors = bitset_malloc(env->colors_n);
-       ir_graph *irg = get_irn_irg(block);
+       ir_node *irn;
 
        int i, n;
        unsigned step = 0;
-       int block_nr = get_block_graph_nr(block);
-       const ir_node *irn;
-       border_t *b;
-       struct list_head head;
+       unsigned pressure = 0;
+       struct list_head *head;
        pset *live_in = get_live_in(block);
-       pset *live_out = get_live_out(block);
-       ir_node *idom = get_Block_idom(block);
-
-       /*
-        * Check, if this block has already been processed, if true, return
-        * immediately.
-        */
-       if(bitset_is_set(env->processed, block_nr))
-               return;
-
-       /*
-        * Ensure, that the immediate dominator of this block is allocated
-        * before this block, since the values live in at this block are
-        * defined in the dominators of this block. Coloring the dominators
-        * thus is vital before coloring this block.
-        */
-       if(idom)
-               block_alloc(idom, env);
+       pset *live_end = get_live_end(block);
 
-       /* Clear the live and allocate the color bitset. */
+       DBG((dbg, LEVEL_1, "Computing pressure in block %n\n", block));
        bitset_clear_all(live);
-       bitset_clear_all(colors);
 
-       INIT_LIST_HEAD(&head);
+       /* Set up the border list in the block info */
+       head = &get_ra_block_info(block)->border_head;
+       INIT_LIST_HEAD(head);
 
        /*
         * Make final uses of all values live out of the block.
         * They are neccessary to build up real intervals.
         */
-       for(irn = pset_first(live_out); irn; irn = pset_next(live_out)) {
-               DBG((dbg, LEVEL_3, "Making live: %n/%d\n", irn, get_irn_graph_nr(irn)));
+       for(irn = pset_first(live_end); irn; irn = pset_next(live_end)) {
+               DBG((dbg, LEVEL_3, "\tMaking live: %n/%d\n", irn, get_irn_graph_nr(irn)));
                bitset_set(live, get_irn_graph_nr(irn));
-               if(!is_Phi(irn) && is_allocatable_irn(irn))
-                       border_add(env, &head, irn, step, 0);
+               if(is_allocatable_irn(irn))
+                       border_use(irn, step, 0);
        }
 
        ++step;
@@ -254,9 +547,10 @@ static void block_alloc(ir_node *block, void *env_ptr)
         * relevant for the interval borders.
         */
        sched_foreach_reverse(block, irn) {
-               DBG((dbg, LEVEL_1, "insn: %n\n", irn));
-               DBG((dbg, LEVEL_2, "live: %b\n", live));
+               DBG((dbg, LEVEL_1, "\tinsn: %n, pressure: %d\n", irn, pressure));
+               DBG((dbg, LEVEL_2, "\tlive: %b\n", live));
 
+               /* Erase the color of each node encountered. */
                set_irn_color(irn, NO_COLOR);
 
                /*
@@ -267,19 +561,17 @@ static void block_alloc(ir_node *block, void *env_ptr)
                        int nr = get_irn_graph_nr(irn);
 
                        bitset_clear(live, nr);
-                       border_add(env, &head, irn, step, 1);
+                       border_def(irn, step, 1);
 
-                       if(is_phi_operand(irn)) {
+#ifdef BUILD_GRAPH
+                       {
                                unsigned long elm;
                                bitset_foreach(live, elm) {
                                        int live_nr = (int) elm;
-                                       ir_node *live_irn = get_irn_for_graph_nr(irg, live_nr);
-                                       if(is_phi_operand(live_irn)) {
-                                               DBG((dbg, LEVEL_3, "\t\tinterfering phi operands: %n, %n\n", irn, live_irn));
-                                               add_if(env, nr, live_nr);
-                                       }
+                                       add_if(env, nr, live_nr);
                                }
                        }
+#endif
                }
 
                /*
@@ -295,7 +587,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
                                        DBG((dbg, LEVEL_4, "\t\tpos: %d, use: %n\n", i, op));
 
                                        if(!bitset_is_set(live, nr)) {
-                                               border_add(env, &head, op, step, 0);
+                                               border_use(op, step, 1);
                                                bitset_set(live, nr);
                                        }
                                }
@@ -305,7 +597,51 @@ static void block_alloc(ir_node *block, void *env_ptr)
                ++step;
        }
 
+       /*
+        * Add initial defs for all values live in.
+        */
+       for(irn = pset_first(live_in); irn; irn = pset_next(live_in)) {
+               if(is_allocatable_irn(irn)) {
+
+                       /* Mark the value live in. */
+                       bitset_set(live, get_irn_graph_nr(irn));
+
+                       /* Add the def */
+                       border_def(irn, step, 0);
+               }
+       }
+}
+
+static void assign(ir_node *block, void *env_ptr)
+{
+       env_t *env = env_ptr;
+       struct obstack *obst = &env->obst;
+       bitset_t *live = env->live;
+       bitset_t *colors = env->colors;
+       bitset_t *in_colors = env->in_colors;
+
+       /* The used colors will remain on the obstack. */
+       bitset_t *used_colors = bitset_obstack_alloc(obst, env->colors_n);
+
+       /* Mark the obstack level and allocate the temporary tmp_colors */
+       void *obstack_level = obstack_base(obst);
+       /*bitset_t *tmp_colors = bitset_obstack_alloc(obst, env->colors_n);*/
+
+       const ir_node *irn;
+       border_t *b;
+       struct list_head *head = &get_ra_block_info(block)->border_head;
+       pset *live_in = get_live_in(block);
+
        bitset_clear_all(live);
+       bitset_clear_all(colors);
+       bitset_clear_all(in_colors);
+
+       DBG((dbg, LEVEL_4, "Assigning colors for block %n\n", block));
+       DBG((dbg, LEVEL_4, "\tusedef chain for block\n"));
+       list_for_each_entry(border_t, b, head, list) {
+               DBG((dbg, LEVEL_4, "\t%s %n/%d\n", b->is_def ? "def" : "use",
+                                       b->irn, get_irn_graph_nr(b->irn)));
+       }
 
        /*
         * Add initial defs for all values live in.
@@ -319,27 +655,20 @@ static void block_alloc(ir_node *block, void *env_ptr)
                        /* Mark the color of the live in value as used. */
                        assert(is_color(col) && "Node must have been assigned a color.");
                        bitset_set(colors, col);
+                       bitset_set(in_colors, col);
                        bitset_set(used_colors, col);
 
                        /* Mark the value live in. */
                        bitset_set(live, get_irn_graph_nr(irn));
-
-                       /* Add the def */
-                       border_add(env, &head, irn, step, 1);
                }
        }
 
-       DBG((dbg, LEVEL_4, "usedef chain for block %n\n", block));
-       list_for_each_entry(border_t, b, &head, list) {
-               DBG((dbg, LEVEL_4, "\t%s %n %d\n", b->is_def ? "def" : "use", b->irn, get_irn_graph_nr(b->irn)));
-       }
-
        /*
         * Mind that the sequence of defs from back to front defines a perfect
         * elimination order. So, coloring the definitions from first to last
         * will work.
         */
-       list_for_each_entry_reverse(border_t, b, &head, list) {
+       list_for_each_entry_reverse(border_t, b, head, list) {
                const ir_node *irn = b->irn;
                int nr = get_irn_graph_nr(irn);
 
@@ -349,7 +678,30 @@ static void block_alloc(ir_node *block, void *env_ptr)
                 */
                if(b->is_def && !is_live_in(block, irn)) {
                        ra_node_info_t *ri = get_ra_node_info(irn);
-                       int col = bitset_next_clear(colors, 0);
+                       int col = NO_COLOR;
+
+                       DBG((dbg, LEVEL_4, "\tcolors in use: %b\n", colors));
+
+                       /*
+                        * Try to assign live out values colors which are not used by live
+                        * in values.
+                        */
+#if 0
+                       if(is_live_out(block, irn)) {
+                               int next_clear;
+
+                               bitset_copy(tmp_colors, colors);
+                               bitset_or(tmp_colors, in_colors);
+                               next_clear = bitset_next_clear(tmp_colors, 0);
+                               col = next_clear != -1 ? next_clear : NO_COLOR;
+
+                               DBG((dbg, LEVEL_5, "next clear in only outs %b: %d\n", tmp_colors, col));
+                       }
+#endif
+
+                       /* If a color is not yet assigned, do it now. */
+                       if(!is_color(col))
+                               col = bitset_next_clear(colors, 0);
 
                        assert(!is_color(get_irn_color(irn)) && "Color must not have assigned");
                        assert(!bitset_is_set(live, nr) && "Value def must not have been encountered");
@@ -359,7 +711,6 @@ static void block_alloc(ir_node *block, void *env_ptr)
                        bitset_set(live, nr);
 
                        ri->color = col;
-                       ri->pressure = bitset_popcnt(colors);
 
                        DBG((dbg, LEVEL_1, "\tassigning color %d to %n\n", col, irn));
                }
@@ -377,7 +728,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
        }
 
 #ifdef DUMP_INTERVALS
-       draw_interval_graphs(block, &head, &dump_params);
+       draw_interval_graphs(block, head, &dump_params);
 #endif
 
 #ifdef DUMP_PRESSURE
@@ -400,23 +751,21 @@ static void block_alloc(ir_node *block, void *env_ptr)
        }
 #endif
 
+
        /*
         * Allocate the used colors array in the blocks ra info structure and
         * fill it.
         */
        get_ra_block_info(block)->used_colors = used_colors;
 
-       /* Mark this block has processed. */
-       bitset_set(env->processed, block_nr);
-
-       /* Reset the obstack to its initial level */
+       /* Free the auxillary data on the obstack. */
        obstack_free(obst, obstack_level);
 }
 
 void be_ra_chordal_init(void)
 {
        dbg = firm_dbg_register(DBG_BERA);
-       /* firm_dbg_set_mask(dbg, -1); */
+       firm_dbg_set_mask(dbg, 0);
 }
 
 void be_ra_chordal(ir_graph *irg)
@@ -428,14 +777,33 @@ void be_ra_chordal(ir_graph *irg)
                compute_doms(irg);
 
        obstack_init(&env->obst);
-       env->phi_if = new_set(if_edge_cmp, node_count);
+
+#ifdef BUILD_GRAPH
+       env->graph = new_set(if_edge_cmp, node_count);
+#endif
+
        env->live = bitset_obstack_alloc(&env->obst, node_count);
-       env->processed = bitset_obstack_alloc(&env->obst, get_graph_block_count(irg));
        env->colors = bitset_obstack_alloc(&env->obst, TEST_COLORS);
+       env->in_colors = bitset_obstack_alloc(&env->obst, TEST_COLORS);
        env->colors_n = TEST_COLORS;
 
-       irg_block_walk_graph(irg, block_alloc, NULL, env);
-       obstack_free(&env->obst, NULL);
+       /* First, determine the pressure */
+       dom_tree_walk_irg(irg, pressure, NULL, env);
+
+       /* Insert probable spills */
+       be_ra_chordal_spill(irg);
+
+       /* Assign the colors */
+       dom_tree_walk_irg(irg, assign, NULL, env);
+
+#ifdef DUMP_IFG
+       {
+               char buf[128];
+
+               ir_snprintf(buf, sizeof(buf), "ifg_%s.dot", get_entity_name(get_irg_entity(irg)));
+               dump_ifg(irg, env->graph, buf);
+       }
+#endif
 
        set_irg_ra_link(irg, env);
 }
@@ -443,16 +811,31 @@ void be_ra_chordal(ir_graph *irg)
 void be_ra_chordal_done(ir_graph *irg)
 {
        env_t *env = get_irg_ra_link(irg);
-       free(env->phi_if);
+
+#ifdef BUILD_GRAPH
+       free(env->graph);
+#endif
+
+       obstack_free(&env->obst, NULL);
        free(env);
 }
 
 int phi_ops_interfere(const ir_node *a, const ir_node *b)
 {
+#ifdef BUILD_GRAPH
        ir_graph *irg = get_irn_irg(a);
        env_t *env = get_irg_ra_link(irg);
 
        assert(irg == get_irn_irg(b) && "Both nodes must be in the same graph");
 
        return are_connected(env, get_irn_graph_nr(a), get_irn_graph_nr(b));
+#else
+       return values_interfere(a, b);
+#endif /* BUILD_GRAPH */
 }
+
+#ifdef BUILD_GRAPH
+set *be_ra_get_ifg(ir_graph *irg) {
+       return ((env_t *)get_irg_ra_link(irg))->graph;
+}
+#endif