X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=39f4480b3441d21878dafab4b709475c62412a61;hb=a1cea00c3c8a93f41d911f740a3855e5b67c4c21;hp=a478e3890423fb9ebf77948920876c10cc20d8a9;hpb=48398403237b6bbc2e7d6fb46e22cff0f1d2d032;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index a478e3890..39f4480b3 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -13,8 +13,11 @@
 #include "debug.h"
 #include "set.h"
 #include "pmap.h"
-#include "irnode.h"
+#include "irnode_t.h"
+#include "ircons_t.h"
 #include "iredges_t.h"
+#include "irgwalk.h"
+#include "irgmod.h"
 #include "irdump.h"
 #include "irprintf.h"
 
@@ -22,67 +25,170 @@
 #include "beutil.h"
 #include "bechordal_t.h"
 #include "bearch.h"
+#include "belive_t.h"
 #include "benode_t.h"
 #include "besched_t.h"
+#include "benodesets.h"
+#include "bestatevent.h"
 
-static firm_dbg_module_t *dbg = NULL;
-#define DEBUG_LVL SET_LEVEL_2
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
+#define get_chordal_arch(ce) ((ce)->birg->main_env->arch_env)
+#define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn)
+#define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg)
 
-#define get_reg(irn) arch_get_irn_register(chordal_env->arch_env, irn, 0)
-#define set_reg(irn, reg) arch_set_irn_register(chordal_env->arch_env, irn, 0, reg)
+#define is_Perm(irn)            (arch_irn_class_is(arch_env, irn, perm))
+#define get_reg_cls(irn)        (arch_get_irn_reg_class(arch_env, irn, -1))
+#define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
+
+static void clear_link(ir_node *irn, void *data) {
+	set_irn_link(irn, NULL);
+}
 
 /**
- * Maps blocks to perm nodes inserted during phi destruction.
+ * For each block build a linked list of phis that
+ *  - are in that block
+ *  - have the current register class
+ * The list is rooted at get_irn_link(BB).
  */
