Fix normal scheduler

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 79e2a7b..7091153 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -38,6 +38,10 @@
 #include "iterator.h"
 #include "firm_config.h"
 
+#include <libcore/lc_opts.h>
+#include <libcore/lc_opts_enum.h>
+#include <libcore/lc_timing.h>
+
 #include "ircons_t.h"
 #include "irmode_t.h"
 #include "irgraph_t.h"
@@ -119,11 +123,6 @@ static be_ra_timer_t ra_timer = {
        NULL,
 };
 
-#ifdef WITH_LIBCORE
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
-#include <libcore/lc_timing.h>
-
 static const lc_opt_enum_int_items_t lower_perm_items[] = {
        { "copy", BE_CH_LOWER_PERM_COPY },
        { "swap", BE_CH_LOWER_PERM_SWAP },
@@ -175,7 +174,6 @@ static const lc_opt_table_entry_t be_chordal_options[] = {
        LC_OPT_ENT_ENUM_PTR ("vrfy",          "verify options", &be_ch_vrfy_var),
        LC_OPT_LAST
 };
-#endif /* WITH_LIBCORE */
 
 static void dump(unsigned mask, ir_graph *irg,
                                 const arch_register_class_t *cls,
@@ -394,9 +392,11 @@ 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;
+       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;
@@ -406,8 +406,9 @@ static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse)
        be_assure_liveness(birg);
        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);
        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);
@@ -436,11 +437,11 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
 
                stat_ev_ctx_push("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
@@ -564,6 +565,8 @@ 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 */
 
@@ -575,6 +578,11 @@ static void be_ra_chordal_main(be_irg_t *birg)
                        pse.birg = birg;
                        pre_spill(isa, j, &pse);
 
+                       /* this is a hack, TODO remove me later */
+                       if(j == 2) {
+                               be_do_stat_reg_pressure(birg);
+                       }
+
                        BE_TIMER_PUSH(ra_timer.t_spill);
                        be_do_spill(birg, pse.cls);
                        BE_TIMER_POP(ra_timer.t_spill);
@@ -607,8 +615,8 @@ static void be_ra_chordal_main(be_irg_t *birg)
                }
        }
 
-       be_verify_register_allocation(main_env->arch_env, irg);
 
+       be_verify_register_allocation(birg);
 
        BE_TIMER_PUSH(ra_timer.t_epilog);
        lower_nodes_after_ra(birg, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0);
@@ -631,13 +639,12 @@ static be_ra_t be_ra_chordal_allocator = {
 
 void be_init_chordal_main(void)
 {
-#ifdef WITH_LIBCORE
        lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
        lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
 
        lc_opt_add_table(chordal_grp, be_chordal_options);
-#endif
+
        be_register_allocator("chordal", &be_ra_chordal_allocator);
 }