X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=62ffddc972fcd379fa5adf9c253982192d460784;hb=895edce679ee6434eb0c4f8b976e3f668bf2d48b;hp=2dae0bc96363814bfa747c0a48e642e027c1296b;hpb=bb77d0c78d7c6b6ce21e0212ca30b322bd11c0ce;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 2dae0bc96..62ffddc97 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -1,9 +1,10 @@
-/*
- * Author:      Daniel Grund, Sebastian Hack, Matthias Braun
- * Date:		29.09.2005
+/**
+ * @file
+ * @author      Daniel Grund, Sebastian Hack, Matthias Braun
+ * @date		29.09.2005
+ * @version     $Id$
  * Copyright:   (c) Universitaet Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- * CVS-Id:      $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -24,8 +25,8 @@
 #include "irgwalk.h"
 #include "array.h"
 #include "pdeq.h"
-#include "unionfind.h"
 #include "execfreq.h"
+#include "irnodeset.h"
 
 #include "belive_t.h"
 #include "besched_t.h"
@@ -37,6 +38,7 @@
 #include "benodesets.h"
 #include "bespilloptions.h"
 #include "bestatevent.h"
+#include "beirgmod.h"
 
 // only rematerialise when costs are less than REMAT_COST_LIMIT
 // TODO determine a good value here...
@@ -75,7 +77,7 @@ struct _spill_env_t {
 	int spill_cost;     /**< the cost of a single spill node */
 	int reload_cost;    /**< the cost of a reload node */
 	set *spills;        /**< all spill_info_t's, which must be placed */
-	pset *mem_phis;     /**< set of all special spilled phis. allocated and freed separately */
+	ir_nodeset_t mem_phis;     /**< set of all special spilled phis. allocated and freed separately */
 
 	DEBUG_ONLY(firm_dbg_module_t *dbg;)
 };
@@ -123,12 +125,12 @@ static spill_info_t *get_spillinfo(const spill_env_t *env, ir_node *value) {
 	return res;
 }
 
