X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=1dca9e65f37dad41a656c06a4126d806d94d81fc;hb=e243eb2e9e8a9f5e57e166950a1a0a8ab25e92a9;hp=a40a448c26b332f082bca0c06fc9d4bfa146c13a;hpb=f7d0af60cd69a01e593074b840c0f510a0945dda;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index a40a448c2..1dca9e65f 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -7,13 +7,64 @@
  * Common stuff used by all ILP fomulations.
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "irtools.h"
+#include "irprintf.h"
+
+#include "bestatevent.h"
+#include "beirg_t.h"
+#include "bemodule.h"
+#include "error.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"
 
@@ -69,7 +120,6 @@ 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_nodes_iter_alloca(ifg);
 
@@ -149,34 +199,54 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
 	ilp_env_t *res = xmalloc(sizeof(*res));
 	assert(res);
 
-	res->co = co;
-	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) {
-	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);
+
+	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, main_env->options->ilp_server, main_env->options->ilp_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);
 
-	snprintf(buf, sizeof(buf), "%s.ilp", ienv->co->name);
-	f = fopen(buf, "wt");
-	lpp_dump_plain(ienv->lp, f);
-	fclose(f);
+	if(dump_flags & DUMP_ILP) {
+		char buf[128];
+		FILE *f;
+
+		ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", ienv->co->cenv->irg,
+		            ienv->co->cenv->cls->name);
+		f = fopen(buf, "wt");
+		if(f == NULL) {
+			panic("Couldn't open '%s' for writing", buf);
+		}
+		lpp_dump_plain(ienv->lp, f);
+		fclose(f);
+	}
 
 	ienv->apply(ienv);
 
@@ -193,7 +263,7 @@ void free_ilp_env(ilp_env_t *ienv) {
 
 #else /* WITH_ILP */
 
-static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
 }
 
 #endif /* WITH_ILP */