X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=39f4480b3441d21878dafab4b709475c62412a61;hb=3dc38f8f23569593c030b85e83ecd9174a95bc73;hp=26768f4ffeb4e19c1ab5e97e59a6bc6c52083432;hpb=839487dfb4a714fa7e66063495ade6a3726040ef;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 26768f4ff..39f4480b3 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -29,6 +29,7 @@
 #include "benode_t.h"
 #include "besched_t.h"
 #include "benodesets.h"
+#include "bestatevent.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -78,13 +79,20 @@ static int cmp_perm_proj(const void *a, const void *b, size_t n) {
 	return !(p->arg == q->arg);
 }
 
+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) {
-	be_chordal_env_t *chordal_env = data;
-	pmap *perm_map = chordal_env->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));
@@ -122,7 +130,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			 * 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(chordal_env->lv, bl, arg)) {
+			if(!pp && !be_is_live_in(lv, bl, arg)) {
 				templ.pos = n_projs++;
 				set_insert(arg_set, &templ, sizeof(templ), hash);
 			}
@@ -139,6 +147,8 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 				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);
@@ -191,6 +201,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
  */
 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 */
@@ -216,7 +227,7 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 
 			DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
 
-			if(values_interfere(chordal_env->lv, phi, arg)) {
+			if(values_interfere(lv, phi, arg)) {
 				/*
 					Insert a duplicate in arguments block,
 					make it the new phi arg,
@@ -332,20 +343,26 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 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;
 
 	FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
 
+	be_assure_liveness(chordal_env->birg);
+
 	/* create a map for fast lookup of perms: block --> perm */
-	chordal_env->data = perm_map;
 	irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
 
 	DBG((dbg, LEVEL_1, "Placing perms...\n"));
-	irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env);
+	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);
 
 	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
 		be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched);
 
-	be_liveness_recompute(chordal_env->lv);
+	// 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);