X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=328d760f0f1e120a71b6b36a3518d77369e37346;hb=b46c894cf05a8c569d404ba0ef92c384d76e34d6;hp=81743d60c116c900aeac4f1343ffde30d772222d;hpb=4c66ebcce62ceffb68a891142dd309429e03351a;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 81743d60c..328d760f0 100644
--- 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,12 @@
 
 #include "bespillbelady.h"
 #include "bespillilp.h"
+#include "beconstrperm.h"
+#include "belower.h"
+
+#include "becopyoptmain.h"
+#include "bessadestr.h"
+#include "becopystat.h"
 
 
 void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
@@ -70,8 +79,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);
@@ -146,10 +155,11 @@ int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node
 
 
 static be_ra_chordal_opts_t options = {
-	BE_CH_DUMP_NONE,
+	BE_CH_DUMP_ALL,
 	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 +181,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 +199,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;
@@ -191,11 +211,22 @@ static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
 }
 #endif
 
-static void dump(int mask, ir_graph *irg, const char *suffix,
-				 void (*dump)(ir_graph *, const char *))
+static void dump(int mask, ir_graph *irg,
+				 const arch_register_class_t *cls,
+				 const char *suffix,
+				 void (*dump_func)(ir_graph *, const char *))
 {
-	if((options.dump_flags & mask) == mask)
-		dump(irg, suffix);
+
+	if((options.dump_flags & mask) == mask) {
+		if(cls) {
+			char buf[256];
+			snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix);
+			dump_func(irg, buf);
+		}
+
+		else
+			dump_func(irg, suffix);
+	}
 }
 
 static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
@@ -209,13 +240,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 +263,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, chordal_env.cls, "-spill", dump_ir_block_graph_sched);
+		be_liveness(irg);
+		be_check_pressure(&chordal_env);
 
-		dump(BE_CH_DUMP_SPILL, irg, "-spill", dump_ir_block_graph_sched);
+		/* Insert perms before reg-constrained instructions */
+		be_insert_constr_perms(&chordal_env);
+		dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-constr", dump_ir_block_graph_sched);
 
 		be_liveness(irg);
 		be_numbering(irg);
@@ -244,28 +280,34 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 
 		/* Build the interference graph. */
 		chordal_env.ifg = be_ifg_std_new(&chordal_env);
+		be_ifg_check(chordal_env.ifg);
 
-#ifdef DO_SSADESTR
 		/* copy minimization */
 		copystat_collect_cls(&chordal_env);
 		be_copy_opt(&chordal_env);
-		dump(BE_CH_DUMP_COPYMIN, irg, "-copymin", dump_ir_block_graph_sched);
+		dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
+		be_ra_chordal_check(&chordal_env);
 
 		/* ssa destruction */
 		be_ssa_destruction(&chordal_env);
+		dump(BE_CH_DUMP_SSADESTR, irg, chordal_env.cls, "-ssadestr", dump_ir_block_graph_sched);
 		be_ssa_destruction_check(&chordal_env);
 		be_ra_chordal_check(&chordal_env);
-		dump(BE_CH_DUMP_SSADESTR, irg, "-ssadestr", dump_ir_block_graph_sched);
 
 		copystat_dump(irg);
-#endif
 
 		be_ifg_free(chordal_env.ifg);
 		be_numbering_done(irg);
+
+		pmap_destroy(chordal_env.border_heads);
 	}
 
+	dump(BE_CH_DUMP_SSADESTR, irg, NULL, "-ssadestr-complete", dump_ir_block_graph_sched);
+
+	lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
+	dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower", dump_ir_block_graph_sched);
+
 	be_free_dominance_frontiers(chordal_env.dom_front);
-	pmap_destroy(chordal_env.border_heads);
 	obstack_free(&chordal_env.obst, NULL);
 }