X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=2a6124dbab8d74d45cdebfd7af7331337774a60f;hb=a2dc796648be8a0e8c85d6488e5ab5a790c218a9;hp=55878bb11705c3094b1f5ae4a897cde47c47064d;hpb=07dda083afb68025db61c8278f430e0044e83977;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 55878bb11..2a6124dba 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -1,10 +1,28 @@
-/**
- * Author:      Daniel Grund
- * Date:		25.05.2005
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
  *
- * Performs SSA-Destruction.
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       Performs SSA-Destruction.
+ * @author      Daniel Grund
+ * @date        25.05.2005
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -24,12 +42,14 @@
 #include "be_t.h"
 #include "beutil.h"
 #include "bechordal_t.h"
-#include "bearch.h"
+#include "bearch_t.h"
 #include "belive_t.h"
 #include "benode_t.h"
 #include "besched_t.h"
 #include "benodesets.h"
 #include "bestatevent.h"
+#include "beirg_t.h"
+#include "beintlive_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -42,6 +62,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 #define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
 
 static void clear_link(ir_node *irn, void *data) {
+	(void) data;
 	set_irn_link(irn, NULL);
 }
 
@@ -53,7 +74,7 @@ static void clear_link(ir_node *irn, void *data) {
  */
 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)) {
+	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);
@@ -76,16 +97,25 @@ typedef struct {
 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;
+	(void) 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));
@@ -113,6 +143,9 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			ir_node *arg     = get_irn_n(phi, i);
 			unsigned hash    = nodeset_hash(arg);
 
+			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+				continue;
+
 			templ.arg  = arg;
 			pp         = set_find(arg_set, &templ, sizeof(templ), hash);
 
@@ -123,7 +156,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);
 			}
@@ -142,7 +175,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			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);
 
@@ -157,7 +189,9 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 				pp->proj = proj;
 				assert(get_reg(pp->arg));
 				set_reg(proj, get_reg(pp->arg));
+#ifdef SCHEDULE_PROJS
 				sched_add_after(insert_after, proj);
+#endif
 				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));
 			}
@@ -172,9 +206,19 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 				pp        = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg));
 
 				/* If not found, it was an interfering argument */
-				if (pp)
+				if (pp) {
 					set_irn_n(phi, i, pp->proj);
+					be_liveness_introduce(lv, pp->proj);
+				}
+			}
+
+			/* update the liveness of the Perm's operands. It might be changed. */
+			{
+				int i;
+				for (i = 0; i < n_projs; ++i)
+					be_liveness_update(lv, in[i]);
 			}
+			free(in);
 
 			/* register in perm map */
 			pmap_insert(perm_map, pred_bl, perm);
@@ -194,6 +238,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 */
@@ -215,11 +260,14 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 			arg_block = get_Block_cfgpred_block(phi_block, i);
 			arg_reg   = get_reg(arg);
 
+			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+				continue;
+
 			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(chordal_env->lv, phi, arg)) {
+			if (values_interfere(chordal_env->birg, phi, arg)) {
 				/*
 					Insert a duplicate in arguments block,
 					make it the new phi arg,
@@ -246,6 +294,8 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 				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);
+				be_liveness_introduce(lv, dupl);
+				be_liveness_update(lv, arg);
 				DBG((dbg, LEVEL_1, "    they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
 				continue; /* with next argument */
 			}
@@ -318,6 +368,8 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 				for(ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins));
 				sched_add_before(ins, dupl);
 				pin_irn(dupl, phi_block);
+				be_liveness_introduce(lv, dupl);
+				be_liveness_update(lv, arg);
 				DBG((dbg, LEVEL_1, "      arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
 			} else {
 				/*
@@ -333,26 +385,39 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 }
 
 void be_ssa_destruction(be_chordal_env_t *chordal_env) {
+	insert_all_perms_env_t insert_perms_env;
 	pmap *perm_map = pmap_create();
 	ir_graph *irg  = chordal_env->irg;
+	be_lv_t *lv    = be_assure_liveness(chordal_env->birg);
 
 	FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
 
+	be_liveness_invalidate(lv);
+	be_liveness_assure_sets(lv);
+
 	/* 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);
+
+	// Matze: really needed here?
+	// Sebastian: Yes. the walker function uses interference.
+	be_liveness_invalidate(lv);
 
 	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);
+	be_liveness_assure_chk(lv);
 
 	DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
 	irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
 
+	/* TODO: unfortunaltely updating doesn't work yet. */
+	be_liveness_invalidate(lv);
+
 	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
 		be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched);
 
@@ -372,6 +437,9 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) {
 		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
 			ir_node *arg = get_irn_n(phi, i);
 
+			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+				continue;
+
 			arg_reg = get_reg(arg);
 
 			if (phi_reg != arg_reg) {