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;
static int algo = BLOCKSCHED_GREEDY;
static const lc_opt_enum_int_items_t blockschedalgo_items[] = {
- { "naiv", BLOCKSCHED_NAIV },
+ { "naiv", BLOCKSCHED_NAIV },
{ "greedy", BLOCKSCHED_GREEDY },
#ifdef WITH_ILP
{ "ilp", BLOCKSCHED_ILP },
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);
*/
#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;
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) {
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 */
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);
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: