X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespill.c;h=964c8a38cd603deb590eca87362a22bb381bc5ff;hb=4d7a9507baf1737297cd4f7fc91eab209fd5d398;hp=f8df2a8c65a4e6bdf45538a3b9e9dd7fc57d3c5b;hpb=56f231e9f79822a8421a9b8fe72aecb6239ed927;p=libfirm

diff --git a/ir/be/bespill.c b/ir/be/bespill.c
index f8df2a8c6..964c8a38c 100644
--- a/ir/be/bespill.c
+++ b/ir/be/bespill.c
@@ -14,6 +14,9 @@
 #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"
 
@@ -104,7 +107,7 @@ 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;
+		const be_main_env_t *env = senv->chordal_env->birg->main_env;
 		ctx->spill = be_spill(env->arch_env, irn, ctx_irn);
 	}
 
@@ -166,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)) {
@@ -176,7 +179,8 @@ static void phi_walker(ir_node *irn, void *env) {
 }
 
 void be_insert_spills_reloads(spill_env_t *senv, pset *reload_set) {
-	ir_graph *irg = senv->chordal_env->irg;
+	const arch_env_t *aenv = senv->chordal_env->birg->main_env->arch_env;
+	ir_graph *irg          = senv->chordal_env->irg;
 	ir_node *irn;
 	spill_info_t *si;
 	struct obstack ob;
@@ -218,23 +222,21 @@ void be_insert_spills_reloads(spill_env_t *senv, pset *reload_set) {
 			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  = be_new_Reload(senv->cls, irg, bl, mode, spill);
+			ir_node *reload  = be_reload(aenv, senv->cls, rld->reloader, mode, spill);
 
 			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);
 
-			/* remember the reaload */
+			/* remember the reload */
 			obstack_ptr_grow(&ob, reload);
-			sched_add_before(rld->reloader, reload);
 			n_reloads++;
 		}
 
 		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);
 	}
 
@@ -279,8 +281,9 @@ void be_add_reload_on_edge(spill_env_t *senv, ir_node *to_spill, ir_node *bl, in
 
 typedef struct _spill_slot_t {
 	unsigned size;
-	unsigned offset;
+	unsigned align;
 	pset *members;
+	ir_mode *largest_mode;	/* the mode of all members with largest size */
 } spill_slot_t;
 
 typedef struct _ss_env_t {
@@ -288,6 +291,7 @@ typedef struct _ss_env_t {
 	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;
 
 
@@ -308,13 +312,15 @@ static void compute_spill_slots_walker(ir_node *spill, void *env) {
 		/* this is a new spill context */
 		ss = obstack_alloc(&ssenv->ob, sizeof(*ss));
 		ss->members = pset_new_ptr(8);
-		ss->size = get_mode_size_bytes(get_irn_mode(get_irn_n(spill, 0)));
+		ss->largest_mode = get_irn_mode(get_irn_n(spill, be_pos_Spill_val));
+		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");
+		assert(ss->size == (unsigned)get_mode_size_bytes(get_irn_mode(get_irn_n(spill, be_pos_Spill_val))) && "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 */
@@ -332,19 +338,20 @@ static int ss_sorter(const void *v1, const void *v2) {
 }
 
 
-/* NOTE/TODO: This function assumes, that all spill slot sizes are a power of 2.
-   Further it assumes, that the alignment is equal to the size and the
-   baseaddr of the spill area is aligned sufficiently for all possible aligments.
-*/
-static void coalesce_slots(ss_env_t *ssenv) {
+/**
+ * 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;
-	unsigned curr_offset;
 	pmap_entry *entr;
-	spill_slot_t **ass;
-
-	/* Build an array of all spill slots */
-	int count = pmap_count(ssenv->slots);
-	ass = obstack_alloc(&ssenv->ob, count * sizeof(*ass));
 
 	i=0;
 	pmap_foreach(ssenv->slots, entr)
@@ -352,14 +359,13 @@ static void coalesce_slots(ss_env_t *ssenv) {
 
 	/* Sort the array to minimize fragmentation and cache footprint.
 	   Large slots come first */
-	qsort(ass, count, sizeof(ass[0]), ss_sorter);
+	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 */
-	curr_offset = 0;
 	used_slots = 0;
-	for (i=0; i<count; ++i) { /* for each spill slot */
+	for (i=0; i<size; ++i) { /* for each spill slot */
 		ir_node *n1;
 		int tgt_slot = -1;
 
@@ -393,9 +399,6 @@ interf_detected: /*nothing*/ ;
 			tgt_slot = used_slots;
 			used_slots++;
 
-			ass[tgt_slot]->offset = curr_offset;
-			curr_offset += ass[i]->size;
-
 			/* init slot */
 			if (tgt_slot != i) {
 				ass[tgt_slot]->size = ass[i]->size;
@@ -405,33 +408,101 @@ interf_detected: /*nothing*/ ;
 		}
 
 		/* copy the members to the target pset */
-		for(n1 = pset_first(ass[i]->members); n1; n1 = pset_next(ass[i]->members)) {
-			/* NOTE: If src and tgt pset are the same, inserting while iterating is not allowed */
-			if (tgt_slot != i)
-				pset_insert_ptr(ass[tgt_slot]->members, n1);
-
-			be_set_Spill_offset(n1, ass[tgt_slot]->offset);
-			DBG((ssenv->dbg, LEVEL_1, "    Offset %+F  %d\n", n1, ass[tgt_slot]->offset));
-		}
+		/* 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);
 
-	/* free all used psets, all other stuff is on the ssenv-obstack */
-	for (i=0; i<count; ++i)
-		del_pset(ass[i]->members);
+		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);
-	coalesce_slots(&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);
+
+	be_copy_entities_to_reloads(cenv->irg);
 }