Changed to the new infrastructure

[libfirm] / ir / be / bemain.c

diff --git a/ir/be/bemain.c b/ir/be/bemain.c
index c87d5d5..867a1a2 100644 (file)
--- a/ir/be/bemain.c
+++ b/ir/be/bemain.c
@@ -38,20 +38,22 @@
 #include "benode_t.h"
 #include "beirgmod.h"
 #include "bespillilp.h"
+#include "bespillbelady.h"
 
 #include "beasm_dump_globals.h"
 #include "beasm_asm_gnu.h"
 
-#undef DUMP_ALLOCATED
-#define DUMP_PREPARED
-#define DUMP_SPILL
+#undef DUMP_BEGIN
+#undef DUMP_PREPARED
 #define DUMP_SCHED
-#undef DUMP_POST
-
+#define DUMP_SPILL
+#undef DUMP_ALLOCATED
+#undef DUMP_COPYMIN
+#undef DUMP_SSADESTR
+#undef DUMP_END
 
 #define N_PHASES 256
 
-
 void be_init(void)
 {
        be_sched_init();
@@ -103,6 +105,9 @@ static void prepare_graph(be_main_session_env_t *s)
        /* Let the isa prepare the graph. */
        s->main_env->arch_env->isa->prepare_graph(s->irg);
 
+       /* Normalize proj nodes. */
+       normalize_proj_nodes(s->irg);
+
        /* Remove critical edges */
        remove_critical_cf_edges(s->irg);
 
@@ -120,11 +125,7 @@ static void prepare_graph(be_main_session_env_t *s)
        if (get_irg_loopinfo_state(s->irg) != (loopinfo_valid & loopinfo_cf_consistent))
                construct_cf_backedges(s->irg);
 
-#ifdef DUMP_PREPARED
-       dump_dominator_information(true);
-       dump_ir_block_graph(s->irg, "-prepared");
-       dump_dominator_information(false);
-#endif
+       be_check_dominance(s->irg);
 }
 
 static void be_main_loop(void)
@@ -142,15 +143,21 @@ static void be_main_loop(void)
                ir_graph *irg = get_irp_irg(i);
                be_main_session_env_t session;
 
-               dump_ir_block_graph(irg, "-be-begin");
-
                DBG((env.dbg, LEVEL_1, "====> IRG: %F\n", irg));
+#ifdef DUMP_BEGIN
+               dump_ir_block_graph(irg, "-begin");
+#endif
 
                /* Init the session. */
                be_init_session_env(&session, &env, irg);
 
                /* Compute some analyses and prepare the graph for backend use. */
                prepare_graph(&session);
+#ifdef DUMP_PREPARED
+               dump_dominator_information(true);
+               dump_ir_block_graph(irg, "-prepared");
+               dump_dominator_information(false);
+#endif
 
                /* Schedule the graphs. */
                list_sched(irg, trivial_selector);
@@ -168,10 +175,11 @@ static void be_main_loop(void)
                for(j = 0, m = isa->get_n_reg_class(); j < m; ++j) {
                        be_chordal_env_t *chordal_env;
                        const arch_register_class_t *cls = isa->get_reg_class(j);
-
                        DBG((env.dbg, LEVEL_1, "----> Reg class: %s\n", cls->name));
 
+                       /* spilling */
                        be_spill_ilp(&session, cls);
+                       //be_spill_belady(&session, cls);
 #ifdef DUMP_SPILL
                        dump_ir_block_graph_sched(session.irg, "-spill");
 #endif
@@ -191,26 +199,32 @@ static void be_main_loop(void)
                        }
 #endif
 
+                       /* allocation */
                        chordal_env = be_ra_chordal(&session, cls);
-
 #ifdef DUMP_ALLOCATED
                        dump_allocated_irg(env.arch_env, irg, "");
 #endif
-                       copystat_collect_cls(chordal_env);
 
-                       dump_allocated_irg(env.arch_env, irg, "pre");
+                       /* copy minimization */
+                       copystat_collect_cls(chordal_env);
                        be_copy_opt(chordal_env);
-                       dump_allocated_irg(env.arch_env, irg, "post");
+#ifdef DUMP_COPYMIN
+                       dump_allocated_irg(env.arch_env, irg, "-copymin");
+#endif
 
+                       /* ssa destruction */
                        be_ssa_destruction(chordal_env);
                        be_ssa_destruction_check(chordal_env);
                        be_ra_chordal_check(chordal_env);
+#ifdef DUMP_SSADESTR
+                       dump_allocated_irg(env.arch_env, irg, "-ssadestr");
+#endif
 
                        be_ra_chordal_done(chordal_env);
                        be_numbering_done(irg);
                }
-#ifdef DUMP_POST
-               dump_ir_block_graph_sched(session.irg, "-post");
+#ifdef DUMP_END
+               dump_ir_block_graph_sched(session.irg, "-end");
 #endif
                copystat_dump(irg);
        }
@@ -221,10 +235,9 @@ void be_main(int argc, const char *argv[])
        assembler_t *gnu_assembler;
        FILE *asm_output_file;
 
-       mtrace();
        be_main_loop();
-       muntrace();
 
+#if 0
        gnu_assembler = gnuasm_create_assembler();
        asm_output_file = fopen("asm_output.asm", "w");
 
@@ -232,5 +245,5 @@ void be_main(int argc, const char *argv[])
        gnuasm_dump(gnu_assembler, asm_output_file);
        gnuasm_delete_assembler(gnu_assembler);
        fclose(asm_output_file);
-
+#endif
 }