X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=c2a1b6fdc9b5c32b38deb49afe089042ed4fd222;hb=482b61870b54c36cdc78dfee6ee144135319aa93;hp=4d6c9a5cf64ba331b70909618feb30475dd1c9ea;hpb=3916645b99cd2cd4d288ffccfa73fb0a184e8419;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 4d6c9a5cf..c2a1b6fdc 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -34,6 +34,8 @@
 #include "bechordal_t.h"
 #include "bejavacoal.h"
 #include "benodesets.h"
+#include "bespilloptions.h"
+#include "bestatevent.h"
 
 // only rematerialise when costs are less than REMAT_COST_LIMIT
 // TODO determine a good value here...
@@ -64,6 +66,7 @@ struct _spill_env_t {
 	const arch_env_t *arch_env;
 	const be_chordal_env_t *chordal_env;
 	struct obstack obst;
+	be_irg_t *birg;
 	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 */
@@ -127,6 +130,7 @@ spill_env_t *be_new_spill_env(const be_chordal_env_t *chordal_env) {
 	env->spills			= new_set(cmp_spillinfo, 1024);
 	env->cls			= chordal_env->cls;
 	env->chordal_env	= chordal_env;
+	env->birg           = chordal_env->birg;
 	env->arch_env       = env->chordal_env->birg->main_env->arch_env;
 	env->mem_phis		= pset_new_ptr_default();
 	// TODO, ask backend about costs...
@@ -144,7 +148,7 @@ void be_delete_spill_env(spill_env_t *env) {
 	free(env);
 }
 
-/**
+/*
  *  ____  _                  ____      _                 _
  * |  _ \| | __ _  ___ ___  |  _ \ ___| | ___   __ _  __| |___
  * | |_) | |/ _` |/ __/ _ \ | |_) / _ \ |/ _ \ / _` |/ _` / __|
@@ -157,7 +161,6 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before) {
 	spill_info_t *info;
 	reloader_t *rel;
 
-	assert(sched_is_scheduled(before));
 	assert(arch_irn_consider_in_reg_alloc(env->arch_env, env->cls, to_spill));
 
 	info = get_spillinfo(env, to_spill);
@@ -169,6 +172,18 @@ void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before) {
 			ir_node *arg = get_irn_n(to_spill, i);
 			get_spillinfo(env, arg);
 		}
+
+#if 1
+		// hackery... sometimes the morgan algo spilled the value of a phi,
+		// the belady algo decides later to spill the whole phi, then sees the
+		// 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))) {
+			printf("spilledphi hack was needed...\n");
+			before = sched_next(info->old_spill);
+		}
+#endif
 	}
 
 	rel           = obstack_alloc(&env->obst, sizeof(rel[0]));
@@ -197,7 +212,15 @@ static ir_node *get_reload_insertion_point(ir_node *block, int pos) {
 		last = sched_prev(last);
 		assert(!sched_is_end(last));
 	}
-	assert(is_cfop(last));
+
+	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);
+	}
 
 	// add the reload before the (cond-)jump
 	return last;
@@ -226,6 +249,7 @@ void be_spill_phi(spill_env_t *env, ir_node *node) {
 	// if we had a spill for the phi value before, then remove this spill from
 	// schedule, as we will remove it in the insert spill/reload phase
 	if(spill->spill != NULL && !is_Phi(spill->spill)) {
+		assert(spill->old_spill == NULL);
 		spill->old_spill = spill->spill;
 		spill->spill = NULL;
 	}
@@ -335,11 +359,15 @@ static void spill_phi(spill_env_t *env, spill_info_t *spillinfo) {
 	// rewire reloads from old_spill to phi
 	if(spillinfo->old_spill != NULL) {
 		const ir_edge_t *edge, *next;
-		foreach_out_edge_safe(spillinfo->old_spill, edge, next) {
+		ir_node *old_spill = spillinfo->old_spill;
+
+		foreach_out_edge_safe(old_spill, edge, next) {
 			ir_node* reload = get_edge_src_irn(edge);
 			assert(be_is_Reload(reload) || is_Phi(reload));
 			set_irn_n(reload, get_edge_src_pos(edge), spillinfo->spill);
 		}
+		set_irn_n(old_spill, be_pos_Spill_val, new_Bad());
+		//sched_remove(old_spill);
 		spillinfo->old_spill = NULL;
 	}
 }
@@ -389,13 +417,18 @@ static int is_value_available(spill_env_t *env, ir_node *arg, ir_node *reloader)
 	if(arg == get_irg_frame(env->chordal_env->irg))
 		return 1;
 
+	// hack for now (happens when command should be inserted at end of block)
+	if(is_Block(reloader)) {
+		return 0;
+	}
+
  	/* the following test does not work while spilling,
 	 * because the liveness info is not adapted yet to the effects of the
 	 * additional spills/reloads.
 	 *
 	 * So we can only do this test for ignore registers (of our register class)
 	 */
-	if(arch_get_irn_reg_class(env->arch_env, arg, -1) == env->chordal_env->cls
+	if(arch_get_irn_reg_class(env->arch_env, arg, -1) == env->cls
 	   && arch_irn_is(env->arch_env, arg, ignore)) {
 		int i, arity;
 
@@ -404,7 +437,7 @@ static int is_value_available(spill_env_t *env, ir_node *arg, ir_node *reloader)
 		 *   - it interferes with the reloaders result
 		 *   - or it is (last-) used by reloader itself
 		 */
-		if (values_interfere(env->chordal_env->lv, reloader, arg)) {
+		if (values_interfere(env->birg->lv, reloader, arg)) {
 			return 1;
 		}
 
@@ -504,9 +537,15 @@ static int check_remat_conditions(spill_env_t *env, ir_node *spilled, ir_node *r
 static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader) {
 	int i, arity;
 	ir_node *res;
-	ir_node *bl = get_nodes_block(reloader);
+	ir_node *bl;
 	ir_node **ins;
 
+	if(is_Block(reloader)) {
+		bl = reloader;
+	} else {
+		bl = get_nodes_block(reloader);
+	}
+
 	ins = alloca(get_irn_arity(spilled) * sizeof(ins[0]));
 	for(i = 0, arity = get_irn_arity(spilled); i < arity; ++i) {
 		ir_node *arg = get_irn_n(spilled, i);
@@ -530,7 +569,6 @@ static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader)
 	DBG((env->dbg, LEVEL_1, "Insert remat %+F before reloader %+F\n", res, reloader));
 
 	/* insert in schedule */
-	assert(!is_Block(reloader));
 	sched_add_before(reloader, res);
 
 	return res;
@@ -539,10 +577,12 @@ static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader)
 int be_get_reload_costs(spill_env_t *env, ir_node *to_spill, ir_node *before) {
 	spill_info_t *spill_info;
 
-	// is the node rematerializable?
-	int costs = check_remat_conditions_costs(env, to_spill, before, 0);
-	if(costs < REMAT_COST_LIMIT)
-		return costs;
+	if(be_do_remats) {
+		// is the node rematerializable?
+		int costs = check_remat_conditions_costs(env, to_spill, before, 0);
+		if(costs < REMAT_COST_LIMIT)
+			return costs;
+	}
 
 	// do we already have a spill?
 	spill_info = find_spillinfo(env, to_spill);
@@ -569,6 +609,9 @@ int be_get_reload_costs_on_edge(spill_env_t *env, ir_node *to_spill, ir_node *bl
 void be_insert_spills_reloads(spill_env_t *env) {
 	const arch_env_t *arch_env = env->arch_env;
 	spill_info_t *si;
+	int remats = 0;
+	int reloads = 0;
+	int spills = 0;
 
 	/* process each spilled node */
 	for(si = set_first(env->spills); si; si = set_next(env->spills)) {
@@ -580,14 +623,19 @@ void be_insert_spills_reloads(spill_env_t *env) {
 		for(rld = si->reloaders; rld; rld = rld->next) {
 			ir_node *new_val;
 
-			if (check_remat_conditions(env, si->spilled_node, rld->reloader)) {
+			if (be_do_remats && check_remat_conditions(env, si->spilled_node, rld->reloader)) {
 				new_val = do_remat(env, si->spilled_node, rld->reloader);
+				remats++;
 			} else {
 				/* make sure we have a spill */
-				spill_node(env, si);
+				if(si->spill == NULL) {
+					spill_node(env, si);
+					spills++;
+				}
 
-				/* do a reload */
+				/* create a reload */
 				new_val = be_reload(arch_env, env->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));
@@ -597,7 +645,7 @@ void be_insert_spills_reloads(spill_env_t *env) {
 		if(pset_count(values) > 0) {
 			/* introduce copies, rewire the uses */
 			pset_insert_ptr(values, si->spilled_node);
-			be_ssa_constr_set_ignore(env->chordal_env->dom_front, env->chordal_env->lv, values, env->mem_phis);
+			be_ssa_constr_set_ignore(env->birg->dom_front, env->birg->lv, values, env->mem_phis);
 		}
 
 		del_pset(values);
@@ -605,6 +653,13 @@ void be_insert_spills_reloads(spill_env_t *env) {
 		si->reloaders = NULL;
 	}
 
+	if(be_stat_ev_is_active()) {
+		be_stat_ev("spill_spills", spills);
+		be_stat_ev("spill_reloads", reloads);
+		be_stat_ev("spill_remats", remats);
+	}
+
 	be_remove_dead_nodes_from_schedule(env->chordal_env->irg);
-	be_liveness_recompute(env->chordal_env->lv);
+	//be_liveness_recompute(env->birg->lv);
+	be_invalidate_liveness(env->birg);
 }