X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=d80281475501315092f1633d099a245bba72556f;hb=ff9b23893ba556b55fb18b0203a804179a4ea5d4;hp=dc37f886c5250b9065e8f2a7fdb19f9f4cdefa2d;hpb=5feaf259238e09923d9d46744a4e42eb23895a8b;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index dc37f886c..d80281475 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -1,7 +1,8 @@
 /**
  * Chordal register allocation.
  * @author Sebastian Hack
- * @date 8.12.2004
+ * @date   8.12.2004
+ * @cvs-id $Id$
  *
  * Copyright (C) Universitaet Karlsruhe
  * Released under the GPL
@@ -34,6 +35,7 @@
 #include "irgwalk.h"
 #include "irdump.h"
 #include "irdom.h"
+#include "irtools.h"
 #include "debug.h"
 #include "xmalloc.h"
 
@@ -56,9 +58,6 @@
 
 #define NO_COLOR (-1)
 
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
-#define MIN(x, y) ((x) < (y) ? (x) : (y))
-
 #define DUMP_INTERVALS
 
 typedef struct _be_chordal_alloc_env_t {
@@ -78,6 +77,7 @@ typedef struct _be_chordal_alloc_env_t {
 /* Make a fourcc for border checking. */
 #define BORDER_FOURCC				FOURCC('B', 'O', 'R', 'D')
 
+#if 0
 static void check_border_list(struct list_head *head)
 {
   border_t *x;
@@ -94,7 +94,7 @@ static void check_heads(be_chordal_env_t *env)
     check_border_list(ent->value);
   }
 }
-
+#endif
 
 /**
  * Add an interval border to the list of a block's list
@@ -208,26 +208,64 @@ static bitset_t *get_decisive_partner_regs(bitset_t *bs, const be_operand_t *o1,
 	return res;
 }
 
-static be_insn_t *chordal_scan_insn(be_chordal_alloc_env_t *env, ir_node *irn)
+static be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn)
 {
 	be_insn_env_t ie;
 
-	ie.ignore_colors = env->chordal_env->ignore_colors;
-	ie.aenv          = env->chordal_env->birg->main_env->arch_env;
-	ie.obst          = &env->chordal_env->obst;
-	ie.cls           = env->chordal_env->cls;
+	ie.ignore_colors = env->ignore_colors;
+	ie.aenv          = env->birg->main_env->arch_env;
+	ie.obst          = &env->obst;
+	ie.cls           = env->cls;
 	return be_scan_insn(&ie, irn);
 }
 
+static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn)
+{
+	be_insn_t *insn = chordal_scan_insn(env, irn);
+	int i;
+
+	if(!insn->has_constraints)
+		goto end;
+
+	for(i = insn->use_start; i < insn->n_ops; ++i) {
+		be_operand_t *op = &insn->ops[i];
+		if(op->has_constraints && values_interfere(env->lv, insn->irn, op->carrier)) {
+			ir_node *bl   = get_nodes_block(insn->irn);
+			ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op->carrier);
+
+			sched_add_before(insn->irn, copy);
+			set_irn_n(insn->irn, op->pos, copy);
+			DBG((env->dbg, LEVEL_3, "inserting constr copy %+F for %+F pos %d\n", copy, insn->irn, op->pos));
+			be_liveness_update(env->lv, op->carrier);
+		}
+	}
+
+end:
+	obstack_free(&env->obst, insn);
+	return insn->next_insn;
+}
+
+static void pre_spill_prepare_constr_walker(ir_node *bl, void *data)
+{
+	be_chordal_env_t *env = data;
+	ir_node *irn;
+	for(irn = sched_first(bl); !sched_is_end(irn);) {
+		irn = prepare_constr_insn(env, irn);
+	}
+}
+
+void be_pre_spill_prepare_constr(be_chordal_env_t *cenv) {
+	irg_block_walk_graph(cenv->irg, pre_spill_prepare_constr_walker, NULL, (void *) cenv);
+}
+
 static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t *insn)
 {
 	const be_chordal_env_t *env = alloc_env->chordal_env;
 
-	int n_uses         = be_insn_n_uses(insn);
-	int n_defs         = be_insn_n_defs(insn);
-	bitset_t *bs       = bitset_alloca(env->cls->n_regs);
-	bipartite_t *bp    = bipartite_new(n_defs, n_uses);
-	int *pairing       = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0]));
+	int n_uses   = be_insn_n_uses(insn);
+	int n_defs   = be_insn_n_defs(insn);
+	bitset_t *bs = bitset_alloca(env->cls->n_regs);
+	int *pairing = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0]));
 
 	int i, j;
 
@@ -235,42 +273,35 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t
 		For each out operand, try to find an in operand which can be assigned the
 		same register as the out operand.
 	*/
