X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=57fdab4ee999c1c4690b981aff507f832b0d1c30;hb=f0a7d482edb206169a6c43ca846d7eb1bbe0d410;hp=3c22accbe2612b79217286754ebcf0954601fa29;hpb=d64ea79ebc6d41bc4253f6b6fd0a09582dce20eb;p=libfirm

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 3c22accbe..57fdab4ee 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -24,15 +24,13 @@
  * @date        28.02.2006
  * @version     $Id$
  */
-#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 "beirg.h"
 #include "bemodule.h"
 #include "error.h"
 
@@ -45,7 +43,6 @@
 #define DUMP_SOL 2
 
 static int time_limit = 60;
-static int solve_net  = 1;
 static int solve_log  = 0;
 static unsigned dump_flags = 0;
 
@@ -61,12 +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);
 void be_init_copyilp(void)
 {
 	lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
@@ -78,10 +75,8 @@ void be_init_copyilp(void)
 	lc_opt_add_table(ilp_grp, options);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
-
 #include "becopyilp_t.h"
-#include "beifg_t.h"
+#include "beifg.h"
 
 /******************************************************************************
     _____ _                        _            _   _
@@ -94,7 +89,8 @@ BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
  *****************************************************************************/
 
 
-size_red_t *new_size_red(copy_opt_t *co) {
+size_red_t *new_size_red(copy_opt_t *co)
+{
 	size_red_t *res = XMALLOC(size_red_t);
 
 	res->co = co;
@@ -108,16 +104,18 @@ size_red_t *new_size_red(copy_opt_t *co) {
 /**
  * Checks if a node is simplicial in the graph heeding the already removed nodes.
  */
-static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
-	int i, o, size = 0;
-	ir_node **all, *curr;
-	be_ifg_t *ifg = sr->co->cenv->ifg;
-	void *iter = be_ifg_neighbours_iter_alloca(ifg);
-
-	all = alloca(be_ifg_degree(ifg, ifn) * sizeof(*all));
+static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn)
+{
+	be_ifg_t *ifg  = sr->co->cenv->ifg;
+	neighbours_iter_t iter;
+	ir_node **all  = ALLOCAN(ir_node*, be_ifg_degree(ifg, ifn));
+	ir_node  *curr;
+	int       size = 0;
+	int       i;
+	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;
 
@@ -131,20 +129,21 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
 	return 1;
 }
 
-void sr_remove(size_red_t *sr) {
+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) {
-			const arch_register_req_t *req = arch_get_register_req(irn, -1);
+		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)) {
 				if (sr_is_simplicial(sr, irn)) {
-					coloring_suffix_t *cs = obstack_alloc(&sr->ob, sizeof(*cs));
+					coloring_suffix_t *cs = OALLOC(&sr->ob, coloring_suffix_t);
 
 					cs->irn = irn;
 					cs->next = sr->col_suff;
@@ -159,11 +158,12 @@ void sr_remove(size_red_t *sr) {
 	}
 }
 
-void sr_reinsert(size_red_t *sr) {
+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) {
@@ -174,9 +174,9 @@ 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(sr->co, other));
+				bitset_set(used_cols, get_irn_col(other));
 		}
 
 		/* now all bits not set are possible colors */
@@ -187,7 +187,8 @@ void sr_reinsert(size_red_t *sr) {
 	}
 }
 
-void free_size_red(size_red_t *sr) {
+void free_size_red(size_red_t *sr)
+{
 	del_pset(sr->all_removed);
 	obstack_free(&sr->ob, NULL);
 	free(sr);
@@ -205,7 +206,8 @@ void free_size_red(size_red_t *sr) {
 
 #include <stdio.h>
 
-ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env) {
+ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env)
+{
 	ilp_env_t *res = XMALLOC(ilp_env_t);
 
 	res->co         = co;
@@ -217,40 +219,33 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
 	return res;
 }
 
-lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
-	be_main_env_t *main_env = ienv->co->cenv->birg->main_env;
+lpp_sol_state_t ilp_go(ilp_env_t *ienv)
+{
+	be_options_t *options = be_get_irg_options(ienv->co->irg);
 
 	sr_remove(ienv->sr);
 
 	ienv->build(ienv);
 	lpp_set_time_limit(ienv->lp, time_limit);
 
-	if(solve_log)
+	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_net(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) {
+	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) {
+		if (f == NULL) {
 			panic("Couldn't open '%s' for writing", buf);
 		}
 		lpp_dump_plain(ienv->lp, f);
@@ -264,7 +259,8 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
 	return lpp_get_sol_state(ienv->lp);
 }
 
-void free_ilp_env(ilp_env_t *ienv) {
+void free_ilp_env(ilp_env_t *ienv)
+{
 	free_size_red(ienv->sr);
 	free_lpp(ienv->lp);
 	free(ienv);
@@ -272,7 +268,8 @@ void free_ilp_env(ilp_env_t *ienv) {
 
 #else /* WITH_ILP */
 
-static INLINE 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 */