fix time measureing in chordal_regalloc
[libfirm] / ir / be / bechordal_main.c
index da0120e..3547d02 100644 (file)
@@ -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);
@@ -391,21 +388,31 @@ static void be_init_timer(be_options_t *main_opts)
 /**
  * Perform things which need to be done per register class before spilling.
  */
-static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse) {
-       be_chordal_env_t *chordal_env = &pse->cenv;
-       be_irg_t         *birg        = pse->birg;
-       node_stat_t      node_stat;
+static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls)
+{
+       be_chordal_env_t    *chordal_env = &pse->cenv;
+       be_irg_t            *birg        = pse->birg;
+       ir_graph            *irg         = be_get_birg_irg(birg);
+       const be_main_env_t *main_env    = birg->main_env;
+       node_stat_t          node_stat;
 
-       pse->cls                   = arch_isa_get_reg_class(isa, cls_idx);
-       chordal_env->cls           = pse->cls;
+       pse->cls                   = cls;
+       chordal_env->cls           = 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("cls", pse->cls->name);
-       stat_ev_dbl("phis_before_spill", node_stat.n_phis);
+       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);
 
        /* put all ignore registers into the ignore register set. */
        be_put_ignore_regs(birg, pse->cls, chordal_env->ignore_colors);
@@ -413,7 +420,7 @@ static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse)
        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();
+       stat_ev_ctx_pop("bechordal_cls");
 }
 
 /**
@@ -424,21 +431,22 @@ 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("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("spillcosts", be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq) - pse->pre_spill_cost);
                stat_ev_dbl("phis_after_spill", node_stat.n_phis);
                stat_ev_dbl("mem_phis", node_stat.n_mem_phis);
                stat_ev_dbl("reloads", node_stat.n_reloads);
                stat_ev_dbl("spills", node_stat.n_spills);
+               stat_ev_dbl("spillcosts", be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq) - pse->pre_spill_cost);
 
                /*
                        If we have a backend provided spiller, post spill is
@@ -499,7 +507,9 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
                BE_TIMER_PUSH(ra_timer.t_ssa);
 
                /* ssa destruction */
+               stat_ev_ctx_push_str("berachordal_phase", "ssadestr");
                be_ssa_destruction(chordal_env);
+               stat_ev_ctx_pop("berachordal_phase");
 
                BE_TIMER_POP(ra_timer.t_ssa);
 
@@ -514,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();
+               stat_ev_ctx_pop("bechordal_cls");
 
                /* the ifg exists only if there are allocatable regs */
                be_ifg_free(chordal_env->ifg);
@@ -562,22 +572,38 @@ static void be_ra_chordal_main(be_irg_t *birg)
 
        be_stat_ev("insns_before", count_insns(irg));
 
+
+
        if (! arch_code_generator_has_spiller(birg->cg)) {
                /* use one of the generic spiller */
 
                /* Perform the following for each register class. */
                for (j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
                        post_spill_env_t pse;
+                       const arch_register_class_t *cls
+                               = arch_isa_get_reg_class(isa, j);
+
+                       if(arch_register_class_flags(cls) & arch_register_class_flag_manual_ra)
+                               continue;
+
 
                        memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env));
                        pse.birg = birg;
-                       pre_spill(isa, j, &pse);
+                       pre_spill(&pse, cls);
+
+#if 0
+                       /* this is a hack, TODO remove me later */
+                       if(j == 2) {
+                               be_do_stat_reg_pressure(birg);
+                       }
+#endif
 
                        BE_TIMER_PUSH(ra_timer.t_spill);
-                       be_do_spill(birg, pse.cls);
+                       be_do_spill(birg, cls);
                        BE_TIMER_POP(ra_timer.t_spill);
 
-                       dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill", dump_ir_block_graph_sched);
+                       dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill",
+                            dump_ir_block_graph_sched);
 
                        post_spill(&pse, 0);
                }
@@ -592,7 +618,7 @@ static void be_ra_chordal_main(be_irg_t *birg)
                for (j = 0; j < m; ++j) {
                        memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env));
                        pse[j].birg = birg;
-                       pre_spill(isa, j, &pse[j]);
+                       pre_spill(&pse[j], pse[j].cls);
                }
 
                BE_TIMER_PUSH(ra_timer.t_spill);
@@ -605,6 +631,7 @@ static void be_ra_chordal_main(be_irg_t *birg)
                }
        }
 
+
        be_verify_register_allocation(birg);
 
        BE_TIMER_PUSH(ra_timer.t_epilog);