X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=ac99880bd8a69c67b2ca8198816fd8cf2ceb0e2f;hb=3516aec5685de4fd54436edb5fa3467e67c76776;hp=7b172be5495358b8a85ef8c9e0a6e0fb6eb949a1;hpb=1784d7abdbabb7b26bab3a49c1460499c1f4f5b9;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 7b172be54..ac99880bd 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -3,6 +3,7 @@
  * Date:		29.09.2005
  * Copyright:   (c) Universitaet Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * CVS-Id:      $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,8 +46,9 @@ typedef struct _reloader_t reloader_t;
 
 struct _reloader_t {
 	reloader_t *next;
-	ir_node *reloader;
-	ir_node *rematted_node;
+	ir_node    *reloader;
+	ir_node    *rematted_node;
+	int        allow_remat;     /**< the node may be rematted instead of reloaded if global remat option is on */
 };
 
 typedef struct _spill_info_t {
@@ -161,29 +163,34 @@ void be_delete_spill_env(spill_env_t *env) {
  *
  */
 
-void be_add_remat(spill_env_t *env, ir_node *to_spill, ir_node *before, ir_node *rematted_node, const arch_register_class_t *reload_cls) {
+void be_add_remat(spill_env_t *env, ir_node *to_spill, ir_node *before, ir_node *rematted_node) {
 	spill_info_t *spill_info;
 	reloader_t *reloader;
 
 	spill_info = get_spillinfo(env, to_spill);
 
-	reloader = obstack_alloc(&env->obst, sizeof(reloader[0]));
-	reloader->next = spill_info->reloaders;
-	reloader->reloader = before;
+	/* add the remat information */
+	reloader                = obstack_alloc(&env->obst, sizeof(reloader[0]));
+	reloader->next          = spill_info->reloaders;
+	reloader->reloader      = before;
 	reloader->rematted_node = rematted_node;
+	reloader->allow_remat   = 1;
 
-	spill_info->reloaders = reloader;
-	assert(spill_info->reload_cls == NULL || spill_info->reload_cls == reload_cls);
-	spill_info->reload_cls = reload_cls;
+	spill_info->reloaders  = reloader;
+
+	DBG((env->dbg, LEVEL_1, "creating spillinfo for %+F, will be rematerialized before %+F\n",
+		to_spill, before));
 }
 
-void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before, const arch_register_class_t *reload_cls) {
+void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before,
+		const arch_register_class_t *reload_cls, int allow_remat)
+{
 	spill_info_t *info;
 	reloader_t *rel;
 
 	info = get_spillinfo(env, to_spill);
 
-	if(is_Phi(to_spill)) {
+	if (is_Phi(to_spill)) {
 		int i, arity;
 
 		/* create spillinfos for the phi arguments */
@@ -198,7 +205,8 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before, const a
 		// spill node and adds a reload for that spill node, problem is the
 		// reload gets attach to that same spill (and is totally unnecessary)
 		if (info->old_spill != NULL &&
-			(before == info->old_spill || value_dominates(before, info->old_spill))) {
+			(before == info->old_spill || value_dominates(before, info->old_spill)))
+		{
 			printf("spilledphi hack was needed...\n");
 			before = sched_next(info->old_spill);
 		}
@@ -206,14 +214,18 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before, const a
 	}
 
 	/* put reload into list */
-	rel           = obstack_alloc(&env->obst, sizeof(rel[0]));
-	rel->next     = info->reloaders;
-	rel->reloader = before;
+	rel                = obstack_alloc(&env->obst, sizeof(rel[0]));
+	rel->next          = info->reloaders;
+	rel->reloader      = before;
 	rel->rematted_node = NULL;
+	rel->allow_remat   = allow_remat;
 
 	info->reloaders  = rel;
 	assert(info->reload_cls == NULL || info->reload_cls == reload_cls);
 	info->reload_cls = reload_cls;
+
+	DBG((env->dbg, LEVEL_1, "creating spillinfo for %+F, will be reloaded before %+F, may%s be rematerialized\n",
+		to_spill, before, allow_remat ? "" : " not"));
 }
 
 static ir_node *get_reload_insertion_point(ir_node *block, int pos) {
@@ -250,11 +262,11 @@ static ir_node *get_reload_insertion_point(ir_node *block, int pos) {
 	return last;
 }
 
-void be_add_reload_on_edge(spill_env_t *env, ir_node *to_spill,
-		ir_node *block, int pos, const arch_register_class_t *reload_cls)
+void be_add_reload_on_edge(spill_env_t *env, ir_node *to_spill, ir_node *block, int pos,
+		const arch_register_class_t *reload_cls, int allow_remat)
 {
 	ir_node *before = get_reload_insertion_point(block, pos);
-	be_add_reload(env, to_spill, before, reload_cls);
+	be_add_reload(env, to_spill, before, reload_cls, allow_remat);
 }
 
 void be_spill_phi(spill_env_t *env, ir_node *node) {
@@ -321,7 +333,7 @@ static void sched_add_after_insn(ir_node *sched_after, ir_node *node) {
 static void spill_irn(spill_env_t *env, spill_info_t *spillinfo) {
 	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
@@ -331,6 +343,7 @@ static void spill_irn(spill_env_t *env, spill_info_t *spillinfo) {
 	 */
 	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;
 	}
 
@@ -339,6 +352,7 @@ static void spill_irn(spill_env_t *env, spill_info_t *spillinfo) {
 	}
 
 	spillinfo->spill = be_spill(env->arch_env, to_spill);
+	DB((env->dbg, LEVEL_1, "add spill %+F after %+F\n", spillinfo->spill, to_spill));
 	sched_add_after_insn(to_spill, spillinfo->spill);
 }
 
@@ -363,6 +377,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) {
@@ -378,17 +393,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;
@@ -409,6 +432,7 @@ static void spill_node(spill_env_t *env, spill_info_t *spillinfo) {
 		return;
 
 	to_spill = spillinfo->spilled_node;
+	assert(sched_is_scheduled(to_spill) && "Node to be spilled must be scheduled!");
 	if (is_Phi(to_spill) && pset_find_ptr(env->mem_phis, spillinfo->spilled_node)) {
 		spill_phi(env, spillinfo);
 	} else {
@@ -593,7 +617,7 @@ static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader)
 	new_backedge_info(res);
 	sched_reset(res);
 
-	DBG((env->dbg, LEVEL_1, "Insert remat %+F before reloader %+F\n", res, reloader));
+	DBG((env->dbg, LEVEL_1, "Insert remat %+F of %+F before reloader %+F\n", res, spilled, reloader));
 
 	/* insert in schedule */
 	sched_add_before(reloader, res);
@@ -646,15 +670,18 @@ void be_insert_spills_reloads(spill_env_t *env) {
 		ir_mode    *mode   = get_irn_mode(si->spilled_node);
 		pset       *values = pset_new_ptr(16);
 
+		DBG((env->dbg, LEVEL_1, "\nhandling all reloaders of %+F:\n", si->spilled_node));
+
 		/* go through all reloads for this spill */
 		for (rld = si->reloaders; rld; rld = rld->next) {
 			ir_node *new_val;
 
-			if(rld->rematted_node != NULL) {
+			if (rld->rematted_node != NULL) {
 				new_val = rld->rematted_node;
 				remats++;
 				sched_add_before(rld->reloader, new_val);
-			} else if (be_do_remats && check_remat_conditions(env, si->spilled_node, rld->reloader)) {
+			}
+			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);
 				remats++;
 			}