-typedef struct _block2perm_t {
-  ir_node *block, *perm;
-} block2perm_t;
-
-static int set_cmp_b2p(const void *x, const void *y, size_t size) {
-  const block2perm_t *b1 = x;
-  const block2perm_t *b2 = y;
-  return b1->block != b2->block;
+static void collect_phis_walker(ir_node *irn, void *data) {
+	be_chordal_env_t *env = data;
+	if(is_Phi(irn) && chordal_has_class(env, irn)) {
+		ir_node *bl = get_nodes_block(irn);
+		set_irn_link(irn, get_irn_link(bl));
+		set_irn_link(bl, irn);
+	}
 }
 
-#define is_Branch(irn)          (arch_irn_classify(arch_env, irn) == arch_irn_class_branch)
-#define is_Perm(irn)            (arch_irn_classify(arch_env, irn) == arch_irn_class_perm)
-#define get_reg_cls(irn)        (arch_get_irn_reg_class(arch_env, irn, arch_pos_make_out(0)))
-#define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
+/**
+ * This struct represents a Proj for a Perm.
+ * It records the argument in the Perm and the corresponding Proj of the
+ * Perm.
+ */
+typedef struct {
+	ir_node *arg;  /**< The phi argument to make the Proj for. */
+	int pos;       /**< The proj number the Proj will get.
+									 This also denotes the position of @p arg
+									 in the in array of the Perm. */
+	ir_node *proj; /**< The proj created for @p arg. */
+} perm_proj_t;
+
+static int cmp_perm_proj(const void *a, const void *b, size_t n) {
+	const perm_proj_t *p = a;
+	const perm_proj_t *q = b;
+	return !(p->arg == q->arg);
+}
 
-static ir_node *get_or_insert_perm(be_main_session_env_t *session, be_chordal_env_t *chordal_env, ir_node *block) {
-	block2perm_t find, *found;
-	ir_node *p;
-	set *b2p = chordal_env->data;
-	const arch_env_t *arch_env = chordal_env->arch_env;
+typedef struct insert_all_perms_env_t {
+	be_chordal_env_t *chordal_env;
+	pmap *perm_map;
+} insert_all_perms_env_t;
 
+/**
+ * Insert Perms in all predecessors of a block containing a phi
+ */
+static void insert_all_perms_walker(ir_node *bl, void *data) {
+	insert_all_perms_env_t *env = data;
+	be_chordal_env_t *chordal_env = env->chordal_env;
+	pmap *perm_map = env->perm_map;
+	ir_graph *irg = chordal_env->irg;
+	be_lv_t *lv = chordal_env->birg->lv;
+	int i, n;
+
+	assert(is_Block(bl));
+
+	/* If the link flag is NULL, this block has no phis. */
+	if(!get_irn_link(bl))
+		return;
+
+	/* Look at all predecessors of the phi block */
+	for(i = 0, n = get_irn_arity(bl); i < n; ++i) {
+		ir_node *phi, *perm, *insert_after, **in;
+		perm_proj_t *pp;
+		set *arg_set     = new_set(cmp_perm_proj, chordal_env->cls->n_regs);
+		ir_node *pred_bl = get_Block_cfgpred_block(bl, i);
+		int n_projs      = 0;
+
+		assert(!pmap_contains(perm_map, pred_bl) && "Already permed that block");
+
+		/*
+		 * Note that all phis in the list are in the same
+		 * register class by construction.
+		 */
+		for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+			perm_proj_t templ;
+			ir_node *arg     = get_irn_n(phi, i);
+			unsigned hash    = nodeset_hash(arg);
+
+			templ.arg  = arg;
+			pp         = set_find(arg_set, &templ, sizeof(templ), hash);
+
+			/*
+			 * If a proj_perm_t entry has not been made in the argument set,
+			 * create one. The only restriction is, that the phi argument
+			 * may not be live in at the current block, since this argument
+			 * interferes with the phi and must thus not be member of a
+			 * Perm. A copy will be inserted for this argument alter on.
+			 */
+			if(!pp && !be_is_live_in(lv, bl, arg)) {
+				templ.pos = n_projs++;
+				set_insert(arg_set, &templ, sizeof(templ), hash);
+			}
+		}
 
-	/* iff needed insert perm node */
-	DBG((dbg, LEVEL_1, "    Getting perm in %+F\n", block));
 
-	/* .if the perm is in the pset return it */
-	find.block = block;
-	find.perm = NULL;
-	found = set_insert(b2p, &find, sizeof(find), HASH_PTR(find.block));
-	if (found->perm) {
-		DBG((dbg, LEVEL_1, "      found it %+F in map\n", found->perm));
-		return found->perm;
-	}
+		if (n_projs) {
+			/*
+			 * Create a new Perm with the arguments just collected
+			 * above in the arg_set and insert it into the schedule.
+			 */
+			in = xmalloc(n_projs * sizeof(in[0]));
+			for(pp = set_first(arg_set); pp; pp = set_next(arg_set))
+				in[pp->pos] = pp->arg;
+
+			perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in);
+			be_stat_ev("phi_perm", n_projs);
+
+			free(in);
+			insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env);
+			sched_add_after(insert_after, perm);
+
+			/*
+			 * Make the Projs for the Perm and insert into schedule.
+			 * Register allocation is copied from the former phi
+			 * arguments to the projs (new phi arguments).
+			 */
+			insert_after = perm;
+			for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) {
+				ir_node *proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos);
+				pp->proj = proj;
+				assert(get_reg(pp->arg));
+				set_reg(proj, get_reg(pp->arg));
+				sched_add_after(insert_after, proj);
+				insert_after = proj;
+				DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", get_reg(pp->arg)->name, pp->arg, pp->proj));
+			}
 
-	/* .else look for a perm of right register class in the schedule */
-	p = sched_last(find.block);
-	while (!is_Block(p) && (is_Branch(p) || (is_Perm(p) && !is_curr_reg_class(p))))
-		p = sched_prev(p);
+			/*
+			 * Set the phi nodes to their new arguments: The Projs of the Perm
+			 */
+			for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+				perm_proj_t templ;
 
