X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=cfc5e62b2811c478c551e5a9537ed520805d2588;hb=17e47394fa72025d14172a2acef2d258a067aa42;hp=1bb18f2ba466fba4ce4062b249a19e3dacb8dff9;hpb=6122410ce4188a5aea78771c7f9d326ab416efd2;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index 1bb18f2ba..cfc5e62b2 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -8,11 +8,17 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+
 #include "pset.h"
 #include "irnode_t.h"
 #include "ircons_t.h"
 #include "iredges_t.h"
+#include "ident_t.h"
+#include "type_t.h"
+#include "entity_t.h"
 #include "debug.h"
+#include "irgwalk.h"
 
 #include "besched.h"
 #include "bespill.h"
@@ -101,8 +107,8 @@ static ir_node *be_spill_irn(spill_env_t *senv, ir_node *irn, ir_node *ctx_irn)
 
 	ctx = be_get_spill_ctx(senv->spill_ctxs, irn, ctx_irn);
 	if(!ctx->spill) {
-		const be_main_env_t *env = senv->chordal_env->main_env;
-		ctx->spill = be_spill(env->node_factory, env->arch_env, irn);
+		const be_main_env_t *env = senv->chordal_env->birg->main_env;
+		ctx->spill = be_spill(env->arch_env, irn, ctx_irn);
 	}
 
 	return ctx->spill;
