X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeblocksched.c;h=387749a4f30f2353a7322179f4858342acb01673;hb=c9b4f4105539e3980500c79e8e9a055e2c8c5173;hp=d9a9861f86d6e8d2a9b09874206a7e488018c2dc;hpb=65a52a96e8ab7ed601d7f98c516d37c46b674b4a;p=libfirm

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index d9a9861f8..387749a4f 100644
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -68,7 +68,7 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-typedef enum _blocksched_algos_t {
+typedef enum blocksched_algos_t {
 	BLOCKSCHED_NAIV, BLOCKSCHED_GREEDY, BLOCKSCHED_ILP
 } blocksched_algos_t;
 
@@ -535,22 +535,22 @@ static ir_node **create_block_schedule_greedy(ir_graph *irg, ir_exec_freq *execf
  */
 
 #ifdef WITH_ILP
-typedef struct _ilp_edge_t {
+typedef struct ilp_edge_t {
 	ir_node *block;   /**< source block */
 	int     pos;      /**< number of cfg predecessor (target) */
 	int     ilpvar;
 } ilp_edge_t;
 
-typedef struct _blocksched_ilp_env_t {
+typedef struct blocksched_ilp_env_t {
 	blocksched_env_t env;
 	ilp_edge_t       *ilpedges;
 	lpp_t            *lpp;
 } blocksched_ilp_env_t;
 
-typedef struct _blocksched_ilp_entry_t {
+typedef struct blocksched_ilp_entry_t {
 	ir_node *block;
-	struct _blocksched_entry_t *next;
-	struct _blocksched_entry_t *prev;
+	struct blocksched_entry_t *next;
+	struct blocksched_entry_t *prev;
 
 	int out_cst;
 } blocksched_ilp_entry_t;
@@ -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 */