X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=7ee6361e4feeb6fb6bffa29ccf1932c4e6cd41ec;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=467b4647fb951cad88cf3ed6c16b681ccc917033;hpb=646d941217399e4bc713359fd5ad393e4db8b905;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 467b4647f..7ee6361e4 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -24,6 +24,10 @@
 
 #ifdef COPYOPT_STAT
 
+#define DO_HEUR
+#undef DO_ILP1
+#define DO_ILP2
+
 #define DEBUG_LVL SET_LEVEL_1
 static firm_dbg_module_t *dbg = NULL;
 
@@ -96,7 +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_REGISTER(dbg, "ir.be.copystat");
 	firm_dbg_set_mask(dbg, DEBUG_LVL);
 
 	all_phi_nodes = pset_new_ptr_default();
@@ -221,7 +225,7 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
 static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
 	curr_vals[I_CPY_CNT]++;
 	curr_vals[I_COPIES_MAX]++;
-	if (nodes_interfere(chordal_env, root, get_Copy_src(root))) {
+	if (nodes_interfere(chordal_env, root, get_Perm_src(root))) {
 		curr_vals[I_COPIES_IF]++;
 		assert(0 && "A Perm pair (in/out) should never interfere!");
 	}
@@ -285,10 +289,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)
@@ -456,15 +458,20 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	color_save_t saver;
 	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);
+	co_build_graph_structure(co);
 	DBG((dbg, LEVEL_1, "----> CO: %s\n", co->name));
-	phi_class_compute(chordal_env->irg);
 
 	/* save colors */
 	saver.arch_env = chordal_env->birg->main_env->arch_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);
@@ -487,6 +494,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));
@@ -512,6 +521,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 */
@@ -519,6 +529,8 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 #endif /* DO_ILP2 */
 
 	pmap_destroy(saver.saved_colors);
+	co_free_graph_structure(co);
+	co_free_ou_structure(co);
 	free_copy_opt(co);
 }