X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=8719cb2c93de99d277fe213f776a4fe8f1d00d59;hb=b46c894cf05a8c569d404ba0ef92c384d76e34d6;hp=079a3be510316d489934493ecd6ee6f2ed7b0ead;hpb=152a8f1c6542fa3f0d83058efe1e8767f0dd0319;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 079a3be51..8719cb2c9 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -1,18 +1,24 @@
 /**
- * Author:      Daniel Grund
+ * Author:      Daniel Grund, Sebastian Hack
  * Date:		29.09.2005
  * Copyright:   (c) Universitaet Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "pset.h"
 #include "irnode_t.h"
 #include "ircons_t.h"
+#include "iredges_t.h"
 #include "debug.h"
+#include "irgwalk.h"
 
 #include "besched.h"
 #include "bespill.h"
 #include "benode_t.h"
+#include "bechordal_t.h"
 
 typedef struct _reloader_t reloader_t;
 typedef struct _spill_info_t spill_info_t;
@@ -36,10 +42,13 @@ typedef struct _spill_ctx_t {
 struct _spill_env_t {
 	firm_dbg_module_t *dbg;
 	const arch_register_class_t *cls;
-	const be_main_session_env_t *session;
+	const be_chordal_env_t *chordal_env;
 	struct obstack obst;
 	set *spill_ctxs;
-	set *spills;		/**< all spill_info_t's, which must be placed */
+	set *spills;				/**< all spill_info_t's, which must be placed */
+	pset *mem_phis;				/**< set of all special spilled phis. allocated and freed seperately */
+	decide_irn_t is_mem_phi;	/**< callback func to decide if a phi needs special spilling */
+	void *data;					/**< data passed to all callbacks */
 };
 
 static int cmp_spillctx(const void *a, const void *b, size_t n) {
@@ -54,23 +63,23 @@ static int cmp_spillinfo(const void *x, const void *y, size_t size) {
 	return ! (xx->spilled_node == yy->spilled_node);
 }
 
-spill_env_t *be_new_spill_env(
-		firm_dbg_module_t *dbg,
-		const be_main_session_env_t *session,
-		const arch_register_class_t *cls)
-{
+spill_env_t *be_new_spill_env(firm_dbg_module_t *dbg,
+							  const be_chordal_env_t *chordal_env,
+							  decide_irn_t is_mem_phi, void *data) {
+
 	spill_env_t *env = malloc(sizeof(env[0]));
-	env->spill_ctxs = new_set(cmp_spillctx, 1024);
-	env->spills     = new_set(cmp_spillinfo, 1024);
-	env->session    = session;
-	env->cls        = cls;
-	env->dbg        = dbg;
+	env->spill_ctxs  = new_set(cmp_spillctx, 1024);
+	env->spills      = new_set(cmp_spillinfo, 1024);
+	env->cls         = chordal_env->cls;
+	env->dbg         = dbg;
+	env->is_mem_phi  = is_mem_phi;
+	env->data        = data;
+	env->chordal_env = chordal_env;
 	obstack_init(&env->obst);
 	return env;
 }
 
-void be_delete_spill_env(spill_env_t *senv)
-{
+void be_delete_spill_env(spill_env_t *senv) {
 	del_set(senv->spill_ctxs);
 	del_set(senv->spills);
 	obstack_free(&senv->obst, NULL);
@@ -89,12 +98,12 @@ static spill_ctx_t *be_get_spill_ctx(set *sc, ir_node *to_spill, ir_node *ctx_ir
 
 static ir_node *be_spill_irn(spill_env_t *senv, ir_node *irn, ir_node *ctx_irn) {
 	spill_ctx_t *ctx;
-//	DBG((dbg, DBG_SPILL, "spill_irn %+F\n", irn));
+	DBG((senv->dbg, LEVEL_1, "%+F in ctx %+F\n", irn, ctx_irn));
 
 	ctx = be_get_spill_ctx(senv->spill_ctxs, irn, ctx_irn);
 	if(!ctx->spill) {
-		const be_main_env_t *env = senv->session->main_env;
-		ctx->spill = be_spill(env->node_factory, env->arch_env, irn);
+		const be_main_env_t *env = senv->chordal_env->main_env;
+		ctx->spill = be_spill(env->node_factory, env->arch_env, irn, ctx_irn);
 	}
 
 	return ctx->spill;
@@ -106,15 +115,14 @@ static ir_node *be_spill_irn(spill_env_t *senv, ir_node *irn, ir_node *ctx_irn)
  * Thus we spill it and all its operands to the same spill slot.
  * Therefore the phi/dataB becomes a phi/Memory
  */
-static ir_node *be_spill_phi(spill_env_t *senv, ir_node *phi, ir_node *ctx_irn,
-		pset *mem_phis) {
+static ir_node *be_spill_phi(spill_env_t *senv, ir_node *phi, ir_node *ctx_irn) {
 	int i, n = get_irn_arity(phi);
 	ir_node **ins, *bl = get_nodes_block(phi);
-	ir_graph *irg = senv->session->irg;
+	ir_graph *irg = senv->chordal_env->irg;
 	spill_ctx_t *ctx;
 
 	assert(is_Phi(phi));
-//	DBG((dbg, DBG_SPILL, "spill_phi %+F\n", phi));
+	DBG((senv->dbg, LEVEL_1, "%+F in ctx %+F\n", phi, ctx_irn));
 
 	/* search an existing spill for this context */
 	ctx = be_get_spill_ctx(senv->spill_ctxs, phi, ctx_irn);
@@ -125,7 +133,7 @@ static ir_node *be_spill_phi(spill_env_t *senv, ir_node *phi, ir_node *ctx_irn,
 		ins  = malloc(n * sizeof(ins[0]));
 		for(i=0; i<n; ++i)
 			ins[i] = new_r_Unknown(irg, mode_M);
-		ctx->spill = new_r_Phi(senv->session->irg, bl, n, ins, mode_M);
+		ctx->spill = new_r_Phi(senv->chordal_env->irg, bl, n, ins, mode_M);
 		free(ins);
 
 		/* re-wire the phiM */
@@ -133,8 +141,8 @@ static ir_node *be_spill_phi(spill_env_t *senv, ir_node *phi, ir_node *ctx_irn,
 			ir_node *arg = get_irn_n(phi, i);
 			ir_node *sub_res;
 
-			if(is_Phi(arg) && pset_find_ptr(mem_phis, arg))
-				sub_res = be_spill_phi(senv, arg, ctx_irn, mem_phis);
+			if(is_Phi(arg) && pset_find_ptr(senv->mem_phis, arg))
+				sub_res = be_spill_phi(senv, arg, ctx_irn);
 			else
 				sub_res = be_spill_irn(senv, arg, ctx_irn);
 
@@ -144,26 +152,58 @@ static ir_node *be_spill_phi(spill_env_t *senv, ir_node *phi, ir_node *ctx_irn,
 	return ctx->spill;
 }
 
-ir_node *be_spill_node(spill_env_t *senv, ir_node *to_spill, pset *mem_phis) {
+static ir_node *be_spill_node(spill_env_t *senv, ir_node *to_spill) {
 	ir_node *res;
-	if (pset_find_ptr(mem_phis, to_spill))
-		res = be_spill_phi(senv, to_spill, to_spill, mem_phis);
+	if (pset_find_ptr(senv->mem_phis, to_spill))
+		res = be_spill_phi(senv, to_spill, to_spill);
 	else
 		res = be_spill_irn(senv, to_spill, to_spill);
 
 	return res;
 }
 
-void be_insert_spills_reloads(spill_env_t *senv, pset *mem_phis, pset *reload_set)
-{
-	ir_graph *irg = senv->session->irg;
+static void phi_walker(ir_node *irn, void *env) {
+	spill_env_t *senv = env;
+	const arch_env_t *arch = senv->chordal_env->main_env->arch_env;
+
+	if (is_Phi(irn) && arch_irn_has_reg_class(arch, irn, 0, senv->cls)
+			&& senv->is_mem_phi(irn, senv->data)) {
+		DBG((senv->dbg, LEVEL_1, "  %+F\n", irn));
+		pset_insert_ptr(senv->mem_phis, irn);
+	}
+}
+
+void be_insert_spills_reloads(spill_env_t *senv, pset *reload_set) {
+	ir_graph *irg = senv->chordal_env->irg;
 	ir_node *irn;
 	spill_info_t *si;
 	struct obstack ob;
 
 	obstack_init(&ob);
 
+	/* get all special spilled phis */
+	DBG((senv->dbg, LEVEL_1, "Mem-phis:\n"));
+	senv->mem_phis = pset_new_ptr_default();
+	irg_walk_graph(senv->chordal_env->irg, phi_walker, NULL, senv);
+
+	/* Add reloads for mem_phis */
+	/* BETTER: These reloads (1) should only be inserted, if they are really needed */
+	DBG((senv->dbg, LEVEL_1, "Reloads for mem-phis:\n"));
+	for(irn = pset_first(senv->mem_phis); irn; irn = pset_next(senv->mem_phis)) {
+		const ir_edge_t *e;
+		DBG((senv->dbg, LEVEL_1, " Mem-phi %+F\n", irn));
+		foreach_out_edge(irn, e) {
+			ir_node *user = e->src;
+			if (is_Phi(user) && !pset_find_ptr(senv->mem_phis, user)) {
+					ir_node *use_bl = get_nodes_block(user);
+					DBG((senv->dbg, LEVEL_1, " non-mem-phi user %+F\n", user));
+					be_add_reload_on_edge(senv, irn, use_bl, e->pos); /* (1) */
+			}
+		}
+	}
+
 	/* process each spilled node */
+	DBG((senv->dbg, LEVEL_1, "Insert spills and reloads:\n"));
 	for(si = set_first(senv->spills); si; si = set_next(senv->spills)) {
 		reloader_t *rld;
 		ir_node **reloads;
@@ -173,15 +213,14 @@ void be_insert_spills_reloads(spill_env_t *senv, pset *mem_phis, pset *reload_se
 		/* go through all reloads for this spill */
 		for(rld = si->reloaders; rld; rld = rld->next) {
 			/* the spill for this reloader */
-			ir_node *spill   = be_spill_node(senv, si->spilled_node, mem_phis);
+			ir_node *spill   = be_spill_node(senv, si->spilled_node);
 
 			/* the reload */
 			ir_node *bl      = is_Block(rld->reloader) ? rld->reloader : get_nodes_block(rld->reloader);
-			ir_node *reload  = new_Reload(senv->session->main_env->node_factory,
-														senv->cls, irg, bl, mode, spill);
+			ir_node *reload  = new_Reload(senv->chordal_env->main_env->node_factory,
+				senv->cls, irg, bl, mode, spill);
 
-			DBG((senv->dbg, LEVEL_2, " RELOADER %+F   Reload %+F of %+F\n",
-						rld->reloader, reload, si->spilled_node));
+			DBG((senv->dbg, LEVEL_1, " %+F of %+F before %+F\n", reload, si->spilled_node, rld->reloader));
 			if(reload_set)
 				pset_insert_ptr(reload_set, reload);
 
@@ -193,23 +232,24 @@ void be_insert_spills_reloads(spill_env_t *senv, pset *mem_phis, pset *reload_se
 
 		assert(n_reloads > 0);
 		reloads = obstack_finish(&ob);
-		be_introduce_copies_ignore(senv->session->dom_front, si->spilled_node,
-				n_reloads, reloads, mem_phis);
+		be_introduce_copies_ignore(senv->chordal_env->dom_front, si->spilled_node,
+				n_reloads, reloads, senv->mem_phis);
 		obstack_free(&ob, reloads);
 	}
 
 	obstack_free(&ob, NULL);
 
-	for(irn = pset_first(mem_phis); irn; irn = pset_next(mem_phis)) {
+	for(irn = pset_first(senv->mem_phis); irn; irn = pset_next(senv->mem_phis)) {
 		int i, n;
 		for(i = 0, n = get_irn_arity(irn); i < n; ++i)
-			set_irn_n(irn, i, new_r_Bad(senv->session->irg));
+			set_irn_n(irn, i, new_r_Bad(senv->chordal_env->irg));
 		sched_remove(irn);
 	}
+
+	del_pset(senv->mem_phis);
 }
 
-void be_add_spill(spill_env_t *senv, ir_node *to_spill, ir_node *before)
-{
+void be_add_reload(spill_env_t *senv, ir_node *to_spill, ir_node *before) {
 	spill_info_t templ, *res;
 	reloader_t *rel;
 
@@ -223,9 +263,7 @@ void be_add_spill(spill_env_t *senv, ir_node *to_spill, ir_node *before)
 	res->reloaders = rel;
 }
 
-void be_add_spill_on_edge(spill_env_t *senv, ir_node *to_spill, ir_node *bl, int pos)
-{
-	ir_node *insert_bl = get_irn_arity(bl) == 1
-		? sched_first(bl) : get_Block_cfgpred_block(bl, pos);
-	be_add_spill(senv, to_spill, insert_bl);
+void be_add_reload_on_edge(spill_env_t *senv, ir_node *to_spill, ir_node *bl, int pos) {
+	ir_node *insert_bl = get_irn_arity(bl) == 1 ? sched_first(bl) : get_Block_cfgpred_block(bl, pos);
+	be_add_reload(senv, to_spill, insert_bl);
 }