rebuild edges after backend transform phase

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index aac1732..0052239 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -218,7 +218,6 @@ const backend_params *be_init(void)
 {
        be_opt_register();
        be_init_modules();
-       phi_class_init();
 
        if (isa_if->get_params)
                return isa_if->get_params();
@@ -374,6 +373,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
        static const char suffix[] = ".prof";
        be_irg_t *birgs;
        unsigned num_birgs;
+       ir_graph **irg_list, **backend_irg_list;
 
        be_ra_timer_t *ra_timer;
 
@@ -408,16 +408,20 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
        be_dbg_so(env.db_handle, cup_name);
        be_dbg_types(env.db_handle);
 
+       /* backend may provide an ordered list of irgs where code should be generated for */
+       irg_list         = NEW_ARR_F(ir_graph *, 0);
+       backend_irg_list = arch_isa_get_backend_irg_list(isa, &irg_list);
+
        /* we might need 1 birg more for instrumentation constructor */
-       num_birgs = get_irp_n_irgs();
+       num_birgs = backend_irg_list ? ARR_LEN(backend_irg_list) : get_irp_n_irgs();
        birgs     = alloca(sizeof(birgs[0]) * (num_birgs + 1));
 
        /* First: initialize all birgs */
-       for(i = 0; i < get_irp_n_irgs(); ++i) {
-               ir_graph *irg = get_irp_irg(i);
-
+       for(i = 0; i < num_birgs; ++i) {
+               ir_graph *irg = backend_irg_list ? backend_irg_list[i] : get_irp_irg(i);
                initialize_birg(&birgs[i], irg, &env);
        }
+       DEL_ARR_F(irg_list);
 
        /*
                Get the filename for the profiling data.
@@ -436,14 +440,13 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                initialize_birg(&birgs[num_birgs], prof_init_irg, &env);
                num_birgs++;
                set_method_img_section(get_irg_entity(prof_init_irg), section_constructors);
-       }
-       else {
+       } else {
                be_profile_read(prof_filename);
        }
 
        /* For all graphs */
        for (i = 0; i < num_birgs; ++i) {
-               be_irg_t *birg = & birgs[i];
+               be_irg_t *birg = &birgs[i];
                ir_graph *irg  = birg->irg;
                optimization_state_t state;
                const arch_code_generator_if_t *cg_if;
@@ -511,8 +514,7 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
                if (be_options.vrfy_option == BE_VRFY_WARN) {
                        be_check_dominance(irg);
                        be_verify_out_edges(irg);
-               }
-               else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
+               } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
                        assert(be_verify_out_edges(irg));
                        assert(be_check_dominance(irg) && "Dominance verification failed");
                }
@@ -524,15 +526,18 @@ static void be_main_loop(FILE *file_handle, const char *cup_name)
 
                be_do_stat_nodes(irg, "03 Prepare");
 
-               /* Compute loop nesting information (for weighting copies) */
+               /* Transformation may produce nodes only reachable via out edges, kill them. */
+#if 1
+               edges_deactivate(irg);
+               edges_activate(irg);
+#endif
                dump(DUMP_PREPARED, irg, "-prepared", dump_ir_block_graph);
                BE_TIMER_ONLY(num_nodes_r = get_num_reachable_nodes(irg));
 
                if (be_options.vrfy_option == BE_VRFY_WARN) {
                        be_check_dominance(irg);
                        be_verify_out_edges(irg);
-               }
-               else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
+               } else if (be_options.vrfy_option == BE_VRFY_ASSERT) {
                        assert(be_verify_out_edges(irg));
                        assert(be_check_dominance(irg) && "Dominance verification failed");
                }