X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=ad061b21465b92152b352731556b3617ce284d9d;hb=4d7a9507baf1737297cd4f7fc91eab209fd5d398;hp=592bfa6bbdb60764eb61c06157bb0f07d162e5bb;hpb=071b81998b17c006621e299c51aafd7ffc19f27a;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 592bfa6bb..ad061b214 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -43,18 +43,20 @@
 #include "beifg_impl.h"
 
 #include "bespillbelady.h"
-#include "bespillilp.h"
-#include "beconstrperm.h"
 #include "belower.h"
 
-#include "becopyoptmain.h"
-#include "bessadestr.h"
+#ifdef WITH_ILP
+#include "bespillilp.h"
+#endif /* WITH_ILP */
+
 #include "becopystat.h"
+#include "becopyopt.h"
+#include "bessadestr.h"
 
 
 void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
 	firm_dbg_module_t *dbg = chordal_env->dbg;
-	const arch_env_t *arch_env = chordal_env->main_env->arch_env;
+	const arch_env_t *arch_env = chordal_env->birg->main_env->arch_env;
 	struct obstack ob;
 	pmap_entry *pme;
 	ir_node **nodes, *n1, *n2;
@@ -155,7 +157,7 @@ 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_ALL,
+	BE_CH_DUMP_NONE,
 	BE_CH_SPILL_BELADY,
 	BE_CH_COPYMIN_HEUR,
 	BE_CH_IFG_STD,
@@ -165,13 +167,17 @@ static be_ra_chordal_opts_t options = {
 #ifdef WITH_LIBCORE
 static const lc_opt_enum_int_items_t spill_items[] = {
 	{ "belady", BE_CH_SPILL_BELADY },
+#ifdef WITH_ILP
 	{ "ilp",	BE_CH_SPILL_ILP },
+#endif
 	{ NULL, 0 }
 };
 
 static const lc_opt_enum_int_items_t copymin_items[] = {
 	{ "heur", BE_CH_COPYMIN_HEUR },
+#ifdef WITH_ILP
 	{ "ilp",  BE_CH_COPYMIN_ILP },
+#endif
 	{ NULL, 0 }
 };
 
@@ -187,6 +193,18 @@ static const lc_opt_enum_int_items_t lower_perm_items[] = {
 	{ NULL, 0 }
 };
 
+static const lc_opt_enum_int_items_t dump_items[] = {
+	{ "spill",    BE_CH_DUMP_SPILL },
+	{ "live",     BE_CH_DUMP_LIVE },
+	{ "color",    BE_CH_DUMP_COLOR },
+	{ "copymin",  BE_CH_DUMP_COPYMIN },
+	{ "ssadestr", BE_CH_DUMP_SSADESTR },
+	{ "tree",     BE_CH_DUMP_TREE_INTV },
+	{ "constr",   BE_CH_DUMP_CONSTR },
+	{ "lower",    BE_CH_DUMP_LOWER },
+	{ NULL, 0 }
+};
+
 static lc_opt_enum_int_var_t spill_var = {
 	&options.spill_method, spill_items
 };
@@ -203,6 +221,10 @@ static lc_opt_enum_int_var_t lower_perm_var = {
 	&options.lower_perm_method, lower_perm_items
 };
 
+static lc_opt_enum_int_var_t dump_var = {
+	&options.dump_flags, dump_items
+};
+
 static void be_ra_chordal_register_options(lc_opt_entry_t *grp)
 {
 	grp = lc_opt_get_grp(grp, "chordal");
@@ -214,7 +236,7 @@ static void dump(unsigned mask, ir_graph *irg,
 				 const char *suffix,
 				 void (*dump_func)(ir_graph *, const char *))
 {
-	if(1 || (options.dump_flags & mask) == mask) {
+	if(1 || ((options.dump_flags & mask) == mask)) {
 		if(cls) {
 			char buf[256];
 			snprintf(buf, sizeof(buf), "-%s%s", cls->name, suffix);
@@ -226,25 +248,28 @@ static void dump(unsigned mask, ir_graph *irg,
 	}
 }
 
-static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
+static void be_ra_chordal_main(const be_irg_t *bi)
 {
 	int j, m;
 	be_chordal_env_t chordal_env;
+	ir_graph *irg = bi->irg;
+	const be_main_env_t *main_env = bi->main_env;
 	const arch_isa_t *isa = arch_env_get_isa(main_env->arch_env);
 
 	compute_doms(irg);
 
+	chordal_env.opts         = &options;
 	chordal_env.irg          = irg;
-	chordal_env.dbg          = firm_dbg_register("be.chordal");
-	chordal_env.main_env     = main_env;
+	chordal_env.dbg          = firm_dbg_register("firm.be.chordal");
+	chordal_env.birg		 = bi;
 	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.cls          = arch_isa_get_reg_class(isa, j);
 		chordal_env.border_heads = pmap_create();
-		chordal_env.cls = arch_isa_get_reg_class(isa, j);
 
 		be_liveness(irg);
 		dump(BE_CH_DUMP_LIVE, irg, chordal_env.cls, "-live", dump_ir_block_graph_sched);
@@ -254,9 +279,11 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 		case BE_CH_SPILL_BELADY:
 			be_spill_belady(&chordal_env);
 			break;
+#ifdef WITH_ILP
 		case BE_CH_SPILL_ILP:
 			be_spill_ilp(&chordal_env);
 			break;
+#endif /* WITH_ILP */
 		default:
 			fprintf(stderr, "no valid spiller selected. falling back to belady\n");
 			be_spill_belady(&chordal_env);
@@ -265,14 +292,6 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 		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, chordal_env.cls, "-constr", dump_ir_block_graph_sched);
-
-		be_liveness(irg);
-		be_numbering(irg);
-		be_check_pressure(&chordal_env);
-
 		/* Color the graph. */
 		be_ra_chordal_color(&chordal_env);
 		dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-color", dump_ir_block_graph_sched);
@@ -282,8 +301,17 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 		be_ifg_check(chordal_env.ifg);
 
 		/* copy minimization */
-		copystat_collect_cls(&chordal_env);
-		be_copy_opt(&chordal_env);
+#ifdef COPYOPT_STAT
+		co_compare_solvers(&chordal_env);
+#else
+		{
+		copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
+		co_build_ou_structure(co);
+		co_solve_heuristic(co);
+		co_free_ou_structure(co);
+		free_copy_opt(co);
+		}
+#endif
 		dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
 		be_ra_chordal_check(&chordal_env);
 
@@ -291,12 +319,11 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 		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);
+//		be_ra_chordal_check(&chordal_env);
 
 		copystat_dump(irg);
 
 		be_ifg_free(chordal_env.ifg);
-		be_numbering_done(irg);
 
 		pmap_destroy(chordal_env.border_heads);
 	}
@@ -305,11 +332,11 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 
 	dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched);
 
-	lower_nodes(&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);
+	lower_nodes_after_ra(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0);
+	dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched);
 
-	be_free_dominance_frontiers(chordal_env.dom_front);
 	obstack_free(&chordal_env.obst, NULL);
+	be_free_dominance_frontiers(chordal_env.dom_front);
 }
 
 const be_ra_t be_ra_chordal_allocator = {