X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=3834e4d486776391d3c3355d84f67f54dc0cb9cf;hb=205396c4f4f5abe7abd6dc2350c8c398a7623afc;hp=19dd2e86bb9b4d081f2fa5c133978b146e6e3129;hpb=7cce4af0dedb6df7966c8d2d1063f17ca018440e;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 19dd2e86b..3834e4d48 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -22,11 +22,9 @@
 #include "iterator.h"
 #include "firm_config.h"
 
-#ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
 #include <libcore/lc_timing.h>
-#endif /* WITH_LIBCORE */
 
 #include "ircons_t.h"
 #include "irmode_t.h"
@@ -51,12 +49,14 @@
 #include "besched.h"
 #include "besched_t.h"
 #include "belive_t.h"
-#include "bearch.h"
+#include "bearch_t.h"
 #include "beifg_t.h"
 #include "beifg_impl.h"
 #include "benode_t.h"
 #include "bestatevent.h"
 #include "bestat.h"
+#include "bemodule.h"
+#include "be_t.h"
 
 #include "bespillbelady.h"
 #include "bespillmorgan.h"
@@ -77,24 +77,17 @@
 
 static be_ra_chordal_opts_t options = {
 	BE_CH_DUMP_NONE,
-	BE_CH_SPILL_BELADY,
-	BE_CH_IFG_STD,
 	BE_CH_LOWER_PERM_SWAP,
 	BE_CH_VRFY_WARN,
 };
 
-/** Enable extreme live range splitting. */
-static int be_elr_split = 0;
-
-/** Assumed loop iteration count for execution frequency estimation. */
-static int be_loop_weight = 9;
-
 typedef struct _post_spill_env_t {
-	be_chordal_env_t cenv;
-	double           pre_spill_cost;
+	be_chordal_env_t            cenv;
+	be_irg_t                    *birg;
+	const arch_register_class_t *cls;
+	double                      pre_spill_cost;
 } post_spill_env_t;
 
