summaryrefslogtreecommitdiffhomepage
path: root/ir/be/beblocksched.c
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2010-07-06 12:45:31 +0200
committerMatthias Braun <matze@braunis.de>2010-07-06 12:45:31 +0200
commit8c9bc8b36959244eaaa2cd8a7ef9569a652054f6 (patch)
treee819810a0ffec3c6a22134decd02b9424bb57a8d /ir/be/beblocksched.c
parent1313146e006d8f264c047f5c6c7362a8b6064e82 (diff)
cleanup/fix ilp code
[r27702]
Diffstat (limited to 'ir/be/beblocksched.c')
-rw-r--r--ir/be/beblocksched.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index d9a9861..a647e34 100644
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -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 */