start register allocator again, fix typo
[libfirm] / ir / be / bemain.c
index 7535e58..1cd2c1a 100644 (file)
@@ -30,6 +30,7 @@
 #include "irloop_t.h"
 #include "irtools.h"
 #include "irvrfy.h"
+#include "irprintf.h"
 #include "return.h"
 #include "firmstat.h"
 #include "cfopt.h"
@@ -43,7 +44,7 @@
 #include "mips/bearch_mips.h"
 
 #include "be_t.h"
-#include "benumb_t.h"
+#include "bemodule.h"
 #include "beutil.h"
 #include "benode_t.h"
 #include "beirgmod.h"
@@ -88,16 +89,11 @@ static be_options_t be_options = {
 /* config file. */
 static char config_file[256] = { 0 };
 
-/* register allocator to use. */
-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;
 
 #ifdef WITH_LIBCORE
 
-static lc_opt_entry_t *be_grp_root = NULL;
-
 /* possible dumping options */
 static const lc_opt_enum_mask_items_t dump_items[] = {
        { "none",       DUMP_NONE },
@@ -112,17 +108,11 @@ static const lc_opt_enum_mask_items_t dump_items[] = {
        { NULL,         0 }
 };
 
-/* register allocators */
-static const lc_opt_enum_const_ptr_items_t ra_items[] = {
-       { "chordal",  &be_ra_chordal_allocator },
-       { "external", &be_ra_external_allocator },
-       { NULL,      NULL }
-};
-
 /* instruction set architectures. */
 static const lc_opt_enum_const_ptr_items_t isa_items[] = {
        { "ia32",    &ia32_isa_if },
 #if 0
+       { "sta",     &sta_isa_if },
        { "arm",     &arm_isa_if },
        { "ppc32",   &ppc32_isa_if },
        { "mips",    &mips_isa_if },
@@ -151,10 +141,6 @@ static lc_opt_enum_mask_var_t dump_var = {
        &be_options.dump_flags, dump_items
 };
 
-static lc_opt_enum_const_ptr_var_t ra_var = {
-       (const void **) &ra, ra_items
-};
-
 static lc_opt_enum_const_ptr_var_t isa_var = {
        (const void **) &isa_if, isa_items
 };
@@ -170,7 +156,6 @@ static lc_opt_enum_int_var_t sched_var = {
 static const lc_opt_table_entry_t be_main_options[] = {
        LC_OPT_ENT_STR      ("config",   "read another config file containing backend options", config_file, sizeof(config_file)),
        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_options.omit_fp),
        LC_OPT_ENT_BOOL     ("stabs",    "enable stabs debug support",                          &be_options.stabs_debug_support),
@@ -192,45 +177,30 @@ static const lc_opt_table_entry_t be_main_options[] = {
 void be_opt_register(void)
 {
 #ifdef WITH_LIBCORE
-       int i;
-       lc_opt_entry_t *be_grp_ra;
+       lc_opt_entry_t *be_grp;
        static int run_once = 0;
 
-       if (! run_once) {
-               run_once     = 1;
-               be_grp_root  = lc_opt_get_grp(firm_opt_get_root(), "be");
-               be_grp_ra    = lc_opt_get_grp(be_grp_root, "ra");
-
-               lc_opt_add_table(be_grp_root, be_main_options);
-
-               /* register allocator options */
-               for(i = 0; ra_items[i].name != NULL; ++i) {
-                       const be_ra_t *ra = ra_items[i].value;
-                       ra->register_options(be_grp_ra);
-               }
-
-               /* register isa options */
-               for(i = 0; isa_items[i].name != NULL; ++i) {
-                       const arch_isa_if_t *isa = isa_items[i].value;
-                       isa->register_options(be_grp_root);
-               }
+       if (run_once) {
+               return;
+       }
+       run_once     = 1;
 
-               /* scheduler register options */
-               list_sched_register_options(be_grp_root);
+       be_init_modules();
 
-               be_block_schedule_register_options(be_grp_root);
-       }
+       be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+       lc_opt_add_table(be_grp, be_main_options);
 #endif /* WITH_LIBCORE */
 }
 
 /* Parse one argument. */
 int be_parse_arg(const char *arg) {
 #ifdef WITH_LIBCORE
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
        if (strcmp(arg, "help") == 0 || (arg[0] == '?' && arg[1] == '\0')) {
-               lc_opt_print_help(be_grp_root, stdout);
+               lc_opt_print_help(be_grp, stdout);
                return -1;
        }
-       return lc_opt_from_single_arg(be_grp_root, NULL, arg, NULL);
+       return lc_opt_from_single_arg(be_grp, NULL, arg, NULL);
 #else
        return 0;
 #endif /* WITH_LIBCORE */
@@ -258,11 +228,7 @@ static void be_sched_vrfy(ir_graph *irg, int vrfy_opt) {
 const backend_params *be_init(void)
 {
        be_opt_register();
-
-       be_sched_init();
-       be_numbering_init();
-       be_copy_opt_init();
-       copystat_init();
+       be_init_modules();
        phi_class_init();
 
        if (isa_if->get_params)
@@ -357,16 +323,9 @@ static void initialize_birg(be_irg_t *birg, ir_graph *irg, be_main_env_t *env)
        /* Remove critical edges */
        remove_critical_cf_edges(irg);
 
-       /* Compute the dominance information. */
-       free_dom(irg);
-       compute_doms(irg);
-
        /* Ensure, that the ir_edges are computed. */
        edges_assure(irg);
 
-       /* check, if the dominance property is fulfilled. */
-       be_check_dominance(irg);
-
        /* reset the phi handler. */
        be_phi_handler_reset(env->phi_handler);
 }
@@ -497,11 +456,19 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                ir_graph *irg  = birg->irg;
                optimization_state_t state;
                const arch_code_generator_if_t *cg_if;
+               char irg_name[128];
 
                /* set the current graph (this is important for several firm functions) */
                current_ir_graph = irg;
 
-               be_init_stat_file(be_options.stat_file_name, irg);
+#ifdef FIRM_STATISTICS
+               if(be_stat_ev_is_active()) {
+                       ir_snprintf(irg_name, sizeof(irg_name), "%F", irg);
+                       be_stat_tags[STAT_TAG_CLS] = "<all>";
+                       be_stat_tags[STAT_TAG_IRG] = irg_name;
+                       be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
+               }
+#endif
 
                /* stop and reset timers */
                BE_TIMER_ONLY(
@@ -517,13 +484,24 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                );
                BE_TIMER_PUSH(t_other);   /* t_other */
 
+               /* Verify the initial graph */
+               BE_TIMER_PUSH(t_verify);
+               if (be_options.vrfy_option == BE_VRFY_WARN) {
+                       irg_verify(irg, VRFY_ENFORCE_SSA);
+                       be_check_dominance(irg);
+               } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
+                       assert(irg_verify(irg, VRFY_ENFORCE_SSA) && "irg verification failed");
+                       assert(be_check_dominance(irg) && "Dominance verification failed");
+               }
+               BE_TIMER_POP(t_verify);
+
                /**
                 * Create execution frequencies from profile data or estimate some
                 */
                if (be_profile_has_data()) {
-                       birg->execfreqs = be_create_execfreqs_from_profile(irg);
+                       birg->exec_freq = be_create_execfreqs_from_profile(irg);
                } else {
-                       birg->execfreqs = compute_execfreq(irg, 10);
+                       birg->exec_freq = compute_execfreq(irg, 10);
                }
 
                BE_TIMER_ONLY(num_nodes_b = get_num_reachable_nodes(irg));
@@ -565,7 +543,6 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                edges_activate(irg);
 
                /* Compute loop nesting information (for weighting copies) */
-               construct_cf_backedges(irg);
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
                BE_TIMER_ONLY(num_nodes_r = get_num_reachable_nodes(irg));
 
@@ -585,8 +562,8 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #ifdef WITH_ILP
                        case BE_SCHED_ILP:
                                be_ilp_sched(birg);
-                               fprintf(stderr, "Warning: ILP scheduler not yet fully implemented, falling back to list scheduler.\n");
-                               list_sched(birg, &be_options);
+                               //fprintf(stderr, "Warning: ILP scheduler not yet fully implemented, falling back to list scheduler.\n");
+                               //list_sched(birg, &be_options);
                                break;
 #endif /* WITH_ILP */
                };
@@ -636,11 +613,25 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                arch_code_generator_before_ra(birg->cg);
                BE_TIMER_POP(t_codegen);
 
+#ifdef FIRM_STATISTICS
+               if(be_stat_ev_is_active()) {
+                       be_stat_ev_l("costs_before_ra",
+                                       (long) be_estimate_irg_costs(irg, env.arch_env, birg->exec_freq));
+               }
+#endif
+
                /* Do register allocation */
                BE_TIMER_PUSH(t_regalloc);
-               ra_timer = ra->allocate(birg);
+               be_allocate_registers(birg);
                BE_TIMER_POP(t_regalloc);
 
+#ifdef FIRM_STATISTICS
+               if(be_stat_ev_is_active()) {
+                       be_stat_ev_l("costs_after_ra",
+                                       (long) be_estimate_irg_costs(irg, env.arch_env, birg->exec_freq));
+               }
+#endif
+
                dump(DUMP_RA, irg, "-ra", dump_ir_block_graph_sched);
                be_do_stat_nodes(irg, "06 Register Allocation");
 
@@ -741,13 +732,17 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 #undef LC_EMIT_RA
 #undef LC_EMIT
 
-               free_execfreq(birg->execfreqs);
+               be_free_birg(birg);
 
         /* switched off due to statistics (statistic module needs all irgs) */
+#ifdef FIRM_STATISTICS
                if (! stat_is_active())
+#endif
                        free_ir_graph(irg);
 
-               be_close_stat_file();
+               if(be_stat_ev_is_active()) {
+                       be_stat_ev_pop();
+               }
        }
        be_profile_free();
        be_done_env(&env);
@@ -782,20 +777,33 @@ void be_main(FILE *file_handle, const char *cup_name)
 
                lc_timer_reset_and_start(t);
        }
+
+#ifdef FIRM_STATISTICS
+       be_init_stat_file(be_options.stat_file_name, cup_name);
+#endif
 #endif /* WITH_LIBCORE */
 
        /* never build code for pseudo irgs */
        set_visit_pseudo_irgs(0);
 
        be_node_init();
+
        be_main_loop(file_handle, cup_name);
 
 #ifdef WITH_LIBCORE
        if (be_options.timing == BE_TIME_ON) {
                lc_timer_stop(t);
                lc_timer_leave_high_priority();
-               printf("%-20s: %lu msec\n", "BEMAINLOOP", lc_timer_elapsed_msec(t));
+               if(be_stat_ev_is_active()) {
+                       be_stat_ev_l("backend_time", lc_timer_elapsed_msec(t));
+               } else {
+                       printf("%-20s: %lu msec\n", "BEMAINLOOP", lc_timer_elapsed_msec(t));
+               }
        }
+
+#ifdef FIRM_STATISTICS
+       be_close_stat_file();
+#endif
 #endif /* WITH_LIBCORE */
 }