-	for(j = 0; j < insn->use_start; ++j) {
+	for (j = 0; j < insn->use_start; ++j) {
+		int smallest         = -1;
+		int smallest_n_regs  = 2 * env->cls->n_regs + 1;
 		be_operand_t *out_op = &insn->ops[j];
 
 		/* Try to find an in operand which has ... */
 		for(i = insn->use_start; i < insn->n_ops; ++i) {
+			int n_total;
 			const be_operand_t *op = &insn->ops[i];
 
-			/*
-			The in operand can only be paired with a def, if the node defining the
-			operand's value does not interfere with the instruction itself. That
-			would mean, that it is live at the instruction, so no result of the instruction
-			can have the same register as the operand.
-
-			Furthermore, tow operands can be paired, if the admissible registers
-			of one are a subset of the other's. We record the operand whose constraints
-			count in the decisive array.
-			*/
-			if(!values_interfere(op->irn, op->carrier)) {
-				if(get_decisive_partner_regs(bs, out_op, op))
-					bipartite_add(bp, j, i - insn->use_start);
+			if (! values_interfere(env->lv, op->irn, op->carrier) && ! op->partner) {
+				bitset_clear_all(bs);
+				bitset_copy(bs, op->regs);
+				bitset_and(bs, out_op->regs);
+				n_total = bitset_popcnt(op->regs) + bitset_popcnt(out_op->regs);
+
+				if (bitset_popcnt(bs) > 0 && n_total < smallest_n_regs) {
+					smallest = i;
+					smallest_n_regs = n_total;
+				}
 			}
 		}
-	}
 
-	/* Compute the pairing. */
-	bipartite_matching(bp, pairing);
-	for(i = 0; i < insn->use_start; ++i) {
-		int p = pairing[i] + insn->use_start;
-
-		if(p >= insn->use_start) {
-			insn->ops[i].partner = &insn->ops[p];
-			insn->ops[p].partner = &insn->ops[i];
+		if (smallest >= 0) {
+			be_operand_t *partner = &insn->ops[smallest];
+			out_op->partner  = partner;
+			partner->partner = out_op;
 		}
 	}
-
-	bipartite_free(bp);
 }
 
 
@@ -306,9 +337,14 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_in
 		Now, figure out which input operand must be copied since it has input
 		constraints which are also output constraints.
 	*/
+	(void) bl;
+	(void) copy;
+	(void) bs;
+	(void) dbg;
+#if 0
 	for(i = insn->use_start; i < insn->n_ops; ++i) {
 		be_operand_t *op = &insn->ops[i];
-		if(op->has_constraints && (values_interfere(op->carrier, insn->irn) || arch_irn_is(aenv, op->carrier, ignore))) {
+		if(op->has_constraints && (values_interfere(env->lv, op->carrier, insn->irn) || arch_irn_is(aenv, op->carrier, ignore))) {
 			bitset_copy(bs, op->regs);
 			bitset_and(bs, out_constr);
 
@@ -326,12 +362,13 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_in
 			}
 		}
 	}
+#endif
 
 	/*
 		Make the Perm, recompute liveness and re-scan the insn since the
 		in operands are now the Projs of the Perm.
 	*/
-	perm = insert_Perm_after(aenv, env->cls, env->dom_front, sched_prev(insn->irn));
+	perm = insert_Perm_after(aenv, env->lv, env->cls, env->dom_front, sched_prev(insn->irn));
 
 	/* Registers are propagated by insert_Perm_after(). Clean them here! */
 	if(perm) {
@@ -347,9 +384,9 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_in
 			the Perm. Recomputing liveness is also a good idea if a Perm is inserted, since
 			the live sets may change.
 		*/
-		be_liveness(env->irg);
+		// be_liveness_recompute(env->lv);
 		obstack_free(&env->obst, insn);
-		*the_insn = insn = chordal_scan_insn(alloc_env, insn->irn);
+		*the_insn = insn = chordal_scan_insn(env, insn->irn);
 
 		/*
 			Copy the input constraints of the insn to the Perm as output
@@ -375,7 +412,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 {
 	be_chordal_env_t *env  = alloc_env->chordal_env;
 	void *base             = obstack_base(&env->obst);
-	be_insn_t *insn        = chordal_scan_insn(alloc_env, irn);
+	be_insn_t *insn        = chordal_scan_insn(env, irn);
 	ir_node *res           = insn->next_insn;
 	int be_silent          = *silent;
 
@@ -469,7 +506,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
 				assert(is_Proj(proj));
 
-				if(values_interfere(proj, irn) && !pmap_contains(partners, proj)) {
+				if(values_interfere(env->lv, proj, irn) && !pmap_contains(partners, proj)) {
 					assert(n_alloc < n_regs);
 					alloc_nodes[n_alloc] = proj;
 					pmap_insert(partners, proj, NULL);
@@ -542,6 +579,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 			}
 		}
 
+		bipartite_free(bp);
 		pmap_destroy(partners);
 	}
 
@@ -605,8 +643,8 @@ static void pressure(ir_node *block, void *env_ptr)
 	unsigned step = 0;
 	unsigned pressure = 0;
 	struct list_head *head;
-	pset *live_in  = put_live_in(block, pset_new_ptr_default());
-	pset *live_end = put_live_end(block, pset_new_ptr_default());
+	pset *live_in  = be_lv_pset_put_in(env->lv, block, pset_new_ptr_default());
+	pset *live_end = be_lv_pset_put_end(env->lv, block, pset_new_ptr_default());
 
 	DBG((dbg, LEVEL_1, "Computing pressure in block %+F\n", block));
 	bitset_clear_all(live);
@@ -700,7 +738,7 @@ static void assign(ir_node *block, void *env_ptr)
 	bitset_t *in_colors         = alloc_env->in_colors;
 	const arch_env_t *arch_env  = env->birg->main_env->arch_env;
 	struct list_head *head      = get_block_border_head(env, block);
-	pset *live_in               = put_live_in(block, pset_new_ptr_default());
+	pset *live_in               = be_lv_pset_put_in(env->lv, block, pset_new_ptr_default());
 
 	const ir_node *irn;
 	border_t *b;
@@ -756,7 +794,7 @@ static void assign(ir_node *block, void *env_ptr)
 		 * Assign a color, if it is a local def. Global defs already have a
 		 * color.
 		 */
-		if(b->is_def && !is_live_in(block, irn)) {
+		if(b->is_def && !be_is_live_in(env->lv, block, irn)) {
 			const arch_register_t *reg;
 			int col = NO_COLOR;
 
@@ -847,5 +885,6 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 		plotter_free(plotter);
 	}
 
+	bitset_free(env.live);
 	del_pset(env.pre_colored);
 }