X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=6c0d410f892199a480738d601d1533a3cbee851a;hb=8ccfe04ca59ff56fc32b2323b80cee2a5194694d;hp=7d9c0fd6674d33f5d1a013b3c1b60233f80c6e92;hpb=ea75e9d38674b468f602a0699fb64b9c01254797;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 7d9c0fd66..6c0d410f8 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -34,16 +34,15 @@
 #include "bemodule.h"
 #include "error.h"
 
+#include "lpp.h"
+
 #include "lc_opts.h"
 #include "lc_opts_enum.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 unsigned dump_flags = 0;
 
@@ -59,13 +58,12 @@ static lc_opt_enum_mask_var_t dump_var = {
 
 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),
 	LC_OPT_LAST
 };
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp)
 void be_init_copyilp(void)
 {
 	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -78,7 +76,7 @@ void be_init_copyilp(void)
 }
 
 #include "becopyilp_t.h"
-#include "beifg_t.h"
+#include "beifg.h"
 
 /******************************************************************************
     _____ _                        _            _   _
@@ -109,7 +107,7 @@ size_red_t *new_size_red(copy_opt_t *co)
 static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn)
 {
 	be_ifg_t *ifg  = sr->co->cenv->ifg;
-	void     *iter = be_ifg_neighbours_iter_alloca(ifg);
+	neighbours_iter_t iter;
 	ir_node **all  = ALLOCAN(ir_node*, be_ifg_degree(ifg, ifn));
 	ir_node  *curr;
 	int       size = 0;
@@ -117,7 +115,7 @@ static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn)
 	int       o;
 
 	/* get all non-removed neighbors */
-	be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
+	be_ifg_foreach_neighbour(ifg, &iter, ifn, curr)
 		if (!sr_is_removed(sr, curr))
 			all[size++] = curr;
 
@@ -136,11 +134,11 @@ void sr_remove(size_red_t *sr)
 	ir_node *irn;
 	int redo = 1;
 	const be_ifg_t *ifg = sr->co->cenv->ifg;
-	void *iter = be_ifg_nodes_iter_alloca(ifg);
+	nodes_iter_t iter;
 
 	while (redo) {
 		redo = 0;
-		be_ifg_foreach_node(ifg, iter, irn) {
+		be_ifg_foreach_node(ifg, &iter, irn) {
 			const arch_register_req_t *req = arch_get_register_req_out(irn);
 
 			if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) {
@@ -165,7 +163,7 @@ void sr_reinsert(size_red_t *sr)
 	coloring_suffix_t *cs;
 	be_ifg_t *ifg        = sr->co->cenv->ifg;
 	bitset_t *used_cols  = bitset_alloca(arch_register_class_n_regs(sr->co->cls));
-	void *iter           = be_ifg_neighbours_iter_alloca(ifg);
+	neighbours_iter_t iter;
 
 	/* color the removed nodes in right order */
 	for (cs = sr->col_suff; cs; cs = cs->next) {
@@ -176,7 +174,7 @@ void sr_reinsert(size_red_t *sr)
 		irn = cs->irn;
 		bitset_clear_all(used_cols);
 
-		be_ifg_foreach_neighbour(ifg, iter, irn, other) {
+		be_ifg_foreach_neighbour(ifg, &iter, irn, other) {
 			if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */
 				bitset_set(used_cols, get_irn_col(other));
 		}
@@ -223,7 +221,7 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
 
 lpp_sol_state_t ilp_go(ilp_env_t *ienv)
 {
-	be_main_env_t *main_env = ienv->co->cenv->birg->main_env;
+	be_options_t *options = be_get_irg_options(ienv->co->irg);
 
 	sr_remove(ienv->sr);
 
@@ -233,20 +231,12 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv)
 	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
-		fprintf(stderr, "can only solve ilp over the net\n");
-#else
-		lpp_solve_cplex(ienv->lp);
-#endif
-	}
+	lpp_solve(ienv->lp, options->ilp_server, options->ilp_solver);
 
-	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);
+	//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",       lpp_get_iter_cnt(ienv->lp));
+	be_stat_ev_dbl("co_ilp_sol_time",   lpp_get_sol_time(ienv->lp));
 
 	if (dump_flags & DUMP_ILP) {
 		char buf[128];
@@ -275,11 +265,3 @@ 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 */