Next step of refactoring

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index ab169a3..98812ca 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -43,17 +43,20 @@
 #include "beifg_impl.h"
 
 #include "bespillbelady.h"
-#include "bespillilp.h"
 #include "belower.h"
 
+#ifdef WITH_ILP
+#include "bespillilp.h"
+#endif /* WITH_ILP */
+
+#include "becopystat.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;
@@ -164,13 +167,17 @@ static be_ra_chordal_opts_t options = {
 #ifdef WITH_LIBCORE
 static const lc_opt_enum_int_items_t spill_items[] = {
        { "belady", BE_CH_SPILL_BELADY },
+#ifdef WITH_ILP
        { "ilp",        BE_CH_SPILL_ILP },
+#endif
        { NULL, 0 }
 };
 
 static const lc_opt_enum_int_items_t copymin_items[] = {
        { "heur", BE_CH_COPYMIN_HEUR },
+#ifdef WITH_ILP
        { "ilp",  BE_CH_COPYMIN_ILP },
+#endif
        { NULL, 0 }
 };
 
@@ -229,7 +236,7 @@ static void dump(unsigned mask, ir_graph *irg,
                                 const char *suffix,
                                 void (*dump_func)(ir_graph *, const char *))
 {
-       if(1 || (options.dump_flags & mask) == mask) {
+       if(1 || ((options.dump_flags & mask) == mask)) {
                if(cls) {
                        char buf[256];
                        snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix);
@@ -251,9 +258,10 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 
        compute_doms(irg);
 
+       chordal_env.opts         = &options;
        chordal_env.irg          = irg;
        chordal_env.dbg          = firm_dbg_register("firm.be.chordal");
-       chordal_env.main_env     = main_env;
+       chordal_env.birg                 = bi;
        chordal_env.dom_front    = be_compute_dominance_frontiers(irg);
 
        obstack_init(&chordal_env.obst);
@@ -271,9 +279,11 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                case BE_CH_SPILL_BELADY:
                        be_spill_belady(&chordal_env);
                        break;
+#ifdef WITH_ILP
                case BE_CH_SPILL_ILP:
                        be_spill_ilp(&chordal_env);
                        break;
+#endif /* WITH_ILP */
                default:
                        fprintf(stderr, "no valid spiller selected. falling back to belady\n");
                        be_spill_belady(&chordal_env);
@@ -295,7 +305,15 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 
                /* copy minimization */
                copystat_collect_cls(&chordal_env);
+#ifdef COPYOPT_STAT
                co_compare_solvers(&chordal_env);
+#else
+               {
+               copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
+               co_solve_heuristic(co);
+               free_copy_opt(co);
+               }
+#endif
                dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
                be_ra_chordal_check(&chordal_env);
 
@@ -303,7 +321,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                be_ssa_destruction(&chordal_env);
                dump(BE_CH_DUMP_SSADESTR, irg, chordal_env.cls, "-ssadestr", dump_ir_block_graph_sched);
                be_ssa_destruction_check(&chordal_env);
-               be_ra_chordal_check(&chordal_env);
+//             be_ra_chordal_check(&chordal_env);
 
                copystat_dump(irg);