@@ -163,7 +169,7 @@ static ir_node *be_spill_node(spill_env_t *senv, ir_node *to_spill) {
 
 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;
+	const arch_env_t *arch = senv->chordal_env->birg->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)) {
@@ -216,8 +222,7 @@ void be_insert_spills_reloads(spill_env_t *senv, pset *reload_set) {
 
 			/* the reload */
 			ir_node *bl      = is_Block(rld->reloader) ? rld->reloader : get_nodes_block(rld->reloader);
-			ir_node *reload  = new_Reload(senv->chordal_env->main_env->node_factory,
-				senv->cls, irg, bl, mode, spill);
+			ir_node *reload  = be_new_Reload(senv->cls, irg, bl, mode, spill);
 
 			DBG((senv->dbg, LEVEL_1, " %+F of %+F before %+F\n", reload, si->spilled_node, rld->reloader));
 			if(reload_set)
@@ -230,9 +235,9 @@ void be_insert_spills_reloads(spill_env_t *senv, pset *reload_set) {
 		}
 
 		assert(n_reloads > 0);
+		obstack_ptr_grow(&ob, si->spilled_node);
 		reloads = obstack_finish(&ob);
-		be_introduce_copies_ignore(senv->chordal_env->dom_front, si->spilled_node,
-				n_reloads, reloads, senv->mem_phis);
+		be_ssa_constr_ignore(senv->chordal_env->dom_front, n_reloads + 1, reloads, senv->mem_phis);
 		obstack_free(&ob, reloads);
 	}
 
@@ -252,8 +257,6 @@ void be_add_reload(spill_env_t *senv, ir_node *to_spill, ir_node *before) {
 	spill_info_t templ, *res;
 	reloader_t *rel;
 
-//	assert(get_irn_opcode(to_spill) != iro_Unknown);
-
 	templ.spilled_node = to_spill;
 	templ.reloaders    = NULL;
 	res = set_insert(senv->spills, &templ, sizeof(templ), HASH_PTR(to_spill));
@@ -268,3 +271,237 @@ void be_add_reload_on_edge(spill_env_t *senv, ir_node *to_spill, ir_node *bl, in
 	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);
 }
+
+
+
+/****************************************
+
+	SPILL SLOT MANAGEMENT AND OPTS
+
+****************************************/
+
+typedef struct _spill_slot_t {
+	unsigned size;
+	unsigned align;
+	pset *members;
+	ir_mode *largest_mode;	/* the mode of all members with largest size */
+} spill_slot_t;
+
+typedef struct _ss_env_t {
+	firm_dbg_module_t *dbg;
+	struct obstack ob;
+	be_chordal_env_t *cenv;
+	pmap *slots;		/* maps spill_contexts to spill_slots */
+  pmap *types;    /* maps modes to types */
+} ss_env_t;
+
+
+static void compute_spill_slots_walker(ir_node *spill, void *env) {
+	ss_env_t *ssenv = env;
+	ir_node *ctx;
+	pmap_entry *entry;
+	spill_slot_t *ss;
+
+	if (!be_is_Spill(spill))
+		return;
+
+	/* check, if this spill is for a context already known */
+	ctx = be_get_Spill_context(spill);
+	entry = pmap_find(ssenv->slots, ctx);
+
+	if (!entry) {
+		/* this is a new spill context */
+		ss = obstack_alloc(&ssenv->ob, sizeof(*ss));
+		ss->members = pset_new_ptr(8);
+		ss->largest_mode = get_irn_mode(get_irn_n(spill, 0));
+		ss->size = get_mode_size_bytes(ss->largest_mode);
+		ss->align = ss->size; /* TODO Assumed for now */
+		pmap_insert(ssenv->slots, ctx, ss);
+	} else {
+		ir_node *irn;
+		/* values with the same spill_ctx must go into the same spill slot */
+		ss = entry->value;
+		assert(ss->size == (unsigned)get_mode_size_bytes(get_irn_mode(get_irn_n(spill, 0))) && "Different sizes for the same spill slot are not allowed yet.");
+		for (irn = pset_first(ss->members); irn; irn = pset_next(ss->members)) {
+			/* use values_interfere here, because it uses the dominance check,
+			   which does work for values in memory */
+			assert(!values_interfere(spill, irn) && "Spills for the same spill slot must not interfere!");
+		}
+	}
+
+	pset_insert_ptr(ss->members, spill);
+}
+
+static int ss_sorter(const void *v1, const void *v2) {
+	const spill_slot_t *ss1 = v1;
+	const spill_slot_t *ss2 = v2;
+	return ((int) ss2->size) - ((int) ss1->size);
+}
+
+
+/**
+ * This function should optimize the spill slots.
+ *  - Coalescing of multiple slots
+ *  - Ordering the slots
+ *
+ * Input slots are in @p ssenv->slots
+ * @p size The count of initial spill slots in @p ssenv->slots
+ *         This also is the size of the preallocated array @p ass
+ *
+ * @return An array of spill slots @p ass in specific order
+ **/
+static void optimize_slots(ss_env_t *ssenv, int size, spill_slot_t **ass) {
+	int i, o, used_slots;
+	pmap_entry *entr;
+
+	i=0;
+	pmap_foreach(ssenv->slots, entr)
+		ass[i++] = entr->value;
+
+	/* Sort the array to minimize fragmentation and cache footprint.
+	   Large slots come first */
+	qsort(ass, size, sizeof(ass[0]), ss_sorter);
+
+	/* For each spill slot:
+		- assign a new offset to this slot
+	    - xor find another slot to coalesce with */
+	used_slots = 0;
+	for (i=0; i<size; ++i) { /* for each spill slot */
+		ir_node *n1;
+		int tgt_slot = -1;
+
+		DBG((ssenv->dbg, LEVEL_1, "Spill slot %d members:\n", i));
+		for(n1 = pset_first(ass[i]->members); n1; n1 = pset_next(ass[i]->members))
+			DBG((ssenv->dbg, LEVEL_1, "  %+F\n", n1));
+
+
+		for (o=0; o < used_slots && tgt_slot == -1; ++o) { /* for each offset-assigned spill slot */
+			/* check inter-slot-pairs for interference */
+			ir_node *n2;
+			for(n1 = pset_first(ass[i]->members); n1; n1 = pset_next(ass[i]->members))
+				for(n2 = pset_first(ass[o]->members); n2; n2 = pset_next(ass[o]->members))
+					if(values_interfere(n1, n2)) {
+						pset_break(ass[i]->members);
+						pset_break(ass[o]->members);
+						DBG((ssenv->dbg, LEVEL_1, "    Interf %+F -- %+F\n", n1, n2));
+						goto interf_detected;
+					}
+
+			/* if we are here, there is no interference between ass[i] and ass[o] */
+			tgt_slot = o;
+
+interf_detected: /*nothing*/ ;
+		}
+
+		/* now the members of ass[i] join the members of ass[tgt_slot] */
+
+		/* do we need a new slot? */
+		if (tgt_slot == -1) {
+			tgt_slot = used_slots;
+			used_slots++;
+
+			/* init slot */
+			if (tgt_slot != i) {
+				ass[tgt_slot]->size = ass[i]->size;
+				del_pset(ass[tgt_slot]->members);
+				ass[tgt_slot]->members = pset_new_ptr(8);
+			}
+		}
+
+		/* copy the members to the target pset */
+		/* NOTE: If src and tgt pset are the same, inserting while iterating is not allowed */
+		if (tgt_slot != i)
+			for(n1 = pset_first(ass[i]->members); n1; n1 = pset_next(ass[i]->members))
+					pset_insert_ptr(ass[tgt_slot]->members, n1);
+	}
+}
+
+#define ALIGN_SPILL_AREA 16
+#define pset_foreach(pset, elm)  for(elm=pset_first(pset); elm; elm=pset_next(pset))
+
+/**
+ * Returns a spill type for a mode. Keep them in a map to reduce
+ * the number of types.
+ */
+static ir_type *get_spill_type(pmap *types, ir_mode *mode) {
+  pmap_entry *e = pmap_find(types, mode);
+  ir_type *res;
+
+  if (! e) {
+		char buf[64];
+    snprintf(buf, sizeof(buf), "spill_slot_type_%s", get_mode_name(mode));
+    res = new_type_primitive(new_id_from_str(buf), mode);
+    pmap_insert(types, mode, res);
+  }
+  else
+    res = e->value;
+  return res;
+}
+
+static void assign_entities(ss_env_t *ssenv, int n, spill_slot_t **ss) {
+	int i, offset;
+	ir_type *frame = get_irg_frame_type(ssenv->cenv->irg);
+
+	/* aligning by increasing frame size */
+	offset = get_type_size_bits(frame) / 8;
+	offset = round_up2(offset, ALIGN_SPILL_AREA);
+	set_type_size_bytes(frame, -1);
+
+	/* create entities and assign offsets according to size and alignment*/
+	for (i=0; i<n; ++i) {
+		char buf[64];
+		ident *name;
+		entity *spill_ent;
+		ir_node *irn;
+
+		/* build entity */
+		snprintf(buf, sizeof(buf), "spill_slot_%d", i);
+		name = new_id_from_str(buf);
+
+		spill_ent = new_entity(frame, name, get_spill_type(ssenv->types, ss[i]->largest_mode));
+
+		/* align */
+		offset = round_up2(offset, ss[i]->align);
+		/* set */
+		set_entity_offset_bytes(spill_ent, offset);
+		/* next possible offset */
+		offset += ss[i]->size;
+
+		pset_foreach(ss[i]->members, irn)
+			be_set_Spill_entity(irn, spill_ent);
+	}
+
+	/* set final size of stack frame */
+	set_type_size_bytes(frame, offset);
+}
+
+void be_compute_spill_offsets(be_chordal_env_t *cenv) {
+	ss_env_t ssenv;
+	spill_slot_t **ss;
+	int ss_size;
+	pmap_entry *pme;
+
+	obstack_init(&ssenv.ob);
+	ssenv.cenv  = cenv;
+	ssenv.slots = pmap_create();
+	ssenv.types = pmap_create();
+	ssenv.dbg   = firm_dbg_register("ir.be.spillslots");
+
+	/* Get initial spill slots */
+	irg_walk_graph(cenv->irg, NULL, compute_spill_slots_walker, &ssenv);
+
+	/* Build an empty array for optimized spill slots */
+	ss_size = pmap_count(ssenv.slots);
+	ss = obstack_alloc(&ssenv.ob, ss_size * sizeof(*ss));
+	optimize_slots(&ssenv, ss_size, ss);
+
+	/* Integrate slots into the stack frame entity */
+	assign_entities(&ssenv, ss_size, ss);
+
+	/* Clean up */
+	pmap_foreach(ssenv.slots, pme)
+		del_pset(((spill_slot_t *)pme->value)->members);
+	pmap_destroy(ssenv.slots);
+  pmap_destroy(ssenv.types);
+	obstack_free(&ssenv.ob, NULL);
+}