fix last commit

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 61e8e09..4d1e2b2 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -52,6 +52,7 @@
 #include "iroptimize.h"
 #include "firmstat.h"
 #include "execfreq.h"
+#include "irprofile.h"
 
 #include "bearch_t.h"
 #include "be_t.h"
@@ -74,7 +75,6 @@
 #include "beschedmris.h"
 #include "bestat.h"
 #include "beverify.h"
-#include "beprofile.h"
 #include "be_dbgout.h"
 #include "beirg_t.h"
 
@@ -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);
@@ -452,6 +452,8 @@ 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(env.phi_handler);
 
@@ -687,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);
@@ -725,6 +736,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #undef LC_EMIT_RA
 #undef LC_EMIT
 
+               be_sched_free_phase(irg);
+
                be_free_birg(birg);
 
         /* switched off due to statistics (statistic module needs all irgs) */
@@ -792,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