-	/* if we haven't found a perm of the right register class create a new one */
-	if (! (is_Perm(p) && is_curr_reg_class(p))) {
-		DBG((dbg, LEVEL_1, "      insert it after %+F\n", p));
-		p = insert_Perm_after(session, chordal_env->cls, p);
-	}
+				templ.arg = get_irn_n(phi, i);
+				pp        = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg));
+
+				/* If not found, it was an interfering argument */
+				if (pp)
+					set_irn_n(phi, i, pp->proj);
+			}
 
-	/* insert perm into pset and return it*/
-	found->perm = p;
-	return p;
+			/* register in perm map */
+			pmap_insert(perm_map, pred_bl, perm);
+		}
+
+		del_set(arg_set);
+	}
 }
 
 #define is_pinned(irn) (get_irn_link(irn))
@@ -90,206 +196,211 @@ static ir_node *get_or_insert_perm(be_main_session_env_t *session, be_chordal_en
 #define pin_irn(irn, lock) (set_irn_link(irn, lock))
 
 /**
- * Adjusts the register allocation for the phi-operands
- * by inserting perm nodes, if necessary.
- * @param phi The phi node to adjust operands for
+ * Adjusts the register allocation for the (new) phi-operands
+ * and insert duplicates iff necessary.
  */
-static void adjust_phi_arguments(be_main_session_env_t *session, be_chordal_env_t *chordal_env, ir_node *phi) {
-	int i, max;
-	ir_node *arg, *phi_block, *arg_block;
-	const arch_register_t *phi_reg, *arg_reg;
-	const arch_register_class_t *cls;
-
-	assert(is_Phi(phi) && "Can only handle phi-destruction :)");
-	DBG((dbg, LEVEL_1, "  for %+F\n", phi));
-
-	cls = arch_get_irn_reg_class(session->main_env->arch_env, phi, arch_pos_make_out(0));
-	phi_block = get_nodes_block(phi);
-	phi_reg = get_reg(phi);
-
-	/* process all arguments of the phi */
-	for(i=0, max=get_irn_arity(phi); i<max; ++i) {
-		ir_node *perm;
-
-		arg = get_irn_n(phi, i);
-		arg_block = get_nodes_block(arg);
-		arg_reg = get_reg(arg);
-		perm = get_Proj_pred(arg);
-
-		DBG((dbg, LEVEL_1, "    arg %+F has perm %+F\n", arg, perm));
-		/* if registers don't match ...*/
-		if (phi_reg != arg_reg) {
-			DBG((dbg, LEVEL_1, "      regs don't match %d %d\n", phi_reg, arg_reg));
-
-			/* First check if there is another phi in the same block
-			 * having arg at the same pos in its arg-list and the same color as arg */
-			if (!is_pinned(arg)) {
-				DBG((dbg, LEVEL_1, "      arg is not pinned\n"));
-				ir_node *other_phi = phi;
-				while ((other_phi = get_irn_link(other_phi)) != phi) {
-					assert(is_Phi(other_phi) && get_nodes_block(phi) == get_nodes_block(other_phi) && "link fields are screwed up");
+static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
+	be_chordal_env_t *chordal_env = data;
+	be_lv_t *lv = chordal_env->birg->lv;
+	ir_node *phi;
+
+	/* Consider all phis of this block */
+	for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+		int i, max;
+		ir_node *arg, *phi_block, *arg_block;
+		const arch_register_t *phi_reg, *arg_reg;
+		const arch_register_class_t *cls;
+
+		assert(is_Phi(phi) && "Can only handle phi-destruction :)");
+
+		phi_block = get_nodes_block(phi);
+		phi_reg   = get_reg(phi);
+		cls       = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1);
+
+		/* process all arguments of the phi */
+		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
+			arg       = get_irn_n(phi, i);
+			arg_block = get_Block_cfgpred_block(phi_block, i);
+			arg_reg   = get_reg(arg);
+
+			assert(arg_reg && "Register must be set while placing perms");
+
+			DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
+
+			if(values_interfere(lv, phi, arg)) {
+				/*
+					Insert a duplicate in arguments block,
+					make it the new phi arg,
+					set its register,
+					insert it into schedule,
+					pin it
+				*/
+				ir_node *dupl  = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+
+				/* this is commented out because it will fail in case of unknown float */
+#if 0
+				ir_mode *m_phi = get_irn_mode(phi), *m_dupl = get_irn_mode(dupl);
+
+				/*
+					Conv signed <-> unsigned is killed on ia32
+					check for: (both int OR both float) AND equal mode sizes
+				*/
+				assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) ||
+					(mode_is_float(m_phi) && mode_is_float(m_dupl))) &&
+					(get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl)));
+#endif /* if 0 */
+
+				set_irn_n(phi, i, dupl);
+				set_reg(dupl, phi_reg);
+				sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env), dupl);
+				pin_irn(dupl, phi_block);
+				DBG((dbg, LEVEL_1, "    they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
+				continue; /* with next argument */
+			}
+
+			if (phi_reg == arg_reg) {
+				/* Phi and arg have the same register, so pin and continue */
+				pin_irn(arg, phi_block);
+				DBG((dbg, LEVEL_1, "      arg has same reg: pin %+F(%s)\n", arg, get_reg(arg)->name));
+				continue;
+			}
+
+			DBG((dbg, LEVEL_1, "    they do not interfere\n"));
+			assert(is_Proj(arg));
+			/*
+				First check if there is an other phi
+				- in the same block
+				- having arg at the current pos in its arg-list
+				- having the same color as arg
+
+				If found, then pin the arg (for that phi)
+			*/
+			if (! is_pinned(arg)) {
+				ir_node *other_phi;
+
+				DBG((dbg, LEVEL_1, "      searching for phi with same arg having args register\n"));
+
+				for(other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) {
+
+					assert(is_Phi(other_phi)                               &&
+						get_nodes_block(phi) == get_nodes_block(other_phi) &&
+						"link fields are screwed up");
+
 					if (get_irn_n(other_phi, i) == arg && get_reg(other_phi) == arg_reg) {
-						DBG((dbg, LEVEL_1, "      other phi pinned the argument\n"));
+						DBG((dbg, LEVEL_1, "        found %+F(%s)\n", other_phi, get_reg(other_phi)->name));
 						pin_irn(arg, phi_block);
+						break;
 					}
 				}
 			}
 
-			/* If arg is pinned, another phi set the color of arg and pinned it.
-			 * So this phi can't change the color again and a duplicate must be inserted.
-			 *
-			 * If arg interferes with phi, one can never set the same color for both
-			 * Hence, a duplicate must be inserted */
-			if (is_pinned(arg) || nodes_interfere(chordal_env, phi, arg)) {
-				ir_node *dupl, *tmp;
-				assert(get_pinning_block(arg) == phi_block && "If arg is pinned it must be due to a phi in the same block");
+			if (is_pinned(arg)) {
+				/*
+					Insert a duplicate of the original value in arguments block,
+					make it the new phi arg,
+					set its register,
+					insert it into schedule,
+					pin it
+				*/
+				ir_node *perm     = get_Proj_pred(arg);
+				ir_node *dupl     = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+				ir_node *ins;
+
+				/* this is commented out because it will fail in case of unknown float */
+#if 0
+				ir_mode *m_phi    = get_irn_mode(phi);
+				ir_mode *m_dupl   = get_irn_mode(dupl);
+
+				/*
+					Conv signed <-> unsigned is killed on ia32
+					check for: (both int OR both float) AND equal mode sizes
+				*/
+				assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) ||
+					(mode_is_float(m_phi) && mode_is_float(m_dupl))) &&
+					(get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl)));
+#endif /* if 0 */
 
