added additional source (new copymin heuristic)

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index ddddad3..b80d6f5 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,12 @@ 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 },
 #ifdef WITH_ILP
-       { "ilp",  BE_CH_COPYMIN_ILP },
+       { "ilp1",  BE_CH_COPYMIN_ILP1 },
+       { "ilp2",  BE_CH_COPYMIN_ILP2 },
 #endif
        { NULL, 0 }
 };
@@ -191,7 +194,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 +235,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 or ilp2)", &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 }
 };
@@ -340,20 +342,47 @@ 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
+#else /* COPYOPT_STAT */
                {
-                       copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
-                       co_build_ou_structure(co);
-                       co_solve_heuristic(co);
-                       co_free_ou_structure(co);
-                       free_copy_opt(co);
+                       copy_opt_t *co = NULL;
+
+                       if (options.copymin_method != BE_CH_COPYMIN_NONE) {
+                               co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
+                               co_build_ou_structure(co);
+                       }
+
+                       switch(options.copymin_method) {
+                               case BE_CH_COPYMIN_HEUR1:
+                                       co_solve_heuristic(co);
+                                       break;
+                               case BE_CH_COPYMIN_HEUR2:
+                                       co_solve_heuristic_new(co);
+                                       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
+#endif /* COPYOPT_STAT */
                dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
                be_ra_chordal_check(&chordal_env);