From: Matthias Braun Date: Mon, 7 Jan 2008 19:17:55 +0000 (+0000) Subject: only timing results to console if statevs are not enabled, add time_ prefix to timer... X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=d4adf39a332b55cfd8e6e96e9d7fdda843b6620f;p=libfirm only timing results to console if statevs are not enabled, add time_ prefix to timer results [r17199] --- diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index f3b419316..4e6bcf37c 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -335,17 +335,17 @@ static unsigned int count_insns(ir_graph *irg) static void be_init_timer(be_options_t *main_opts) { if (main_opts->timing == BE_TIME_ON) { - ra_timer.t_prolog = lc_timer_register("ra_prolog", "regalloc prolog"); - ra_timer.t_epilog = lc_timer_register("ra_epilog", "regalloc epilog"); - ra_timer.t_live = lc_timer_register("ra_liveness", "be liveness"); - ra_timer.t_spill = lc_timer_register("ra_spill", "spiller"); - ra_timer.t_spillslots = lc_timer_register("ra_spillslots", "spillslots"); - ra_timer.t_color = lc_timer_register("ra_color", "graph coloring"); - ra_timer.t_ifg = lc_timer_register("ra_ifg", "interference graph"); - ra_timer.t_copymin = lc_timer_register("ra_copymin", "copy minimization"); - ra_timer.t_ssa = lc_timer_register("ra_ssadestr", "ssa destruction"); - ra_timer.t_verify = lc_timer_register("ra_verify", "graph verification"); - ra_timer.t_other = lc_timer_register("ra_other", "other time"); + ra_timer.t_prolog = lc_timer_register("time_ra_prolog", "regalloc prolog"); + ra_timer.t_epilog = lc_timer_register("time_ra_epilog", "regalloc epilog"); + ra_timer.t_live = lc_timer_register("time_ra_liveness", "be liveness"); + ra_timer.t_spill = lc_timer_register("time_ra_spill", "spiller"); + ra_timer.t_spillslots = lc_timer_register("time_ra_spillslots", "spillslots"); + ra_timer.t_color = lc_timer_register("time_ra_color", "graph coloring"); + ra_timer.t_ifg = lc_timer_register("time_ra_ifg", "interference graph"); + ra_timer.t_copymin = lc_timer_register("time_ra_copymin", "copy minimization"); + ra_timer.t_ssa = lc_timer_register("time_ra_ssadestr", "ssa destruction"); + ra_timer.t_verify = lc_timer_register("time_ra_verify", "graph verification"); + ra_timer.t_other = lc_timer_register("time_ra_other", "other time"); LC_STOP_AND_RESET_TIMER(ra_timer.t_prolog); LC_STOP_AND_RESET_TIMER(ra_timer.t_epilog); diff --git a/ir/be/bemain.c b/ir/be/bemain.c index f5b2c42cc..4d1e2b29b 100644 --- a/ir/be/bemain.c +++ b/ir/be/bemain.c @@ -387,15 +387,15 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) lc_timer_t *t_verify = NULL; if (be_options.timing == BE_TIME_ON) { - t_abi = lc_timer_register("beabi", "be abi introduction"); - t_codegen = lc_timer_register("codegen", "codegeneration"); - t_sched = lc_timer_register("sched", "scheduling"); - t_constr = lc_timer_register("constr", "assure constraints"); - t_regalloc = lc_timer_register("regalloc", "register allocation"); - t_finish = lc_timer_register("finish", "graph finish"); - t_emit = lc_timer_register("emiter", "code emiter"); - t_verify = lc_timer_register("verify", "graph verification"); - t_other = lc_timer_register("other", "other"); + t_abi = lc_timer_register("time_beabi", "be abi introduction"); + t_codegen = lc_timer_register("time_codegen", "codegeneration"); + t_sched = lc_timer_register("time_sched", "scheduling"); + t_constr = lc_timer_register("time_constr", "assure constraints"); + t_regalloc = lc_timer_register("time_regalloc", "register allocation"); + t_finish = lc_timer_register("time_finish", "graph finish"); + t_emit = lc_timer_register("time_emiter", "code emiter"); + t_verify = lc_timer_register("time_verify", "graph verification"); + t_other = lc_timer_register("time_other", "other"); } be_init_env(&env, file_handle); @@ -689,18 +689,27 @@ static void be_main_loop(FILE *file_handle, const char *cup_name) BE_TIMER_POP(t_other); #define LC_EMIT(timer) \ - printf("%-20s: %.3lf msec\n", lc_timer_get_description(timer), (double)lc_timer_elapsed_usec(timer) / 1000.0); \ - stat_ev_dbl(lc_timer_get_name(timer), lc_timer_elapsed_msec(timer)); + stat_ev_if { \ + stat_ev_dbl(lc_timer_get_name(timer), lc_timer_elapsed_msec(timer)); \ + } else { \ + printf("%-20s: %.3lf msec\n", lc_timer_get_description(timer), (double)lc_timer_elapsed_usec(timer) / 1000.0); \ + } #define LC_EMIT_RA(timer) \ - printf("\t%-20s: %.3lf msec\n", lc_timer_get_description(timer), (double)lc_timer_elapsed_usec(timer) / 1000.0); \ - stat_ev_dbl(lc_timer_get_name(timer), lc_timer_elapsed_msec(timer)); \ + stat_ev_if { \ + stat_ev_dbl(lc_timer_get_name(timer), lc_timer_elapsed_msec(timer)); \ + } else { \ + printf("\t%-20s: %.3lf msec\n", lc_timer_get_description(timer), (double)lc_timer_elapsed_usec(timer) / 1000.0); \ + } BE_TIMER_ONLY( - printf("==>> IRG %s <<==\n", get_entity_name(get_irg_entity(irg))); - printf("# nodes at begin: %u\n", num_nodes_b); - printf("# nodes before ra: %u\n", num_nodes_r); - printf("# nodes at end: %u\n\n", num_nodes_a); + stat_ev_if { + } else { + printf("==>> IRG %s <<==\n", get_entity_name(get_irg_entity(irg))); + printf("# nodes at begin: %u\n", num_nodes_b); + printf("# nodes before ra: %u\n", num_nodes_r); + printf("# nodes at end: %u\n\n", num_nodes_a); + } LC_EMIT(t_abi); LC_EMIT(t_codegen); LC_EMIT(t_sched); @@ -796,8 +805,11 @@ void be_main(FILE *file_handle, const char *cup_name) if (be_options.timing == BE_TIME_ON) { lc_timer_stop(t); lc_timer_leave_high_priority(); - stat_ev_dbl("backend_time", lc_timer_elapsed_msec(t)); - printf("%-20s: %lu msec\n", "BEMAINLOOP", lc_timer_elapsed_msec(t)); + stat_ev_if { + stat_ev_dbl("backend_time", lc_timer_elapsed_msec(t)); + } else { + printf("%-20s: %lu msec\n", "BEMAINLOOP", lc_timer_elapsed_msec(t)); + } } #ifdef FIRM_STATISTICS