X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur4.c;h=3c2a262885c8ab7b6c493a55622a435d7c9a8fa5;hb=d64ea79ebc6d41bc4253f6b6fd0a09582dce20eb;hp=4b92c3df4c373359a756baae162d27a60b716710;hpb=0f89db9666c5accd98f89b7c993db0ccc27bf429;p=libfirm

diff --git a/ir/be/becopyheur4.c b/ir/be/becopyheur4.c
index 4b92c3df4..3c2a26288 100644
--- a/ir/be/becopyheur4.c
+++ b/ir/be/becopyheur4.c
@@ -33,6 +33,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#define DISABLE_STATEV
+
 #include <float.h>
 
 #include "array.h"
@@ -81,8 +83,8 @@ static firm_dbg_module_t *dbg = NULL;
 typedef float real_t;
 #define REAL(C)   (C ## f)
 
-static int last_chunk_id        = 0;
-static int recolor_limit        = 4;
+static unsigned last_chunk_id   = 0;
+static int recolor_limit        = 7;
 static real_t dislike_influence = REAL(0.1);
 
 typedef struct _col_cost_t {
@@ -95,13 +97,12 @@ typedef struct _col_cost_t {
  */
 typedef struct _aff_chunk_t {
 	const ir_node    **n;                   /**< An ARR_F containing all nodes of the chunk. */
-	bitset_t         *nodes;                /**< A bitset containing all nodes inside this chunk. */
-	bitset_t         *interfere;            /**< A bitset containing all interfering neighbours of the nodes in this chunk. */
+	const ir_node  **interfere;             /**< An ARR_F containing all inference. */
 	int              weight;                /**< Weight of this chunk */
 	unsigned         weight_consistent : 1; /**< Set if the weight is consistent. */
 	unsigned         deleted           : 1; /**< For debugging: Set if the was deleted. */
-	int              id;                    /**< An id of this chunk. */
-	int              visited;
+	unsigned         id;                    /**< An id of this chunk. */
+	unsigned         visited;
 	col_cost_t       color_affinity[1];
 } aff_chunk_t;
 
@@ -111,7 +112,7 @@ typedef struct _aff_chunk_t {
 typedef struct _aff_edge_t {
 	const ir_node *src;                   /**< Source node. */
 	const ir_node *tgt;                   /**< Target node. */
-	double  weight;                 /**< The weight of this edge. */
+	int           weight;                 /**< The weight of this edge. */
 } aff_edge_t;
 
 /* main coalescing environment */
@@ -120,12 +121,12 @@ typedef struct _co_mst_env_t {
 	int              k;              /**< number of non-ignore registers in class */
 	bitset_t         *ignore_regs;   /**< set containing all global ignore registers */
 	ir_phase         ph;             /**< phase object holding data for nodes */
-	pqueue           *chunks;        /**< priority queue for chunks */
+	pqueue_t         *chunks;        /**< priority queue for chunks */
 	pset             *chunkset;      /**< set holding all chunks */
 	be_ifg_t         *ifg;           /**< the interference graph */
 	const arch_env_t *aenv;          /**< the arch environment */
 	copy_opt_t       *co;            /**< the copy opt object */
-	int               chunk_visited;
+	unsigned         chunk_visited;
 	col_cost_t      **single_cols;
 } co_mst_env_t;
 
@@ -155,12 +156,13 @@ typedef int decide_func_t(const co_mst_irn_t *node, int col);
  * Write a chunk to stderr for debugging.
  */
 static void dbg_aff_chunk(const co_mst_env_t *env, const aff_chunk_t *c) {
-	bitset_pos_t idx;
+	int i, l;
+	(void) env;
 	if (c->weight_consistent)
 		ir_fprintf(stderr, " $%d ", c->weight);
 	ir_fprintf(stderr, "{");
-	bitset_foreach(c->nodes, idx) {
-		ir_node *n = get_idx_irn(env->co->irg, idx);
+	for (i = 0, l = ARR_LEN(c->n); i < l; ++i) {
+		const ir_node *n = c->n[i];
 		ir_fprintf(stderr, " %+F,", n);
 	}
 	ir_fprintf(stderr, "}");
@@ -254,10 +256,9 @@ static int cmp_col_cost_gt(const void *a, const void *b) {
  * Creates a new affinity chunk
  */
 static INLINE aff_chunk_t *new_aff_chunk(co_mst_env_t *env) {
-	aff_chunk_t *c = xmalloc(sizeof(*c) + (env->n_regs - 1) * sizeof(c->color_affinity[0]));
+	aff_chunk_t *c = XMALLOCF(aff_chunk_t, color_affinity, env->n_regs);
 	c->n                 = NEW_ARR_F(const ir_node *, 0);
-	c->nodes             = bitset_irg_malloc(env->co->irg);
-	c->interfere         = bitset_irg_malloc(env->co->irg);
+	c->interfere         = NEW_ARR_F(const ir_node *, 0);
 	c->weight            = -1;
 	c->weight_consistent = 0;
 	c->deleted           = 0;
@@ -272,31 +273,82 @@ static INLINE aff_chunk_t *new_aff_chunk(co_mst_env_t *env) {
  */
 static INLINE void delete_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 	pset_remove(env->chunkset, c, c->id);
-	bitset_free(c->nodes);
-	bitset_free(c->interfere);
+	DEL_ARR_F(c->interfere);
 	DEL_ARR_F(c->n);
 	c->deleted = 1;
 	free(c);
 }
 
+/**
+ * binary search of sorted nodes.
+ *
+ * @return the position where n is found in the array arr or ~pos
+ * if the nodes is not here.
+ */
+static INLINE int nodes_bsearch(const ir_node **arr, const ir_node *n) {
+	int hi = ARR_LEN(arr);
+	int lo = 0;
+
+	while (lo < hi) {
+		int md = lo + ((hi - lo) >> 1);
+
+		if (arr[md] == n)
+			return md;
+		if (arr[md] < n)
+			lo = md + 1;
+		else
+			hi = md;
+	}
+
+	return ~lo;
+}
+
+/** Check if a node n can be found inside arr. */
+static int node_contains(const ir_node **arr, const ir_node *n) {
+	int i = nodes_bsearch(arr, n);
+	return i >= 0;
+}
+
+/**
+ * Insert a node into the sorted nodes list.
+ *
+ * @return 1 if the node was inserted, 0 else
+ */
+static int nodes_insert(const ir_node ***arr, const ir_node *irn) {
+	int idx = nodes_bsearch(*arr, irn);
+
+	if (idx < 0) {
+		int i, n = ARR_LEN(*arr);
+		const ir_node **l;
+
+		ARR_APP1(const ir_node *, *arr, irn);
+
+		/* move it */
+		idx = ~idx;
+		l = *arr;
+		for (i = n - 1; i >= idx; --i)
+			l[i + 1] = l[i];
+		l[idx] = irn;
+		return 1;
+	}
+	return 0;
+}
+
 /**
  * Adds a node to an affinity chunk
  */
 static INLINE void aff_chunk_add_node(aff_chunk_t *c, co_mst_irn_t *node) {
 	int i;
 
-	if (bitset_is_set(c->nodes, get_irn_idx(node->irn)))
+	if (! nodes_insert(&c->n, node->irn))
 		return;
 
 	c->weight_consistent = 0;
 	node->chunk          = c;
-	bitset_set(c->nodes, get_irn_idx(node->irn));
-
-	ARR_APP1(ir_node *, c->n, node->irn);
 
 	for (i = node->n_neighs - 1; i >= 0; --i) {
 		ir_node *neigh = node->int_neighs[i];
-		bitset_set(c->interfere, get_irn_idx(neigh));
+		nodes_insert(&c->interfere, neigh);
 	}
 }
 
@@ -329,7 +381,7 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) {
 		res->adm_colors = bitset_obstack_alloc(phase_obst(ph), env->n_regs);
 
 		/* Exclude colors not assignable to the irn */
-		req = arch_get_register_req(env->aenv, irn, -1);
+		req = arch_get_register_req(irn, -1);
 		if (arch_register_req_is(req, limited))
 			rbitset_copy_to_bitset(req->limited, res->adm_colors);
 		else
@@ -361,25 +413,30 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) {
 /**
  * Check if affinity chunk @p chunk interferes with node @p irn.
  */
-static INLINE int aff_chunk_interferes(co_mst_env_t *env, const aff_chunk_t *chunk, const ir_node *irn) {
-	(void) env;
-	return bitset_is_set(chunk->interfere, get_irn_idx(irn));
+static INLINE int aff_chunk_interferes(const aff_chunk_t *chunk, const ir_node *irn) {
+	return node_contains(chunk->interfere, irn);
 }
 
 /**
  * Check if there are interference edges from c1 to c2.
- * @param env   The global co_mst environment
  * @param c1    A chunk
  * @param c2    Another chunk
  * @return 1 if there are interferences between nodes of c1 and c2, 0 otherwise.
  */
-static INLINE int aff_chunks_interfere(co_mst_env_t *env, const aff_chunk_t *c1, const aff_chunk_t *c2) {
-	(void) env;
+static INLINE int aff_chunks_interfere(const aff_chunk_t *c1, const aff_chunk_t *c2) {
+	int i;
+
 	if (c1 == c2)
 		return 0;
 
 	/* check if there is a node in c2 having an interfering neighbor in c1 */
-	return bitset_intersect(c1->interfere, c2->nodes);
+	for (i = ARR_LEN(c2->n) - 1; i >= 0; --i) {
+		const ir_node *irn = c2->n[i];
+
+		if (node_contains(c1->interfere, irn))
+			return 1;
+	}
+	return 0;
 }
 
 /**
@@ -401,13 +458,13 @@ static int aff_chunk_absorb(co_mst_env_t *env, const ir_node *src, const ir_node
 	aff_chunk_t *c2 = get_aff_chunk(env, tgt);
 
 #ifdef DEBUG_libfirm
-		DB((dbg, LEVEL_4, "Attempt to let c1 (id %d): ", c1 ? c1->id : -1));
+		DB((dbg, LEVEL_4, "Attempt to let c1 (id %u): ", c1 ? c1->id : 0));
 		if (c1) {
 			DBG_AFF_CHUNK(env, LEVEL_4, c1);
 		} else {
 			DB((dbg, LEVEL_4, "{%+F}", src));
 		}
-		DB((dbg, LEVEL_4, "\n\tabsorb c2 (id %d): ", c2 ? c2->id : -1));
+		DB((dbg, LEVEL_4, "\n\tabsorb c2 (id %u): ", c2 ? c2->id : 0));
 		if (c2) {
 			DBG_AFF_CHUNK(env, LEVEL_4, c2);
 		} else {
@@ -435,24 +492,28 @@ static int aff_chunk_absorb(co_mst_env_t *env, const ir_node *src, const ir_node
 			}
 		} else {
 			/* c2 already exists */
-			if (! aff_chunk_interferes(env, c2, src)) {
+			if (! aff_chunk_interferes(c2, src)) {
 				aff_chunk_add_node(c2, get_co_mst_irn(env, src));
 				goto absorbed;
 			}
 		}
 	} else if (c2 == NULL) {
 		/* c1 already exists */
-		if (! aff_chunk_interferes(env, c1, tgt)) {
+		if (! aff_chunk_interferes(c1, tgt)) {
 			aff_chunk_add_node(c1, get_co_mst_irn(env, tgt));
 			goto absorbed;
 		}
-	} else if (c1 != c2 && ! aff_chunks_interfere(env, c1, c2)) {
+	} else if (c1 != c2 && ! aff_chunks_interfere(c1, c2)) {
 		int idx, len;
 
 		for (idx = 0, len = ARR_LEN(c2->n); idx < len; ++idx)
 			aff_chunk_add_node(c1, get_co_mst_irn(env, c2->n[idx]));
 
-		bitset_or(c1->interfere, c2->interfere);
+		for (idx = 0, len = ARR_LEN(c2->interfere); idx < len; ++idx) {
+			const ir_node *irn = c2->interfere[idx];
+			nodes_insert(&c1->interfere, irn);
+		}
+
 		c1->weight_consistent = 0;
 
 		delete_aff_chunk(env, c2);
@@ -495,13 +556,12 @@ static void aff_chunk_assure_weight(co_mst_env_t *env, aff_chunk_t *c) {
 				neighb_t *neigh;
 				co_gs_foreach_neighb(an, neigh) {
 					const ir_node *m    = neigh->irn;
-					const int     m_idx = get_irn_idx(m);
 
 					/* skip ignore nodes */
 					if (arch_irn_is(env->aenv, m, ignore))
 						continue;
 
-					w += bitset_is_set(c->nodes, m_idx) ? neigh->costs : 0;
+					w += node_contains(c->n, m) ? neigh->costs : 0;
 				}
 			}
 		}
@@ -623,7 +683,7 @@ static void build_affinity_chunks(co_mst_env_t *env) {
 	foreach_pset(env->chunkset, curr_chunk) {
 		aff_chunk_assure_weight(env, curr_chunk);
 
-		DBG((dbg, LEVEL_1, "entry #%d", curr_chunk->id));
+		DBG((dbg, LEVEL_1, "entry #%u", curr_chunk->id));
 		DBG_AFF_CHUNK(env, LEVEL_1, curr_chunk);
 		DBG((dbg, LEVEL_1, "\n"));
 
@@ -640,7 +700,7 @@ static void build_affinity_chunks(co_mst_env_t *env) {
 
 			aff_chunk_assure_weight(env, curr_chunk);
 
-			DBG((dbg, LEVEL_1, "entry #%d", curr_chunk->id));
+			DBG((dbg, LEVEL_1, "entry #%u", curr_chunk->id));
 			DBG_AFF_CHUNK(env, LEVEL_1, curr_chunk);
 			DBG((dbg, LEVEL_1, "\n"));
 
@@ -653,7 +713,7 @@ static void build_affinity_chunks(co_mst_env_t *env) {
 
 static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chunk_t *chunk)
 {
-	pqueue *grow = new_pqueue();
+	pqueue_t *grow = new_pqueue();
 	const ir_node *max_node = NULL;
 	int max_weight = 0;
 	int i;
@@ -688,7 +748,7 @@ static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chu
 		bitset_remv_irn(visited, max_node);
 		i = 0;
 		while (!pqueue_empty(grow)) {
-			ir_node *irn = pqueue_get(grow);
+			ir_node *irn = pqueue_pop_front(grow);
 			affinity_node_t *an = get_affinity_info(env->co, irn);
 			neighb_t *neigh;
 
@@ -724,7 +784,7 @@ static void expand_chunk_from(co_mst_env_t *env, co_mst_irn_t *node, bitset_t *v
 {
 	waitq *nodes = new_waitq();
 
-	DBG((dbg, LEVEL_1, "\n\tExpanding new chunk (#%d) from %+F, color %d:", chunk->id, node->irn, col));
+	DBG((dbg, LEVEL_1, "\n\tExpanding new chunk (#%u) from %+F, color %d:", chunk->id, node->irn, col));
 
 	/* init queue and chunk */
 	waitq_put(nodes, node);
@@ -751,11 +811,11 @@ static void expand_chunk_from(co_mst_env_t *env, co_mst_irn_t *node, bitset_t *v
 
 				n2 = get_co_mst_irn(env, m);
 
-				if (! bitset_is_set(visited, m_idx)       &&
-					decider(n2, col)                      &&
-					! n2->fixed                           &&
-					! aff_chunk_interferes(env, chunk, m) &&
-					bitset_is_set(orig_chunk->nodes, m_idx))
+				if (! bitset_is_set(visited, m_idx)  &&
+					decider(n2, col)                 &&
+					! n2->fixed                      &&
+					! aff_chunk_interferes(chunk, m) &&
+					node_contains(orig_chunk->n, m))
 				{
 					/*
 						following conditions are met:
@@ -804,19 +864,19 @@ static aff_chunk_t *fragment_chunk(co_mst_env_t *env, int col, aff_chunk_t *c, w
 		if (get_mst_irn_col(node) == col) {
 			decider        = decider_has_color;
 			check_for_best = 1;
-			DBG((dbg, LEVEL_4, "\tcolor %d wanted", col));
+			DBG((dbg, LEVEL_4, "\tcolor %d wanted\n", col));
 		}
 		else {
 			decider        = decider_hasnot_color;
 			check_for_best = 0;
-			DBG((dbg, LEVEL_4, "\tcolor %d forbidden", col));
+			DBG((dbg, LEVEL_4, "\tcolor %d forbidden\n", col));
 		}
 
 		/* create a new chunk starting at current node */
 		tmp_chunk = new_aff_chunk(env);
 		waitq_put(tmp, tmp_chunk);
 		expand_chunk_from(env, node, visited, tmp_chunk, c, decider, col);
-		assert(bitset_popcnt(tmp_chunk->nodes) > 0 && "No nodes added to chunk");
+		assert(ARR_LEN(tmp_chunk->n) > 0 && "No nodes added to chunk");
 
 		/* remember the local best */
 		aff_chunk_assure_weight(env, tmp_chunk);
@@ -955,21 +1015,25 @@ static int recolor_nodes(co_mst_env_t *env, co_mst_irn_t *node, col_cost_t *cost
 	if (depth > *max_depth)
 		*max_depth = depth;
 
-	if (depth >= recolor_limit)
-		return 0;
-
 	DBG((dbg, LEVEL_4, "\tRecoloring %+F with color-costs", node->irn));
 	DBG_COL_COST(env, LEVEL_4, costs);
 	DB((dbg, LEVEL_4, "\n"));
 
+	if (depth >= recolor_limit) {
+		DBG((dbg, LEVEL_4, "\tHit recolor limit\n"));
+		return 0;
+	}
+
 	for (i = 0; i < env->n_regs; ++i) {
 		int tgt_col  = costs[i].col;
 		int neigh_ok = 1;
 		int j;
 
 		/* If the costs for that color (and all successive) are infinite, bail out we won't make it anyway. */
-		if (costs[i].cost == REAL(0.0))
+		if (costs[i].cost == REAL(0.0)) {
+			DBG((dbg, LEVEL_4, "\tAll further colors forbidden\n"));
 			return 0;
+		}
 
 		/* Set the new color of the node and mark the node as temporarily fixed. */
 		assert(node->tmp_col < 0 && "Node must not have been temporary fixed.");
@@ -1022,6 +1086,7 @@ static int recolor_nodes(co_mst_env_t *env, co_mst_irn_t *node, col_cost_t *cost
 		}
 	}
 
+	DBG((dbg, LEVEL_4, "\tAll colors failed\n"));
 	return 0;
 }
 
@@ -1089,23 +1154,22 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 	waitq       *best_starts  = NULL;
 	col_cost_t  *order        = alloca(env->n_regs * sizeof(order[0]));
 	bitset_t    *visited;
-	int         idx, len, i;
+	int         idx, len, i, nidx, pos;
 	struct list_head changed;
-	bitset_pos_t pos;
 
-	DB((dbg, LEVEL_2, "fragmentizing chunk #%d", c->id));
+	DB((dbg, LEVEL_2, "fragmentizing chunk #%u", c->id));
 	DBG_AFF_CHUNK(env, LEVEL_2, c);
 	DB((dbg, LEVEL_2, "\n"));
 
-	stat_ev_ctx_push_fmt("heur4_color_chunk", "%d", c->id);
+	stat_ev_ctx_push_fmt("heur4_color_chunk", "%u", c->id);
 
 	++env->chunk_visited;
 
 	/* compute color preference */
 	memset(order, 0, env->n_regs * sizeof(order[0]));
 
-	bitset_foreach (c->interfere, pos) {
-		ir_node      *n    = get_idx_irn(env->co->irg, pos);
+	for (pos = 0, len = ARR_LEN(c->interfere); pos < len; ++pos) {
+		const ir_node *n = c->interfere[pos];
 		co_mst_irn_t *node = get_co_mst_irn(env, n);
 		aff_chunk_t *chunk = node->chunk;
 
@@ -1201,7 +1265,7 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 		if (local_best) {
 			aff_chunk_assure_weight(env, local_best);
 
-			DB((dbg, LEVEL_3, "\t\tlocal best chunk (id %d) for color %d: ", local_best->id, col));
+			DB((dbg, LEVEL_3, "\t\tlocal best chunk (id %u) for color %d: ", local_best->id, col));
 			DBG_AFF_CHUNK(env, LEVEL_3, local_best);
 
 			if (! best_chunk || best_chunk->weight < local_best->weight) {
@@ -1210,7 +1274,7 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 				if (best_starts)
 					del_waitq(best_starts);
 				best_starts = good_starts;
-				DB((dbg, LEVEL_3, "\n\t\t... setting global best chunk (id %d), color %d\n", best_chunk->id, best_color));
+				DB((dbg, LEVEL_3, "\n\t\t... setting global best chunk (id %u), color %d\n", best_chunk->id, best_color));
 			} else {
 				DB((dbg, LEVEL_3, "\n\t\t... omitting, global best is better\n"));
 				del_waitq(good_starts);
@@ -1242,7 +1306,7 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 		return;
 	}
 
-	DB((dbg, LEVEL_2, "\tbest chunk #%d ", best_chunk->id));
+	DB((dbg, LEVEL_2, "\tbest chunk #%u ", best_chunk->id));
 	DBG_AFF_CHUNK(env, LEVEL_2, best_chunk);
 	DB((dbg, LEVEL_2, "using color %d\n", best_color));
 
@@ -1252,7 +1316,7 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 		int res;
 
 		/* bring the node to the color. */
-		DB((dbg, LEVEL_4, "\tManifesting color %d for %+F, chunk #%d\n", best_color, node->irn, best_chunk->id));
+		DB((dbg, LEVEL_4, "\tManifesting color %d for %+F, chunk #%u\n", best_color, node->irn, best_chunk->id));
 		INIT_LIST_HEAD(&changed);
 		stat_ev_tim_push();
 		res = change_node_color(env, node, best_color, &changed);
@@ -1265,18 +1329,24 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 	}
 
 	/* remove the nodes in best chunk from original chunk */
-	bitset_andnot(c->nodes, best_chunk->nodes);
-	for (idx = 0, len = ARR_LEN(c->n); idx < len; ++idx) {
-		const ir_node *irn = c->n[idx];
+	len = ARR_LEN(best_chunk->n);
+	for (idx = 0; idx < len; ++idx) {
+		const ir_node *irn = best_chunk->n[idx];
+		int pos = nodes_bsearch(c->n, irn);
 
-		if (bitset_is_set(best_chunk->nodes, get_irn_idx(irn))) {
-			int last = ARR_LEN(c->n) - 1;
+		if (pos > 0)
+			c->n[pos] = NULL;
+	}
+	len = ARR_LEN(c->n);
+	for (idx = nidx = 0; idx < len; ++idx) {
+		const ir_node *irn = c->n[idx];
 
-			c->n[idx] = c->n[last];
-			ARR_SHRINKLEN(c->n, last+1);
-			len--;
+		if (irn != NULL) {
+			c->n[nidx++] = irn;
 		}
 	}
+	ARR_SHRINKLEN(c->n, nidx);
+
 
 	/* we have to get the nodes back into the original chunk because they are scattered over temporary chunks */
 	for (idx = 0, len = ARR_LEN(c->n); idx < len; ++idx) {
@@ -1287,7 +1357,9 @@ static void color_aff_chunk(co_mst_env_t *env, aff_chunk_t *c) {
 
 	/* fragment the remaining chunk */
 	visited = bitset_irg_malloc(env->co->irg);
-	bitset_or(visited, best_chunk->nodes);
+	for (idx = 0, len = ARR_LEN(best_chunk->n); idx < len; ++idx)
+		bitset_set(visited, get_irn_idx(best_chunk->n[idx]));
+
 	for (idx = 0, len = ARR_LEN(c->n); idx < len; ++idx) {
 		const ir_node *irn = c->n[idx];
 		if (! bitset_is_set(visited, get_irn_idx(irn))) {
@@ -1325,6 +1397,8 @@ int co_solve_heuristic_mst(copy_opt_t *co) {
 	ir_node      *irn;
 	co_mst_env_t mst_env;
 
+	last_chunk_id = 0;
+
 	stat_ev_tim_push();
 
 	/* init phase */
@@ -1366,10 +1440,10 @@ int co_solve_heuristic_mst(copy_opt_t *co) {
 
 	/* color chunks as long as there are some */
 	while (! pqueue_empty(mst_env.chunks)) {
-		aff_chunk_t *chunk = pqueue_get(mst_env.chunks);
+		aff_chunk_t *chunk = pqueue_pop_front(mst_env.chunks);
 
 		color_aff_chunk(&mst_env, chunk);
-		DB((dbg, LEVEL_4, "<<<====== Coloring chunk (%d) done\n", chunk->id));
+		DB((dbg, LEVEL_4, "<<<====== Coloring chunk (%u) done\n", chunk->id));
 		delete_aff_chunk(&mst_env, chunk);
 	}