-				dupl = new_Copy(session->main_env->node_factory, cls, session->irg, arg_block, arg);
 				set_irn_n(phi, i, dupl);
 				set_reg(dupl, phi_reg);
-				DBG((dbg, LEVEL_1, "      inserting dupl %+F\n", dupl));
-
-				/* Add dupl to schedule */
-				tmp = sched_next(perm);
-				while (is_Proj(tmp) && sched_has_next(tmp))
-					tmp = sched_next(tmp);
-				sched_add_after(tmp, dupl);
-
-				/* Add dupl to chained list of duplicates. Ptrs starting at the Perm */
-				tmp = perm;
-				while (get_irn_link(tmp))
-					tmp = get_irn_link(tmp);
-				set_irn_link(tmp, dupl);
-				set_irn_link(dupl, NULL);
-
-				/* now the arg is the dupl */
-				arg = dupl;
+				/* skip the Perm's Projs and insert the copies behind. */
+				for(ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins));
+				sched_add_before(ins, dupl);
+				pin_irn(dupl, phi_block);
+				DBG((dbg, LEVEL_1, "      arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
 			} else {
-				/* Arg is not pinned. So set its color to the color of the phi.
-				 * If the phi color is used by another proj of this perm
-				 * one must NOT swap the colors. Proof: Critical edges removed,
-				 * livein(PhiBl) = liveout(ArgBl), if all phis are processed then
-				 * every color is used exactly once.
-				 */
-				DBG((dbg, LEVEL_1, "      just set color\n"));
+				/*
+					No other phi has the same color (else arg would have been pinned),
+					so just set the register and pin
+				*/
 				set_reg(arg, phi_reg);
+				pin_irn(arg, phi_block);
+				DBG((dbg, LEVEL_1, "      arg is not pinned: so pin %+F(%s)\n", arg, get_reg(arg)->name));
 			}
 		}
