backend: created a (not so nice) macro to iterate over all values defined by an instr...

[libfirm] / ir / be / beblocksched.c

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index f8c19c1..a647e34 100644 (file)
--- 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);
@@ -747,8 +735,7 @@ void be_init_blocksched(void)
 
 ir_node **be_create_block_schedule(ir_graph *irg)
 {
-       const be_irg_t *birg      = be_birg_from_irg(irg);
-       ir_exec_freq   *execfreqs = be_get_birg_exec_freq(birg);
+       ir_exec_freq *execfreqs = be_get_irg_exec_freq(irg);
 
        switch (algo) {
        case BLOCKSCHED_GREEDY: