X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=b423b2cc3e08f8c6791e6e3ed0ad04bcbd37e0bc;hb=e6ad8ee4680a88db8652483c2c6f3124f3d9a888;hp=5f74c84797065635216a114277095fa37490215c;hpb=8786fa72e7744afaaecdab0d002fc821539b79b9;p=libfirm

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 5f74c8479..b423b2cc3 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -43,17 +43,20 @@
 #include "beifg_impl.h"
 
 #include "bespillbelady.h"
-#include "bespillilp.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;
@@ -164,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 }
 };
 
@@ -229,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);
@@ -241,17 +248,20 @@ 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("firm.be.chordal");
-	chordal_env.main_env     = main_env;
+	chordal_env.birg		 = bi;
 	chordal_env.dom_front    = be_compute_dominance_frontiers(irg);
 
 	obstack_init(&chordal_env.obst);
@@ -269,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);
@@ -293,7 +305,17 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 
 		/* 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);
 
@@ -301,7 +323,7 @@ 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);
 
@@ -317,8 +339,8 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
 	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 = {