-
-		/* Now the color of the arg (arg may be a dupl now) and the phi-result are equal.
-		 * Pin it, so everyone knows and it never gets changed again.
-		 * An arg never is a phi, because perms were inserted. So the link field is free */
-		DBG((dbg, LEVEL_1, "      arg has correct color (now), so pin it\n"));
-		pin_irn(arg, phi_block);
 	}
 }
 
+void be_ssa_destruction(be_chordal_env_t *chordal_env) {
+	pmap *perm_map = pmap_create();
+	ir_graph *irg  = chordal_env->irg;
+	insert_all_perms_env_t insert_perms_env;
 
-static void insert_all_perms(be_main_session_env_t *session, be_chordal_env_t *chordal_env) {
-	pmap_entry *pme;
-	int i, max;
-	ir_node *first_phi, *recent_phi;
+	FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
+
+	be_assure_liveness(chordal_env->birg);
+
+	/* create a map for fast lookup of perms: block --> perm */
+	irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
 
 	DBG((dbg, LEVEL_1, "Placing perms...\n"));
+	insert_perms_env.chordal_env = chordal_env;
+	insert_perms_env.perm_map = perm_map;
+	irg_block_walk_graph(irg, insert_all_perms_walker, NULL, &insert_perms_env);
 
-	/* place perms in cf-preds of phis */
-	pmap_foreach(chordal_env->border_heads, pme) {
-		border_t *curr;
-		struct list_head *head = pme->value;
-
-		first_phi = NULL;
-		/* iterate over the first ops in the block until a non-phi is reached */
-		list_for_each_entry(border_t, curr, head, list) {
-			ir_node *phi = curr->irn;
-
-			if (curr->is_def && curr->is_real && is_Phi(phi)) {
-				set_irn_link(phi, NULL);
-				/* chain of phis in a block */
-				if (first_phi == NULL)
-					first_phi = phi;
-				else
-					set_irn_link(recent_phi, phi);
-				recent_phi = phi;
-
-				/* insert perms */
-				DBG((dbg, LEVEL_1, "  for %+F\n", phi));
-				for(i=0, max=get_irn_arity(phi); i<max; ++i) {
-					ir_node *perm;
-
-					perm = get_or_insert_perm(session, chordal_env, get_Block_cfgpred_block(get_nodes_block(phi), i));
-					DBG((dbg, LEVEL_1, "    %+F in block %N\n", perm, get_Block_cfgpred_block(get_nodes_block(phi), i)));
-					set_irn_link(perm, NULL);
-				}
-			}
-		}
-		if (first_phi)
-			set_irn_link(recent_phi, first_phi);
-	}
-}
+	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
+		be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched);
 
-static void	set_regs_or_place_dupls(be_main_session_env_t *session, be_chordal_env_t *chordal_env) {
-	pmap_entry *pme;
+	// Matze: really needed here?
+	be_invalidate_liveness(chordal_env->birg);
+	be_assure_liveness(chordal_env->birg);
 
 	DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
+	irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
 
-	/* iterate over all blocks and correct color of arguments*/
-	pmap_foreach(chordal_env->border_heads, pme) {
-		border_t *curr;
-		struct list_head *head = pme->value;
+	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
+		be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched);
 
-		/* iterate over the first ops in the block until a non-phi is reached */
-		list_for_each_entry(border_t, curr, head, list)
-			if (curr->is_def && curr->is_real && is_Phi(curr->irn))
-				adjust_phi_arguments(session, chordal_env, curr->irn);
-	}
+	pmap_destroy(perm_map);
 }
 
-void be_ssa_destruction(be_main_session_env_t *session, be_chordal_env_t *chordal_env) {
-	set *b2p;
-
-	dbg = firm_dbg_register("ir.be.ssadestr");
-	firm_dbg_set_mask(dbg, DEBUG_LVL);
-
-	/* create a map for fast lookup of perms: block --> perm */
-	b2p = new_set(set_cmp_b2p, 32);
-	chordal_env->data = b2p;
+static void ssa_destruction_check_walker(ir_node *bl, void *data) {
+	be_chordal_env_t *chordal_env = data;
+	ir_node *phi;
+	int i, max;
 
-	insert_all_perms(session, chordal_env);
-	dump_ir_block_graph(session->irg, "-ssa_destr_perms_placed");
+	for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+		const arch_register_t *phi_reg, *arg_reg;
 
-	set_regs_or_place_dupls(session, chordal_env);
-	dump_ir_block_graph(session->irg, "-ssa_destr_regs_set");
+		phi_reg = get_reg(phi);
+		/* iterate over all args of phi */
+		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
+			ir_node *arg = get_irn_n(phi, i);
 
-	del_set(b2p);
-}
+			arg_reg = get_reg(arg);
 
-void be_ssa_destruction_check(be_main_session_env_t *session, be_chordal_env_t *chordal_env) {
-	pmap_entry *pme;
-	int i, max;
+			if (phi_reg != arg_reg) {
+				DBG((dbg, 0, "Error: Registers of %+F and %+F differ: %s %s\n", phi, arg, phi_reg->name, arg_reg->name));
+				assert(0);
+			}
 
-	/* iterate over all blocks */
-	pmap_foreach(chordal_env->border_heads, pme) {
-		border_t *curr;
-		struct list_head *head = pme->value;
-
-		/* iterate over the first ops in the block */
-		list_for_each_entry(border_t, curr, head, list)
-			if (curr->is_def && curr->is_real && is_Phi(curr->irn)) {
-				const arch_register_t *phi_reg, *arg_reg;
-				ir_node *phi = curr->irn;
-
-				phi_reg = get_reg(phi);
-				/* iterate over all args of phi */
-				for(i=0, max=get_irn_arity(phi); i<max; ++i) {
-					ir_node *arg = get_irn_n(phi, i);
-					arg_reg = get_reg(arg);
-					if(phi_reg != arg_reg) {
-						ir_printf("Registers of %+F and %+F differ: %s %s\n", phi, arg, phi_reg->name, arg_reg->name);
-						assert(0 && "Registers of phi and arg differ\n");
-					}
-					if(!is_pinned(arg))
-						ir_printf("Warning: Arg %+F not pinned\n", arg);
-				}
+			if (! is_pinned(arg)) {
+				DBG((dbg, 0, "Warning: Phi argument %+F is not pinned.\n", arg));
+				assert(0);
 			}
+		}
 	}
 }
+
+void be_ssa_destruction_check(be_chordal_env_t *chordal_env) {
+	irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, chordal_env);
+}