slight bugfix

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index cb960d1..ca848c6 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -65,6 +65,8 @@
 static be_options_t be_options = {
        DUMP_NONE,                         /* dump options */
        BE_TIME_OFF,                       /* no timing */
+       BE_SCHED_SELECT_HEUR,              /* mueller heuristic selector */
+       0,                                 /* disable mris */
        "i44pc52.info.uni-karlsruhe.de",   /* ilp server */
        "cplex"                            /* ilp solver */
 };
@@ -73,7 +75,7 @@ static be_options_t be_options = {
 static unsigned dump_flags = 0;
 
 /* verify options */
-static unsigned vrfy_option = BE_VRFY_WARN;
+static int vrfy_option = BE_VRFY_WARN;
 
 /* register allocator to use. */
 static const be_ra_t *ra = &be_ra_chordal_allocator;
@@ -81,9 +83,6 @@ static const be_ra_t *ra = &be_ra_chordal_allocator;
 /* back end instruction set architecture to use */
 static const arch_isa_if_t *isa_if = &ia32_isa_if;
 
-/* mris option */
-static int be_enable_mris = 0;
-
 #ifdef WITH_LIBCORE
 
 static lc_opt_entry_t *be_grp_root = NULL;
@@ -128,6 +127,15 @@ static const lc_opt_enum_int_items_t vrfy_items[] = {
        { NULL,     0 }
 };
 
+/* schedule selector options. */
+static const lc_opt_enum_int_items_t sched_select_items[] = {
+       { "isa",      BE_SCHED_SELECT_ISA      },
+       { "muchnik",  BE_SCHED_SELECT_MUCHNIK  },
+       { "heur",     BE_SCHED_SELECT_HEUR     },
+       { "hmuchnik", BE_SCHED_SELECT_HMUCHNIK },
+       { NULL,     0 }
+};
+
 static lc_opt_enum_mask_var_t dump_var = {
        &dump_flags, dump_items
 };
@@ -144,14 +152,19 @@ static lc_opt_enum_int_var_t vrfy_var = {
        &vrfy_option, vrfy_items
 };
 
+static lc_opt_enum_int_var_t sched_select_var = {
+       &be_options.sched_select, sched_select_items
+};
+
 static const lc_opt_table_entry_t be_main_options[] = {
-       LC_OPT_ENT_ENUM_MASK("dump",     "dump irg on several occasions",     &dump_var),
-       LC_OPT_ENT_ENUM_PTR ("ra",       "register allocator",                &ra_var),
-       LC_OPT_ENT_ENUM_PTR ("isa",      "the instruction set architecture",  &isa_var),
-       LC_OPT_ENT_NEGBOOL  ("noomitfp", "do not omit frame pointer",         &be_omit_fp),
-       LC_OPT_ENT_BOOL     ("mris",     "enable mris schedule preparation",  &be_enable_mris),
-       LC_OPT_ENT_ENUM_PTR ("vrfy",     "verify the backend irg (off, warn, assert)",  &vrfy_var),
-       LC_OPT_ENT_BOOL     ("time",     "get backend timing statistics",     &be_options.timing),
+       LC_OPT_ENT_ENUM_MASK("dump",         "dump irg on several occasions",     &dump_var),
+       LC_OPT_ENT_ENUM_PTR ("ra",           "register allocator",                &ra_var),
+       LC_OPT_ENT_ENUM_PTR ("isa",          "the instruction set architecture",  &isa_var),
+       LC_OPT_ENT_NEGBOOL  ("noomitfp",     "do not omit frame pointer",         &be_omit_fp),
+       LC_OPT_ENT_ENUM_PTR ("vrfy",         "verify the backend irg (off, warn, assert)",  &vrfy_var),
+       LC_OPT_ENT_BOOL     ("time",         "get backend timing statistics",     &be_options.timing),
+       LC_OPT_ENT_BOOL     ("sched.mris",   "enable mris schedule preparation",  &be_options.mris),
+       LC_OPT_ENT_ENUM_PTR ("sched.select", "schedule node selector (isa, muchnik, heur, hmuchnik)",&sched_select_var),
 
 #ifdef WITH_ILP
        LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
@@ -228,7 +241,6 @@ const backend_params *be_init(void)
        be_opt_register();
 
        be_sched_init();
-       be_liveness_init();
        be_numbering_init();
        be_copy_opt_init();
        copystat_init();
@@ -475,7 +487,7 @@ static void be_main_loop(FILE *file_handle)
 
                /* schedule the irg */
                BE_TIMER_PUSH(t_sched);
-               list_sched(&birg, be_enable_mris);
+               list_sched(&birg, &be_options);
                BE_TIMER_POP(t_sched);
 
                dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
@@ -504,7 +516,7 @@ static void be_main_loop(FILE *file_handle)
 
                /* connect all stack modifying nodes together (see beabi.c) */
                BE_TIMER_PUSH(t_abi);
-               be_abi_fix_stack_nodes(birg.abi);
+               be_abi_fix_stack_nodes(birg.abi, NULL);
                BE_TIMER_POP(t_abi);
 
                dump(DUMP_SCHED, irg, "-fix_stack", dump_ir_block_graph_sched);
@@ -540,9 +552,16 @@ static void be_main_loop(FILE *file_handle)
                be_abi_fix_stack_bias(birg.abi);
                BE_TIMER_POP(t_abi);
 
-               /* check schedule */
+               BE_TIMER_PUSH(t_finish);
+               arch_code_generator_finish(birg.cg);
+               BE_TIMER_POP(t_finish);
+
+               dump(DUMP_FINAL, irg, "-finish", dump_ir_block_graph_sched);
+
+               /* check schedule and register allocation */
                BE_TIMER_PUSH(t_verify);
                be_sched_vrfy(birg.irg, vrfy_option);
+               be_verify_register_allocation(env.arch_env, birg.irg);
                BE_TIMER_POP(t_verify);
 
                /* emit assembler code */
@@ -560,11 +579,6 @@ static void be_main_loop(FILE *file_handle)
                restore_optimization_state(&state);
 
                BE_TIMER_ONLY(num_nodes_a = get_num_reachable_nodes(irg));
-
-               /* switched off due to statistics (statistic module needs all irgs) */
-               if (! stat_is_active())
-                       free_ir_graph(irg);
-
                BE_TIMER_POP(t_other);
 
 #define LC_EMIT(timer)    printf("%-20s: %.3lf msec\n", lc_timer_get_description(timer), (double)lc_timer_elapsed_usec(timer) / 1000.0)
@@ -583,6 +597,7 @@ static void be_main_loop(FILE *file_handle)
                        LC_EMIT_RA(ra_timer->t_prolog);
                        LC_EMIT_RA(ra_timer->t_live);
                        LC_EMIT_RA(ra_timer->t_spill);
+                        LC_EMIT_RA(ra_timer->t_spillslots);
                        LC_EMIT_RA(ra_timer->t_color);
                        LC_EMIT_RA(ra_timer->t_ifg);
                        LC_EMIT_RA(ra_timer->t_copymin);
@@ -596,6 +611,11 @@ static void be_main_loop(FILE *file_handle)
                        LC_EMIT(t_other);
                }
 #undef LC_EMIT
+
+        /* switched off due to statistics (statistic module needs all irgs) */
+               if (! stat_is_active())
+                       free_ir_graph(irg);
+
        }
        be_done_env(&env);