fixed typedef

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 4b31592..21d7a5a 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -160,7 +160,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_NONE,
        BE_CH_SPILL_BELADY,
-       BE_CH_COPYMIN_HEUR,
+       BE_CH_COPYMIN_HEUR1,
        BE_CH_IFG_STD,
        BE_CH_LOWER_PERM_SWAP,
 };
@@ -175,9 +175,13 @@ static const lc_opt_enum_int_items_t spill_items[] = {
 };
 
 static const lc_opt_enum_int_items_t copymin_items[] = {
-       { "heur", BE_CH_COPYMIN_HEUR },
+       { "none",  BE_CH_COPYMIN_NONE },
+       { "heur1", BE_CH_COPYMIN_HEUR1 },
+       { "heur2", BE_CH_COPYMIN_HEUR2 },
+       { "stat",  BE_CH_COPYMIN_STAT  },
 #ifdef WITH_ILP
-       { "ilp",  BE_CH_COPYMIN_ILP },
+       { "ilp1",  BE_CH_COPYMIN_ILP1 },
+       { "ilp2",  BE_CH_COPYMIN_ILP2 },
 #endif
        { NULL, 0 }
 };
@@ -191,7 +195,6 @@ static const lc_opt_enum_int_items_t ifg_flavor_items[] = {
 static const lc_opt_enum_int_items_t lower_perm_items[] = {
        { "copy", BE_CH_LOWER_PERM_COPY },
        { "swap", BE_CH_LOWER_PERM_SWAP },
-       { "stat", BE_CH_LOWER_PERM_STAT },
        { NULL, 0 }
 };
 
@@ -233,9 +236,9 @@ static lc_opt_enum_int_var_t dump_var = {
 
 static const lc_opt_table_entry_t be_chordal_options[] = {
        LC_OPT_ENT_ENUM_MASK("spill", "spill method (belady or ilp)", &spill_var),
-       LC_OPT_ENT_ENUM_PTR("copymin", "copymin method (heur or ilp)", &copymin_var),
+       LC_OPT_ENT_ENUM_PTR("copymin", "copymin method (none, heur1, heur2, ilp1, ilp2 or stat)", &copymin_var),
        LC_OPT_ENT_ENUM_PTR("ifg", "interference graph flavour (std or fast)", &ifg_flavor_var),
-       LC_OPT_ENT_ENUM_MASK("perm", "perm lowering options (copy, swap, stat)", &lower_perm_var),
+       LC_OPT_ENT_ENUM_MASK("perm", "perm lowering options (copy or swap)", &lower_perm_var),
        LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var),
        { NULL }
 };
@@ -283,11 +286,20 @@ static void put_ignore_colors(be_chordal_env_t *chordal_env)
                        bitset_set(chordal_env->ignore_colors, i);
 }
 
+FILE *be_chordal_open(const be_chordal_env_t *env, const char *prefix, const char *suffix)
+{
+       char buf[1024];
+
+       ir_snprintf(buf, sizeof(buf), "%s%F_%s.%s", prefix, env->irg, env->cls->name, suffix);
+       return fopen(buf, "wt");
+}
+
 static void be_ra_chordal_main(const be_irg_t *bi)
 {
        const be_main_env_t *main_env = bi->main_env;
-       const arch_isa_t *isa         = arch_env_get_isa(main_env->arch_env);
-       ir_graph *irg                 = bi->irg;
+       const arch_isa_t    *isa      = arch_env_get_isa(main_env->arch_env);
+       ir_graph            *irg      = bi->irg;
+       copy_opt_t          *co;
 
        int j, m;
        be_chordal_env_t chordal_env;
@@ -329,6 +341,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                        be_spill_belady(&chordal_env);
                }
                dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
+               be_abi_fix_stack_nodes(bi->abi);
                be_liveness(irg);
                be_check_pressure(&chordal_env);
 
@@ -340,20 +353,46 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                chordal_env.ifg = be_ifg_std_new(&chordal_env);
                be_ifg_check(chordal_env.ifg);
 
-#if 1
                /* copy minimization */
-#ifdef COPYOPT_STAT
-               co_compare_solvers(&chordal_env);
-#else
-               {
-                       copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
+               co = NULL;
+               if (options.copymin_method != BE_CH_COPYMIN_NONE && options.copymin_method != BE_CH_COPYMIN_STAT) {
+                       co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
                        co_build_ou_structure(co);
-                       co_solve_heuristic(co);
+               }
+
+               switch(options.copymin_method) {
+                       case BE_CH_COPYMIN_HEUR1:
+                               co_solve_heuristic(co);
+                               break;
+                       case BE_CH_COPYMIN_HEUR2:
+                               co_build_graph_structure(co);
+                               co_solve_heuristic_new(co);
+                               co_free_graph_structure(co);
+                               break;
+                       case BE_CH_COPYMIN_STAT:
+                               co_compare_solvers(&chordal_env);
+                               break;
+#ifdef WITH_ILP
+                       case BE_CH_COPYMIN_ILP1:
+                               printf("FIXME: %s:%d ILP1 not yet implemented!\n", __FILE__, __LINE__);
+                               co_solve_ilp1(co, 60.0);
+                               break;
+                       case BE_CH_COPYMIN_ILP2:
+                               co_build_graph_structure(co);
+                               co_solve_ilp2(co, 60.0);
+                               co_free_graph_structure(co);
+                               break;
+#endif /* WITH_ILP */
+                       case BE_CH_COPYMIN_NONE:
+                       default:
+                               break;
+               }
+
+               if (co) {
                        co_free_ou_structure(co);
                        free_copy_opt(co);
                }
-#endif
-#endif
+
                dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
                be_ra_chordal_check(&chordal_env);
 
@@ -374,9 +413,7 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 
        dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched);
 
-       lower_nodes_after_ra(&chordal_env,
-               options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0,
-               options.lower_perm_opt & BE_CH_LOWER_PERM_STAT ? 1 : 0);
+       lower_nodes_after_ra(&chordal_env, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0);
        dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched);
 
        obstack_free(&chordal_env.obst, NULL);