X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=42fb15cc9d953e076ab7974cd71d6fb8e30b7abe;hb=afbbc0b1ccd684c4c24bfd43d0f994123245f39f;hp=98ce4e32f4a317e754e7cc2bcf412491df560537;hpb=294764ce7bb590e7714ef1378d7eda9608dbef6e;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 98ce4e32f..42fb15cc9 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -74,7 +74,6 @@ typedef struct _local_env_t {
 } local_env_t;
 
 static void build_coloring_cstr(ilp_env_t *ienv) {
-	local_env_t *lenv = ienv->env;
 	be_ifg_t *ifg     = ienv->co->cenv->ifg;
 	void *iter        = be_ifg_nodes_iter_alloca(ifg);
 	bitset_t *colors;
@@ -89,7 +88,7 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
 			int cst_idx;
 			const arch_register_req_t *req;
 			int curr_node_color = get_irn_col(ienv->co, irn);
-			int node_nr = (int)get_irn_node_nr(irn);
+			int node_nr = (int)get_irn_idx(irn);
 			local_env_t *lenv = ienv->env;
 
 			pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
@@ -163,7 +162,7 @@ static void build_interference_cstr(ilp_env_t *ienv) {
 				ir_node *irn = clique[i];
 
 				if (!sr_is_removed(ienv->sr, irn)) {
-					int var_idx = lpp_get_var_idx(lpp, name_cdd(buf, 'x', (int)get_irn_node_nr(irn), col));
+					int var_idx = lpp_get_var_idx(lpp, name_cdd(buf, 'x', (int)get_irn_idx(irn), col));
 					lpp_set_factor_fast(lpp, cst_idx, var_idx, 1);
 				}
 			}
@@ -190,12 +189,12 @@ static void build_affinity_cstr(ilp_env_t *ienv) {
 		int root_col, arg_col;
 
 		root = curr->nodes[0];
-		root_nr = (int) get_irn_node_nr(root);
+		root_nr = (int) get_irn_idx(root);
 		root_col = get_irn_col(ienv->co, root);
 
 		for (i = 1; i < curr->node_count; ++i) {
 			arg = curr->nodes[i];
-			arg_nr = (int) get_irn_node_nr(arg);
+			arg_nr = (int) get_irn_idx(arg);
 			arg_col = get_irn_col(ienv->co, arg);
 
 			/* add a new affinity variable */
@@ -292,19 +291,24 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 	co_gs_foreach_aff_node(ienv->co, aff) {
 		struct obstack ob;
 		neighb_t *nbr;
-		ir_node *center = aff->irn;
+		const ir_node *center = aff->irn;
 		ir_node **nodes;
 		set *edges;
 		int i, o, n_nodes, n_edges;
 
+		if (arch_irn_is(ienv->co->aenv, aff->irn, ignore))
+			continue;
+
 		obstack_init(&ob);
 		edges = new_set(compare_edge_t, 8);
 
 		/* get all affinity neighbours */
 		n_nodes = 0;
 		co_gs_foreach_neighb(aff, nbr) {
-			obstack_ptr_grow(&ob, nbr->irn);
-			++n_nodes;
+			if (!arch_irn_is(ienv->co->aenv, nbr->irn, ignore)) {
+				obstack_ptr_grow(&ob, nbr->irn);
+				++n_nodes;
+			}
 		}
 		nodes = obstack_finish(&ob);
 
@@ -376,10 +380,10 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 				char buf[16];
 
 				cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, pset_count(clique)-1);
-				center_nr = get_irn_node_nr(center);
+				center_nr = get_irn_idx(center);
 
 				pset_foreach(clique, member) {
-					member_nr = get_irn_node_nr(member);
+					member_nr = get_irn_idx(member);
 					var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', center_nr, member_nr));
 					lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
 				}
@@ -394,7 +398,7 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 }
 
 
-static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) {
+static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) {
 	be_ifg_t *ifg = ienv->co->cenv->ifg;
 	int i, len;
 	ir_node **curr_path;
@@ -405,6 +409,9 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) {
 	if (pdeq_contains(path, irn))
 		return;
 
+	if (arch_irn_is(ienv->co->aenv, irn, ignore))
+		return;
+
 	/* insert the new irn */
 	pdeq_putr(path, irn);
 
@@ -431,8 +438,8 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) {
 			int cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, 1.0);
 			for (i=1; i<len; ++i) {
 				char buf[16];
-				int nr_1    = get_irn_node_nr(curr_path[i-1]);
-				int nr_2    = get_irn_node_nr(curr_path[i]);
+				int nr_1    = get_irn_idx(curr_path[i-1]);
+				int nr_2    = get_irn_idx(curr_path[i]);
 				int var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', nr_1, nr_2));
 				lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
 			}
@@ -493,16 +500,14 @@ static void ilp2_build(ilp_env_t *ienv) {
 
 static void ilp2_apply(ilp_env_t *ienv) {
 	local_env_t *lenv = ienv->env;
-	double *sol;
-	lpp_sol_state_t state;
-	int i, count;
+	int i;
 
 	/* first check if there was sth. to optimize */
 	if (lenv->first_x_var >= 0) {
+		int              count = lenv->last_x_var - lenv->first_x_var + 1;
+		double          *sol   = XMALLOCN(double, count);
+		lpp_sol_state_t  state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
 
-		count = lenv->last_x_var - lenv->first_x_var + 1;
-		sol = xmalloc(count * sizeof(sol[0]));
-		state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
 		if (state != lpp_optimal) {
 			printf("WARNING %s: Solution state is not 'optimal': %d\n", ienv->co->name, state);
 			assert(state >= lpp_feasible && "The solution should at least be feasible!");
@@ -524,6 +529,8 @@ static void ilp2_apply(ilp_env_t *ienv) {
 					assert(0 && "This should be a x-var");
 			}
 		}
+
+		xfree(sol);
 	}
 
 #ifdef COPYOPT_STAT