static be_ra_chordal_opts_t options = {
BE_CH_DUMP_NONE,
BE_CH_SPILL_BELADY,
- BE_CH_COPYMIN_HEUR,
+ BE_CH_COPYMIN_HEUR1,
BE_CH_IFG_STD,
BE_CH_LOWER_PERM_SWAP,
};
static const lc_opt_enum_int_items_t copymin_items[] = {
{ "none", BE_CH_COPYMIN_NONE },
- { "heur", BE_CH_COPYMIN_HEUR },
+ { "heur1", BE_CH_COPYMIN_HEUR1 },
+ { "heur2", BE_CH_COPYMIN_HEUR2 },
#ifdef WITH_ILP
{ "ilp1", BE_CH_COPYMIN_ILP1 },
{ "ilp2", BE_CH_COPYMIN_ILP2 },
static const lc_opt_table_entry_t be_chordal_options[] = {
LC_OPT_ENT_ENUM_MASK("spill", "spill method (belady or ilp)", &spill_var),
- LC_OPT_ENT_ENUM_PTR("copymin", "copymin method (none, heur or ilp)", ©min_var),
+ LC_OPT_ENT_ENUM_PTR("copymin", "copymin method (none, heur1, heur2, ilp1 or ilp2)", ©min_var),
LC_OPT_ENT_ENUM_PTR("ifg", "interference graph flavour (std or fast)", &ifg_flavor_var),
- LC_OPT_ENT_ENUM_MASK("perm", "perm lowering options (copy, swap)", &lower_perm_var),
+ LC_OPT_ENT_ENUM_MASK("perm", "perm lowering options (copy or swap)", &lower_perm_var),
LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var),
{ NULL }
};
co_compare_solvers(&chordal_env);
#else /* COPYOPT_STAT */
{
- copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
- co_build_ou_structure(co);
+ copy_opt_t *co = NULL;
+
+ if (options.copymin_method != BE_CH_COPYMIN_NONE) {
+ co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
+ co_build_ou_structure(co);
+ }
switch(options.copymin_method) {
- case BE_CH_COPYMIN_HEUR:
+ case BE_CH_COPYMIN_HEUR1:
co_solve_heuristic(co);
break;
+ case BE_CH_COPYMIN_HEUR2:
+ co_solve_heuristic_new(co);
+ break;
#ifdef WITH_ILP
case BE_CH_COPYMIN_ILP1:
+ printf("FIXME: %s:%d ILP1 not yet implemented!\n", __FILE__, __LINE__);
co_solve_ilp1(co, 60.0);
break;
case BE_CH_COPYMIN_ILP2:
break;
}
- co_free_ou_structure(co);
- free_copy_opt(co);
+ if (co) {
+ co_free_ou_structure(co);
+ free_copy_opt(co);
+ }
}
#endif /* COPYOPT_STAT */
dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);