X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=7ea2e49e1cb72d941b946f55759bfae9be9349b4;hb=e782bd598a2f96d5181ee4aebe353addc6d04058;hp=0e5df3e6331acaf8dd538839e61ab7b3a14fe820;hpb=dc3c6e3fd61414aae453a1836b614a982d226cd5;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index 0e5df3e63..7ea2e49e1 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -33,6 +33,7 @@ #include "xmalloc.h" #include "bechordal_t.h" +#include "beabi.h" #include "beutil.h" #include "besched.h" #include "benumb_t.h" @@ -55,12 +56,12 @@ 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->birg->main_env->arch_env; struct obstack ob; pmap_entry *pme; ir_node **nodes, *n1, *n2; int i, o; + DEBUG_ONLY(firm_dbg_module_t *dbg = chordal_env->dbg;) /* Collect all irns */ obstack_init(&ob); @@ -98,13 +99,13 @@ void be_ra_chordal_check(be_chordal_env_t *chordal_env) { static void check_pressure_walker(ir_node *bl, void *data) { be_chordal_env_t *env = data; - firm_dbg_module_t *dbg = env->dbg; int n_regs = arch_register_class_n_regs(env->cls); pset *live = pset_new_ptr_default(); int step = 0; ir_node *irn; irn_live_t *li; + DEBUG_ONLY(firm_dbg_module_t *dbg = env->dbg;) live_foreach(bl, li) { if(live_is_end(li) && chordal_has_class(env, li->irn)) { @@ -161,7 +162,7 @@ static be_ra_chordal_opts_t options = { BE_CH_SPILL_BELADY, BE_CH_COPYMIN_HEUR, BE_CH_IFG_STD, - BE_CH_LOWER_PERM_SWAP + BE_CH_LOWER_PERM_SWAP, }; #ifdef WITH_LIBCORE @@ -174,9 +175,11 @@ static const lc_opt_enum_int_items_t spill_items[] = { }; static const lc_opt_enum_int_items_t copymin_items[] = { + { "none", BE_CH_COPYMIN_NONE }, { "heur", BE_CH_COPYMIN_HEUR }, #ifdef WITH_ILP - { "ilp", BE_CH_COPYMIN_ILP }, + { "ilp1", BE_CH_COPYMIN_ILP1 }, + { "ilp2", BE_CH_COPYMIN_ILP2 }, #endif { NULL, 0 } }; @@ -188,8 +191,12 @@ static const lc_opt_enum_int_items_t ifg_flavor_items[] = { }; static const lc_opt_enum_int_items_t lower_perm_items[] = { - { "swap", BE_CH_LOWER_PERM_SWAP }, { "copy", BE_CH_LOWER_PERM_COPY }, + { "swap", BE_CH_LOWER_PERM_SWAP }, + { NULL, 0 } +}; + +static const lc_opt_enum_int_items_t lower_perm_stat_items[] = { { NULL, 0 } }; @@ -218,16 +225,33 @@ static lc_opt_enum_int_var_t ifg_flavor_var = { }; static lc_opt_enum_int_var_t lower_perm_var = { - &options.lower_perm_method, lower_perm_items + &options.lower_perm_opt, lower_perm_items }; static lc_opt_enum_int_var_t dump_var = { &options.dump_flags, dump_items }; +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("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("dump", "select dump phases", &dump_var), + { NULL } +}; + static void be_ra_chordal_register_options(lc_opt_entry_t *grp) { - grp = lc_opt_get_grp(grp, "chordal"); + static int run_once = 0; + lc_opt_entry_t *chordal_grp; + + if (! run_once) { + run_once = 1; + chordal_grp = lc_opt_get_grp(grp, "chordal"); + + lc_opt_add_table(chordal_grp, be_chordal_options); + } } #endif @@ -248,28 +272,45 @@ static void dump(unsigned mask, ir_graph *irg, } } +static void put_ignore_colors(be_chordal_env_t *chordal_env) +{ + int n_colors = chordal_env->cls->n_regs; + int i; + + bitset_clear_all(chordal_env->ignore_colors); + be_abi_put_ignore_regs(chordal_env->birg->abi, chordal_env->cls, chordal_env->ignore_colors); + for(i = 0; i < n_colors; ++i) + if(arch_register_type_is(&chordal_env->cls->regs[i], ignore)) + bitset_set(chordal_env->ignore_colors, i); +} + static void be_ra_chordal_main(const be_irg_t *bi) { + const be_main_env_t *main_env = bi->main_env; + const arch_isa_t *isa = arch_env_get_isa(main_env->arch_env); + ir_graph *irg = bi->irg; + int j, m; be_chordal_env_t chordal_env; - ir_graph *irg = bi->irg; - const be_main_env_t *main_env = bi->main_env; - const arch_isa_t *isa = arch_env_get_isa(main_env->arch_env); compute_doms(irg); - chordal_env.opts = &options; - chordal_env.irg = irg; - chordal_env.birg = bi; - chordal_env.dom_front = be_compute_dominance_frontiers(irg); + chordal_env.opts = &options; + chordal_env.irg = irg; + chordal_env.birg = bi; + chordal_env.dom_front = be_compute_dominance_frontiers(irg); FIRM_DBG_REGISTER(chordal_env.dbg, "firm.be.chordal"); obstack_init(&chordal_env.obst); /* Perform the following for each register class. */ for(j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) { - chordal_env.cls = arch_isa_get_reg_class(isa, j); - chordal_env.border_heads = pmap_create(); + chordal_env.cls = arch_isa_get_reg_class(isa, j); + chordal_env.border_heads = pmap_create(); + chordal_env.ignore_colors = bitset_malloc(chordal_env.cls->n_regs); + + /* put all ignore registers into the ignore register set. */ + put_ignore_colors(&chordal_env); be_liveness(irg); dump(BE_CH_DUMP_LIVE, irg, chordal_env.cls, "-live", dump_ir_block_graph_sched); @@ -303,15 +344,34 @@ static void be_ra_chordal_main(const be_irg_t *bi) /* copy minimization */ #ifdef COPYOPT_STAT co_compare_solvers(&chordal_env); -#else +#else /* COPYOPT_STAT */ { - copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth); - co_build_ou_structure(co); - co_solve_heuristic(co); - co_free_ou_structure(co); - free_copy_opt(co); + copy_opt_t *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: + co_solve_heuristic(co); + break; +#ifdef WITH_ILP + case BE_CH_COPYMIN_ILP1: + co_solve_ilp1(co, 60.0); + break; + case BE_CH_COPYMIN_ILP2: + co_build_graph_structure(co); + co_solve_ilp2(co, 60.0); + co_free_graph_structure(co); + break; +#endif /* WITH_ILP */ + case BE_CH_COPYMIN_NONE: + default: + break; + } + + co_free_ou_structure(co); + free_copy_opt(co); } -#endif +#endif /* COPYOPT_STAT */ dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched); be_ra_chordal_check(&chordal_env); @@ -324,15 +384,15 @@ static void be_ra_chordal_main(const be_irg_t *bi) copystat_dump(irg); be_ifg_free(chordal_env.ifg); - pmap_destroy(chordal_env.border_heads); + bitset_free(chordal_env.ignore_colors); } be_compute_spill_offsets(&chordal_env); dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched); - lower_nodes_after_ra(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0); + lower_nodes_after_ra(&chordal_env, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0); dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched); obstack_free(&chordal_env.obst, NULL);