make use of generated proj nums

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index 51dcb5c..8ed05fd 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -55,6 +55,8 @@
 #include "bessadestr.h"
 #include "beabi.h"
 #include "belower.h"
+#include "beschedmris.h"
+#include "bestat.h"
 
 #define DUMP_INITIAL    (1 << 0)
 #define DUMP_ABI        (1 << 1)
@@ -84,6 +86,8 @@ static const arch_isa_if_t *isa_if = &ia32_isa_if;
 
 static lc_opt_entry_t *be_grp_root = NULL;
 
+static int be_disable_mris = 0;
+
 /* possible dumping options */
 static const lc_opt_enum_mask_items_t dump_items[] = {
        { "none",       0 },
@@ -109,7 +113,7 @@ static const lc_opt_enum_const_ptr_items_t isa_items[] = {
        { "firm",    &firm_isa },
        { "ia32",    &ia32_isa_if },
        { "arm",     &arm_isa_if },
-       { "ppc",     &ppc32_isa_if },
+       { "ppc32",   &ppc32_isa_if },
        { "mips",    &mips_isa_if },
        { NULL,      NULL }
 };
@@ -127,9 +131,11 @@ static lc_opt_enum_const_ptr_var_t isa_var = {
 };
 
 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_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_NEGBOOL  ("nomris",   "disable mris schedule preparation", &be_disable_mris),
 
 #ifdef WITH_ILP
        LC_OPT_ENT_STR ("ilp.server", "the ilp server name", be_options.ilp_server, sizeof(be_options.ilp_server)),
@@ -169,15 +175,14 @@ void be_opt_register(void)
 #endif /* WITH_LIBCORE */
 }
 
-static int be_opt_error_handler(const char *prefix, const lc_opt_err_info_t *err)
-{
-
-}
-
 /* Parse one argument. */
 int be_parse_arg(const char *arg) {
 #ifdef WITH_LIBCORE
-       return lc_opt_from_single_arg(be_grp_root, NULL, arg, be_opt_error_handler);
+       if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) {
+               lc_opt_print_help(be_grp_root, stdout);
+               return -1;
+       }
+       return lc_opt_from_single_arg(be_grp_root, NULL, arg, NULL);
 #endif /* WITH_LIBCORE */
 }
 
@@ -194,7 +199,7 @@ void be_init(void)
        phi_class_init();
 }
 
-static be_main_env_t *be_init_env(be_main_env_t *env)
+static be_main_env_t *be_init_env(be_main_env_t *env, FILE *file_handle)
 {
        memset(env, 0, sizeof(*env));
        obstack_init(&env->obst);
@@ -202,7 +207,7 @@ static be_main_env_t *be_init_env(be_main_env_t *env)
        env->options  = &be_options;
        FIRM_DBG_REGISTER(env->dbg, "be.main");
 
-       arch_env_init(env->arch_env, isa_if);
+       arch_env_init(env->arch_env, isa_if, file_handle);
 
        /* Register the irn handler of the architecture */
        if (arch_isa_get_irn_handler(env->arch_env->isa))
@@ -275,12 +280,15 @@ static void be_main_loop(FILE *file_handle)
        arch_isa_t *isa;
        be_main_env_t env;
 
-       be_init_env(&env);
+       be_init_env(&env, file_handle);
 
        isa = arch_env_get_isa(env.arch_env);
 
+       // /* for debugging, anchors helps */
+       // dump_all_anchors(1);
+
        /* For all graphs */
-       for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
+       for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                ir_graph *irg = get_irp_irg(i);
                const arch_code_generator_if_t *cg_if;
                be_irg_t birg;
@@ -298,7 +306,7 @@ static void be_main_loop(FILE *file_handle)
                cg_if = isa->impl->get_code_generator_if(isa);
 
                /* get a code generator for this graph. */
-               birg.cg = cg_if->init(file_handle, &birg);
+               birg.cg = cg_if->init(&birg);
 
                /* create the code generator and generate code. */
                prepare_graph(&birg);
@@ -327,20 +335,25 @@ static void be_main_loop(FILE *file_handle)
 
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
 
-               /* add Keeps for should_be_different constrained nodes */
-               assure_constraints(&birg);
-               dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph);
-
                /* Schedule the graphs. */
                arch_code_generator_before_sched(birg.cg);
-               list_sched(env.arch_env, irg);
+               list_sched(&birg, be_disable_mris);
+               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
+
+               /* add Keeps for should_be_different constrained nodes  */
+               /* beware: needs schedule due to usage of be_ssa_constr */
+               assure_constraints(&birg);
+               dump(DUMP_PREPARED, irg, "-assured", dump_ir_block_graph_sched);
 
                /* connect all stack modifying nodes together (see beabi.c) */
                be_abi_fix_stack_nodes(birg.abi);
-               dump(DUMP_SCHED, irg, "-sched", dump_ir_block_graph_sched);
+               dump(DUMP_SCHED, irg, "-fix_stack", dump_ir_block_graph_sched);
 
                /* Verify the schedule */
-               sched_verify_irg(irg);
+               assert(sched_verify_irg(irg));
+
+               /* do some statistics */
+               be_do_stat_reg_pressure(&birg);
 
                /* Do register allocation */
                arch_code_generator_before_ra(birg.cg);
@@ -354,9 +367,8 @@ static void be_main_loop(FILE *file_handle)
                dump(DUMP_FINAL, irg, "-end", dump_ir_block_graph_sched);
                be_abi_free(birg.abi);
 
-               free_ir_graph(irg);
+//             free_ir_graph(irg);
        }
-
        be_done_env(&env);
 }