X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=1cd2c1a9e78eac375235cef02f9481268dcc2b91;hb=80a6158fdd766f42ee6c508a773bc114ff1b61f3;hp=814641ce174ddea25f8c0d496f23774b16c91d27;hpb=0c92b911be3d9d02b4a49b2a142dab8d7ba978a6;p=libfirm diff --git a/ir/be/bemain.c b/ir/be/bemain.c index 814641ce1..1cd2c1a9e 100644 --- a/ir/be/bemain.c +++ b/ir/be/bemain.c @@ -42,10 +42,9 @@ #include "arm/bearch_arm.h" #include "ppc32/bearch_ppc32.h" #include "mips/bearch_mips.h" -// #include "sta/bearch_sta.h" #include "be_t.h" -#include "benumb_t.h" +#include "bemodule.h" #include "beutil.h" #include "benode_t.h" #include "beirgmod.h" @@ -90,16 +89,11 @@ static be_options_t be_options = { /* config file. */ static char config_file[256] = { 0 }; -/* register allocator to use. */ -static const be_ra_t *ra = &be_ra_chordal_allocator; - /* back end instruction set architecture to use */ static const arch_isa_if_t *isa_if = &ia32_isa_if; #ifdef WITH_LIBCORE -static lc_opt_entry_t *be_grp_root = NULL; - /* possible dumping options */ static const lc_opt_enum_mask_items_t dump_items[] = { { "none", DUMP_NONE }, @@ -114,13 +108,6 @@ static const lc_opt_enum_mask_items_t dump_items[] = { { NULL, 0 } }; -/* register allocators */ -static const lc_opt_enum_const_ptr_items_t ra_items[] = { - { "chordal", &be_ra_chordal_allocator }, - { "external", &be_ra_external_allocator }, - { NULL, NULL } -}; - /* instruction set architectures. */ static const lc_opt_enum_const_ptr_items_t isa_items[] = { { "ia32", &ia32_isa_if }, @@ -154,10 +141,6 @@ static lc_opt_enum_mask_var_t dump_var = { &be_options.dump_flags, dump_items }; -static lc_opt_enum_const_ptr_var_t ra_var = { - (const void **) &ra, ra_items -}; - static lc_opt_enum_const_ptr_var_t isa_var = { (const void **) &isa_if, isa_items }; @@ -173,7 +156,6 @@ static lc_opt_enum_int_var_t sched_var = { static const lc_opt_table_entry_t be_main_options[] = { LC_OPT_ENT_STR ("config", "read another config file containing backend options", config_file, sizeof(config_file)), LC_OPT_ENT_ENUM_MASK("dump", "dump irg on several occasions", &dump_var), - LC_OPT_ENT_ENUM_PTR ("ra", "register allocator", &ra_var), LC_OPT_ENT_ENUM_PTR ("isa", "the instruction set architecture", &isa_var), LC_OPT_ENT_NEGBOOL ("noomitfp", "do not omit frame pointer", &be_options.omit_fp), LC_OPT_ENT_BOOL ("stabs", "enable stabs debug support", &be_options.stabs_debug_support), @@ -195,50 +177,30 @@ static const lc_opt_table_entry_t be_main_options[] = { void be_opt_register(void) { #ifdef WITH_LIBCORE - int i; - lc_opt_entry_t *be_grp_ra; + lc_opt_entry_t *be_grp; static int run_once = 0; - if (! run_once) { - run_once = 1; - be_grp_root = lc_opt_get_grp(firm_opt_get_root(), "be"); - be_grp_ra = lc_opt_get_grp(be_grp_root, "ra"); - - lc_opt_add_table(be_grp_root, be_main_options); - - /* register allocator options */ - for(i = 0; ra_items[i].name != NULL; ++i) { - const be_ra_t *ra = ra_items[i].value; - ra->register_options(be_grp_ra); - } - - /* register isa options */ - for(i = 0; isa_items[i].name != NULL; ++i) { - const arch_isa_if_t *isa = isa_items[i].value; - isa->register_options(be_grp_root); - } - - /* list scheduler register options */ - list_sched_register_options(be_grp_root); + if (run_once) { + return; + } + run_once = 1; -#ifdef WITH_ILP - /* ilp scheduler register options */ - ilpsched_register_options(be_grp_root); -#endif /* WITH_ILP */ + be_init_modules(); - be_block_schedule_register_options(be_grp_root); - } + be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); + lc_opt_add_table(be_grp, be_main_options); #endif /* WITH_LIBCORE */ } /* Parse one argument. */ int be_parse_arg(const char *arg) { #ifdef WITH_LIBCORE + lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) { - lc_opt_print_help(be_grp_root, stdout); + lc_opt_print_help(be_grp, stdout); return -1; } - return lc_opt_from_single_arg(be_grp_root, NULL, arg, NULL); + return lc_opt_from_single_arg(be_grp, NULL, arg, NULL); #else return 0; #endif /* WITH_LIBCORE */ @@ -266,11 +228,7 @@ static void be_sched_vrfy(ir_graph *irg, int vrfy_opt) { const backend_params *be_init(void) { be_opt_register(); - - be_sched_init(); - be_numbering_init(); - be_copy_opt_init(); - copystat_init(); + be_init_modules(); phi_class_init(); if (isa_if->get_params) @@ -503,12 +461,14 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) /* set the current graph (this is important for several firm functions) */ current_ir_graph = irg; +#ifdef FIRM_STATISTICS if(be_stat_ev_is_active()) { ir_snprintf(irg_name, sizeof(irg_name), "%F", irg); be_stat_tags[STAT_TAG_CLS] = ""; be_stat_tags[STAT_TAG_IRG] = irg_name; be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file); } +#endif /* stop and reset timers */ BE_TIMER_ONLY( @@ -583,7 +543,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) edges_activate(irg); /* Compute loop nesting information (for weighting copies) */ - construct_cf_backedges(irg); dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph); BE_TIMER_ONLY(num_nodes_r = get_num_reachable_nodes(irg)); @@ -654,20 +613,24 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) arch_code_generator_before_ra(birg->cg); BE_TIMER_POP(t_codegen); +#ifdef FIRM_STATISTICS if(be_stat_ev_is_active()) { be_stat_ev_l("costs_before_ra", (long) be_estimate_irg_costs(irg, env.arch_env, birg->exec_freq)); } +#endif /* Do register allocation */ BE_TIMER_PUSH(t_regalloc); - ra_timer = ra->allocate(birg); + be_allocate_registers(birg); BE_TIMER_POP(t_regalloc); +#ifdef FIRM_STATISTICS if(be_stat_ev_is_active()) { be_stat_ev_l("costs_after_ra", (long) be_estimate_irg_costs(irg, env.arch_env, birg->exec_freq)); } +#endif dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched); be_do_stat_nodes(irg, "06 Register Allocation"); @@ -769,20 +732,12 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) #undef LC_EMIT_RA #undef LC_EMIT - free_execfreq(birg->exec_freq); - birg->exec_freq = NULL; - - if(birg->dom_front != NULL) { - be_free_dominance_frontiers(birg->dom_front); - birg->dom_front = NULL; - } - if(birg->lv != NULL) { - be_liveness_free(birg->lv); - birg->lv = NULL; - } + be_free_birg(birg); /* switched off due to statistics (statistic module needs all irgs) */ +#ifdef FIRM_STATISTICS if (! stat_is_active()) +#endif free_ir_graph(irg); if(be_stat_ev_is_active()) { @@ -823,7 +778,9 @@ void be_main(FILE *file_handle, const char *cup_name) lc_timer_reset_and_start(t); } +#ifdef FIRM_STATISTICS be_init_stat_file(be_options.stat_file_name, cup_name); +#endif #endif /* WITH_LIBCORE */ /* never build code for pseudo irgs */ @@ -844,7 +801,9 @@ void be_main(FILE *file_handle, const char *cup_name) } } +#ifdef FIRM_STATISTICS be_close_stat_file(); +#endif #endif /* WITH_LIBCORE */ } @@ -879,37 +838,3 @@ int be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *cls, b return bitset_popcnt(bs); } - -void be_assure_liveness(be_irg_t *birg) -{ - if(birg->lv != NULL) - return; - - birg->lv = be_liveness(birg->irg); -} - -void be_invalidate_liveness(be_irg_t *birg) -{ - if(birg->lv == NULL) - return; - - be_liveness_free(birg->lv); - birg->lv = NULL; -} - -void be_assure_dom_front(be_irg_t *birg) -{ - if(birg->dom_front != NULL) - return; - - birg->dom_front = be_compute_dominance_frontiers(birg->irg); -} - -void be_invalidate_dom_front(be_irg_t *birg) -{ - if(birg->dom_front == NULL) - return; - - be_free_dominance_frontiers(birg->dom_front); - birg->dom_front = NULL; -}