-DEBUG_ONLY(
+#ifdef DEBUG_libfirm
 /* Sets the debug module of a spill environment. */
 void be_set_spill_env_dbg_module(spill_env_t *env, firm_dbg_module_t *dbg) {
 	env->dbg = dbg;
 }
-)
+#endif
 
 /* Creates a new spill environment. */
 spill_env_t *be_new_spill_env(be_irg_t *birg) {
@@ -137,7 +139,7 @@ spill_env_t *be_new_spill_env(be_irg_t *birg) {
 	env->irg            = be_get_birg_irg(birg);
 	env->birg           = birg;
 	env->arch_env       = birg->main_env->arch_env;
-	env->mem_phis		= pset_new_ptr_default();
+	ir_nodeset_init(&env->mem_phis);
 	// TODO, ask backend about costs..., or even ask backend whether we should
 	// rematerialize...
 	env->spill_cost     = 8;
@@ -149,7 +151,7 @@ spill_env_t *be_new_spill_env(be_irg_t *birg) {
 /* Deletes a spill environment. */
 void be_delete_spill_env(spill_env_t *env) {
 	del_set(env->spills);
-	del_pset(env->mem_phis);
+	ir_nodeset_destroy(&env->mem_phis);
 	obstack_free(&env->obst, NULL);
 	free(env);
 }
@@ -250,12 +252,9 @@ static ir_node *get_reload_insertion_point(ir_node *block, int pos) {
 	}
 
 	if(!is_cfop(last)) {
-		ir_graph *irg = get_irn_irg(block);
-		ir_node *startblock = get_irg_start_block(irg);
-
 		last = sched_next(last);
 		// last node must be a cfop, only exception is the start block
-		assert(last	== startblock);
+		assert(last	== get_irg_start_block(get_irn_irg(block)));
 	}
 
 	// add the reload before the (cond-)jump
@@ -275,7 +274,7 @@ void be_spill_phi(spill_env_t *env, ir_node *node) {
 
 	assert(is_Phi(node));
 
-	pset_insert_ptr(env->mem_phis, node);
+	ir_nodeset_insert(&env->mem_phis, node);
 
 	// create spillinfos for the phi arguments
 	spill = get_spillinfo(env, node);
@@ -331,9 +330,10 @@ static void sched_add_after_insn(ir_node *sched_after, ir_node *node) {
  * @return a be_Spill node
  */
 static void spill_irn(spill_env_t *env, spill_info_t *spillinfo) {
-	ir_node *to_spill = spillinfo->spilled_node;
+	optimization_state_t opt;
+	ir_node              *to_spill = spillinfo->spilled_node;
 
-	DBG((env->dbg, LEVEL_1, "%+F\n", to_spill));
+	DBG((env->dbg, LEVEL_1, "spilling %+F ... ", to_spill));
 
 	/* Trying to spill an already spilled value, no need for a new spill
 	 * node then, we can simply connect to the same one for this reload
@@ -341,8 +341,9 @@ static void spill_irn(spill_env_t *env, spill_info_t *spillinfo) {
 	 * (although rematerialization code should handle most of these cases
 	 * this can still happen when spilling Phis)
 	 */
-	if(be_is_Reload(to_spill)) {
+	if (be_is_Reload(to_spill)) {
 		spillinfo->spill = get_irn_n(to_spill, be_pos_Reload_mem);
+		DB((env->dbg, LEVEL_1, "skip reload, using existing spill %+F\n", spillinfo->spill));
 		return;
 	}
 
@@ -350,8 +351,22 @@ static void spill_irn(spill_env_t *env, spill_info_t *spillinfo) {
 		assert(0 && "Attempt to spill a node marked 'dont_spill'");
 	}
 
+	/*
+		We switch on optimizations here to get CSE. This is needed as some backends
+		have some extra spill phases and we want to make use of those spills instead
+		of creating new ones.
+	*/
+	save_optimization_state(&opt);
+	set_optimize(1);
 	spillinfo->spill = be_spill(env->arch_env, to_spill);
-	sched_add_after_insn(to_spill, spillinfo->spill);
+	restore_optimization_state(&opt);
+	if (! sched_is_scheduled(spillinfo->spill)) {
+		DB((env->dbg, LEVEL_1, "add spill %+F after %+F\n", spillinfo->spill, to_spill));
+		sched_add_after_insn(to_spill, spillinfo->spill);
+	}
+	else {
+		DB((env->dbg, LEVEL_1, "re-using spill %+F after %+F\n", spillinfo->spill, to_spill));
+	}
 }
 
 static void spill_node(spill_env_t *env, spill_info_t *spillinfo);
@@ -375,6 +390,7 @@ static void spill_phi(spill_env_t *env, spill_info_t *spillinfo) {
 
 	assert(is_Phi(phi));
 
+	DBG((env->dbg, LEVEL_1, "spilling Phi %+F:\n", phi));
 	/* build a new PhiM */
 	ins = alloca(sizeof(ir_node*) * arity);
 	for(i = 0; i < arity; ++i) {
@@ -390,17 +406,25 @@ static void spill_phi(spill_env_t *env, spill_info_t *spillinfo) {
 
 		set_irn_n(spillinfo->spill, i, arg_info->spill);
 	}
+	DBG((env->dbg, LEVEL_1, "... done spilling Phi %+F\n", phi));
 
 	// rewire reloads from old_spill to phi
-	if(spillinfo->old_spill != NULL) {
+	if (spillinfo->old_spill != NULL) {
 		const ir_edge_t *edge, *next;
 		ir_node *old_spill = spillinfo->old_spill;
 
+		DBG((env->dbg, LEVEL_1, "old spill found, rewiring reloads:\n"));
+
 		foreach_out_edge_safe(old_spill, edge, next) {
-			ir_node* reload = get_edge_src_irn(edge);
+			ir_node *reload = get_edge_src_irn(edge);
+			int     pos     = get_edge_src_pos(edge);
+
+			DBG((env->dbg, LEVEL_1, "\tset input %d of %+F to %+F\n", pos, reload, spillinfo->spill));
+
 			assert(be_is_Reload(reload) || is_Phi(reload));
-			set_irn_n(reload, get_edge_src_pos(edge), spillinfo->spill);
+			set_irn_n(reload, pos, spillinfo->spill);
 		}
+		DBG((env->dbg, LEVEL_1, "\tset input of %+F to BAD\n", old_spill));
 		set_irn_n(old_spill, be_pos_Spill_val, new_Bad());
 		//sched_remove(old_spill);
 		spillinfo->old_spill = NULL;
@@ -421,7 +445,8 @@ static void spill_node(spill_env_t *env, spill_info_t *spillinfo) {
 		return;
 
 	to_spill = spillinfo->spilled_node;
-	if (is_Phi(to_spill) && pset_find_ptr(env->mem_phis, spillinfo->spilled_node)) {
+	assert(sched_is_scheduled(to_spill) && "Node to be spilled must be scheduled!");
+	if (is_Phi(to_spill) && ir_nodeset_contains(&env->mem_phis, to_spill)) {
 		spill_phi(env, spillinfo);
 	} else {
 		spill_irn(env, spillinfo);
@@ -651,29 +676,38 @@ void be_insert_spills_reloads(spill_env_t *env) {
 	int              reloads   = 0;
 	int              spills    = 0;
 	spill_info_t     *si;
+	ir_nodeset_iterator_t iter;
+	ir_node          *node;
+
+	/* create all phi-ms first, this is needed so, that phis, hanging on
+	   spilled phis work correctly */
+	foreach_ir_nodeset(&env->mem_phis, node, iter) {
+		spill_info_t *info = get_spillinfo(env, node);
+		spill_phi(env, info);
+	}
 
 	/* process each spilled node */
 	for (si = set_first(env->spills); si; si = set_next(env->spills)) {
 		reloader_t *rld;
-		ir_mode    *mode   = get_irn_mode(si->spilled_node);
-		pset       *values = pset_new_ptr(16);
+		ir_node *spilled_node = si->spilled_node;
+		ir_mode         *mode = get_irn_mode(spilled_node);
+		ir_node      **copies = NEW_ARR_F(ir_node*, 0);
 
-		DBG((env->dbg, LEVEL_1, "\nhandling all reloaders of %+F:\n", si->spilled_node));
+		DBG((env->dbg, LEVEL_1, "\nhandling all reloaders of %+F:\n", spilled_node));
 
 		/* go through all reloads for this spill */
 		for (rld = si->reloaders; rld; rld = rld->next) {
-			ir_node *new_val;
+			ir_node *copy; /* a reaload is a "copy" of the original value */
 
 			if (rld->rematted_node != NULL) {
-				new_val = rld->rematted_node;
+				copy = rld->rematted_node;
 				remats++;
-				sched_add_before(rld->reloader, new_val);
-			}
-			else if (be_do_remats && rld->allow_remat && check_remat_conditions(env, si->spilled_node, rld->reloader)) {
-				new_val = do_remat(env, si->spilled_node, rld->reloader);
+				sched_add_before(rld->reloader, copy);
+			} else if (be_do_remats && rld->allow_remat &&
+					check_remat_conditions(env, spilled_node, rld->reloader)) {
+				copy = do_remat(env, spilled_node, rld->reloader);
 				remats++;
-			}
-			else {
+			} else {
 				/* make sure we have a spill */
 				if (si->spill == NULL) {
 					spill_node(env, si);
@@ -681,22 +715,29 @@ void be_insert_spills_reloads(spill_env_t *env) {
 				}
 
 				/* create a reload */
-				new_val = be_reload(arch_env, si->reload_cls, rld->reloader, mode, si->spill);
+				copy = be_reload(arch_env, si->reload_cls, rld->reloader, mode, si->spill);
 				reloads++;
 			}
 
-			DBG((env->dbg, LEVEL_1, " %+F of %+F before %+F\n", new_val, si->spilled_node, rld->reloader));
-			pset_insert_ptr(values, new_val);
+			DBG((env->dbg, LEVEL_1, " %+F of %+F before %+F\n",
+			     copy, spilled_node, rld->reloader));
+			ARR_APP1(ir_node*, copies, copy);
 		}
 
-		if (pset_count(values) > 0) {
-			/* introduce copies, rewire the uses */
-			pset_insert_ptr(values, si->spilled_node);
-			be_ssa_constr_set_ignore(env->birg->dom_front, env->birg->lv, values, env->mem_phis);
+		/* if we had any reloads or remats, then we need to reconstruct the
+		 * SSA form for the spilled value */
+		if (ARR_LEN(copies) > 0) {
+			/* Matze: used mem_phis as ignore uses in the past, I don't see how
+			   one of the mem_phis can be a use of the spilled value...
+			   so I changed this to NULL now */
+			be_ssa_construction(
+					be_get_birg_dom_front(env->birg),
+					be_get_birg_liveness(env->birg),
+					spilled_node, ARR_LEN(copies), copies,
+					NULL, 0);
 		}
 
-		del_pset(values);
-
+		DEL_ARR_F(copies);
 		si->reloaders = NULL;
 	}
 
@@ -709,6 +750,7 @@ void be_insert_spills_reloads(spill_env_t *env) {
 #endif /* FIRM_STATISTICS */
 
 	be_remove_dead_nodes_from_schedule(env->irg);
-	//be_liveness_recompute(env->birg->lv);
+	/* Matze: In theory be_ssa_construction should take care of the livenes...
+	 * try to disable this again in the future */
 	be_invalidate_liveness(env->birg);
 }