X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=278b5c282a0785fbc8847f4649d59726be39e9f1;hb=dfc341ac6f54b4b0922d605e28333be76f487c68;hp=fb3d9ad4616985d1a8b57905a8a4175d79a05a13;hpb=aa89f2a8eee2c5a5b84b6b5377ddc5d57b3aa2e0;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index fb3d9ad46..278b5c282 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -1,18 +1,34 @@
-/**
- * @file   bechordal_main.c
- * @date   29.11.2005
- * @author Sebastian Hack
- * @cvs-id $Id$
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
  *
- * Copyright (C) 2005-2006 Universitaet Karlsruhe
- * Released under the GPL
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
  *
- * Driver for the chordal register allocator.
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       Driver for the chordal register allocator.
+ * @author      Sebastian Hack
+ * @date        29.11.2005
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <time.h>
 
 #include "obst.h"
@@ -22,11 +38,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"
@@ -43,6 +57,7 @@
 #include "debug.h"
 #include "xmalloc.h"
 #include "execfreq.h"
+#include "iredges_t.h"
 
 #include "bechordal_t.h"
 #include "beabi.h"
@@ -51,13 +66,16 @@
 #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 "bera.h"
+#include "beirg_t.h"
 
 #include "bespillbelady.h"
 #include "bespillmorgan.h"
@@ -82,12 +100,11 @@ static be_ra_chordal_opts_t options = {
 	BE_CH_VRFY_WARN,
 };
 
-/** Enable extreme live range splitting. */
-static int be_elr_split = 0;
-
 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;
 
 static be_ra_timer_t ra_timer = {
@@ -115,6 +132,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      },
@@ -152,7 +170,6 @@ static const lc_opt_table_entry_t be_chordal_options[] = {
 	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),
 	{ NULL }
 };
 
@@ -172,18 +189,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);
-}
-
 /**
  * Checks for every reload if it's user can perform the load on itself.
  */
@@ -211,7 +216,6 @@ 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);
 		}
 	}
@@ -220,6 +224,7 @@ static void memory_operand_walker(ir_node *irn, void *env) {
 	if (get_irn_n_edges(irn) == 0) {
 		sched_remove(irn);
 		set_irn_n(irn, be_pos_Reload_mem, new_Bad());
+		set_irn_n(irn, be_pos_Reload_frame, new_Bad());
 	}
 }
 
@@ -243,17 +248,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))
@@ -288,15 +294,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);
 }
 
@@ -322,7 +329,6 @@ static unsigned int count_insns(ir_graph *irg)
 	return cnt;
 }
 
-#ifdef WITH_LIBCORE
 /**
  * Initialize all timers.
  */
@@ -352,6 +358,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;
 	}
 }
 
@@ -377,46 +385,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 */
 }
@@ -424,112 +428,125 @@ 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) {
 
 #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;
+		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_ev_l("spillcosts", (long) spillcosts);
+			be_stat_tags[STAT_TAG_CLS] = pse->cls->name;
+			be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
 
-		node_stats(chordal_env, &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);
-		be_stat_ev("spills", node_stat.n_spills);
-	}
+			be_stat_ev_l("spillcosts", (long) spillcosts);
+
+			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);
+			be_stat_ev("spills", node_stat.n_spills);
+		}
 #endif /* FIRM_STATISTICS */
 
-	check_for_memory_operands(chordal_env);
+		/*
+			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_abi_fix_stack_nodes(birg->abi, birg->lv);
+		BE_TIMER_PUSH(ra_timer.t_verify);
 
-	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(birg);
+			be_verify_register_pressure(birg, pse->cls, irg);
+		}
+		else if (chordal_env->opts->vrfy_option == BE_CH_VRFY_ASSERT) {
+			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);
 
-	/* 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);
-	}
-	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)
-			&& "Register pressure verification failed");
-	}
-	BE_TIMER_POP(ra_timer.t_verify);
+		/* Color the graph. */
+		BE_TIMER_PUSH(ra_timer.t_color);
+		be_ra_chordal_color(chordal_env);
+		BE_TIMER_POP(ra_timer.t_color);
 
-	if (be_elr_split && ! splitted) {
-		extreme_liverange_splitting(chordal_env);
-		splitted = 1;
-	}
+		dump(BE_CH_DUMP_CONSTR, irg, pse->cls, "-color", dump_ir_block_graph_sched);
 
-	/* Color the graph. */
-	BE_TIMER_PUSH(ra_timer.t_color);
-	be_ra_chordal_color(chordal_env);
-	BE_TIMER_POP(ra_timer.t_color);
+		/* Create the ifg with the selected flavor */
+		BE_TIMER_PUSH(ra_timer.t_ifg);
+		chordal_env->ifg = be_create_ifg(chordal_env);
+		BE_TIMER_POP(ra_timer.t_ifg);
 
-	dump(BE_CH_DUMP_CONSTR, irg, chordal_env->cls, "-color", dump_ir_block_graph_sched);
+#ifdef FIRM_STATISTICS
+		if (be_stat_ev_is_active()) {
+			be_ifg_stat_t stat;
 
-	/* Create the ifg with the selected flavor */
-	BE_TIMER_PUSH(ra_timer.t_ifg);
-	chordal_env->ifg = be_create_ifg(chordal_env);
-	BE_TIMER_POP(ra_timer.t_ifg);
+			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);
 
