From: Christian Würdig <chriswue@ipd.info.uni-karlsruhe.de>
Date: Thu, 20 Apr 2006 16:06:32 +0000 (+0000)
Subject: substituted copymin ilp option with ilp1 and ilp2
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=e782bd598a2f96d5181ee4aebe353addc6d04058;p=libfirm

substituted copymin ilp option with ilp1 and ilp2
use copymin ilp when specified on command line
---

diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c
index 8b0f655ad..7ea2e49e1 100644
--- a/ir/be/bechordal_main.c
+++ b/ir/be/bechordal_main.c
@@ -178,7 +178,8 @@ static const lc_opt_enum_int_items_t copymin_items[] = {
 	{ "none", BE_CH_COPYMIN_NONE },
 	{ "heur", BE_CH_COPYMIN_HEUR },
 #ifdef WITH_ILP
-	{ "ilp",  BE_CH_COPYMIN_ILP },
+	{ "ilp1",  BE_CH_COPYMIN_ILP1 },
+	{ "ilp2",  BE_CH_COPYMIN_ILP2 },
 #endif
 	{ NULL, 0 }
 };
@@ -343,16 +344,34 @@ static void be_ra_chordal_main(const be_irg_t *bi)
 		/* copy minimization */
 #ifdef COPYOPT_STAT
 		co_compare_solvers(&chordal_env);
-#else
-		if (options.copymin_method != BE_CH_COPYMIN_NONE)
+#else /* COPYOPT_STAT */
 		{
 			copy_opt_t *co = new_copy_opt(&chordal_env, co_get_costs_loop_depth);
 			co_build_ou_structure(co);
-			co_solve_heuristic(co);
+
+			switch(options.copymin_method) {
+				case BE_CH_COPYMIN_HEUR:
+					co_solve_heuristic(co);
+					break;
+#ifdef WITH_ILP
+				case BE_CH_COPYMIN_ILP1:
+					co_solve_ilp1(co, 60.0);
+					break;
+				case BE_CH_COPYMIN_ILP2:
+					co_build_graph_structure(co);
+					co_solve_ilp2(co, 60.0);
+					co_free_graph_structure(co);
+					break;
+#endif /* WITH_ILP */
+				case BE_CH_COPYMIN_NONE:
+				default:
+					break;
+			}
+
 			co_free_ou_structure(co);
 			free_copy_opt(co);
 		}
-#endif
+#endif /* COPYOPT_STAT */
 		dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
 		be_ra_chordal_check(&chordal_env);
 
diff --git a/ir/be/bechordal_t.h b/ir/be/bechordal_t.h
index 23399a78a..d4e34f773 100644
--- a/ir/be/bechordal_t.h
+++ b/ir/be/bechordal_t.h
@@ -108,7 +108,8 @@ enum {
 	/* copymin method */
 	BE_CH_COPYMIN_NONE    = 0,
 	BE_CH_COPYMIN_HEUR    = 1,
-	BE_CH_COPYMIN_ILP     = 2,
+	BE_CH_COPYMIN_ILP1    = 2,
+	BE_CH_COPYMIN_ILP2    = 3,
 
 	/* ifg flavor */
 	BE_CH_IFG_STD         = 1,