-#ifdef WITH_LIBCORE
 static be_ra_timer_t ra_timer = {
 	NULL,
 	NULL,
@@ -109,25 +102,6 @@ static be_ra_timer_t ra_timer = {
 	NULL,
 };
 
-static const lc_opt_enum_int_items_t spill_items[] = {
-	{ "morgan", BE_CH_SPILL_MORGAN },
-	{ "belady", BE_CH_SPILL_BELADY },
-#ifdef WITH_ILP
-	{ "remat",  BE_CH_SPILL_REMAT },
-#endif /* WITH_ILP */
-	{ NULL, 0 }
-};
-
-static const lc_opt_enum_int_items_t ifg_flavor_items[] = {
-	{ "std",     BE_CH_IFG_STD     },
-	{ "fast",    BE_CH_IFG_FAST    },
-	{ "clique",  BE_CH_IFG_CLIQUE  },
-	{ "pointer", BE_CH_IFG_POINTER },
-	{ "list",    BE_CH_IFG_LIST    },
-	{ "check",   BE_CH_IFG_CHECK   },
-	{ NULL,      0                 }
-};
-
 static const lc_opt_enum_int_items_t lower_perm_items[] = {
 	{ "copy", BE_CH_LOWER_PERM_COPY },
 	{ "swap", BE_CH_LOWER_PERM_SWAP },
@@ -139,6 +113,7 @@ static const lc_opt_enum_int_items_t lower_perm_stat_items[] = {
 };
 
 static const lc_opt_enum_int_items_t dump_items[] = {
+	{ "none",       BE_CH_DUMP_NONE       },
 	{ "spill",      BE_CH_DUMP_SPILL      },
 	{ "live",       BE_CH_DUMP_LIVE       },
 	{ "color",      BE_CH_DUMP_COLOR      },
@@ -160,14 +135,6 @@ static const lc_opt_enum_int_items_t be_ch_vrfy_items[] = {
 	{ NULL, 0 }
 };
 
-static lc_opt_enum_int_var_t spill_var = {
-	&options.spill_method, spill_items
-};
-
-static lc_opt_enum_int_var_t ifg_flavor_var = {
-	&options.ifg_flavor, ifg_flavor_items
-};
-
 static lc_opt_enum_int_var_t lower_perm_var = {
 	&options.lower_perm_opt, lower_perm_items
 };
@@ -181,91 +148,12 @@ static lc_opt_enum_int_var_t be_ch_vrfy_var = {
 };
 
 static const lc_opt_table_entry_t be_chordal_options[] = {
-	LC_OPT_ENT_ENUM_INT ("spill",	      "spill method", &spill_var),
-	LC_OPT_ENT_ENUM_PTR ("ifg",           "interference graph flavour", &ifg_flavor_var),
 	LC_OPT_ENT_ENUM_PTR ("perm",          "perm lowering options", &lower_perm_var),
 	LC_OPT_ENT_ENUM_MASK("dump",          "select dump phases", &dump_var),
 	LC_OPT_ENT_ENUM_PTR ("vrfy",          "verify options", &be_ch_vrfy_var),
-	LC_OPT_ENT_BOOL     ("elrsplit",      "enable extreme live range splitting", &be_elr_split),
-	LC_OPT_ENT_INT      ("loop_weight",   "assumed amount of loop iterations for guessing the execution frequency", &be_loop_weight),
 	{ NULL }
 };
 
-extern void be_spill_remat_register_options(lc_opt_entry_t *ent);
-
-void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
-	const arch_env_t *arch_env = chordal_env->birg->main_env->arch_env;
-	struct obstack ob;
-	pmap_entry *pme;
-	ir_node **nodes, *n1, *n2;
-	int i, o;
-	be_lv_t *lv = chordal_env->birg->lv;
-	DEBUG_ONLY(firm_dbg_module_t *dbg = chordal_env->dbg;)
-
-	/* Collect all irns */
-	obstack_init(&ob);
-	pmap_foreach(chordal_env->border_heads, pme) {
-		border_t *curr;
-		struct list_head *head = pme->value;
-		list_for_each_entry(border_t, curr, head, list)
-			if (curr->is_def && curr->is_real)
-				if (arch_get_irn_reg_class(arch_env, curr->irn, -1) == chordal_env->cls)
-					obstack_ptr_grow(&ob, curr->irn);
-	}
-	obstack_ptr_grow(&ob, NULL);
-	nodes = (ir_node **) obstack_finish(&ob);
-
-	/* Check them */
-	for (i = 0, n1 = nodes[i]; n1; n1 = nodes[++i]) {
-		const arch_register_t *n1_reg, *n2_reg;
-
-		n1_reg = arch_get_irn_register(arch_env, n1);
-		if (!arch_reg_is_allocatable(arch_env, n1, -1, n1_reg)) {
-			DBG((dbg, 0, "Register %s assigned to %+F is not allowed\n", n1_reg->name, n1));
-			assert(0 && "Register constraint does not hold");
-		}
-		for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) {
-			n2_reg = arch_get_irn_register(arch_env, n2);
-			if (values_interfere(lv, n1, n2) && n1_reg == n2_reg) {
-				DBG((dbg, 0, "Values %+F and %+F interfere and have the same register assigned: %s\n", n1, n2, n1_reg->name));
-				assert(0 && "Interfering values have the same color!");
-			}
-		}
-	}
-	obstack_free(&ob, NULL);
-}
-
-int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b)
-{
-	if(env->ifg)
-		return be_ifg_connected(env->ifg, a, b);
-	else
-		return values_interfere(env->birg->lv, a, b);
-}
-
-static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
-{
-	static int run_once = 0;
-	lc_opt_entry_t *chordal_grp;
-
-	if (! run_once) {
-		run_once    = 1;
-		chordal_grp = lc_opt_get_grp(grp, "chordal");
-
-		lc_opt_add_table(chordal_grp, be_chordal_options);
-
-		co_register_options(chordal_grp);
-#ifdef WITH_JVM
-		be_java_coal_register_options(chordal_grp);
-#endif
-#ifdef WITH_ILP
-		be_spill_remat_register_options(chordal_grp);
-#endif
-		be_spill_register_options(chordal_grp);
-	}
-}
-#endif /* WITH_LIBCORE */
-
 static void dump(unsigned mask, ir_graph *irg,
 				 const arch_register_class_t *cls,
 				 const char *suffix,
@@ -282,56 +170,6 @@ static void dump(unsigned mask, ir_graph *irg,
 	}
 }
 