-#ifdef FIRM_STATISTICS
-	if (be_stat_ev_is_active()) {
-		be_ifg_stat_t stat;
-		be_ifg_stat(chordal_env, &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);
-		be_stat_ev("perms_before_coal", node_stat.n_perms);
-		be_stat_ev("copies_before_coal", node_stat.n_copies);
-	}
+			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);
+		}
 #endif /* FIRM_STATISTICS */
 
-	/* copy minimization */
-	BE_TIMER_PUSH(ra_timer.t_copymin);
-	co_driver(chordal_env);
-	BE_TIMER_POP(ra_timer.t_copymin);
+		/* copy minimization */
+		BE_TIMER_PUSH(ra_timer.t_copymin);
+		co_driver(chordal_env);
+		BE_TIMER_POP(ra_timer.t_copymin);
+
+		dump(BE_CH_DUMP_COPYMIN, irg, pse->cls, "-copymin", dump_ir_block_graph_sched);
 
-	dump(BE_CH_DUMP_COPYMIN, irg, chordal_env->cls, "-copymin", dump_ir_block_graph_sched);
+		BE_TIMER_PUSH(ra_timer.t_ssa);
 
-	BE_TIMER_PUSH(ra_timer.t_ssa);
+		/* ssa destruction */
+		be_ssa_destruction(chordal_env);
 
-	/* ssa destruction */
-	be_ssa_destruction(chordal_env);
+		BE_TIMER_POP(ra_timer.t_ssa);
 
-	BE_TIMER_POP(ra_timer.t_ssa);
+		dump(BE_CH_DUMP_SSADESTR, irg, pse->cls, "-ssadestr", dump_ir_block_graph_sched);
 
-	dump(BE_CH_DUMP_SSADESTR, irg, chordal_env->cls, "-ssadestr", dump_ir_block_graph_sched);
+		BE_TIMER_PUSH(ra_timer.t_verify);
+		if (chordal_env->opts->vrfy_option != BE_CH_VRFY_OFF) {
+			be_ssa_destruction_check(chordal_env);
+		}
+		BE_TIMER_POP(ra_timer.t_verify);
 
-	BE_TIMER_PUSH(ra_timer.t_verify);
-	if (chordal_env->opts->vrfy_option != BE_CH_VRFY_OFF) {
-		be_ssa_destruction_check(chordal_env);
+#ifdef FIRM_STATISTICS
+		if (be_stat_ev_is_active()) {
+			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();
+		}
+#endif /* FIRM_STATISTICS */
+
+		/* the ifg exists only if there are allocatable regs */
+		be_ifg_free(chordal_env->ifg);
 	}
-	BE_TIMER_POP(ra_timer.t_verify);
 
-	be_ifg_free(chordal_env->ifg);
+	/* free some always allocated data structures */
 	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);
-		be_stat_ev("perms_after_coal", node_stat.n_perms);
-		be_stat_ev("copies_after_coal", node_stat.n_copies);
-		be_stat_ev_pop();
-	}
-#endif /* FIRM_STATISTICS */
 }
 
 /**
@@ -546,6 +563,7 @@ static void be_ra_chordal_main(be_irg_t *birg)
 	be_options_t        *main_opts = main_env->options;
 	int                 j, m;
 	be_chordal_env_t    chordal_env;
+	struct obstack      obst;
 
 	BE_TIMER_INIT(main_opts);
 	BE_TIMER_PUSH(ra_timer.t_other);
@@ -554,12 +572,15 @@ static void be_ra_chordal_main(be_irg_t *birg)
 	be_assure_dom_front(birg);
 	be_assure_liveness(birg);
 
-	chordal_env.opts      = &options;
-	chordal_env.irg       = irg;
-	chordal_env.birg      = birg;
-	FIRM_DBG_REGISTER(chordal_env.dbg, "firm.be.chordal");
+	chordal_env.obst          = &obst;
+	chordal_env.opts          = &options;
+	chordal_env.irg           = irg;
+	chordal_env.birg          = birg;
+	chordal_env.border_heads  = NULL;
+	chordal_env.ifg           = NULL;
+	chordal_env.ignore_colors = NULL;
 
-	obstack_init(&chordal_env.obst);
+	obstack_init(&obst);
 
 	BE_TIMER_POP(ra_timer.t_prolog);
 
@@ -573,18 +594,18 @@ static void 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);
-			be_do_spill(&pse.cenv);
+			be_do_spill(birg, pse.cls);
 			BE_TIMER_POP(ra_timer.t_spill);
 
-			dump(BE_CH_DUMP_SPILL, irg, pse.cenv.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 */
@@ -594,43 +615,26 @@ static void 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);
+	obstack_free(&obst, NULL);
+	be_invalidate_liveness(birg);
 	BE_TIMER_POP(ra_timer.t_epilog);
 
 	BE_TIMER_POP(ra_timer.t_other);
@@ -644,7 +648,7 @@ static be_ra_t be_ra_chordal_allocator = {
 	be_ra_chordal_main,
 };
 
-void be_init_chordal(void)
+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");
@@ -655,4 +659,4 @@ void be_init_chordal(void)
 	be_register_allocator("chordal", &be_ra_chordal_allocator);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);