X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=017f0771bb960a18bf6c22f8010ddef2b817ff2a;hb=366a46e4479da65e90385be36b77b185eb95bda7;hp=2b71f865b334227ea71719b9224f1e0e526f1f1d;hpb=ad6d1026d8102f9efd98ab92fa170dc10998dcea;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index 2b71f865b..017f0771b 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -29,6 +29,7 @@ #include "irgwalk.h" #include "irdump.h" #include "irdom.h" +#include "irbitset.h" #include "debug.h" #include "xmalloc.h" @@ -44,15 +45,19 @@ #include "beifg_impl.h" #include "bespillbelady.h" +#include "bespillmorgan.h" #include "belower.h" #ifdef WITH_ILP #include "bespillilp.h" +#include "bespillremat.h" +#include "bespillappel.h" #endif /* WITH_ILP */ #include "becopystat.h" #include "becopyopt.h" #include "bessadestr.h" +#include "beverify.h" void be_ra_chordal_check(be_chordal_env_t *chordal_env) { @@ -96,58 +101,6 @@ void be_ra_chordal_check(be_chordal_env_t *chordal_env) { obstack_free(&ob, NULL); } -static void check_pressure_walker(ir_node *bl, void *data) -{ - be_chordal_env_t *env = data; - 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)) { - ir_node *irn = (ir_node *) li->irn; - pset_insert_ptr(live, irn); - } - } - - DBG((dbg, LEVEL_1, "end set for %+F\n", bl)); - for(irn = pset_first(live); irn; irn = pset_next(live)) - DBG((dbg, LEVEL_1, "\t%+F\n", irn)); - - sched_foreach_reverse(bl, irn) { - int i, n; - int pressure = pset_count(live); - - DBG((dbg, LEVEL_1, "%+10F@%+10F: pressure %d\n", bl, irn, pressure)); - - if(pressure > n_regs) { - ir_node *x; - ir_printf("%+10F@%+10F: pressure to high: %d\n", bl, irn, pressure); - for(x = pset_first(live); x; x = pset_next(live)) - ir_printf("\t%+10F\n", x); - } - - if(chordal_has_class(env, irn)) - pset_remove_ptr(live, irn); - - for(i = 0, n = get_irn_arity(irn); i < n; i++) { - ir_node *op = get_irn_n(irn, i); - if(chordal_has_class(env, op) && !is_Phi(irn)) - pset_insert_ptr(live, op); - } - step++; - } -} - -void be_check_pressure(const be_chordal_env_t *env) -{ - irg_block_walk_graph(env->irg, check_pressure_walker, NULL, (void *) env); -} - int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b) { if(env->ifg) @@ -163,22 +116,27 @@ static be_ra_chordal_opts_t options = { BE_CH_COPYMIN_HEUR1, BE_CH_IFG_STD, BE_CH_LOWER_PERM_SWAP, + BE_CH_VRFY_WARN, }; #ifdef WITH_LIBCORE static const lc_opt_enum_int_items_t spill_items[] = { + { "morgan", BE_CH_SPILL_MORGAN }, { "belady", BE_CH_SPILL_BELADY }, #ifdef WITH_ILP - { "ilp", BE_CH_SPILL_ILP }, + { "ilp", BE_CH_SPILL_ILP }, + { "remat", BE_CH_SPILL_REMAT }, + { "appel", BE_CH_SPILL_APPEL }, #endif { NULL, 0 } }; static const lc_opt_enum_int_items_t copymin_items[] = { - { "none", BE_CH_COPYMIN_NONE }, - { "heur1", BE_CH_COPYMIN_HEUR1 }, - { "heur2", BE_CH_COPYMIN_HEUR2 }, - { "stat", BE_CH_COPYMIN_STAT }, + { "none", BE_CH_COPYMIN_NONE }, + { "heur1", BE_CH_COPYMIN_HEUR1 }, + { "heur2", BE_CH_COPYMIN_HEUR2 }, + { "stat", BE_CH_COPYMIN_STAT }, + { "park", BE_CH_COPYMIN_PARK_MOON }, #ifdef WITH_ILP { "ilp1", BE_CH_COPYMIN_ILP1 }, { "ilp2", BE_CH_COPYMIN_ILP2 }, @@ -203,14 +161,22 @@ static const lc_opt_enum_int_items_t lower_perm_stat_items[] = { }; static const lc_opt_enum_int_items_t dump_items[] = { - { "spill", BE_CH_DUMP_SPILL }, - { "live", BE_CH_DUMP_LIVE }, - { "color", BE_CH_DUMP_COLOR }, - { "copymin", BE_CH_DUMP_COPYMIN }, - { "ssadestr", BE_CH_DUMP_SSADESTR }, + { "spill", BE_CH_DUMP_SPILL }, + { "live", BE_CH_DUMP_LIVE }, + { "color", BE_CH_DUMP_COLOR }, + { "copymin", BE_CH_DUMP_COPYMIN }, + { "ssadestr", BE_CH_DUMP_SSADESTR }, { "tree", BE_CH_DUMP_TREE_INTV }, - { "constr", BE_CH_DUMP_CONSTR }, - { "lower", BE_CH_DUMP_LOWER }, + { "constr", BE_CH_DUMP_CONSTR }, + { "lower", BE_CH_DUMP_LOWER }, + { "all", BE_CH_DUMP_ALL }, + { NULL, 0 } +}; + +static const lc_opt_enum_int_items_t be_ch_vrfy_items[] = { + { "off", BE_CH_VRFY_OFF }, + { "warn", BE_CH_VRFY_WARN }, + { "assert", BE_CH_VRFY_ASSERT }, { NULL, 0 } }; @@ -223,7 +189,7 @@ static lc_opt_enum_int_var_t copymin_var = { }; static lc_opt_enum_int_var_t ifg_flavor_var = { - &options.spill_method, ifg_flavor_items + &options.ifg_flavor, ifg_flavor_items }; static lc_opt_enum_int_var_t lower_perm_var = { @@ -234,12 +200,17 @@ static lc_opt_enum_int_var_t dump_var = { &options.dump_flags, dump_items }; +static lc_opt_enum_int_var_t be_ch_vrfy_var = { + &options.vrfy_option, be_ch_vrfy_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, 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 or swap)", &lower_perm_var), - LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var), + LC_OPT_ENT_ENUM_MASK("spill", "spill method (belady, ilp, remat or appel)", &spill_var), + LC_OPT_ENT_ENUM_PTR ("copymin", "copymin method (none, heur1, heur2, ilp1, ilp2 or stat)", ©min_var), + LC_OPT_ENT_ENUM_PTR ("ifg", "interference graph flavour (std or fast)", &ifg_flavor_var), + LC_OPT_ENT_ENUM_PTR ("perm", "perm lowering options (copy or swap)", &lower_perm_var), + LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var), + LC_OPT_ENT_ENUM_PTR ("vrfy", "verify options (off, warn, assert)", &be_ch_vrfy_var), { NULL } }; @@ -254,21 +225,22 @@ static void be_ra_chordal_register_options(lc_opt_entry_t *grp) lc_opt_add_table(chordal_grp, be_chordal_options); } + + co_register_options(chordal_grp); } -#endif +#endif /* WITH_LIBCORE */ static void dump(unsigned mask, ir_graph *irg, const arch_register_class_t *cls, const char *suffix, void (*dump_func)(ir_graph *, const char *)) { - if(1 || ((options.dump_flags & mask) == mask)) { - if(cls) { + if((options.dump_flags & mask) == mask) { + if (cls) { char buf[256]; snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix); be_dump(irg, buf, dump_func); } - else be_dump(irg, suffix, dump_func); } @@ -286,12 +258,20 @@ static void put_ignore_colors(be_chordal_env_t *chordal_env) bitset_set(chordal_env->ignore_colors, i); } +FILE *be_chordal_open(const be_chordal_env_t *env, const char *prefix, const char *suffix) +{ + char buf[1024]; + + ir_snprintf(buf, sizeof(buf), "%s%F_%s.%s", prefix, env->irg, env->cls->name, suffix); + return fopen(buf, "wt"); +} + 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; - copy_opt_t *co = NULL; + copy_opt_t *co; int j, m; be_chordal_env_t chordal_env; @@ -320,6 +300,9 @@ static void be_ra_chordal_main(const be_irg_t *bi) /* spilling */ switch(options.spill_method) { + case BE_CH_SPILL_MORGAN: + be_spill_morgan(&chordal_env); + break; case BE_CH_SPILL_BELADY: be_spill_belady(&chordal_env); break; @@ -327,16 +310,33 @@ static void be_ra_chordal_main(const be_irg_t *bi) case BE_CH_SPILL_ILP: be_spill_ilp(&chordal_env); break; + case BE_CH_SPILL_REMAT: + be_spill_remat(&chordal_env); + break; + case BE_CH_SPILL_APPEL: + be_spill_appel(&chordal_env); + break; #endif /* WITH_ILP */ default: fprintf(stderr, "no valid spiller selected. falling back to belady\n"); be_spill_belady(&chordal_env); } dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched); - be_liveness(irg); - be_check_pressure(&chordal_env); + be_abi_fix_stack_nodes(bi->abi); + + /* verify schedule and register pressure */ + if (options.vrfy_option == BE_CH_VRFY_WARN) { + be_verify_schedule(irg); + be_verify_register_pressure(chordal_env.birg->main_env->arch_env, chordal_env.cls, irg); + } + else if (options.vrfy_option == BE_CH_VRFY_ASSERT) { + assert(be_verify_schedule(irg) && "Schedule verification failed"); + assert(be_verify_register_pressure(chordal_env.birg->main_env->arch_env, chordal_env.cls, irg) + && "Register pressure verification failed"); + } /* Color the graph. */ + be_liveness(irg); be_ra_chordal_color(&chordal_env); dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-color", dump_ir_block_graph_sched); @@ -345,9 +345,11 @@ static void be_ra_chordal_main(const be_irg_t *bi) be_ifg_check(chordal_env.ifg); /* copy minimization */ + co = NULL; if (options.copymin_method != BE_CH_COPYMIN_NONE && options.copymin_method != BE_CH_COPYMIN_STAT) { co = new_copy_opt(&chordal_env, co_get_costs_loop_depth); co_build_ou_structure(co); + co_build_graph_structure(co); } switch(options.copymin_method) { @@ -357,6 +359,9 @@ static void be_ra_chordal_main(const be_irg_t *bi) case BE_CH_COPYMIN_HEUR2: co_solve_heuristic_new(co); break; + case BE_CH_COPYMIN_PARK_MOON: + co_solve_park_moon(co); + break; case BE_CH_COPYMIN_STAT: co_compare_solvers(&chordal_env); break; @@ -366,9 +371,7 @@ static void be_ra_chordal_main(const be_irg_t *bi) 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: @@ -377,6 +380,7 @@ static void be_ra_chordal_main(const be_irg_t *bi) } if (co) { + co_free_graph_structure(co); co_free_ou_structure(co); free_copy_opt(co); }