X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=fa6ee3eb33d0e0a71f07bff62a04d193dc0e3414;hb=4ed245f5007168dab7850942a7ee6b6b29a19817;hp=425714bb1e3bca55a8474f355ae5917cd52d8277;hpb=5776909de54f878d723524d03d072ca8a1e50ab6;p=libfirm

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 425714bb1..fa6ee3eb3 100644
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -486,12 +486,11 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	copystat_add_init_costs(costs_init);
 	copystat_add_max_costs(co_get_max_copy_costs(co));
 
-
 	/* heuristic 1 (Daniel Grund) */
 	timer = lc_timer_register("heur1", NULL);
 	lc_timer_reset_and_start(timer);
 
-	co_solve_heuristic_new(co);
+	co_solve_heuristic(co);
 
 	lc_timer_stop(timer);
 
@@ -517,6 +516,21 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	copystat_add_heur_costs(costs_solved);
 	assert(lower_bound <= costs_solved);
 
+	/* Park & Moon register coalescing (Kimon Hoffmann) */
+	timer = lc_timer_register("park", NULL);
+	lc_timer_reset_and_start(timer);
+
+	co_solve_park_moon(co);
+
+	lc_timer_stop(timer);
+
+	be_ra_chordal_check(co->cenv);
+	costs_solved = co_get_copy_costs(co);
+	DBG((dbg, LEVEL_1, "Park/Moon costs: %3d\n", costs_solved));
+	copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+	copystat_add_heur_costs(costs_solved);
+	assert(lower_bound <= costs_solved);
+
 
 #ifdef WITH_ILP
 
@@ -535,7 +549,7 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
 	/* ILP 2 */
 	load_colors(&saver);
 
-	co_solve_ilp2(co, 60.0);
+	co_solve_ilp2(co);
 
 	be_ra_chordal_check(co->cenv);
 	costs_solved = co_get_copy_costs(co);