X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeblocksched.c;h=d783a8922080fe64cfac9b157bed263db104bae5;hb=b2008e0b7c77ead1540a4793d235fafb6fcff873;hp=4e76c02eecf0eed3b59fe1e0bded38e76316a2e6;hpb=3bb47464dc990c9def630a208a12da1bdd035bbb;p=libfirm diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c index 4e76c02ee..d783a8922 100644 --- a/ir/be/beblocksched.c +++ b/ir/be/beblocksched.c @@ -22,7 +22,6 @@ * @brief Block-scheduling strategies. * @author Matthias Braun, Christoph Mallon * @date 27.09.2006 - * @version $Id$ * * The goals of the greedy (and ILP) algorithm here works by assuming that * we want to change as many jumps to fallthroughs as possible (executed jumps @@ -52,6 +51,7 @@ #include "execfreq.h" #include "irdump_t.h" #include "irtools.h" +#include "util.h" #include "debug.h" #include "beirgmod.h" #include "bemodule.h" @@ -616,7 +616,6 @@ static void collect_egde_frequency_ilp(ir_node *block, void *data) static void coalesce_blocks_ilp(blocksched_ilp_env_t *env) { int edge_count = ARR_LEN(env->ilpedges); - be_options_t *options = be_get_irg_options(env->env.irg); int i; /* complete out constraints */ @@ -638,7 +637,7 @@ static void coalesce_blocks_ilp(blocksched_ilp_env_t *env) lpp_set_factor_fast(env->lpp, entry->out_cst, edge->ilpvar, 1.0); } - lpp_solve_net(env->lpp, options->ilp_server, options->ilp_solver); + lpp_solve_net(env->lpp, be_options.ilp_server, be_options.ilp_solver); assert(lpp_is_sol_valid(env->lpp)); /* Apply results to edges */