X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=15d1a255c408b77412ca1f59c08cd08165159db9;hb=1161999117f5c0f56b3af2dc9bb7150e03761905;hp=33505486a109825ff066c3ee418af9d9c7e46711;hpb=76c0c4f215716a69cebe49fbcba24c17a9595f32;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 33505486a..15d1a255c 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -29,7 +29,7 @@
 #define DO_ILP2
 
 #define DEBUG_LVL SET_LEVEL_1
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define MAX_ARITY 20
 #define MAX_CLS_SIZE 20
@@ -100,8 +100,7 @@ static pset *all_copy_nodes;
 static ir_graph *last_irg;
 
 void copystat_init(void) {
-	dbg = firm_dbg_register("ir.be.copystat");
-	firm_dbg_set_mask(dbg, DEBUG_LVL);
+	FIRM_DBG_REGISTER(dbg, "firm.be.copystat");
 
 	all_phi_nodes = pset_new_ptr_default();
 	all_phi_classes = pset_new_ptr_default();
@@ -289,10 +288,8 @@ void copystat_collect_cls(be_chordal_env_t *cenv) {
 	ir_graph *irg = cenv->irg;
 	arch_env_t *aenv = cenv->birg->main_env->arch_env;
 
-	if (last_irg != irg) {
-		copystat_reset();
-		copystat_collect_irg(irg, aenv);
-	}
+	copystat_reset();
+	copystat_collect_irg(irg, aenv);
 
 	for (n = pset_first(all_phi_nodes); n; n = pset_next(all_phi_nodes))
 		if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls)
@@ -461,6 +458,7 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	int costs_inevit, costs_init, costs_heur, costs_ilp1, costs_ilp2, lower_bound;
 
 	phi_class_compute(chordal_env->irg);
+	copystat_collect_cls(chordal_env);
 
 	co = new_copy_opt(chordal_env, co_get_costs_loop_depth);
 	co_build_ou_structure(co);
@@ -472,6 +470,7 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	saver.chordal_env = chordal_env;
 	saver.saved_colors = pmap_create();
 	save_colors(&saver);
+	be_ra_chordal_check(co->cenv);
 
 	/* initial values */
 	costs_inevit = co_get_inevit_copy_costs(co);
@@ -494,6 +493,8 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	co_solve_heuristic(co);
 
 	lc_timer_stop(timer);
+
+	be_ra_chordal_check(co->cenv);
 	costs_heur = co_get_copy_costs(co);
 	DBG((dbg, LEVEL_1, "HEUR costs: %3d\n", costs_heur));
 	copystat_add_heur_time(lc_timer_elapsed_msec(timer));
@@ -519,6 +520,7 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 
 	co_solve_ilp2(co, 60.0);
 
+	be_ra_chordal_check(co->cenv);
 	costs_ilp2 = co_get_copy_costs(co);
 	DBG((dbg, LEVEL_1, "ILP2 costs: %3d\n", costs_ilp2));
 	copystat_add_opt_costs(costs_ilp2); /*TODO ADAPT */