-static void put_ignore_colors(be_chordal_env_t *chordal_env)
-{
-	int n_colors = chordal_env->cls->n_regs;
-	int i;
-
-	bitset_clear_all(chordal_env->ignore_colors);
-	be_abi_put_ignore_regs(chordal_env->birg->abi, chordal_env->cls, chordal_env->ignore_colors);
-	for(i = 0; i < n_colors; ++i)
-		if(arch_register_type_is(&chordal_env->cls->regs[i], ignore))
-			bitset_set(chordal_env->ignore_colors, i);
-}
-
-FILE *be_chordal_open(const be_chordal_env_t *env, const char *prefix, const char *suffix)
-{
-	char buf[1024];
-
-	ir_snprintf(buf, sizeof(buf), "%s%F_%s%s", prefix, env->irg, env->cls->name, suffix);
-	return fopen(buf, "wt");
-}
-
-void check_ifg_implementations(be_chordal_env_t *chordal_env)
-{
-	FILE *f;
-
-	f = be_chordal_open(chordal_env, "std", ".log");
-	chordal_env->ifg = be_ifg_std_new(chordal_env);
-	be_ifg_check_sorted_to_file(chordal_env->ifg, f);
-	fclose(f);
-
-	f = be_chordal_open(chordal_env, "list", ".log");
-	be_ifg_free(chordal_env->ifg);
-	chordal_env->ifg = be_ifg_list_new(chordal_env);
-	be_ifg_check_sorted_to_file(chordal_env->ifg, f);
-	fclose(f);
-
-	f = be_chordal_open(chordal_env, "clique", ".log");
-	be_ifg_free(chordal_env->ifg);
-	chordal_env->ifg = be_ifg_clique_new(chordal_env);
-	be_ifg_check_sorted_to_file(chordal_env->ifg, f);
-	fclose(f);
-
-	f = be_chordal_open(chordal_env, "pointer", ".log");
-	be_ifg_free(chordal_env->ifg);
-	chordal_env->ifg = be_ifg_pointer_new(chordal_env);
-	be_ifg_check_sorted_to_file(chordal_env->ifg, f);
-	fclose(f);
-
-	chordal_env->ifg = NULL;
-};
-
 /**
  * Checks for every reload if it's user can perform the load on itself.
  */
@@ -345,12 +183,9 @@ static void memory_operand_walker(ir_node *irn, void *env) {
 	if (! be_is_Reload(irn))
 		return;
 
-	/* always use addressmode, it's good for x86 */
-#if 0
 	/* only use memory operands, if the reload is only used by 1 node */
 	if(get_irn_n_edges(irn) > 1)
 		return;
-#endif
 
 	spill = be_get_Reload_mem(irn);
 	block = get_nodes_block(irn);
@@ -362,16 +197,15 @@ static void memory_operand_walker(ir_node *irn, void *env) {
 		assert(src && "outedges broken!");
 
 		if (get_nodes_block(src) == block && arch_possible_memory_operand(aenv, src, pos)) {
-			DBG((cenv->dbg, LEVEL_3, "performing memory operand %+F at %+F\n", irn, src));
-			//arch_perform_memory_operand(aenv, src, spill, pos);
+			arch_perform_memory_operand(aenv, src, spill, pos);
 		}
 	}
 
 	/* kill the Reload */
 	if (get_irn_n_edges(irn) == 0) {
 		sched_remove(irn);
-		set_irn_n(irn, 0, new_Bad());
-		set_irn_n(irn, 1, new_Bad());
+		set_irn_n(irn, be_pos_Reload_mem, new_Bad());
+		set_irn_n(irn, be_pos_Reload_frame, new_Bad());
 	}
 }
 
