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

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 97dd23be0..0fc169a5b 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -8,6 +8,49 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef WITH_ILP
+
+#define DUMP_ILP 1
+#define DUMP_SOL 2
+
+static int time_limit = 60;
+static int solve_net  = 1;
+static int solve_log  = 0;
+static int dump_flags = 0;
+
+#ifdef WITH_LIBCORE
+#include <libcore/lc_opts.h>
+#include <libcore/lc_opts_enum.h>
+static const lc_opt_enum_mask_items_t dump_items[] = {
+	{ "ilp",   DUMP_ILP },
+	{ "sol",   DUMP_SOL },
+	{ NULL,    0 }
+};
+
+static lc_opt_enum_mask_var_t dump_var = {
+	&dump_flags, dump_items
+};
+
+static const lc_opt_table_entry_t options[] = {
+	LC_OPT_ENT_INT      ("limit", "time limit for solving in seconds (0 for unlimited, default 60)", &time_limit),
+	LC_OPT_ENT_BOOL     ("net",   "solve over the net (default: yes)", &solve_net),
+	LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
+	LC_OPT_ENT_ENUM_MASK("dump",  "dump flags (ilp, sol)",             &dump_var),
+	{ NULL }
+};
+
+void be_co_ilp_register_options(lc_opt_entry_t *grp)
+{
+	lc_opt_entry_t *ilp_grp = lc_opt_get_grp(grp, "ilp");
+	lc_opt_add_table(ilp_grp, options);
+}
+#endif
+
+
 #include "becopyilp_t.h"
 #include "beifg_t.h"
 
@@ -21,6 +64,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.
  */
@@ -36,6 +91,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)
@@ -50,15 +106,17 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
 void sr_remove(size_red_t *sr) {
 	ir_node *irn;
 	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));
 
@@ -72,6 +130,7 @@ void sr_remove(size_red_t *sr) {
           	 	}
 			}
 		}
+		be_ifg_nodes_break(ifg, iter);
 	}
 }
 
@@ -94,6 +153,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);
@@ -104,6 +164,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,32 +179,47 @@ 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;
-	res->sr = new_size_red(co);
+	res->co         = co;
+	res->build      = build;
+	res->apply      = apply;
+	res->env        = env;
+	res->sr         = new_size_red(co);
 
 	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) {
+	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);
 
+	if(solve_log)
+		lpp_set_log(ienv->lp, stdout);
+
+	if(solve_net)
+		lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
+	else {
 #ifdef LPP_SOLVE_NET
-	lpp_solve_net(ienv->lp, LPP_HOST, LPP_SOLVER);
+		fprintf(stderr, "can only solve ilp over the net\n");
 #else
-	lpp_solve_cplex(ienv->lp);
+		lpp_solve_cplex(ienv->lp);
 #endif
+	}
+
+	if(dump_flags & DUMP_ILP) {
+		FILE *f = be_chordal_open(ienv->co->cenv, "", "-co.ilp");
+		lpp_dump_plain(ienv->lp, f);
+		fclose(f);
+	}
 
 	ienv->apply(ienv);
 
@@ -157,3 +233,10 @@ void free_ilp_env(ilp_env_t *ienv) {
 	free_lpp(ienv->lp);
 	free(ienv);
 }
+
+#else /* WITH_ILP */
+
+static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */