added additional ifg flavour options
[libfirm] / ir / be / bechordal_main.c
index 32f06ab..cec2bde 100644 (file)
 #include "list.h"
 #include "bitset.h"
 #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 "irmode_t.h"
@@ -50,6 +52,8 @@
 
 #ifdef WITH_ILP
 #include "bespillilp.h"
+#include "bespillremat.h"
+#include "bespillappel.h"
 #endif /* WITH_ILP */
 
 #include "becopystat.h"
@@ -114,6 +118,7 @@ static be_ra_chordal_opts_t options = {
        BE_CH_COPYMIN_HEUR1,
        BE_CH_IFG_STD,
        BE_CH_LOWER_PERM_SWAP,
+       BE_CH_VRFY_WARN,
 };
 
 #ifdef WITH_LIBCORE
@@ -121,8 +126,10 @@ static const lc_opt_enum_int_items_t spill_items[] = {
        { "morgan", BE_CH_SPILL_MORGAN },
        { "belady", BE_CH_SPILL_BELADY },
 #ifdef WITH_ILP
-       { "ilp",        BE_CH_SPILL_ILP },
-#endif
+       { "ilp",    BE_CH_SPILL_ILP    },
+       { "remat",  BE_CH_SPILL_REMAT  },
+       { "appel",  BE_CH_SPILL_APPEL  },
+#endif /* WITH_ILP */
        { NULL, 0 }
 };
 
@@ -135,14 +142,18 @@ static const lc_opt_enum_int_items_t copymin_items[] = {
 #ifdef WITH_ILP
        { "ilp1",  BE_CH_COPYMIN_ILP1 },
        { "ilp2",  BE_CH_COPYMIN_ILP2 },
-#endif
+#endif /* WITH_ILP */
        { NULL, 0 }
 };
 
 static const lc_opt_enum_int_items_t ifg_flavor_items[] = {
-       { "std",  BE_CH_IFG_STD },
-       { "fast", BE_CH_IFG_FAST },
-       { NULL, 0 }
+       { "std",     BE_CH_IFG_STD     },
+       { "fast",    BE_CH_IFG_FAST    },
+       { "clique",  BE_CH_IFG_CLIQUE  },
+       { "pointer", BE_CH_IFG_POINTER },
+       { "list",    BE_CH_IFG_LIST    },
+       { "check",   BE_CH_IFG_CHECK   },
+       { NULL,      0                 }
 };
 
 static const lc_opt_enum_int_items_t lower_perm_items[] = {
@@ -156,14 +167,22 @@ static const lc_opt_enum_int_items_t lower_perm_stat_items[] = {
 };
 
 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 },
+       { "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 },
+       { "constr",   BE_CH_DUMP_CONSTR    },
+       { "lower",    BE_CH_DUMP_LOWER     },
+       { "all",      BE_CH_DUMP_ALL       },
+       { NULL, 0 }
+};
+
+static const lc_opt_enum_int_items_t be_ch_vrfy_items[] = {
+       { "off",    BE_CH_VRFY_OFF    },
+       { "warn",   BE_CH_VRFY_WARN   },
+       { "assert", BE_CH_VRFY_ASSERT },
        { NULL, 0 }
 };
 
@@ -176,7 +195,7 @@ static lc_opt_enum_int_var_t copymin_var = {
 };
 
 static lc_opt_enum_int_var_t ifg_flavor_var = {
-       &options.spill_method, ifg_flavor_items
+       &options.ifg_flavor, ifg_flavor_items
 };
 
 static lc_opt_enum_int_var_t lower_perm_var = {
@@ -187,12 +206,17 @@ static lc_opt_enum_int_var_t dump_var = {
        &options.dump_flags, dump_items
 };
 
+static lc_opt_enum_int_var_t be_ch_vrfy_var = {
+       &options.vrfy_option, be_ch_vrfy_items
+};
+
 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_MASK("spill",   "spill method (belady, ilp, remat or appel)", &spill_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 or swap)", &lower_perm_var),
+       LC_OPT_ENT_ENUM_PTR ("ifg",     "interference graph flavour (std, fast, clique, pointer, list, check)", &ifg_flavor_var),
+       LC_OPT_ENT_ENUM_PTR ("perm",    "perm lowering options (copy or swap)", &lower_perm_var),
        LC_OPT_ENT_ENUM_MASK("dump",    "select dump phases", &dump_var),
+       LC_OPT_ENT_ENUM_PTR ("vrfy",    "verify options (off, warn, assert)", &be_ch_vrfy_var),
        { NULL }
 };
 
@@ -210,20 +234,19 @@ static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
 
        co_register_options(chordal_grp);
 }
