X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=3e2469e2ca4e8010c57948cda09ca89180056007;hb=8544304305897e5f2b5752fc243fd45c4f95a38c;hp=97dd23be0aa52d43cb903159f0b2f5fe8d3787ff;hpb=719b0dc8377fc55decc4629bf5e523104a82b76f;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 97dd23be0..3e2469e2c 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -8,6 +8,12 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef WITH_ILP
+
 #include "becopyilp_t.h"
 #include "beifg_t.h"
 
@@ -21,6 +27,18 @@
 
  *****************************************************************************/
 
+
+size_red_t *new_size_red(copy_opt_t *co) {
+	size_red_t *res = xmalloc(sizeof(*res));
+
+	res->co = co;
+	res->all_removed = pset_new_ptr_default();
+	res->col_suff = NULL;
+	obstack_init(&res->ob);
+
+	return res;
+}
+
 /**
  * Checks if a node is simplicial in the graph heeding the already removed nodes.
  */
@@ -55,10 +73,13 @@ void sr_remove(size_red_t *sr) {
 	void *iter = be_ifg_neighbours_iter_alloca(ifg);
 
 	while (redo) {
-		arch_register_req_t req;
 		redo = 0;
 		be_ifg_foreach_node(ifg, iter, irn) {
-			if (!sr_is_removed(sr, irn) && !co_is_optimizable(sr->co->aenv, irn, &req) && !co_is_optimizable_arg(sr->co, irn)) {
+			arch_register_req_t req;
+
+			arch_get_register_req(sr->co->aenv, &req, irn, -1);
+
+			if (!arch_register_req_is(&req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
           	 	if (sr_is_simplicial(sr, irn)) {
 					coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
 
@@ -104,6 +125,7 @@ void sr_reinsert(size_red_t *sr) {
 }
 
 void free_size_red(size_red_t *sr) {
+	del_pset(sr->all_removed);
 	obstack_free(&sr->ob, NULL);
 	free(sr);
 }
@@ -118,12 +140,13 @@ void free_size_red(size_red_t *sr) {
 
  *****************************************************************************/
 
-ilp_env_t *new_ilp_env(copy_opt_t *co, firm_dbg_module_t *dbg, ilp_callback build, ilp_callback apply, void *env) {
-	ilp_env_t *res = malloc(sizeof(*res));
+#include <stdio.h>
+
+ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env) {
+	ilp_env_t *res = xmalloc(sizeof(*res));
 	assert(res);
 
 	res->co = co;
-	res->dbg = dbg;
 	res->build = build;
 	res->apply = apply;
 	res->env = env;
@@ -132,19 +155,26 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, firm_dbg_module_t *dbg, ilp_callback buil
 	return res;
 }
 
-lpp_sol_state_t ilp_go(ilp_env_t *ienv, double time_limit) {
+lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
+	FILE *f;
+	char buf[256];
+	be_main_env_t *main_env = ienv->co->cenv->birg->main_env;
+
 	sr_remove(ienv->sr);
 
 	ienv->build(ienv);
 
-	lpp_set_time_limit(ienv->lp, time_limit);
-
 #ifdef LPP_SOLVE_NET
-	lpp_solve_net(ienv->lp, LPP_HOST, LPP_SOLVER);
+	lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
 #else
 	lpp_solve_cplex(ienv->lp);
 #endif
 
+	snprintf(buf, sizeof(buf), "%s.ilp", ienv->co->name);
+	f = fopen(buf, "wt");
+	lpp_dump_plain(ienv->lp, f);
+	fclose(f);
+
 	ienv->apply(ienv);
 
 	sr_reinsert(ienv->sr);
@@ -157,3 +187,10 @@ void free_ilp_env(ilp_env_t *ienv) {
 	free_lpp(ienv->lp);
 	free(ienv);
 }
+
+#else /* WITH_ILP */
+
+static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */