projects / libfirm / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix time measureing in chordal_regalloc
[libfirm] / ir / be / bechordal_main.c
diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 4f52dc0..3547d02 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.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.
  *
@@ -77,8 +77,6 @@
 #include "bera.h"
 #include "beirg_t.h"
 
-#include "bespillbelady.h"
-#include "bespillmorgan.h"
 #include "bespillslots.h"
 #include "bespilloptions.h"
 #include "belower.h"
@@ -109,7 +107,8 @@ typedef struct _post_spill_env_t {
        double                      pre_spill_cost;
 } post_spill_env_t;
 
-static be_ra_timer_t ra_timer = {
+static be_options_t  *main_opts;
+static be_ra_timer_t  ra_timer = {
        NULL,
        NULL,
        NULL,
@@ -337,23 +336,21 @@ 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_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);
                LC_STOP_AND_RESET_TIMER(ra_timer.t_live);
                LC_STOP_AND_RESET_TIMER(ra_timer.t_spill);
-               LC_STOP_AND_RESET_TIMER(ra_timer.t_spillslots);
                LC_STOP_AND_RESET_TIMER(ra_timer.t_color);
                LC_STOP_AND_RESET_TIMER(ra_timer.t_ifg);
                LC_STOP_AND_RESET_TIMER(ra_timer.t_copymin);
@@ -404,9 +401,15 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
        chordal_env->border_heads  = pmap_create();
        chordal_env->ignore_colors = bitset_malloc(chordal_env->cls->n_regs);
 
+       BE_TIMER_PUSH(ra_timer.t_live);
        be_assure_liveness(birg);
+       BE_TIMER_POP(ra_timer.t_live);
+
+       BE_TIMER_PUSH(ra_timer.t_verify);
        be_liveness_assure_chk(be_get_birg_liveness(birg));
-       stat_ev_ctx_push_str("cls", pse->cls->name);
+       BE_TIMER_POP(ra_timer.t_verify);
+
+       stat_ev_ctx_push_str("bechordal_cls", pse->cls->name);
        stat_ev_do(node_stats(birg, pse->cls, &node_stat));
        stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq));
        stat_ev_dbl("phis_before_spill", node_stat.n_phis);
@@ -417,7 +420,7 @@ static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
        be_pre_spill_prepare_constr(chordal_env);
        dump(BE_CH_DUMP_CONSTR, birg->irg, pse->cls, "-constr-pre", dump_ir_block_graph_sched);
 
-       stat_ev_ctx_pop("cls");
+       stat_ev_ctx_pop("bechordal_cls");
 }
 
 /**
@@ -428,15 +431,16 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
        be_irg_t            *birg        = pse->birg;
        ir_graph            *irg         = birg->irg;
        const be_main_env_t *main_env    = birg->main_env;
-       be_options_t        *main_opts   = main_env->options;
-       node_stat_t         node_stat;
-       int                 colors_n     = arch_register_class_n_regs(chordal_env->cls);
+       node_stat_t          node_stat;
+       int                  colors_n     = arch_register_class_n_regs(chordal_env->cls);
        int             allocatable_regs = colors_n - be_put_ignore_regs(birg, chordal_env->cls, NULL);
 
+       main_opts = main_env->options;
+
        /* some special classes contain only ignore regs, no work to be done */
        if (allocatable_regs > 0) {
 
-               stat_ev_ctx_push_str("cls", pse->cls->name);
+               stat_ev_ctx_push_str("bechordal_cls", pse->cls->name);
                stat_ev_do(node_stats(birg, pse->cls, &node_stat));
                stat_ev_dbl("phis_after_spill", node_stat.n_phis);
                stat_ev_dbl("mem_phis", node_stat.n_mem_phis);
@@ -520,7 +524,7 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
                stat_ev_do(node_stats(birg, pse->cls, &node_stat));
                stat_ev_dbl("perms_after_coal", node_stat.n_perms);
                stat_ev_dbl("copies_after_coal", node_stat.n_copies);
-               stat_ev_ctx_pop("cls");
+               stat_ev_ctx_pop("bechordal_cls");
 
                /* the ifg exists only if there are allocatable regs */
                be_ifg_free(chordal_env->ifg);
libfirm