-#endif
+#endif /* WITH_LIBCORE */
 
 static void dump(unsigned mask, ir_graph *irg,
                                 const arch_register_class_t *cls,
                                 const char *suffix,
                                 void (*dump_func)(ir_graph *, const char *))
 {
-       if(1 || ((options.dump_flags & mask) == mask)) {
-               if(cls) {
+       if((options.dump_flags & mask) == mask) {
+               if (cls) {
                        char buf[256];
                        snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix);
                        be_dump(irg, buf, dump_func);
                }
-
                else
                        be_dump(irg, suffix, dump_func);
        }
@@ -249,6 +272,33 @@ FILE *be_chordal_open(const be_chordal_env_t *env, const char *prefix, const cha
        return fopen(buf, "wt");
 }
 
+void check_ifg_implementations(be_chordal_env_t *chordal_env)
+{
+       FILE *f;
+
+       f = be_chordal_open(chordal_env, "std", "log");
+       chordal_env->ifg = be_ifg_std_new(chordal_env);
+       be_ifg_check_sorted(chordal_env->ifg, f);
+       fclose(f);
+
+       f = be_chordal_open(chordal_env, "list", "log");
+       chordal_env->ifg = be_ifg_list_new(chordal_env);
+       be_ifg_check_sorted(chordal_env->ifg, f);
+       fclose(f);
+
+       f = be_chordal_open(chordal_env, "clique", "log");
+       chordal_env->ifg = be_ifg_clique_new(chordal_env);
+       be_ifg_check_sorted(chordal_env->ifg, f);
+       fclose(f);
+
+       f = be_chordal_open(chordal_env, "pointer", "log");
+       chordal_env->ifg = be_ifg_pointer_new(chordal_env);
+       be_ifg_check_sorted(chordal_env->ifg, f);
+       fclose(f);
+
+       chordal_env->ifg = NULL;
+};
+
 static void be_ra_chordal_main(const be_irg_t *bi)
 {
        const be_main_env_t *main_env = bi->main_env;
@@ -259,6 +309,9 @@ static void be_ra_chordal_main(const be_irg_t *bi)
        int j, m;
        be_chordal_env_t chordal_env;
 
+       //lc_timer_t *timer = lc_timer_register("getTime","get Time of copy minimization using the ifg");
+       //unsigned long elapsed_milisec = 0;
+
        compute_doms(irg);
 
        chordal_env.opts          = &options;
@@ -293,6 +346,12 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                case BE_CH_SPILL_ILP:
                        be_spill_ilp(&chordal_env);
                        break;
+                case BE_CH_SPILL_REMAT:
+                        be_spill_remat(&chordal_env);
+                        break;
+               case BE_CH_SPILL_APPEL:
+                       be_spill_appel(&chordal_env);
+                       break;
 #endif /* WITH_ILP */
                default:
                        fprintf(stderr, "no valid spiller selected. falling back to belady\n");
@@ -301,17 +360,51 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                dump(BE_CH_DUMP_SPILL, irg, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
                be_abi_fix_stack_nodes(bi->abi);
 
-               DEBUG_ONLY(be_verify_schedule(irg);)
-               DEBUG_ONLY(be_verify_register_pressure(chordal_env.birg->main_env->arch_env, chordal_env.cls, irg);)
+               /* verify schedule and register pressure */
+               if (options.vrfy_option == BE_CH_VRFY_WARN) {
+                       be_verify_schedule(irg);
+                       be_verify_register_pressure(chordal_env.birg->main_env->arch_env, chordal_env.cls, irg);
+               }
+               else if (options.vrfy_option == BE_CH_VRFY_ASSERT) {
+                       assert(be_verify_schedule(irg) && "Schedule verification failed");
+                       assert(be_verify_register_pressure(chordal_env.birg->main_env->arch_env, chordal_env.cls, irg)
+                               && "Register pressure verification failed");
+               }
 
                /* Color the graph. */
                be_liveness(irg);
                be_ra_chordal_color(&chordal_env);
                dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-color", dump_ir_block_graph_sched);
 
-               /* Build the interference graph. */
-               chordal_env.ifg = be_ifg_std_new(&chordal_env);
-               be_ifg_check(chordal_env.ifg);
+               /* Check the implementations of the ifg */
+
+               switch (options.ifg_flavor) {
+                       default:
+                               fprintf(stderr, "no valid ifg flavour selected. falling back to std\n");
+                       case BE_CH_IFG_STD:
+                       case BE_CH_IFG_FAST:
+                               chordal_env.ifg = be_ifg_std_new(&chordal_env);
+                               break;
+                       case BE_CH_IFG_CLIQUE:
+                               chordal_env.ifg = be_ifg_clique_new(&chordal_env);
+                               break;
+                       case BE_CH_IFG_POINTER:
+                               chordal_env.ifg = be_ifg_pointer_new(&chordal_env);
+                               break;
+                       case BE_CH_IFG_LIST:
+                               chordal_env.ifg = be_ifg_list_new(&chordal_env);
+                               break;
+                       case BE_CH_IFG_CHECK:
+                               check_ifg_implementations(&chordal_env);
+                               /* Build the interference graph. */
+                               chordal_env.ifg = be_ifg_std_new(&chordal_env);
+                               //be_ifg_check(chordal_env.ifg);
+                               //be_ifg_check_sorted(chordal_env.ifg);
+                               break;
+               }
+
+               /* start timer */
+               //lc_timer_reset_and_start(timer);
 
                /* copy minimization */
                co = NULL;
@@ -321,6 +414,12 @@ static void be_ra_chordal_main(const be_irg_t *bi)
                        co_build_graph_structure(co);
                }
 
+               /* stop timer */
+               //lc_timer_stop(timer);
+               //elapsed_milisec = lc_timer_elapsed_msec(timer);
+
+               //ir_printf("%u\n", elapsed_milisec);
+
                switch(options.copymin_method) {
                        case BE_CH_COPYMIN_HEUR1:
                                co_solve_heuristic(co);