#include "bespillilp.h"
#include "belower.h"
-#include "becopyoptmain.h"
+#include "becopyopt.h"
#include "bessadestr.h"
#include "becopystat.h"
void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
firm_dbg_module_t *dbg = chordal_env->dbg;
- const arch_env_t *arch_env = chordal_env->main_env->arch_env;
+ const arch_env_t *arch_env = chordal_env->birg->main_env->arch_env;
struct obstack ob;
pmap_entry *pme;
ir_node **nodes, *n1, *n2;
#ifdef WITH_LIBCORE
static const lc_opt_enum_int_items_t spill_items[] = {
{ "belady", BE_CH_SPILL_BELADY },
+#ifndef NO_ILP
{ "ilp", BE_CH_SPILL_ILP },
+#endif
{ NULL, 0 }
};
compute_doms(irg);
+ chordal_env.opts = &options;
chordal_env.irg = irg;
chordal_env.dbg = firm_dbg_register("firm.be.chordal");
- chordal_env.main_env = main_env;
+ chordal_env.birg = bi;
chordal_env.dom_front = be_compute_dominance_frontiers(irg);
obstack_init(&chordal_env.obst);
case BE_CH_SPILL_BELADY:
be_spill_belady(&chordal_env);
break;
+#ifdef WITH_ILP
case BE_CH_SPILL_ILP:
be_spill_ilp(&chordal_env);
break;
+#endif /* WITH_ILP */
default:
fprintf(stderr, "no valid spiller selected. falling back to belady\n");
be_spill_belady(&chordal_env);
/* copy minimization */
copystat_collect_cls(&chordal_env);
- be_copy_opt(&chordal_env);
+ co_compare_solvers(&chordal_env);
dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
be_ra_chordal_check(&chordal_env);