X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=924d203ad8095f2b34e40a2d5e53cfd3eb0f970c;hb=c221526a38e632139bb36afb3e059b429e76c2d7;hp=a44121ffed745750cefc2fa33bee6998eacbfff4;hpb=429d687f06baeeb63d04750f846d39e55fb62343;p=libfirm diff --git a/ir/be/bemain.c b/ir/be/bemain.c index a44121ffe..924d203ad 100644 --- a/ir/be/bemain.c +++ b/ir/be/bemain.c @@ -39,7 +39,6 @@ #include "irgopt.h" #include "irgraph.h" #include "irdump.h" -#include "phiclass.h" #include "irdom_t.h" #include "iredges_t.h" #include "irloop_t.h" @@ -51,13 +50,13 @@ #include "execfreq.h" #include "irprofile.h" -#include "bearch_t.h" +#include "bearch.h" #include "be_t.h" #include "bemodule.h" #include "beutil.h" -#include "benode_t.h" +#include "benode.h" #include "beirgmod.h" -#include "besched_t.h" +#include "besched.h" #include "belistsched.h" #include "belive_t.h" #include "bera.h" @@ -73,7 +72,7 @@ #include "bestat.h" #include "beverify.h" #include "be_dbgout.h" -#include "beirg_t.h" +#include "beirg.h" #define NEW_ID(s) new_id_from_chars(s, sizeof(s) - 1) @@ -155,7 +154,7 @@ static const lc_opt_table_entry_t be_main_options[] = { LC_OPT_ENT_BOOL ("omitleaffp", "omit frame pointer in leaf routines", &be_options.omit_leaf_fp), LC_OPT_ENT_BOOL ("pic", "create PIC code", &be_options.pic), LC_OPT_ENT_BOOL ("gprof", "create gprof profiling code", &be_options.gprof), - LC_OPT_ENT_ENUM_PTR ("verify", "verify the backend irg", &vrfy_var), + LC_OPT_ENT_ENUM_PTR ("verify", "verify the backend irg", &vrfy_var), LC_OPT_ENT_BOOL ("time", "get backend timing statistics", &be_options.timing), LC_OPT_ENT_BOOL ("profile", "instrument the code for execution count profiling", &be_options.opt_profile), LC_OPT_ENT_ENUM_PTR ("sched", "select a scheduler", &sched_var), @@ -265,7 +264,7 @@ asm_constraint_flags_t be_parse_asm_constraints(const char *constraint) if (tflags != 0) { flags |= tflags; } else { - flags |= isa_if->parse_asm_constraint(isa_if, &c); + flags |= isa_if->parse_asm_constraint(&c); } break; } @@ -301,7 +300,7 @@ int be_is_valid_clobber(const char *clobber) if (strcmp(clobber, "cc") == 0) return 1; - return isa_if->is_valid_clobber(isa_if, clobber); + return isa_if->is_valid_clobber(clobber); } void be_register_isa_if(const char *name, const arch_isa_if_t *isa) @@ -344,13 +343,15 @@ int be_parse_arg(const char *arg) { static const backend_params be_params = { 0, /* need dword lowering */ 0, /* don't support inline assembler yet */ - 0, /* no immediate floating point mode. */ - NULL, /* no additional opcodes */ NULL, /* will be set later */ NULL, /* but yet no creator function */ NULL, /* context for create_intrinsic_fkt */ NULL, /* no if conversion settings */ - NULL /* no immediate fp mode */ + NULL, /* no float arithmetic mode */ + 0, /* no trampoline support: size 0 */ + 0, /* no trampoline support: align 0 */ + NULL, /* no trampoline support: no trampoline builder */ + 4 /* alignment of stack parameter */ }; /* Perform schedule verification if requested. */ @@ -405,8 +406,6 @@ static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle) memset(asm_constraint_flags, 0, sizeof(asm_constraint_flags)); env->arch_env = arch_env_init(isa_if, file_handle, env); - be_phi_handler_new(); - be_dbg_open(); return env; } @@ -418,7 +417,6 @@ static void be_done_env(be_main_env_t *env) { arch_env_done(env->arch_env); be_dbg_close(); - be_phi_handler_free(); pmap_destroy(env->ent_trampoline_map); pmap_destroy(env->ent_pic_symbol_map); @@ -447,9 +445,12 @@ static void dump(int mask, ir_graph *irg, const char *suffix, */ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env) { + irg->be_data = birg; + memset(birg, 0, sizeof(*birg)); birg->irg = irg; birg->main_env = env; + obstack_init(&birg->obst); edges_deactivate_kind(irg, EDGE_KIND_DEP); edges_activate_kind(irg, EDGE_KIND_DEP); @@ -473,6 +474,7 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env) edges_assure(irg); set_irg_phase_state(irg, phase_backend); + be_info_init_irg(irg); dump(DUMP_INITIAL, irg, "-prepared", dump_ir_block_graph); } @@ -482,6 +484,7 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env) int be_timing; ir_timer_t *t_abi; ir_timer_t *t_codegen; +ir_timer_t *t_ra_preparation; ir_timer_t *t_sched; ir_timer_t *t_constr; ir_timer_t *t_finish; @@ -513,20 +516,21 @@ ir_timer_t *t_ra_other; */ static void be_main_loop(FILE *file_handle, const char *cup_name) { - int i; - be_main_env_t env; - char prof_filename[256]; static const char suffix[] = ".prof"; - be_irg_t *birgs; - int num_birgs; - ir_graph **irg_list, **backend_irg_list; - arch_env_t *arch_env; + + int i, num_birgs, stat_active = 0; + be_main_env_t env; + char prof_filename[256]; + be_irg_t *birgs; + ir_graph **irg_list, **backend_irg_list; + arch_env_t *arch_env; be_timing = (be_options.timing == BE_TIME_ON); if (be_timing) { t_abi = ir_timer_register("bemain_time_beabi", "be abi introduction"); t_codegen = ir_timer_register("bemain_time_codegen", "codegeneration"); + t_ra_preparation = ir_timer_register("bemain_time_ra_preparation", "ra preparation"); t_sched = ir_timer_register("bemain_time_sched", "scheduling"); t_constr = ir_timer_register("bemain_time_constr", "assure constraints"); t_finish = ir_timer_register("bemain_time_finish", "graph finish"); @@ -567,11 +571,14 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs(); birgs = ALLOCAN(be_irg_t, num_birgs + 1); + be_info_init(); + /* First: initialize all birgs */ for(i = 0; i < num_birgs; ++i) { ir_graph *irg = backend_irg_list ? backend_irg_list[i] : get_irp_irg(i); initialize_birg(&birgs[i], irg, &env); } + arch_env_handle_intrinsics(arch_env); DEL_ARR_F(irg_list); /* @@ -594,6 +601,10 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) ir_profile_read(prof_filename); } +#ifdef FIRM_STATISTICS + stat_active = stat_is_active(); +#endif /* FIRM_STATISTICS */ + /* For all graphs */ for (i = 0; i < num_birgs; ++i) { be_irg_t *birg = &birgs[i]; @@ -604,11 +615,6 @@ 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; - be_sched_init_phase(irg); - - /* reset the phi handler. */ - be_phi_handler_reset(); - stat_ev_if { stat_ev_ctx_push_fobj("bemain_irg", irg); be_stat_ev("bemain_insns_start", be_count_insns(irg)); @@ -645,6 +651,22 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) dump(DUMP_ABI, irg, "-abi", dump_ir_block_graph); + /* do local optimizations */ + optimize_graph_df(irg); + + /* we have to do cfopt+remove_critical_edges as we can't have Bad-blocks + * or critical edges in the backend */ + optimize_cf(irg); + remove_critical_cf_edges(irg); + + /* TODO: we often have dead code reachable through out-edges here. So for + * now we rebuild edges (as we need correct user count for code selection) + */ + edges_deactivate(irg); + edges_activate(irg); + + dump(DUMP_PREPARED, irg, "-pre_transform", dump_ir_block_graph_sched); + if (be_options.vrfy_option == BE_VRFY_WARN) { be_check_dominance(irg); be_verify_out_edges(irg); @@ -658,9 +680,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) arch_code_generator_prepare_graph(birg->cg); BE_TIMER_POP(t_codegen); - /* reset the phi handler. */ - be_phi_handler_reset(); - dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph); if (be_options.vrfy_option == BE_VRFY_WARN) { @@ -728,9 +747,9 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) dump(DUMP_SCHED, irg, "-assured", dump_ir_block_graph_sched); /* stuff needs to be done after scheduling but before register allocation */ - BE_TIMER_PUSH(t_codegen); + BE_TIMER_PUSH(t_ra_preparation); arch_code_generator_before_ra(birg->cg); - BE_TIMER_POP(t_codegen); + BE_TIMER_POP(t_ra_preparation); /* connect all stack modifying nodes together (see beabi.c) */ BE_TIMER_PUSH(t_abi); @@ -823,7 +842,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) #define LC_EMIT(timer) \ stat_ev_if { \ - stat_ev_dbl(ir_timer_get_name(timer), ir_timer_elapsed_msec(timer)); \ + stat_ev_dbl(ir_timer_get_name(timer), ir_timer_elapsed_usec(timer)); \ } else { \ printf("%-20s: %8.3lf msec\n", ir_timer_get_description(timer), (double)ir_timer_elapsed_usec(timer) / 1000.0); \ } \ @@ -836,6 +855,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) } LC_EMIT(t_abi); LC_EMIT(t_codegen); + LC_EMIT(t_ra_preparation); LC_EMIT(t_sched); LC_EMIT(t_live); LC_EMIT(t_heights); @@ -859,13 +879,19 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) ); #undef LC_EMIT - be_sched_free_phase(irg); - be_free_birg(birg); + + /* switched off due to statistics (statistic module needs all irgs) */ +#ifdef FIRM_STATISTICS + if (! stat_active) +#endif /* FIRM_STATISTICS */ + remove_irp_irg(irg); stat_ev_ctx_pop("bemain_irg"); } ir_profile_free(); be_done_env(&env); + + be_info_free(); } /* Main interface to the frontend. */ @@ -912,8 +938,6 @@ void be_main(FILE *file_handle, const char *cup_name) /* never build code for pseudo irgs */ set_visit_pseudo_irgs(0); - be_node_init(); - be_main_loop(file_handle, cup_name); if (be_options.timing == BE_TIME_ON) {