X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=a40a448c26b332f082bca0c06fc9d4bfa146c13a;hb=4585effab77d4716f3a0c4315d094fc175e20841;hp=3cb37853963ef84cedab882d6dd83d99c943ab3e;hpb=0732cd1cf5916d2b82aa14fb51f8aeb8192e4158;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 3cb378539..a40a448c2 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"
 
@@ -23,7 +29,7 @@
 
 
 size_red_t *new_size_red(copy_opt_t *co) {
-	size_red_t *res = malloc(sizeof(*res));
+	size_red_t *res = xmalloc(sizeof(*res));
 
 	res->co = co;
 	res->all_removed = pset_new_ptr_default();
@@ -48,6 +54,7 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
 	be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
 		if (!sr_is_removed(sr, curr))
 			all[size++] = curr;
+	be_ifg_neighbours_break(ifg, iter);
 
 	/* check if these form a clique */
 	for (i=0; i<size; ++i)
@@ -64,13 +71,16 @@ void sr_remove(size_red_t *sr) {
 	int redo = 1;
 	int n_nodes = 0;
 	const be_ifg_t *ifg = sr->co->cenv->ifg;
-	void *iter = be_ifg_neighbours_iter_alloca(ifg);
+	void *iter = be_ifg_nodes_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));
 
@@ -84,6 +94,7 @@ void sr_remove(size_red_t *sr) {
           	 	}
 			}
 		}
+		be_ifg_nodes_break(ifg, iter);
 	}
 }
 
@@ -106,6 +117,7 @@ void sr_reinsert(size_red_t *sr) {
 			if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */
 				bitset_set(used_cols, get_irn_col(sr->co, other));
 		}
+		be_ifg_neighbours_break(ifg, iter);
 
 		/* now all bits not set are possible colors */
 		free_col = bitset_next_clear(used_cols, 0);
@@ -131,12 +143,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;
@@ -145,19 +158,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);
@@ -170,3 +190,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 */