@@ -395,17 +229,18 @@ typedef struct _node_stat_t {
 } node_stat_t;
 
 struct node_stat_walker {
-	node_stat_t *stat;
-	const be_chordal_env_t *cenv;
-	bitset_t *mem_phis;
+	node_stat_t      *stat;
+	const arch_env_t *arch_env;
+	bitset_t         *mem_phis;
+	const arch_register_class_t *cls;
 };
 
 static void node_stat_walker(ir_node *irn, void *data)
 {
-	struct node_stat_walker *env = data;
-	const arch_env_t *aenv       = env->cenv->birg->main_env->arch_env;
+	struct node_stat_walker *env  = data;
+	const arch_env_t        *aenv = env->arch_env;
 
-	if(arch_irn_consider_in_reg_alloc(aenv, env->cenv->cls, irn)) {
+	if (arch_irn_consider_in_reg_alloc(aenv, env->cls, irn)) {
 
 		/* if the node is a normal phi */
 		if(is_Phi(irn))
@@ -440,15 +275,16 @@ static void node_stat_walker(ir_node *irn, void *data)
 	}
 }
 
-static void node_stats(const be_chordal_env_t *cenv, node_stat_t *stat)
+static void node_stats(be_irg_t *birg, const arch_register_class_t *cls, node_stat_t *stat)
 {
 	struct node_stat_walker env;
 
 	memset(stat, 0, sizeof(stat[0]));
-	env.cenv     = cenv;
-	env.mem_phis = bitset_irg_malloc(cenv->irg);
+	env.arch_env = birg->main_env->arch_env;
+	env.mem_phis = bitset_irg_malloc(birg->irg);
 	env.stat     = stat;
-	irg_walk_graph(cenv->irg, NULL, node_stat_walker, &env);
+	env.cls      = cls;
+	irg_walk_graph(birg->irg, NULL, node_stat_walker, &env);
 	bitset_free(env.mem_phis);
 }
 
@@ -474,7 +310,6 @@ static unsigned int count_insns(ir_graph *irg)
 	return cnt;
 }
 
-#ifdef WITH_LIBCORE
 /**
  * Initialize all timers.
  */
@@ -504,6 +339,8 @@ static void be_init_timer(be_options_t *main_opts)
 		LC_STOP_AND_RESET_TIMER(ra_timer.t_ssa);
 		LC_STOP_AND_RESET_TIMER(ra_timer.t_verify);
 		LC_STOP_AND_RESET_TIMER(ra_timer.t_other);
+
+		global_ra_timer = &ra_timer;
 	}
 }
 
@@ -529,46 +366,42 @@ static void be_init_timer(be_options_t *main_opts)
 				lc_timer_get_name(tmp), lc_timer_get_name(timer));                             \
 		timer = tmp;                                                                           \
 	}
-#else
-
-#define BE_TIMER_INIT(main_opts)
-#define BE_TIMER_PUSH(timer)
-#define BE_TIMER_POP(timer)
-
-#endif /* WITH_LIBCORE */
 
 /**
  * Perform things which need to be done per register class before spilling.
  */
 static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse) {
 	be_chordal_env_t *chordal_env = &pse->cenv;
+	be_irg_t         *birg        = pse->birg;
 	node_stat_t      node_stat;
 
-	chordal_env->cls           = arch_isa_get_reg_class(isa, cls_idx);
+	pse->cls                   = arch_isa_get_reg_class(isa, cls_idx);
+	chordal_env->cls           = pse->cls;
 	chordal_env->border_heads  = pmap_create();
 	chordal_env->ignore_colors = bitset_malloc(chordal_env->cls->n_regs);
 
 #ifdef FIRM_STATISTICS
 	if (be_stat_ev_is_active()) {
-		be_stat_tags[STAT_TAG_CLS] = chordal_env->cls->name;
+		be_stat_tags[STAT_TAG_CLS] = pse->cls->name;
 		be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
 
 		/* perform some node statistics. */
-		node_stats(chordal_env, &node_stat);
+		node_stats(birg, pse->cls, &node_stat);
 		be_stat_ev("phis_before_spill", node_stat.n_phis);
 	}
 #endif /* FIRM_STATISTICS */
 
 	/* put all ignore registers into the ignore register set. */
-	put_ignore_colors(chordal_env);
+	be_put_ignore_regs(birg, pse->cls, chordal_env->ignore_colors);
 
 	be_pre_spill_prepare_constr(chordal_env);
-	dump(BE_CH_DUMP_CONSTR, chordal_env->irg, chordal_env->cls, "-constr-pre", dump_ir_block_graph_sched);
+	dump(BE_CH_DUMP_CONSTR, birg->irg, pse->cls, "-constr-pre", dump_ir_block_graph_sched);
 
 #ifdef FIRM_STATISTICS
 	if (be_stat_ev_is_active()) {
-		pse->pre_spill_cost = be_estimate_irg_costs(chordal_env->irg,
-			chordal_env->birg->main_env->arch_env, chordal_env->birg->exec_freq);
+		pse->pre_spill_cost = be_estimate_irg_costs(birg->irg,
+			birg->main_env->arch_env, birg->exec_freq);
+		be_stat_ev_pop();
 	}
 #endif /* FIRM_STATISTICS */
 }
