- Split bearch.h correctly into bearch.h and bearch_t.h

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index e98bc57..3834e4d 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -10,7 +10,7 @@
  * Driver for the chordal register allocator.
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <time.h>
@@ -22,11 +22,9 @@
 #include "iterator.h"
 #include "firm_config.h"
 
-#ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
 #include <libcore/lc_timing.h>
-#endif /* WITH_LIBCORE */
 
 #include "ircons_t.h"
 #include "irmode_t.h"
@@ -51,13 +49,14 @@
 #include "besched.h"
 #include "besched_t.h"
 #include "belive_t.h"
-#include "bearch.h"
+#include "bearch_t.h"
 #include "beifg_t.h"
 #include "beifg_impl.h"
 #include "benode_t.h"
 #include "bestatevent.h"
 #include "bestat.h"
 #include "bemodule.h"
+#include "be_t.h"
 
 #include "bespillbelady.h"
 #include "bespillmorgan.h"
@@ -82,9 +81,6 @@ static be_ra_chordal_opts_t options = {
        BE_CH_VRFY_WARN,
 };
 
-/** Enable extreme live range splitting. */
-static int be_elr_split = 0;
-
 typedef struct _post_spill_env_t {
        be_chordal_env_t            cenv;
        be_irg_t                    *birg;
@@ -155,7 +151,6 @@ static const lc_opt_table_entry_t be_chordal_options[] = {
        LC_OPT_ENT_ENUM_PTR ("perm",          "perm lowering options", &lower_perm_var),
        LC_OPT_ENT_ENUM_MASK("dump",          "select dump phases", &dump_var),
        LC_OPT_ENT_ENUM_PTR ("vrfy",          "verify options", &be_ch_vrfy_var),
-       LC_OPT_ENT_BOOL     ("elrsplit",      "enable extreme live range splitting", &be_elr_split),
        { NULL }
 };
 
@@ -202,7 +197,6 @@ static void memory_operand_walker(ir_node *irn, void *env) {
                assert(src && "outedges broken!");
 
                if (get_nodes_block(src) == block && arch_possible_memory_operand(aenv, src, pos)) {
-                       DBG((cenv->dbg, LEVEL_3, "performing memory operand %+F at %+F\n", irn, src));
                        arch_perform_memory_operand(aenv, src, spill, pos);
                }
        }
@@ -316,7 +310,6 @@ static unsigned int count_insns(ir_graph *irg)
        return cnt;
 }
 
-#ifdef WITH_LIBCORE
 /**
  * Initialize all timers.
  */
@@ -373,13 +366,6 @@ static void be_init_timer(be_options_t *main_opts)
                                lc_timer_get_name(tmp), lc_timer_get_name(timer));                             \
                timer = tmp;                                                                           \
        }
-#else
-
-#define BE_TIMER_INIT(main_opts)
-#define BE_TIMER_PUSH(timer)
-#define BE_TIMER_POP(timer)
-
-#endif /* WITH_LIBCORE */
 
 /**
  * Perform things which need to be done per register class before spilling.
@@ -415,6 +401,7 @@ static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse)
        if (be_stat_ev_is_active()) {
                pse->pre_spill_cost = be_estimate_irg_costs(birg->irg,
                        birg->main_env->arch_env, birg->exec_freq);
+               be_stat_ev_pop();
        }
 #endif /* FIRM_STATISTICS */
 }
@@ -428,13 +415,21 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
        ir_graph            *irg         = birg->irg;
        const be_main_env_t *main_env    = birg->main_env;
        be_options_t        *main_opts   = main_env->options;
-       static int          splitted     = 0;
        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);
+
+       /* some special classes contain only ignore regs, no work to be done */
+       if(allocatable_regs == 0)
+               return;
 
 #ifdef FIRM_STATISTICS
        if (be_stat_ev_is_active()) {
                double spillcosts = be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq) - pse->pre_spill_cost;
 
+               be_stat_tags[STAT_TAG_CLS] = pse->cls->name;
+               be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
+
                be_stat_ev_l("spillcosts", (long) spillcosts);
 
                node_stats(birg, pse->cls, &node_stat);
@@ -452,28 +447,23 @@ static void post_spill(post_spill_env_t *pse, int iteration) {
        */
        if (iteration == 0) {
                check_for_memory_operands(chordal_env);
-               be_abi_fix_stack_nodes(birg->abi, birg->lv);
+               be_abi_fix_stack_nodes(birg->abi);
        }
 
        BE_TIMER_PUSH(ra_timer.t_verify);
 
        /* verify schedule and register pressure */
        if (chordal_env->opts->vrfy_option == BE_CH_VRFY_WARN) {
-               be_verify_schedule(irg);
+               be_verify_schedule(birg);
                be_verify_register_pressure(birg, pse->cls, irg);
        }
        else if (chordal_env->opts->vrfy_option == BE_CH_VRFY_ASSERT) {
-               assert(be_verify_schedule(irg) && "Schedule verification failed");
+               assert(be_verify_schedule(birg) && "Schedule verification failed");
                assert(be_verify_register_pressure(birg, pse->cls, irg)
                        && "Register pressure verification failed");
        }
        BE_TIMER_POP(ra_timer.t_verify);
 
-       if (be_elr_split && ! splitted) {
-               extreme_liverange_splitting(chordal_env);
-               splitted = 1;
-       }
-
        /* Color the graph. */
        BE_TIMER_PUSH(ra_timer.t_color);
        be_ra_chordal_color(chordal_env);
@@ -563,7 +553,6 @@ static void be_ra_chordal_main(be_irg_t *birg)
        chordal_env.opts      = &options;
        chordal_env.irg       = irg;
        chordal_env.birg      = birg;
-       FIRM_DBG_REGISTER(chordal_env.dbg, "firm.be.chordal");
 
        obstack_init(&chordal_env.obst);
 
@@ -633,7 +622,7 @@ static be_ra_t be_ra_chordal_allocator = {
        be_ra_chordal_main,
 };
 
-void be_init_chordal(void)
+void be_init_chordal_main(void)
 {
        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");
@@ -644,4 +633,4 @@ void be_init_chordal(void)
        be_register_allocator("chordal", &be_ra_chordal_allocator);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);