Bugfixes

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 592bfa6..a77748e 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -44,17 +44,16 @@
 
 #include "bespillbelady.h"
 #include "bespillilp.h"
-#include "beconstrperm.h"
 #include "belower.h"
 
-#include "becopyoptmain.h"
+#include "becopyopt.h"
 #include "bessadestr.h"
 #include "becopystat.h"
 
 
 void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
        firm_dbg_module_t *dbg = chordal_env->dbg;
-       const arch_env_t *arch_env = chordal_env->main_env->arch_env;
+       const arch_env_t *arch_env = chordal_env->birg->main_env->arch_env;
        struct obstack ob;
        pmap_entry *pme;
        ir_node **nodes, *n1, *n2;
@@ -155,7 +154,7 @@ int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node
 
 
 static be_ra_chordal_opts_t options = {
-       BE_CH_DUMP_ALL,
+       BE_CH_DUMP_NONE,
        BE_CH_SPILL_BELADY,
        BE_CH_COPYMIN_HEUR,
        BE_CH_IFG_STD,
@@ -187,6 +186,18 @@ static const lc_opt_enum_int_items_t lower_perm_items[] = {
        { NULL, 0 }
 };
 
+static const lc_opt_enum_int_items_t dump_items[] = {
+       { "spill",    BE_CH_DUMP_SPILL },
+       { "live",     BE_CH_DUMP_LIVE },
+       { "color",    BE_CH_DUMP_COLOR },
+       { "copymin",  BE_CH_DUMP_COPYMIN },
+       { "ssadestr", BE_CH_DUMP_SSADESTR },
+       { "tree",     BE_CH_DUMP_TREE_INTV },
+       { "constr",   BE_CH_DUMP_CONSTR },
+       { "lower",    BE_CH_DUMP_LOWER },
+       { NULL, 0 }
+};
+
 static lc_opt_enum_int_var_t spill_var = {
        &options.spill_method, spill_items
 };
@@ -203,6 +214,10 @@ static lc_opt_enum_int_var_t lower_perm_var = {
        &options.lower_perm_method, lower_perm_items
 };
 
+static lc_opt_enum_int_var_t dump_var = {
+       &options.dump_flags, dump_items
+};
+
 static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
 {
        grp = lc_opt_get_grp(grp, "chordal");
@@ -226,25 +241,28 @@ static void dump(unsigned mask, ir_graph *irg,
        }
 }
 
-static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
+static void be_ra_chordal_main(const be_irg_t *bi)
 {
        int j, m;
        be_chordal_env_t chordal_env;
+       ir_graph *irg = bi->irg;
+       const be_main_env_t *main_env = bi->main_env;
        const arch_isa_t *isa = arch_env_get_isa(main_env->arch_env);
 
        compute_doms(irg);
 
+       chordal_env.opts         = &options;
        chordal_env.irg          = irg;
-       chordal_env.dbg          = firm_dbg_register("be.chordal");
-       chordal_env.main_env     = main_env;
+       chordal_env.dbg          = firm_dbg_register("firm.be.chordal");
+       chordal_env.birg                 = bi;
        chordal_env.dom_front    = be_compute_dominance_frontiers(irg);
 
        obstack_init(&chordal_env.obst);
 
        /* Perform the following for each register class. */
        for(j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
+               chordal_env.cls          = arch_isa_get_reg_class(isa, j);
                chordal_env.border_heads = pmap_create();
-               chordal_env.cls = arch_isa_get_reg_class(isa, j);
 
                be_liveness(irg);
                dump(BE_CH_DUMP_LIVE, irg, chordal_env.cls, "-live", dump_ir_block_graph_sched);
@@ -265,12 +283,7 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
                be_liveness(irg);
                be_check_pressure(&chordal_env);
 
-               /* Insert perms before reg-constrained instructions */
-               be_insert_constr_perms(&chordal_env);
-               dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-constr", dump_ir_block_graph_sched);
-
                be_liveness(irg);
-               be_numbering(irg);
                be_check_pressure(&chordal_env);
 
                /* Color the graph. */
@@ -283,7 +296,7 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 
                /* copy minimization */
                copystat_collect_cls(&chordal_env);
-               be_copy_opt(&chordal_env);
+               co_compare_solvers(&chordal_env);
                dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
                be_ra_chordal_check(&chordal_env);
 
@@ -296,7 +309,6 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
                copystat_dump(irg);
 
                be_ifg_free(chordal_env.ifg);
-               be_numbering_done(irg);
 
                pmap_destroy(chordal_env.border_heads);
        }
@@ -305,11 +317,11 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 
        dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched);
 
-       lower_nodes(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
-       dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower", dump_ir_block_graph_sched);
+       lower_nodes_after_ra(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
+       dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched);
 
-       be_free_dominance_frontiers(chordal_env.dom_front);
        obstack_free(&chordal_env.obst, NULL);
+       be_free_dominance_frontiers(chordal_env.dom_front);
 }
 
 const be_ra_t be_ra_chordal_allocator = {