X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeblocksched.c;h=a647e3484796e17858573327573a12a21e131e20;hb=efdb09dd64658e15cd9fd2599884bfe72bba7fd2;hp=6c8bc8c4edcfd921351ab49fbad70dabc26e11fe;hpb=69849fc8fe452350bfbd2ad67f1898147fc906b4;p=libfirm

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index 6c8bc8c4e..a647e3484 100644
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -517,7 +517,7 @@ static ir_node **create_block_schedule_greedy(ir_graph *irg, ir_exec_freq *execf
 
 	start_entry = finish_block_schedule(&env);
 	block_list  = create_blocksched_array(&env, start_entry, env.blockcount,
-	                                      be_get_birg_obst(irg));
+	                                      be_get_be_obst(irg));
 
 	DEL_ARR_F(env.edges);
 	obstack_free(&obst, NULL);
@@ -623,8 +623,9 @@ static void collect_egde_frequency_ilp(ir_node *block, void *data)
 
 static void coalesce_blocks_ilp(blocksched_ilp_env_t *env)
 {
-	int  i;
-	int  edge_count = ARR_LEN(env->ilpedges);
+	int           edge_count = ARR_LEN(env->ilpedges);
+	be_options_t *options    = be_get_irg_options(env->env.irg);
+	int           i;
 
 	/* complete out constraints */
 	for (i = 0; i < edge_count; ++i) {
@@ -645,20 +646,7 @@ static void coalesce_blocks_ilp(blocksched_ilp_env_t *env)
 		lpp_set_factor_fast(env->lpp, entry->out_cst, edge->ilpvar, 1.0);
 	}
 
-#if 0
-	{
-		FILE *f;
-		char fname[256];
-		lpp_dump(env->lpp, "lpp.out");
-		snprintf(fname, sizeof(fname), "lpp_%s.plain", get_irg_dump_name(env->env.irg));
-		f = fopen(fname, "w");
-		lpp_dump_plain(env->lpp, f);
-		fclose(f);
-	}
-#endif
-
-	//lpp_solve_net(env->lpp, main_env->options->ilp_server, main_env->options->ilp_solver);
-	lpp_solve_net(env->lpp, "i44pc52", "cplex");
+	lpp_solve_net(env->lpp, options->ilp_server, options->ilp_solver);
 	assert(lpp_is_sol_valid(env->lpp));
 
 	/* Apply results to edges */
@@ -716,7 +704,7 @@ static ir_node **create_block_schedule_ilp(ir_graph *irg, ir_exec_freq *execfreq
 	start_entry = finish_block_schedule(&env.env);
 	block_list  = create_blocksched_array(&env.env, start_entry,
 	                                      env.env.blockcount,
-	                                      be_get_birg_obst(irg));
+	                                      be_get_be_obst(irg));
 
 	DEL_ARR_F(env.ilpedges);
 	free_lpp(env.lpp);