From 65c7054fd76fe79d02225ee567f63bae64946fc2 Mon Sep 17 00:00:00 2001 From: Daniel Grund Date: Wed, 14 Dec 2005 13:35:16 +0000 Subject: [PATCH] *** empty log message *** --- ir/be/becopyoptmain.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/ir/be/becopyoptmain.c b/ir/be/becopyoptmain.c index a98f84cff..5fc48f47a 100644 --- a/ir/be/becopyoptmain.c +++ b/ir/be/becopyoptmain.c @@ -70,7 +70,8 @@ void be_copy_opt(be_chordal_env_t *chordal_env) { copy_opt_t *co; int costs, costs_init=-1, costs_heur=-1, costs_ilp_5_sec=-1, costs_ilp_30_sec=-1, costs_ilp=-1; int lower_bound = -1; - int was_optimal = 0; + int was_optimal = 0; + color_save_t saver; saver.arch_env = chordal_env->main_env->arch_env; saver.chordal_env = chordal_env; @@ -97,7 +98,7 @@ void be_copy_opt(be_chordal_env_t *chordal_env) { DBG((dbg, LEVEL_1, "Init costs: %3d\n", costs_init)); #endif - save_colors(&saver); +// save_colors(&saver); #ifdef DO_HEUR { @@ -116,19 +117,16 @@ void be_copy_opt(be_chordal_env_t *chordal_env) { assert(lower_bound == -1 || costs_heur == -1 || lower_bound <= costs_heur); #endif - { #ifdef DO_ILP_5_SEC - load_colors(&saver); - was_optimal = co_ilp_opt(co, 5.0); + load_colors(&saver); + was_optimal = co_ilp_opt(co, 5.0); #ifdef DO_STAT - costs = co_get_copy_costs(co); - costs_ilp_5_sec = costs; - copystat_add_ilp_5_sec_costs(costs_ilp_5_sec); - DBG((dbg, LEVEL_1, "5_Sec costs: %3d\n", costs_ilp_5_sec)); + costs = co_get_copy_costs(co); + costs_ilp_5_sec = costs; + copystat_add_ilp_5_sec_costs(costs_ilp_5_sec); + DBG((dbg, LEVEL_1, "5_Sec costs: %3d\n", costs_ilp_5_sec)); #endif #endif - } - #ifdef DO_ILP_30_SEC if (!was_optimal) { @@ -143,10 +141,9 @@ void be_copy_opt(be_chordal_env_t *chordal_env) { #endif #endif - #ifdef DO_ILP load_colors(&saver); - co_ilp_opt(co, 1000.0); + co_ilp_opt(co, 60.0); #ifdef DO_STAT costs = co_get_copy_costs(co); costs_ilp = costs; @@ -154,7 +151,6 @@ void be_copy_opt(be_chordal_env_t *chordal_env) { DBG((dbg, LEVEL_1, "Opt costs: %3d\n", costs_ilp)); #endif assert(lower_bound == -1 || costs_ilp == -1 || lower_bound <= costs_ilp); - assert(costs_ilp == -1 || costs_heur == -1 || costs_ilp <= costs_heur); #endif pmap_destroy(saver.saved_colors); -- 2.20.1