X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbechordal_main.c;h=80cebc112cf931d1e9bd70447de5dbe961c058e9;hb=69a5cd48b51a38cf6abc517bca2feef9f3a6c433;hp=1e6e6baa2cb01fa0220926fcdde3006924483f6f;hpb=9e7ee3213754779cbd43ac3256c71735a9a7767b;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index 1e6e6baa2..80cebc112 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -58,28 +58,30 @@ #include "beabi.h" #include "beutil.h" #include "besched.h" -#include "besched_t.h" +#include "besched.h" #include "belive_t.h" -#include "bearch_t.h" +#include "bearch.h" #include "beifg_t.h" #include "beifg_impl.h" -#include "benode_t.h" +#include "benode.h" #include "bestatevent.h" #include "bestat.h" #include "bemodule.h" #include "be_t.h" #include "bera.h" -#include "beirg_t.h" +#include "beirg.h" #include "bespillslots.h" -#include "bespilloptions.h" +#include "bespill.h" #include "belower.h" #include "becopystat.h" #include "becopyopt.h" #include "bessadestr.h" #include "beverify.h" -#include "benode_t.h" +#include "benode.h" + +#include "bepbqpcoloring.h" static be_ra_chordal_opts_t options = { BE_CH_DUMP_NONE, @@ -148,6 +150,26 @@ static const lc_opt_table_entry_t be_chordal_options[] = { LC_OPT_LAST }; +static be_module_list_entry_t *colorings = NULL; +static const be_ra_chordal_coloring_t *selected_coloring = NULL; + +void be_register_chordal_coloring(const char *name, be_ra_chordal_coloring_t *coloring) +{ + if (selected_coloring == NULL) + selected_coloring = coloring; + + be_add_module_to_list(&colorings, name, coloring); +} + +void be_ra_chordal_coloring(be_chordal_env_t *env) +{ + assert(selected_coloring != NULL); + if(selected_coloring != NULL) { + selected_coloring->allocate(env); + } +} + + static void dump(unsigned mask, ir_graph *irg, const arch_register_class_t *cls, const char *suffix, @@ -207,7 +229,7 @@ static void memory_operand_walker(ir_node *irn, void *env) /** * Starts a walk for memory operands if supported by the backend. */ -static INLINE void check_for_memory_operands(ir_graph *irg) +void check_for_memory_operands(ir_graph *irg) { irg_walk_graph(irg, NULL, memory_operand_walker, NULL); } @@ -237,9 +259,9 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls) /* put all ignore registers into the ignore register set. */ be_put_ignore_regs(birg, pse->cls, chordal_env->ignore_colors); - BE_TIMER_PUSH(t_ra_constr); - be_pre_spill_prepare_constr(chordal_env); - BE_TIMER_POP(t_ra_constr); + be_timer_push(T_RA_CONSTR); + be_pre_spill_prepare_constr(chordal_env->birg, chordal_env->cls); + be_timer_pop(T_RA_CONSTR); dump(BE_CH_DUMP_CONSTR, birg->irg, pse->cls, "-constr-pre", dump_ir_block_graph_sched); } @@ -263,16 +285,16 @@ static void post_spill(post_spill_env_t *pse, int iteration) { called in a loop after spilling for each register class. But we only need to fix stack nodes once in this case. */ - BE_TIMER_PUSH(t_ra_spill_apply); + be_timer_push(T_RA_SPILL_APPLY); check_for_memory_operands(irg); if (iteration == 0) { be_abi_fix_stack_nodes(birg->abi); } - BE_TIMER_POP(t_ra_spill_apply); + be_timer_pop(T_RA_SPILL_APPLY); - BE_TIMER_PUSH(t_verify); /* verify schedule and register pressure */ + be_timer_push(T_VERIFY); if (chordal_env->opts->vrfy_option == BE_CH_VRFY_WARN) { be_verify_schedule(birg); be_verify_register_pressure(birg, pse->cls, irg); @@ -281,19 +303,19 @@ static void post_spill(post_spill_env_t *pse, int iteration) { assert(be_verify_register_pressure(birg, pse->cls, irg) && "Register pressure verification failed"); } - BE_TIMER_POP(t_verify); + be_timer_pop(T_VERIFY); /* Color the graph. */ - BE_TIMER_PUSH(t_ra_color); - be_ra_chordal_color(chordal_env); - BE_TIMER_POP(t_ra_color); + be_timer_push(T_RA_COLOR); + be_ra_chordal_coloring(chordal_env); + be_timer_pop(T_RA_COLOR); dump(BE_CH_DUMP_CONSTR, irg, pse->cls, "-color", dump_ir_block_graph_sched); /* Create the ifg with the selected flavor */ - BE_TIMER_PUSH(t_ra_ifg); + be_timer_push(T_RA_IFG); chordal_env->ifg = be_create_ifg(chordal_env); - BE_TIMER_POP(t_ra_ifg); + be_timer_pop(T_RA_IFG); stat_ev_if { be_ifg_stat_t stat; @@ -313,25 +335,23 @@ static void post_spill(post_spill_env_t *pse, int iteration) { node_stats[BE_STAT_COPIES]); } - /* copy minimization */ - BE_TIMER_PUSH(t_ra_copymin); + be_timer_push(T_RA_COPYMIN); co_driver(chordal_env); - BE_TIMER_POP(t_ra_copymin); + be_timer_pop(T_RA_COPYMIN); dump(BE_CH_DUMP_COPYMIN, irg, pse->cls, "-copymin", dump_ir_block_graph_sched); - /* ssa destruction */ - BE_TIMER_PUSH(t_ra_ssa); + be_timer_push(T_RA_SSA); be_ssa_destruction(chordal_env); - BE_TIMER_POP(t_ra_ssa); + be_timer_pop(T_RA_SSA); dump(BE_CH_DUMP_SSADESTR, irg, pse->cls, "-ssadestr", dump_ir_block_graph_sched); if (chordal_env->opts->vrfy_option != BE_CH_VRFY_OFF) { - BE_TIMER_PUSH(t_verify); + be_timer_push(T_VERIFY); be_ssa_destruction_check(chordal_env); - BE_TIMER_POP(t_verify); + be_timer_pop(T_VERIFY); } /* the ifg exists only if there are allocatable regs */ @@ -358,9 +378,9 @@ static void be_ra_chordal_main(be_irg_t *birg) be_chordal_env_t chordal_env; struct obstack obst; - BE_TIMER_PUSH(t_ra_other); + be_timer_push(T_RA_OTHER); - BE_TIMER_PUSH(t_ra_prolog); + be_timer_push(T_RA_PROLOG); be_assure_liveness(birg); @@ -374,7 +394,7 @@ static void be_ra_chordal_main(be_irg_t *birg) obstack_init(&obst); - BE_TIMER_POP(t_ra_prolog); + be_timer_pop(T_RA_PROLOG); stat_ev_if { be_collect_node_stats(&last_node_stats, birg); @@ -403,9 +423,9 @@ static void be_ra_chordal_main(be_irg_t *birg) pse.birg = birg; pre_spill(&pse, cls); - BE_TIMER_PUSH(t_ra_spill); + be_timer_push(T_RA_SPILL); be_do_spill(birg, cls); - BE_TIMER_POP(t_ra_spill); + be_timer_pop(T_RA_SPILL); dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill", dump_ir_block_graph_sched); @@ -429,7 +449,7 @@ static void be_ra_chordal_main(be_irg_t *birg) /* the backend has its own spiller */ m = arch_env_get_n_reg_class(arch_env); - pse = alloca(m * sizeof(pse[0])); + pse = ALLOCAN(post_spill_env_t, m); for (j = 0; j < m; ++j) { memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env)); @@ -437,9 +457,9 @@ static void be_ra_chordal_main(be_irg_t *birg) pre_spill(&pse[j], pse[j].cls); } - BE_TIMER_PUSH(t_ra_spill); + be_timer_push(T_RA_SPILL); arch_code_generator_spill(birg->cg, birg); - BE_TIMER_POP(t_ra_spill); + be_timer_pop(T_RA_SPILL); dump(BE_CH_DUMP_SPILL, irg, NULL, "-spill", dump_ir_block_graph_sched); for (j = 0; j < m; ++j) { @@ -447,34 +467,40 @@ static void be_ra_chordal_main(be_irg_t *birg) } } - BE_TIMER_PUSH(t_verify); - be_verify_register_allocation(birg); - BE_TIMER_POP(t_verify); + be_timer_push(T_VERIFY); + if (chordal_env.opts->vrfy_option == BE_CH_VRFY_WARN) { + be_verify_register_allocation(birg); + } else if(chordal_env.opts->vrfy_option == BE_CH_VRFY_ASSERT) { + assert(be_verify_register_allocation(birg) + && "Register allocation invalid"); + } + be_timer_pop(T_VERIFY); - BE_TIMER_PUSH(t_ra_epilog); + be_timer_push(T_RA_EPILOG); lower_nodes_after_ra(birg, 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(&obst, NULL); be_liveness_invalidate(be_get_birg_liveness(birg)); - BE_TIMER_POP(t_ra_epilog); + be_timer_pop(T_RA_EPILOG); - BE_TIMER_POP(t_ra_other); + be_timer_pop(T_RA_OTHER); } -static be_ra_t be_ra_chordal_allocator = { - be_ra_chordal_main, -}; - void be_init_chordal_main(void) { + static be_ra_t be_ra_chordal_allocator = { + be_ra_chordal_main, + }; + lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra"); lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal"); - lc_opt_add_table(chordal_grp, be_chordal_options); - be_register_allocator("chordal", &be_ra_chordal_allocator); + + lc_opt_add_table(chordal_grp, be_chordal_options); + be_add_module_list_opt(chordal_grp, "coloring", "select coloring methode", &colorings, (void**) &selected_coloring); } BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);