X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbemain.c;h=4dde352a126b8f160553a5cc42ea5adc84db8076;hb=bb4b701ebadcf132a2a6637f41db3c845d51de78;hp=81f137e03edc270d6636aeebd6bc66666d4251b5;hpb=cabe54a4c9fe9bcd6e66a221fde914c7e16e274f;p=libfirm diff --git a/ir/be/bemain.c b/ir/be/bemain.c index 81f137e03..4dde352a1 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 ("vrfy", "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) @@ -317,25 +316,24 @@ void be_opt_register(void) lc_opt_entry_t *be_grp; static int run_once = 0; - if (run_once) { + if (run_once) return; - } - run_once = 1; - - be_init_modules(); + run_once = 1; be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); lc_opt_add_table(be_grp, be_main_options); be_add_module_list_opt(be_grp, "isa", "the instruction set architecture", &isa_ifs, (void**) &isa_if); + + be_init_modules(); } /* Parse one argument. */ int be_parse_arg(const char *arg) { 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, stdout); + lc_opt_print_help_for_entry(be_grp, '-', stdout); return -1; } return lc_opt_from_single_arg(be_grp, NULL, arg, NULL); @@ -345,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. */ @@ -406,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(env); - be_dbg_open(); return env; } @@ -419,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); @@ -448,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); @@ -474,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); } @@ -481,28 +482,37 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env) #define BE_TIMER_ONLY(code) do { if (be_timing) { code; } } while(0) int be_timing; -ir_timer_t *t_abi; -ir_timer_t *t_codegen; -ir_timer_t *t_sched; -ir_timer_t *t_constr; -ir_timer_t *t_finish; -ir_timer_t *t_emit; -ir_timer_t *t_other; -ir_timer_t *t_verify; -ir_timer_t *t_heights; -ir_timer_t *t_live; -ir_timer_t *t_execfreq; -ir_timer_t *t_ssa_constr; -ir_timer_t *t_ra_constr; -ir_timer_t *t_ra_prolog; -ir_timer_t *t_ra_epilog; -ir_timer_t *t_ra_spill; -ir_timer_t *t_ra_spill_apply; -ir_timer_t *t_ra_color; -ir_timer_t *t_ra_ifg; -ir_timer_t *t_ra_copymin; -ir_timer_t *t_ra_ssa; -ir_timer_t *t_ra_other; + +static const char *get_timer_name(be_timer_id_t id) +{ + switch (id) { + case T_ABI: return "abi"; + case T_CODEGEN: return "codegen"; + case T_RA_PREPARATION: return "ra_preparation"; + case T_SCHED: return "sched"; + case T_CONSTR: return "constr"; + case T_FINISH: return "finish"; + case T_EMIT: return "emit"; + case T_VERIFY: return "verify"; + case T_OTHER: return "other"; + case T_HEIGHTS: return "heights"; + case T_LIVE: return "live"; + case T_EXECFREQ: return "execfreq"; + case T_SSA_CONSTR: return "ssa_constr"; + case T_RA_PROLOG: return "ra_prolog"; + case T_RA_EPILOG: return "ra_epilog"; + case T_RA_CONSTR: return "ra_constr"; + case T_RA_SPILL: return "ra_spill"; + case T_RA_SPILL_APPLY: return "ra_spill_apply"; + case T_RA_COLOR: return "ra_color"; + case T_RA_IFG: return "ra_ifg"; + case T_RA_COPYMIN: return "ra_copymin"; + case T_RA_SSA: return "ra_ssa"; + case T_RA_OTHER: return "ra_other"; + } + return "unknown"; +} +ir_timer_t *be_timers[T_LAST+1]; /** * The Firm backend main loop. @@ -514,41 +524,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_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"); - t_emit = ir_timer_register("bemain_time_emiter", "code emiter"); - t_verify = ir_timer_register("bemain_time_verify", "graph verification"); - t_other = ir_timer_register("bemain_time_other", "other"); - t_heights = ir_timer_register("bemain_time_heights", "heights"); - t_live = ir_timer_register("bemain_time_liveness", "be liveness"); - t_execfreq = ir_timer_register("bemain_time_execfreq", "execfreq"); - t_ssa_constr = ir_timer_register("bemain_time_ssa_constr", "ssa reconstruction"); - t_ra_prolog = ir_timer_register("bemain_time_ra_prolog", "regalloc prolog"); - t_ra_epilog = ir_timer_register("bemain_time_ra_epilog", "regalloc epilog"); - t_ra_constr = ir_timer_register("bemain_time_ra_constr", "regalloc constraints"); - t_ra_spill = ir_timer_register("bemain_time_ra_spill", "spiller"); - t_ra_spill_apply - = ir_timer_register("bemain_time_ra_spill_apply", "apply spills"); - t_ra_color = ir_timer_register("bemain_time_ra_color", "graph coloring"); - t_ra_ifg = ir_timer_register("bemain_time_ra_ifg", "interference graph"); - t_ra_copymin = ir_timer_register("bemain_time_ra_copymin", "copy minimization"); - t_ra_ssa = ir_timer_register("bemain_time_ra_ssadestr", "ssa destruction"); - t_ra_other = ir_timer_register("bemain_time_ra_other", "regalloc other"); + for (i = 0; i < T_LAST+1; ++i) { + be_timers[i] = ir_timer_new(); + } } be_init_env(&env, file_handle); @@ -566,13 +556,16 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) /* we might need 1 birg more for instrumentation constructor */ num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs(); - birgs = alloca(sizeof(birgs[0]) * (num_birgs + 1)); + 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); /* @@ -595,6 +588,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]; @@ -605,11 +602,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)); @@ -617,10 +609,10 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) } /* stop and reset timers */ - BE_TIMER_PUSH(t_other); /* t_other */ + be_timer_push(T_OTHER); /* Verify the initial graph */ - BE_TIMER_PUSH(t_verify); + be_timer_push(T_VERIFY); if (be_options.vrfy_option == BE_VRFY_WARN) { irg_verify(irg, VRFY_ENFORCE_SSA); be_check_dominance(irg); @@ -628,7 +620,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) assert(irg_verify(irg, VRFY_ENFORCE_SSA) && "irg verification failed"); assert(be_check_dominance(irg) && "Dominance verification failed"); } - BE_TIMER_POP(t_verify); + be_timer_pop(T_VERIFY); /* Get the code generator interface. */ cg_if = arch_env_get_code_generator_if(arch_env); @@ -640,12 +632,28 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) arch_code_generator_before_abi(birg->cg); /* implement the ABI conventions. */ - BE_TIMER_PUSH(t_abi); + be_timer_push(T_ABI); birg->abi = be_abi_introduce(birg); - BE_TIMER_POP(t_abi); + be_timer_pop(T_ABI); 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); @@ -655,12 +663,9 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) } /* generate code */ - BE_TIMER_PUSH(t_codegen); + be_timer_push(T_CODEGEN); arch_code_generator_prepare_graph(birg->cg); - BE_TIMER_POP(t_codegen); - - /* reset the phi handler. */ - be_phi_handler_reset(); + be_timer_pop(T_CODEGEN); dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph); @@ -672,7 +677,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) assert(be_check_dominance(irg) && "Dominance verification failed"); } - BE_TIMER_PUSH(t_execfreq); + be_timer_push(T_EXECFREQ); /** * Create execution frequencies from profile data or estimate some */ @@ -684,19 +689,14 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) edges_deactivate(irg); birg->exec_freq = compute_execfreq(irg, 10); } - BE_TIMER_POP(t_execfreq); + be_timer_pop(T_EXECFREQ); /* disabled for now, fails for EmptyFor.c and XXEndless.c */ /* be_live_chk_compare(birg); */ - /* let backend prepare scheduling */ - BE_TIMER_PUSH(t_codegen); - arch_code_generator_before_sched(birg->cg); - BE_TIMER_POP(t_codegen); - /* schedule the irg */ - BE_TIMER_PUSH(t_sched); + be_timer_push(T_SCHED); switch (be_options.scheduler) { default: fprintf(stderr, "Warning: invalid scheduler (%d) selected, falling back to list scheduler.\n", be_options.scheduler); @@ -709,17 +709,17 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) break; #endif /* WITH_ILP */ }; - BE_TIMER_POP(t_sched); + be_timer_pop(T_SCHED); dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched); /* check schedule */ - BE_TIMER_PUSH(t_verify); + be_timer_push(T_VERIFY); be_sched_vrfy(birg, be_options.vrfy_option); - BE_TIMER_POP(t_verify); + be_timer_pop(T_VERIFY); /* introduce patterns to assure constraints */ - BE_TIMER_PUSH(t_constr); + be_timer_push(T_CONSTR); /* we switch off optimizations here, because they might cause trouble */ save_optimization_state(&state); set_optimize(0); @@ -729,26 +729,26 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) /* add Keeps for should_be_different constrained nodes */ /* beware: needs schedule due to usage of be_ssa_constr */ assure_constraints(birg); - BE_TIMER_POP(t_constr); + be_timer_pop(T_CONSTR); 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); + be_timer_push(T_ABI); be_abi_fix_stack_nodes(birg->abi); - BE_TIMER_POP(t_abi); + be_timer_pop(T_ABI); dump(DUMP_SCHED, irg, "-fix_stack", dump_ir_block_graph_sched); /* check schedule */ - BE_TIMER_PUSH(t_verify); + be_timer_push(T_VERIFY); be_sched_vrfy(birg, be_options.vrfy_option); - BE_TIMER_POP(t_verify); + be_timer_pop(T_VERIFY); stat_ev_if { stat_ev_dbl("bemain_costs_before_ra", @@ -767,22 +767,22 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched); /* let the code generator prepare the graph for emitter */ - BE_TIMER_PUSH(t_finish); + be_timer_push(T_FINISH); arch_code_generator_after_ra(birg->cg); - BE_TIMER_POP(t_finish); + be_timer_pop(T_FINISH); /* fix stack offsets */ - BE_TIMER_PUSH(t_abi); + be_timer_push(T_ABI); be_abi_fix_stack_nodes(birg->abi); be_remove_dead_nodes_from_schedule(birg); be_abi_fix_stack_bias(birg->abi); - BE_TIMER_POP(t_abi); + be_timer_pop(T_ABI); dump(DUMP_SCHED, irg, "-fix_stack_after_ra", dump_ir_block_graph_sched); - BE_TIMER_PUSH(t_finish); + be_timer_push(T_FINISH); arch_code_generator_finish(birg->cg); - BE_TIMER_POP(t_finish); + be_timer_pop(T_FINISH); dump(DUMP_FINAL, irg, "-finish", dump_ir_block_graph_sched); @@ -792,7 +792,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) } /* check schedule and register allocation */ - BE_TIMER_PUSH(t_verify); + be_timer_push(T_VERIFY); if (be_options.vrfy_option == BE_VRFY_WARN) { irg_verify(irg, VRFY_ENFORCE_SSA); be_check_dominance(irg); @@ -808,70 +808,53 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) && "register allocation verification failed"); } - BE_TIMER_POP(t_verify); + be_timer_pop(T_VERIFY); /* emit assembler code */ - BE_TIMER_PUSH(t_emit); + be_timer_push(T_EMIT); arch_code_generator_done(birg->cg); - BE_TIMER_POP(t_emit); + be_timer_pop(T_EMIT); dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched); - BE_TIMER_PUSH(t_abi); + be_timer_push(T_ABI); be_abi_free(birg->abi); - BE_TIMER_POP(t_abi); + be_timer_pop(T_ABI); restore_optimization_state(&state); - BE_TIMER_POP(t_other); - -#define STOP_AND_RESET_TIMER(timer) do { ir_timer_stop(timer); ir_timer_reset(timer); } while(0) - -#define LC_EMIT(timer) \ - stat_ev_if { \ - stat_ev_dbl(ir_timer_get_name(timer), ir_timer_elapsed_msec(timer)); \ - } else { \ - printf("%-20s: %8.3lf msec\n", ir_timer_get_description(timer), (double)ir_timer_elapsed_usec(timer) / 1000.0); \ - } \ - STOP_AND_RESET_TIMER(timer); - - BE_TIMER_ONLY( - stat_ev_if { + be_timer_pop(T_OTHER); + + if (be_timing) { + int t; + if (stat_ev_enabled) { + for (t = 0; t < T_LAST+1; ++t) { + char buf[128]; + snprintf(buf, sizeof(buf), "bemain_time_%s", + get_timer_name(t)); + stat_ev_dbl(buf, ir_timer_elapsed_usec(be_timers[i])); + } } else { - printf("==>> IRG %s <<==\n", get_entity_name(get_irg_entity(irg))); + printf("==>> IRG %s <<==\n", + get_entity_name(get_irg_entity(irg))); + for (t = 0; t < T_LAST+1; ++t) { + double val = ir_timer_elapsed_usec(be_timers[t]) / 1000.0; + printf("%-20s: %8.3lf msec\n", get_timer_name(t), val); + } + } + for (t = 0; t < T_LAST+1; ++t) { + ir_timer_stop(be_timers[t]); + ir_timer_reset(be_timers[t]); } - LC_EMIT(t_abi); - LC_EMIT(t_codegen); - LC_EMIT(t_sched); - LC_EMIT(t_live); - LC_EMIT(t_heights); - LC_EMIT(t_ssa_constr); - LC_EMIT(t_constr); - LC_EMIT(t_execfreq); - LC_EMIT(t_ra_prolog); - LC_EMIT(t_ra_spill); - LC_EMIT(t_ra_spill_apply); - LC_EMIT(t_ra_constr); - LC_EMIT(t_ra_color); - LC_EMIT(t_ra_ifg); - LC_EMIT(t_ra_copymin); - LC_EMIT(t_ra_ssa); - LC_EMIT(t_ra_epilog); - LC_EMIT(t_ra_other); - LC_EMIT(t_finish); - LC_EMIT(t_emit); - LC_EMIT(t_verify); - LC_EMIT(t_other); - ); -#undef LC_EMIT - - be_sched_free_phase(irg); + } be_free_birg(birg); stat_ev_ctx_pop("bemain_irg"); } ir_profile_free(); be_done_env(&env); + + be_info_free(); } /* Main interface to the frontend. */ @@ -881,16 +864,18 @@ void be_main(FILE *file_handle, const char *cup_name) /* The user specified another config file to read. do that now. */ if (config_file[0] != '\0') { - FILE *f; + FILE *f = fopen(config_file, "rt"); - if ((f = fopen(config_file, "rt")) != NULL) { + if (f != NULL) { lc_opt_from_file(config_file, f, NULL); fclose(f); + } else { + fprintf(stderr, "Warning: Cannot open config file '%s'\n", config_file); } } if (be_options.timing == BE_TIME_ON) { - t = ir_timer_register("bemain", "measure complete bemain loop"); + t = ir_timer_new(); if (ir_timer_enter_high_priority()) { fprintf(stderr, "Warning: Could not enter high priority mode.\n"); @@ -903,7 +888,7 @@ void be_main(FILE *file_handle, const char *cup_name) if (be_options.statev) { const char *dot = strrchr(cup_name, '.'); const char *pos = dot ? dot : cup_name + strlen(cup_name); - char *buf = alloca(pos - cup_name + 1); + char *buf = ALLOCAN(char, pos - cup_name + 1); strncpy(buf, cup_name, pos - cup_name); buf[pos - cup_name] = '\0'; @@ -916,8 +901,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) { @@ -926,7 +909,8 @@ void be_main(FILE *file_handle, const char *cup_name) stat_ev_if { stat_ev_dbl("bemain_backend_time", ir_timer_elapsed_msec(t)); } else { - printf("%-20s: %lu msec\n", "BEMAINLOOP", ir_timer_elapsed_msec(t)); + double val = ir_timer_elapsed_usec(t) / 1000.0; + printf("%-20s: %8.3lf msec\n", "BEMAINLOOP", val); } } @@ -945,7 +929,7 @@ unsigned be_put_ignore_regs(const be_irg_t *birg, const arch_register_class_t *c else bitset_clear_all(bs); - assert(bitset_size(bs) == (unsigned)cls->n_regs); + assert(bitset_size(bs) == cls->n_regs); arch_put_non_ignore_regs(cls, bs); bitset_flip_all(bs); be_abi_put_ignore_regs(birg->abi, cls, bs);