@@ -576,22 +409,30 @@ static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse)
 /**
  * Perform things which need to be done per register class after spilling.
  */
-static void post_spill(post_spill_env_t *pse) {
+static void post_spill(post_spill_env_t *pse, int iteration) {
 	be_chordal_env_t    *chordal_env = &pse->cenv;
-	ir_graph            *irg         = chordal_env->irg;
-	be_irg_t            *birg        = chordal_env->birg;
+	be_irg_t            *birg        = pse->birg;
+	ir_graph            *irg         = birg->irg;
 	const be_main_env_t *main_env    = birg->main_env;
 	be_options_t        *main_opts   = main_env->options;
-	static int          splitted     = 0;
 	node_stat_t         node_stat;
+	int                 colors_n     = arch_register_class_n_regs(chordal_env->cls);
+	int             allocatable_regs = colors_n - be_put_ignore_regs(birg, chordal_env->cls, NULL);
+
+	/* some special classes contain only ignore regs, no work to be done */
+	if(allocatable_regs == 0)
+		return;
 
 #ifdef FIRM_STATISTICS
 	if (be_stat_ev_is_active()) {
 		double spillcosts = be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq) - pse->pre_spill_cost;
 
+		be_stat_tags[STAT_TAG_CLS] = pse->cls->name;
+		be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
+
 		be_stat_ev_l("spillcosts", (long) spillcosts);
 
-		node_stats(chordal_env, &node_stat);
+		node_stats(birg, pse->cls, &node_stat);
 		be_stat_ev("phis_after_spill", node_stat.n_phis);
 		be_stat_ev("mem_phis", node_stat.n_mem_phis);
 		be_stat_ev("reloads", node_stat.n_reloads);
@@ -599,71 +440,52 @@ static void post_spill(post_spill_env_t *pse) {
 	}
 #endif /* FIRM_STATISTICS */
 
-	check_for_memory_operands(chordal_env);
-
-	be_abi_fix_stack_nodes(birg->abi, birg->lv);
+	/*
+		If we have a backend provided spiller, post spill is
+		called in a loop after spilling for each register class.
+		But we only need to fix stack nodes once in this case.
+	*/
+	if (iteration == 0) {
+		check_for_memory_operands(chordal_env);
+		be_abi_fix_stack_nodes(birg->abi);
+	}
 
 	BE_TIMER_PUSH(ra_timer.t_verify);
 
 	/* verify schedule and register pressure */
 	if (chordal_env->opts->vrfy_option == BE_CH_VRFY_WARN) {
-		be_verify_schedule(irg);
-		be_verify_register_pressure(chordal_env->birg, chordal_env->cls, irg);
+		be_verify_schedule(birg);
+		be_verify_register_pressure(birg, pse->cls, irg);
 	}
 	else if (chordal_env->opts->vrfy_option == BE_CH_VRFY_ASSERT) {
-		assert(be_verify_schedule(irg) && "Schedule verification failed");
-		assert(be_verify_register_pressure(chordal_env->birg, chordal_env->cls, irg)
+		assert(be_verify_schedule(birg) && "Schedule verification failed");
+		assert(be_verify_register_pressure(birg, pse->cls, irg)
 			&& "Register pressure verification failed");
 	}
 	BE_TIMER_POP(ra_timer.t_verify);
 
-	if (be_elr_split && ! splitted) {
-		extreme_liverange_splitting(chordal_env);
-		splitted = 1;
-	}
-
 	/* Color the graph. */
 	BE_TIMER_PUSH(ra_timer.t_color);
 	be_ra_chordal_color(chordal_env);
 	BE_TIMER_POP(ra_timer.t_color);
 
-	dump(BE_CH_DUMP_CONSTR, irg, chordal_env->cls, "-color", dump_ir_block_graph_sched);
+	dump(BE_CH_DUMP_CONSTR, irg, pse->cls, "-color", dump_ir_block_graph_sched);
 
 	/* Create the ifg with the selected flavor */
 	BE_TIMER_PUSH(ra_timer.t_ifg);
-	switch (chordal_env->opts->ifg_flavor) {
-		default:
-			fprintf(stderr, "no valid ifg flavour selected. falling back to std\n");
-		case BE_CH_IFG_STD:
-		case BE_CH_IFG_FAST:
-			chordal_env->ifg = be_ifg_std_new(chordal_env);
-			break;
-		case BE_CH_IFG_CLIQUE:
-			chordal_env->ifg = be_ifg_clique_new(chordal_env);
-			break;
-		case BE_CH_IFG_POINTER:
-			chordal_env->ifg = be_ifg_pointer_new(chordal_env);
-			break;
-		case BE_CH_IFG_LIST:
-			chordal_env->ifg = be_ifg_list_new(chordal_env);
-			break;
-		case BE_CH_IFG_CHECK:
-			check_ifg_implementations(chordal_env);
-			/* Build the interference graph. */
-			chordal_env->ifg = be_ifg_std_new(chordal_env);
-			break;
-	}
+	chordal_env->ifg = be_create_ifg(chordal_env);
 	BE_TIMER_POP(ra_timer.t_ifg);
 
 #ifdef FIRM_STATISTICS
 	if (be_stat_ev_is_active()) {
 		be_ifg_stat_t stat;
-		be_ifg_stat(chordal_env, &stat);
+
+		be_ifg_stat(birg, chordal_env->ifg, &stat);
 		be_stat_ev("ifg_nodes", stat.n_nodes);
 		be_stat_ev("ifg_edges", stat.n_edges);
 		be_stat_ev("ifg_comps", stat.n_comps);
 
-		node_stats(chordal_env, &node_stat);
+		node_stats(birg, pse->cls, &node_stat);
 		be_stat_ev("perms_before_coal", node_stat.n_perms);
 		be_stat_ev("copies_before_coal", node_stat.n_copies);
 	}
@@ -674,7 +496,7 @@ static void post_spill(post_spill_env_t *pse) {
 	co_driver(chordal_env);
 	BE_TIMER_POP(ra_timer.t_copymin);
 
-	dump(BE_CH_DUMP_COPYMIN, irg, chordal_env->cls, "-copymin", dump_ir_block_graph_sched);
+	dump(BE_CH_DUMP_COPYMIN, irg, pse->cls, "-copymin", dump_ir_block_graph_sched);
 
 	BE_TIMER_PUSH(ra_timer.t_ssa);
 
@@ -683,7 +505,7 @@ static void post_spill(post_spill_env_t *pse) {
 
 	BE_TIMER_POP(ra_timer.t_ssa);
 
-	dump(BE_CH_DUMP_SSADESTR, irg, chordal_env->cls, "-ssadestr", dump_ir_block_graph_sched);
+	dump(BE_CH_DUMP_SSADESTR, irg, pse->cls, "-ssadestr", dump_ir_block_graph_sched);
 
 	BE_TIMER_PUSH(ra_timer.t_verify);
 	if (chordal_env->opts->vrfy_option != BE_CH_VRFY_OFF) {
@@ -691,13 +513,14 @@ static void post_spill(post_spill_env_t *pse) {
 	}
 	BE_TIMER_POP(ra_timer.t_verify);
 
+	/* free some data structures */
 	be_ifg_free(chordal_env->ifg);
 	pmap_destroy(chordal_env->border_heads);
 	bitset_free(chordal_env->ignore_colors);
 
 #ifdef FIRM_STATISTICS
 	if (be_stat_ev_is_active()) {
-		node_stats(chordal_env, &node_stat);
+		node_stats(birg, pse->cls, &node_stat);
 		be_stat_ev("perms_after_coal", node_stat.n_perms);
 		be_stat_ev("copies_after_coal", node_stat.n_copies);
 		be_stat_ev_pop();
@@ -711,7 +534,7 @@ static void post_spill(post_spill_env_t *pse) {
  * @param birg  Backend irg object
  * @return Structure containing timer for the single phases or NULL if no timing requested.
  */
-static be_ra_timer_t *be_ra_chordal_main(be_irg_t *birg)
+static void be_ra_chordal_main(be_irg_t *birg)
 {
 	const be_main_env_t *main_env  = birg->main_env;
 	const arch_isa_t    *isa       = arch_env_get_isa(main_env->arch_env);
@@ -730,7 +553,6 @@ static be_ra_timer_t *be_ra_chordal_main(be_irg_t *birg)
 	chordal_env.opts      = &options;
 	chordal_env.irg       = irg;
 	chordal_env.birg      = birg;
-	FIRM_DBG_REGISTER(chordal_env.dbg, "firm.be.chordal");
 
 	obstack_init(&chordal_env.obst);
 
@@ -746,34 +568,18 @@ static be_ra_timer_t *be_ra_chordal_main(be_irg_t *birg)
 			post_spill_env_t pse;
 
 			memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
+			pse.birg = birg;
 			pre_spill(isa, j, &pse);
 
 			BE_TIMER_PUSH(ra_timer.t_spill);
-			/* spilling */
-			switch(options.spill_method) {
-			case BE_CH_SPILL_MORGAN:
-				be_spill_morgan(&chordal_env);
-				break;
-			case BE_CH_SPILL_BELADY:
-				be_spill_belady(&chordal_env);
-				break;
-	#ifdef WITH_ILP
-			case BE_CH_SPILL_REMAT:
-				be_spill_remat(&chordal_env);
-				break;
-	#endif /* WITH_ILP */
-			default:
-				fprintf(stderr, "no valid spiller selected. falling back to belady\n");
-				be_spill_belady(&chordal_env);
-			}
+			be_do_spill(birg, pse.cls);
 			BE_TIMER_POP(ra_timer.t_spill);
 
-			dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
+			dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill", dump_ir_block_graph_sched);
 
-			post_spill(&pse);
+			post_spill(&pse, 0);
 		}
-	}
-	else {
+	} else {
 		post_spill_env_t *pse;
 
 		/* the backend has it's own spiller */
@@ -783,60 +589,48 @@ static be_ra_timer_t *be_ra_chordal_main(be_irg_t *birg)
 
 		for (j = 0; j < m; ++j) {
 			memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env));
+			pse[j].birg = birg;
 			pre_spill(isa, j, &pse[j]);
 		}
 
 		BE_TIMER_PUSH(ra_timer.t_spill);
-		arch_code_generator_spill(birg->cg, &chordal_env);
+		arch_code_generator_spill(birg->cg, birg);
 		BE_TIMER_POP(ra_timer.t_spill);
 		dump(BE_CH_DUMP_SPILL, irg, NULL, "-spill", dump_ir_block_graph_sched);
 
 		for (j = 0; j < m; ++j) {
-			post_spill(&pse[j]);
+			post_spill(&pse[j], j);
 		}
 	}
 
-	BE_TIMER_PUSH(ra_timer.t_spillslots);
-
-	be_coalesce_spillslots(&chordal_env);
-	dump(BE_CH_DUMP_SPILLSLOTS, irg, NULL, "-spillslots", dump_ir_block_graph_sched);
-
-	BE_TIMER_POP(ra_timer.t_spillslots);
-
-	BE_TIMER_PUSH(ra_timer.t_verify);
-	/* verify spillslots */
-	if (options.vrfy_option == BE_CH_VRFY_WARN) {
-		be_verify_spillslots(main_env->arch_env, irg);
-	}
-	else if (options.vrfy_option == BE_CH_VRFY_ASSERT) {
-		assert(be_verify_spillslots(main_env->arch_env, irg) && "Spillslot verification failed");
-	}
-	BE_TIMER_POP(ra_timer.t_verify);
-
 	BE_TIMER_PUSH(ra_timer.t_epilog);
-	dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched);
-
-	lower_nodes_after_ra(&chordal_env, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0);
+	lower_nodes_after_ra(birg, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0);
 	dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched);
 
 	obstack_free(&chordal_env.obst, NULL);
+	be_invalidate_liveness(birg);
 	BE_TIMER_POP(ra_timer.t_epilog);
 
 	BE_TIMER_POP(ra_timer.t_other);
 
 	be_stat_ev("insns_after", count_insns(irg));
 
-#ifdef WITH_LIBCORE
-	return main_opts->timing == BE_TIME_ON ? &ra_timer : NULL;
-#endif /* WITH_LIBCORE */
-	return NULL;
+	return;
 }
 
-const be_ra_t be_ra_chordal_allocator = {
-#ifdef WITH_LIBCORE
-	be_ra_chordal_register_options,
-#else
-	NULL,
-#endif
+static be_ra_t be_ra_chordal_allocator = {
 	be_ra_chordal_main,
 };
+
+void be_init_chordal_main(void)
+{
+	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+	lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
+	lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
+
+	lc_opt_add_table(chordal_grp, be_chordal_options);
+
+	be_register_allocator("chordal", &be_ra_chordal_allocator);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);