#define COST_FUNC_LOOP 2
#define COST_FUNC_ALL_ONE 3
-static int dump_flags = 0;
-static int style_flags = 0;
-static int do_stats = 0;
+static unsigned dump_flags = 0;
+static unsigned style_flags = 0;
+static unsigned do_stats = 0;
static cost_fct_t cost_func = co_get_costs_exec_freq;
-static int algo = CO_ALGO_HEUR2;
+static unsigned algo = CO_ALGO_HEUR2;
static int improve = 1;
#ifdef WITH_LIBCORE
{ "none", CO_ALGO_NONE },
{ "heur", CO_ALGO_HEUR },
{ "heur2", CO_ALGO_HEUR2 },
+#ifdef WITH_JVM
{ "heur3", CO_ALGO_HEUR3 },
+#endif /* WITH_JVM */
+#ifdef WITH_ILP
{ "ilp", CO_ALGO_ILP },
+#endif /* WITH_ILP */
{ NULL, 0 }
};
};
static const lc_opt_table_entry_t options[] = {
- LC_OPT_ENT_ENUM_INT ("algo", "select copy optimization algo (heur, heur2, heur3, ilp)", &algo_var),
- LC_OPT_ENT_ENUM_FUNC_PTR ("cost", "select a cost function (freq, loop, one)", &cost_func_var),
+ LC_OPT_ENT_ENUM_INT ("algo", "select copy optimization algo", &algo_var),
+ LC_OPT_ENT_ENUM_FUNC_PTR ("cost", "select a cost function", &cost_func_var),
LC_OPT_ENT_ENUM_MASK ("dump", "dump ifg before or after copy optimization", &dump_var),
LC_OPT_ENT_ENUM_MASK ("style", "dump style for ifg dumping", &style_var),
LC_OPT_ENT_BOOL ("stats", "dump statistics after each optimization", &do_stats),
int res;
ir_node *root_bl = get_nodes_block(root);
ir_node *copy_bl = is_Phi(root) ? get_Block_cfgpred_block(root_bl, pos) : root_bl;
- res = get_block_execfreq_ulong(co->cenv->exec_freq, copy_bl);
+ res = get_block_execfreq_ulong(co->cenv->birg->exec_freq, copy_bl);
/* don't allow values smaller than one. */
return res < 1 ? 1 : res;
struct obstack *obst = &env->obst;
void *base = obstack_base(obst);
pset *live = pset_new_ptr_default();
+ be_lv_t *lv = env->co->cenv->birg->lv;
int n_insns = 0;
int n_nodes = 0;
}
DBG((env->co->cenv->dbg, LEVEL_2, "%+F\n", bl));
- be_liveness_end_of_block(env->co->cenv->lv, env->co->aenv, env->co->cls, bl, live);
+ be_liveness_end_of_block(lv, env->co->aenv, env->co->cls, bl, live);
/* Generate the bad and ugly. */
for(i = n_insns - 1; i >= 0; --i) {
int n_colors;
appel_clique_walker_t env;
bitset_t *adm = bitset_alloca(co->cls->n_regs);
+ be_lv_t *lv = co->cenv->birg->lv;
- be_liveness_recompute(co->cenv->lv);
+ be_liveness_recompute(lv);
obstack_init(&env.obst);
phase_init(&env.ph, "appel_clique_dumper", co->irg, PHASE_DEFAULT_GROWTH, appel_clique_walker_irn_init);
env.curr_nr = co->cls->n_regs;
be_stat_ev_ull("co_prepare_costs", stats.costs);
}
+#ifdef WITH_JVM
/* start the JVM here so that it does not tamper the timing. */
if(algo == CO_ALGO_HEUR3)
be_java_coal_start_jvm();
+#endif
algo_func = algos[algo].algo;