X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur.c;h=7f24bccfab3ada13d4df0cb28b0bda0ba2a0141f;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=42d40673e80477b577bc00f0e7de34ce2b7b0cd8;hpb=02ae66a3aad03968ce98244e723affdab1fac88e;p=libfirm

diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c
index 42d40673e..7f24bccfa 100644
--- a/ir/be/becopyheur.c
+++ b/ir/be/becopyheur.c
@@ -23,23 +23,23 @@
 #include <malloc.h>
 #endif
 
+#include "debug.h"
 #include "xmalloc.h"
-#include "becopyopt.h"
+#include "becopyopt_t.h"
 #include "becopystat.h"
+#include "benodesets.h"
 #include "bitset.h"
-#include "bearch.h"
 
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 #define SEARCH_FREE_COLORS
 
-#define SLOTS_PINNED_GLOBAL 256
+#define SLOTS_PINNED_GLOBAL 64
 #define SLOTS_CONFLICTS 8
 #define SLOTS_CHANGED_NODES 32
 
-#define MIN(a,b) ((a<b)?(a):(b))
 #define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
-#define HASH_CONFLICT(c) (HASH_PTR(c.n1) ^ HASH_PTR(c.n2))
+#define HASH_CONFLICT(c) (nodeset_hash(c.n1) ^ nodeset_hash(c.n2))
 
 /**
  * Modeling additional conflicts between nodes. NOT live range interference
@@ -104,7 +104,7 @@ static INLINE void qnode_add_conflict(const qnode_t *qn, const ir_node *n1, cons
 static INLINE int qnode_are_conflicting(const qnode_t *qn, const ir_node *n1, const ir_node *n2) {
 	conflict_t c;
 	/* search for live range interference */
-	if (n1!=n2 && nodes_interfere(qn->ou->co->chordal_env, n1, n2))
+	if (n1!=n2 && nodes_interfere(qn->ou->co->cenv, n1, n2))
 		return 1;
 	/* search for recoloring conflicts */
 	if ((int)n1 < (int)n2) {
@@ -127,7 +127,7 @@ static int set_cmp_node_stat_t(const void *x, const void *y, size_t size) {
 static INLINE node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn) {
 	node_stat_t find;
 	find.irn = irn;
-	return set_find(qn->changed_nodes, &find, sizeof(find), HASH_PTR(irn));
+	return set_find(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn));
 }
 
 /**
@@ -139,7 +139,7 @@ static INLINE node_stat_t *qnode_find_or_insert_node(const qnode_t *qn, ir_node
 	find.irn = irn;
 	find.new_color = NO_COLOR;
 	find.pinned_local = 0;
-	return set_insert(qn->changed_nodes, &find, sizeof(find), HASH_PTR(irn));
+	return set_insert(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn));
 }
 
 /**
@@ -213,9 +213,10 @@ static INLINE void qnode_pin_local(const qnode_t *qn, ir_node *irn) {
  *
  */
 static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const ir_node *trigger) {
-	const be_chordal_env_t *chordal_env = qn->ou->co->chordal_env;
-	const arch_register_class_t *cls = chordal_env->cls;
-	const arch_env_t *arch_env = chordal_env->main_env->arch_env;
+	copy_opt_t *co = qn->ou->co;
+	const be_chordal_env_t *chordal_env = co->cenv;
+	const arch_register_class_t *cls = co->cls;
+	const arch_env_t *arch_env = co->aenv;
 	int irn_col = qnode_get_new_color(qn, irn);
 	ir_node *sub_res, *curr;
 	be_ifg_t *ifg = chordal_env->ifg;
@@ -247,7 +248,8 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
 		int free_col;
 
 		/* Get all possible colors */
-		arch_put_non_ignore_regs(arch_env, cls, free_cols);
+		bitset_copy(free_cols, co->cenv->ignore_colors);
+		bitset_flip_all(free_cols);
 
 		/* Exclude colors not assignable to the irn */
 		arch_get_register_req(arch_env, &req, irn, -1);
@@ -455,7 +457,7 @@ static INLINE qnode_t *new_qnode(const unit_t *ou, int color) {
 	qnode_t *qn = xmalloc(sizeof(*qn));
 	qn->ou = ou;
 	qn->color = color;
-	qn->mis = malloc(ou->node_count * sizeof(*qn->mis));
+	qn->mis = xmalloc(ou->node_count * sizeof(*qn->mis));
 	qn->conflicts = new_set(set_cmp_conflict_t, SLOTS_CONFLICTS);
 	qn->changed_nodes = new_set(set_cmp_node_stat_t, SLOTS_CHANGED_NODES);
 	return qn;
@@ -507,10 +509,9 @@ static INLINE void ou_insert_qnode(unit_t *ou, qnode_t *qn) {
 static void ou_optimize(unit_t *ou) {
 	int i;
 	qnode_t *curr = NULL, *tmp;
-	arch_env_t *aenv = get_arch_env(ou->co);
-	const arch_register_class_t *cls = ou->co->chordal_env->cls;
+	const arch_env_t *aenv = ou->co->aenv;
+	const arch_register_class_t *cls = ou->co->cls;
 	bitset_t *pos_regs = bitset_alloca(cls->n_regs);
-	bitset_t *ign_regs = bitset_alloca(cls->n_regs);
 
 	DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
 	for (i=0; i<ou->node_count; ++i)
@@ -522,8 +523,9 @@ static void ou_optimize(unit_t *ou) {
 	arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
 
 	/* exclude ingore colors */
-	arch_put_non_ignore_regs(aenv, cls, ign_regs);
-	bitset_and(pos_regs, ign_regs);
+	bitset_andnot(pos_regs, ou->co->cenv->ignore_colors);
+
+	assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
 
 	/* create new qnode */
 	bitset_foreach(pos_regs, i)
@@ -576,9 +578,11 @@ static void ou_optimize(unit_t *ou) {
 		free_qnode(curr);
 }
 
-void co_heur_opt(copy_opt_t *co) {
+int co_solve_heuristic(copy_opt_t *co) {
 	unit_t *curr;
-	dbg = firm_dbg_register("ir.be.copyoptheur");
+	FIRM_DBG_REGISTER(dbg, "ir.be.copyoptheur");
+
+	ASSERT_OU_AVAIL(co);
 
 	pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
 	list_for_each_entry(unit_t, curr, &co->units, units)
@@ -586,4 +590,5 @@ void co_heur_opt(copy_opt_t *co) {
 			ou_optimize(curr);
 
 	del_pset(pinned_global);
+	return 0;
 }