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

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 3cb378539..3a804e945 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -7,6 +7,61 @@
  * Common stuff used by all ILP fomulations.
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include "irtools.h"
+
+#include "bestatevent.h"
+#include "beirg_t.h"
+#include "bemodule.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)", &time_limit),
+	LC_OPT_ENT_BOOL     ("net",   "solve over the net", &solve_net),
+	LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
+	LC_OPT_ENT_ENUM_MASK("dump",  "dump flags",             &dump_var),
+	{ NULL }
+};
+
+void be_init_copyilp(void)
+{
+	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+	lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
+	lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
+	lc_opt_entry_t *co_grp = lc_opt_get_grp(chordal_grp, "co");
+	lc_opt_entry_t *ilp_grp = lc_opt_get_grp(co_grp, "ilp");
+
+	lc_opt_add_table(ilp_grp, options);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
+#endif /* WITH_LIBCORE */
+
 
 #include "becopyilp_t.h"
 #include "beifg_t.h"
@@ -23,7 +78,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 +103,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)
@@ -62,15 +118,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));
 
@@ -84,6 +142,7 @@ void sr_remove(size_red_t *sr) {
           	 	}
 			}
 		}
+		be_ifg_nodes_break(ifg, iter);
 	}
 }
 
@@ -106,6 +165,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,32 +191,52 @@ 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
+	}
+
+	be_stat_ev_dbl("co_ilp_objval",     ienv->lp->objval);
+	be_stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound);
+	be_stat_ev    ("co_ilp_iter",       ienv->lp->iterations);
+	be_stat_ev_dbl("co_ilp_sol_time",   ienv->lp->sol_time);
+
+	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);
 
@@ -170,3 +250,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 */