Changes API a little bit :-)

[libfirm] / ir / be / bechordal_main.c

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 81743d6..4cc6ba5 100644 (file)
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -8,6 +8,9 @@
  *
  * Driver for the chordal register allocator.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "obst.h"
 #include "pset.h"
@@ -18,7 +21,7 @@
 #ifdef WITH_LIBCORE
 #include <libcore/lc_opts.h>
 #include <libcore/lc_opts_enum.h>
-#endif
+#endif /* WITH_LIBCORE */
 
 #include "irmode_t.h"
 #include "irgraph_t.h"
@@ -41,6 +44,16 @@
 
 #include "bespillbelady.h"
 #include "bespillilp.h"
+#include "beconstrperm.h"
+#include "belower.h"
+
+#define DO_SSADESTR
+
+#ifdef DO_SSADESTR
+#include "bessadestr.h"
+#include "becopystat.h"
+#include "becopyoptmain.h"
+#endif /* DO_SSADESTR */
 
 
 void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
@@ -70,8 +83,8 @@ void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
 
                n1_reg = arch_get_irn_register(arch_env, n1);
                if (!arch_reg_is_allocatable(arch_env, n1, -1, n1_reg)) {
-                       DBG((dbg, 0, "Register assigned to %+F is not allowed\n", n1));
-                       assert(0 && "Register constraint does not hold");
+                       DBG((dbg, 0, "Register %s assigned to %+F is not allowed\n", n1_reg->name, n1));
+//                     assert(0 && "Register constraint does not hold");
                }
                for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) {
                        n2_reg = arch_get_irn_register(arch_env, n2);
@@ -149,7 +162,8 @@ static be_ra_chordal_opts_t options = {
        BE_CH_DUMP_NONE,
        BE_CH_SPILL_BELADY,
        BE_CH_COPYMIN_HEUR,
-       BE_CH_IFG_STD
+       BE_CH_IFG_STD,
+       BE_CH_LOWER_PERM_SWAP
 };
 
 #ifdef WITH_LIBCORE
@@ -171,6 +185,12 @@ static const lc_opt_enum_int_items_t ifg_flavor_items[] = {
        { NULL, 0 }
 };
 
+static const lc_opt_enum_int_items_t lower_perm_items[] = {
+       { "swap", BE_CH_LOWER_PERM_SWAP },
+       { "copy", BE_CH_LOWER_PERM_COPY },
+       { NULL, 0 }
+};
+
 static lc_opt_enum_int_var_t spill_var = {
        &options.spill_method, spill_items
 };
@@ -183,6 +203,10 @@ static lc_opt_enum_int_var_t ifg_flavor_var = {
        &options.spill_method, ifg_flavor_items
 };
 
+static lc_opt_enum_int_var_t lower_perm_var = {
+       &options.lower_perm_method, lower_perm_items
+};
+
 static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
 {
        lc_opt_entry_t *dump;
@@ -209,13 +233,13 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
        chordal_env.irg          = irg;
        chordal_env.dbg          = firm_dbg_register("firm.be.chordal");
        chordal_env.main_env     = main_env;
-       chordal_env.border_heads = pmap_create();
        chordal_env.dom_front    = be_compute_dominance_frontiers(irg);
 
        obstack_init(&chordal_env.obst);
 
        /* Perform the following for each register class. */
        for(j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) {
+               chordal_env.border_heads = pmap_create();
                chordal_env.cls = arch_isa_get_reg_class(isa, j);
 
                be_liveness(irg);
@@ -232,8 +256,13 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
                        fprintf(stderr, "no valid spiller selected. falling back to belady\n");
                        be_spill_belady(&chordal_env);
                }
-
                dump(BE_CH_DUMP_SPILL, irg, "-spill", dump_ir_block_graph_sched);
+               be_liveness(irg);
+               be_check_pressure(&chordal_env);
+
+               /* Insert perms before reg-constrained instructions */
+               be_insert_constr_perms(&chordal_env);
+               dump(BE_CH_DUMP_CONSTR, irg, "-constr", dump_ir_block_graph_sched);
 
                be_liveness(irg);
                be_numbering(irg);
@@ -258,14 +287,19 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
                dump(BE_CH_DUMP_SSADESTR, irg, "-ssadestr", dump_ir_block_graph_sched);
 
                copystat_dump(irg);
-#endif
+#endif /* DO_SSADESTR */
 
                be_ifg_free(chordal_env.ifg);
                be_numbering_done(irg);
+
+               pmap_destroy(chordal_env.border_heads);
        }
 
+#ifdef DO_SSADESTR
+       lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
+#endif /* DO_SSADESTR */
+
        be_free_dominance_frontiers(chordal_env.dom_front);
-       pmap_destroy(chordal_env.border_heads);
        obstack_free(&chordal_env.obst, NULL);
 }