X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=9f17809417d7a4b212cce97515aaed8e45ed903f;hb=efdb09dd64658e15cd9fd2599884bfe72bba7fd2;hp=40987850116cbdca347fc8a30b8d013dd236f939;hpb=e1397b01aceb38b6bb62c319007146af3b922f39;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 409878501..9f1780941 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -50,20 +50,22 @@
 
 #include "beutil.h"
 #include "besched.h"
-#include "besched_t.h"
+#include "besched.h"
 #include "belive_t.h"
-#include "benode_t.h"
-#include "bearch_t.h"
+#include "benode.h"
+#include "bearch.h"
 #include "beirgmod.h"
 #include "beifg.h"
 #include "beinsn_t.h"
 #include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "beintlive_t.h"
 #include "bera.h"
 #include "bechordal_t.h"
 #include "bechordal_draw.h"
 #include "bemodule.h"
+#include "bearch.h"
+#include "bechordal_common.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -82,102 +84,6 @@ typedef struct _be_chordal_alloc_env_t {
 	int colors_n;          /**< The number of colors. */
 } be_chordal_alloc_env_t;
 
-#include "fourcc.h"
-
-/* 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;
-	list_for_each_entry(border_t, x, head, list) {
-		assert(x->magic == BORDER_FOURCC);
-	}
-}
-
-static void check_heads(be_chordal_env_t *env)
-{
-	pmap_entry *ent;
-	for (ent = pmap_first(env->border_heads); ent; ent = pmap_next(env->border_heads)) {
-		/* ir_printf("checking border list of block %+F\n", ent->key); */
-		check_border_list(ent->value);
-	}
-}
-#endif
-
-/**
- * Add an interval border to the list of a block's list
- * of interval border.
- * @note You always have to create the use before the def.
- * @param env The environment.
- * @param head The list head to enqueue the borders.
- * @param irn The node (value) the border belongs to.
- * @param pressure The pressure at this point in time.
- * @param step A time step for the border.
- * @param is_def Is the border a use or a def.
- * @return The created border.
- */
-static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head,
-			ir_node *irn, unsigned step, unsigned pressure,
-			unsigned is_def, unsigned is_real)
-{
-	border_t *b;
-
-	if (!is_def) {
-		border_t *def;
-
-		b = obstack_alloc(env->obst, sizeof(*b));
-
-		/* also allocate the def and tie it to the use. */
-		def = obstack_alloc(env->obst, sizeof(*def));
-		memset(def, 0, sizeof(*def));
-		b->other_end = def;
-		def->other_end = b;
-
-		/*
-		 * Set the link field of the irn to the def.
-		 * This strongly relies on the fact, that the use is always
-		 * made before the def.
-		 */
-		set_irn_link(irn, def);
-
-		DEBUG_ONLY(b->magic = BORDER_FOURCC);
-		DEBUG_ONLY(def->magic = BORDER_FOURCC);
-	} else {
-		/*
-		 * If the def is encountered, the use was made and so was the
-		 * the def node (see the code above). It was placed into the
-		 * link field of the irn, so we can get it there.
-		 */
-		b = get_irn_link(irn);
-
-		DEBUG_ONLY(assert(b && b->magic == BORDER_FOURCC && "Illegal border encountered"));
-	}
-
-	b->pressure = pressure;
-	b->is_def = is_def;
-	b->is_real = is_real;
-	b->irn = irn;
-	b->step = step;
-	list_add_tail(&b->list, head);
-	DBG((dbg, LEVEL_5, "\t\t%s adding %+F, step: %d\n", is_def ? "def" : "use", irn, step));
-
-
-	return b;
-}
-
-/**
- * Check, if an irn is of the register class currently under processing.
- * @param env The chordal environment.
- * @param irn The node.
- * @return 1, if the node is of that register class, 0 if not.
- */
-static inline int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
-{
-	return arch_irn_consider_in_reg_alloc(env->cls, irn);
-}
-
 static int get_next_free_reg(const be_chordal_alloc_env_t *alloc_env, bitset_t *colors)
 {
 	bitset_t *tmp = alloc_env->tmp_colors;
@@ -213,159 +119,6 @@ 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_env_t *env, ir_node *irn)
-{
-	be_insn_env_t ie;
-
-	ie.ignore_colors = env->ignore_colors;
-	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)
-{
-	bitset_t *tmp          = bitset_alloca(env->cls->n_regs);
-	bitset_t *def_constr   = bitset_alloca(env->cls->n_regs);
-	ir_node *bl            = get_nodes_block(irn);
-	const be_irg_t *birg   = env->birg;
-	be_lv_t *lv            = birg->lv;
-
-	be_insn_t *insn;
-	int i, j;
-
-	for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
-		ir_node *op = get_irn_n(irn, i);
-		ir_node *copy;
-		const arch_register_t *reg;
-		const arch_register_req_t *req;
-
-		req = arch_get_register_req(irn, i);
-		if (req->cls != env->cls)
-			continue;
-
-		reg = arch_get_irn_register(op);
-
-		if (reg == NULL || !arch_register_type_is(reg, ignore))
-			continue;
-		if (arch_register_type_is(reg, joker))
-			continue;
-
-		if (!arch_register_req_is(req, limited))
-			continue;
-
-		if (rbitset_is_set(req->limited, reg->index))
-			continue;
-
-		copy = be_new_Copy(env->cls, bl, op);
-		be_stat_ev("constr_copy", 1);
-
-		sched_add_before(irn, copy);
-		set_irn_n(irn, i, copy);
-		DBG((dbg, LEVEL_3, "inserting ignore arg copy %+F for %+F pos %d\n", copy, irn, i));
-	}
-
-	insn = chordal_scan_insn(env, irn);
-
-	if (!insn->has_constraints)
-		goto end;
-
-	/* insert copies for nodes that occur constrained more than once. */
-	for (i = insn->use_start; i < insn->n_ops; ++i) {
-		be_operand_t *op = &insn->ops[i];
-
-		if (!op->has_constraints)
-			continue;
-
-		for (j = i + 1; j < insn->n_ops; ++j) {
-			ir_node *copy;
-			be_operand_t *a_op = &insn->ops[j];
-
-			if (a_op->carrier != op->carrier || !a_op->has_constraints)
-				continue;
-
-			/* if the constraint is the same, no copy is necessary
-			 * TODO generalise unequal but overlapping constraints */
-			if (a_op->req == op->req)
-				continue;
-
-			if (be_is_Copy(get_irn_n(insn->irn, a_op->pos)))
-				continue;
-
-			copy = be_new_Copy(env->cls, bl, op->carrier);
-			be_stat_ev("constr_copy", 1);
-
-			sched_add_before(insn->irn, copy);
-			set_irn_n(insn->irn, a_op->pos, copy);
-			DBG((dbg, LEVEL_3, "inserting multiple constr copy %+F for %+F pos %d\n", copy, insn->irn, a_op->pos));
-		}
-	}
-
-	/* collect all registers occurring in out constraints. */
-	for (i = 0; i < insn->use_start; ++i) {
-		be_operand_t *op = &insn->ops[i];
-		if (op->has_constraints)
-			bitset_or(def_constr, op->regs);
-	}
-
-	/*
-	 * insert copies for all constrained arguments living through the node
-	 * and being constrained to a register which also occurs in out constraints.
-	 */
-	for (i = insn->use_start; i < insn->n_ops; ++i) {
-		ir_node *copy;
-		be_operand_t *op = &insn->ops[i];
-
-		bitset_copy(tmp, op->regs);
-		bitset_and(tmp, def_constr);
-
-		/*
-		 * Check, if
-		 * 1) the operand is constrained.
-		 * 2) lives through the node.
-		 * 3) is constrained to a register occurring in out constraints.
-		 */
-		if (!op->has_constraints ||
-		   !values_interfere(birg, insn->irn, op->carrier) ||
-		   bitset_is_empty(tmp))
-			continue;
-
-		/*
-		 * only create the copy if the operand is no copy.
-		 * this is necessary since the assure constraints phase inserts
-		 * Copies and Keeps for operands which must be different from the
-		 * results. Additional copies here would destroy this.
-		 */
-		if (be_is_Copy(get_irn_n(insn->irn, op->pos)))
-			continue;
-
-		copy = be_new_Copy(env->cls, bl, op->carrier);
-
-		sched_add_before(insn->irn, copy);
-		set_irn_n(insn->irn, op->pos, copy);
-		DBG((dbg, LEVEL_3, "inserting constr copy %+F for %+F pos %d\n", copy, insn->irn, op->pos));
-		be_liveness_update(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, 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;
@@ -386,16 +139,18 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t
 		for (i = insn->use_start; i < insn->n_ops; ++i) {
 			int n_total;
 			const be_operand_t *op = &insn->ops[i];
+			be_lv_t            *lv;
 
 			if (op->partner != NULL)
 				continue;
-			if (values_interfere(env->birg, op->irn, op->carrier))
+			lv = be_get_irg_liveness(env->irg);
+			if (be_values_interfere(lv, op->irn, op->carrier))
 				continue;
 
 			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);
+			n_total = bitset_popcount(op->regs) + bitset_popcount(out_op->regs);
 
 			if (!bitset_is_empty(bs) && n_total < smallest_n_regs) {
 				smallest = i;
@@ -416,74 +171,6 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t
 	}
 }
 
-
-static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env,
-                                        be_insn_t **the_insn)
-{
-	be_chordal_env_t *env       = alloc_env->chordal_env;
-	be_insn_t *insn             = *the_insn;
-	ir_node *perm               = NULL;
-	bitset_t *out_constr        = bitset_alloca(env->cls->n_regs);
-	const ir_edge_t *edge;
-	int i;
-
-	assert(insn->has_constraints && "only do this for constrained nodes");
-
-	/*
-	 * Collect all registers that occur in output constraints.
-	 * This is necessary, since if the insn has one of these as an input constraint
-	 * and the corresponding operand interferes with the insn, the operand must
-	 * be copied.
-	 */
-	for (i = 0; i < insn->use_start; ++i) {
-		be_operand_t *op = &insn->ops[i];
-		if (op->has_constraints)
-			bitset_or(out_constr, op->regs);
-	}
-
-	/*
-	 * 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(env->birg, env->cls, sched_prev(insn->irn));
-
-	/* Registers are propagated by insert_Perm_after(). Clean them here! */
-	if (perm == NULL)
-		return NULL;
-
-	be_stat_ev("constr_perm", get_irn_arity(perm));
-	foreach_out_edge(perm, edge) {
-		ir_node *proj = get_edge_src_irn(edge);
-		arch_set_irn_register(proj, NULL);
-	}
-
-	/*
-	 * We also have to re-build the insn since the input operands are now the Projs of
-	 * the Perm. Recomputing liveness is also a good idea if a Perm is inserted, since
-	 * the live sets may change.
-	 */
-	obstack_free(env->obst, insn);
-	*the_insn = insn = chordal_scan_insn(env, insn->irn);
-
-	/*
-	 * Copy the input constraints of the insn to the Perm as output
-	 * constraints. Succeeding phases (coalescing) will need that.
-	 */
-	for (i = insn->use_start; i < insn->n_ops; ++i) {
-		be_operand_t *op = &insn->ops[i];
-		ir_node *proj = op->carrier;
-		/*
-		 * Note that the predecessor must not be a Proj of the Perm,
-		 * since ignore-nodes are not Perm'ed.
-		 */
-		if (op->has_constraints &&  is_Proj(proj) && get_Proj_pred(proj) == perm) {
-			be_set_constr_limited(perm, BE_OUT_POS(get_Proj_proj(proj)), op->req);
-		}
-	}
-
-	return perm;
-}
-
 static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
                                    ir_node *irn, int *silent)
 {
@@ -494,7 +181,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
 	int *assignment;
 	pmap *partners;
 	int i, n_alloc;
-	bitset_pos_t col;
+	unsigned col;
 	const ir_edge_t *edge;
 	ir_node *perm = NULL;
 	//int match_res, cost;
@@ -503,7 +190,6 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
 	be_insn_t *insn        = chordal_scan_insn(env, irn);
 	ir_node *res           = insn->next_insn;
 	int be_silent          = *silent;
-	be_irg_t *birg         = env->birg;
 	bipartite_t *bp;
 
 	if (insn->pre_colored) {
@@ -545,7 +231,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
 	 * Perms are constructed and Copies are created for constrained values
 	 * interfering with the instruction.
 	 */
-	perm = pre_process_constraints(alloc_env, &insn);
+	perm = pre_process_constraints(alloc_env->chordal_env, &insn);
 
 	/* find suitable in operands to the out operands of the node. */
 	pair_up_operands(alloc_env, insn);
@@ -608,10 +294,12 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
 		foreach_out_edge(perm, edge) {
 			int i;
 			ir_node *proj = get_edge_src_irn(edge);
+			be_lv_t *lv   = be_get_irg_liveness(env->irg);
 
 			assert(is_Proj(proj));
 
-			if (!values_interfere(birg, proj, irn) || pmap_contains(partners, proj))
+			if (!be_values_interfere(lv, proj, irn)
+			    || pmap_contains(partners, proj))
 				continue;
 
 			/* don't insert a node twice */
@@ -647,6 +335,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
 	match_res = hungarian_solve(bp, assignment, &cost, 1);
 	assert(match_res == 0 && "matching failed");
 #else
+	/*bipartite_dump_f(stderr, bp);*/
 	bipartite_matching(bp, assignment);
 #endif
 
@@ -655,7 +344,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env,
 		const arch_register_t *reg;
 		ir_node *irn;
 
-		assert(assignment[i] >= 0 && "there must have been a register assigned");
+		assert(assignment[i] >= 0 && "there must have been a register assigned (node not register pressure faithful?)");
 		reg = arch_register_for_index(env->cls, assignment[i]);
 		assert(! (reg->type & arch_register_type_ignore));
 
@@ -741,126 +430,6 @@ static void constraints(ir_node *bl, void *data)
 	}
 }
 
-/**
- * Annotate the register pressure to the nodes and compute
- * the liveness intervals.
- * @param block The block to do it for.
- * @param env_ptr The environment.
- */
-static void pressure(ir_node *block, void *env_ptr)
-{
-/* Convenience macro for a def */
-#define border_def(irn, step, real) \
-	border_add(env, head, irn, step, pressure--, 1, real)
-
-/* Convenience macro for a use */
-#define border_use(irn, step, real) \
-	border_add(env, head, irn, step, ++pressure, 0, real)
-
-	be_chordal_alloc_env_t *alloc_env = env_ptr;
-	be_chordal_env_t *env             = alloc_env->chordal_env;
-	bitset_t *live                    = alloc_env->live;
-	ir_node *irn;
-	be_lv_t *lv                       = env->birg->lv;
-
-	int i, n;
-	bitset_pos_t elm;
-	unsigned step = 0;
-	unsigned pressure = 0;
-	struct list_head *head;
-
-	DBG((dbg, LEVEL_1, "Computing pressure in block %+F\n", block));
-	bitset_clear_all(live);
-
-	/* Set up the border list in the block info */
-	head = obstack_alloc(env->obst, sizeof(*head));
-	INIT_LIST_HEAD(head);
-	assert(pmap_get(env->border_heads, block) == NULL);
-	pmap_insert(env->border_heads, block, head);
-
-	/*
-	 * Make final uses of all values live out of the block.
-	 * They are necessary to build up real intervals.
-	 */
-	be_lv_foreach(lv, block, be_lv_state_end, i) {
-		ir_node *irn = be_lv_get_irn(lv, block, i);
-		if (has_reg_class(env, irn)) {
-			DBG((dbg, LEVEL_3, "\tMaking live: %+F/%d\n", irn, get_irn_idx(irn)));
-			bitset_set(live, get_irn_idx(irn));
-			border_use(irn, step, 0);
-		}
-	}
-	++step;
-
-	/*
-	 * Determine the last uses of a value inside the block, since they are
-	 * relevant for the interval borders.
-	 */
-	sched_foreach_reverse(block, irn) {
-		DBG((dbg, LEVEL_1, "\tinsn: %+F, pressure: %d\n", irn, pressure));
-		DBG((dbg, LEVEL_2, "\tlive: %B\n", live));
-
-		if (get_irn_mode(irn) == mode_T) {
-			const ir_edge_t *edge;
-
-			foreach_out_edge(irn, edge) {
-				ir_node *proj = get_edge_src_irn(edge);
-
-				/*
-				 * If the node defines some value, which can put into a
-				 * register of the current class, make a border for it.
-				 */
-				if (has_reg_class(env, proj)) {
-					int nr = get_irn_idx(proj);
-
-					bitset_clear(live, nr);
-					border_def(proj, step, 1);
-				}
-			}
-		}
-
-		/*
-		 * If the node defines some value, which can put into a
-		 * register of the current class, make a border for it.
-		 */
-		if (has_reg_class(env, irn)) {
-			int nr = get_irn_idx(irn);
-
-			bitset_clear(live, nr);
-			border_def(irn, step, 1);
-		}
-
-		/*
-		 * If the node is no phi node we can examine the uses.
-		 */
-		if (!is_Phi(irn)) {
-			for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
-				ir_node *op = get_irn_n(irn, i);
-
-				if (has_reg_class(env, op)) {
-					int nr = get_irn_idx(op);
-					const char *msg = "-";
-
-					if (!bitset_is_set(live, nr)) {
-						border_use(op, step, 1);
-						bitset_set(live, nr);
-						msg = "X";
-					}
-
-					DBG((dbg, LEVEL_4, "\t\t%s pos: %d, use: %+F\n", msg, i, op));
-				}
-			}
-		}
-		++step;
-	}
-
-	bitset_foreach(live, elm) {
-		ir_node *irn = get_idx_irn(env->irg, elm);
-		if (be_is_live_in(lv, block, irn))
-			border_def(irn, step, 0);
-	}
-}
-
 static void assign(ir_node *block, void *env_ptr)
 {
 	be_chordal_alloc_env_t *alloc_env = env_ptr;
@@ -869,7 +438,7 @@ static void assign(ir_node *block, void *env_ptr)
 	bitset_t *colors            = alloc_env->colors;
 	bitset_t *in_colors         = alloc_env->in_colors;
 	struct list_head *head      = get_block_border_head(env, block);
-	be_lv_t *lv                 = env->birg->lv;
+	be_lv_t *lv                 = be_get_irg_liveness(env->irg);
 
 	const ir_node *irn;
 	border_t *b;
@@ -972,13 +541,12 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	be_chordal_alloc_env_t env;
 	char buf[256];
 	be_lv_t *lv;
-	be_irg_t *birg = chordal_env->birg;
 	const arch_register_class_t *cls = chordal_env->cls;
 
 	int colors_n          = arch_register_class_n_regs(cls);
 	ir_graph *irg         = chordal_env->irg;
 
-	lv = be_assure_liveness(birg);
+	lv = be_assure_liveness(irg);
 	be_liveness_assure_sets(lv);
 	be_liveness_assure_chk(lv);
 
@@ -991,22 +559,22 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	env.in_colors     = bitset_alloca(colors_n);
 	env.pre_colored   = pset_new_ptr_default();
 
-	BE_TIMER_PUSH(t_constr);
+	be_timer_push(T_CONSTR);
 
 	/* Handle register targeting constraints */
 	dom_tree_walk_irg(irg, constraints, NULL, &env);
 
 	if (chordal_env->opts->dump_flags & BE_CH_DUMP_CONSTR) {
-		snprintf(buf, sizeof(buf), "-%s-constr", chordal_env->cls->name);
-		be_dump(chordal_env->irg, buf, dump_ir_block_graph_sched);
+		snprintf(buf, sizeof(buf), "%s-constr", chordal_env->cls->name);
+		dump_ir_graph(chordal_env->irg, buf);
 	}
 
-	BE_TIMER_POP(t_constr);
+	be_timer_pop(T_CONSTR);
 
 	env.live = bitset_malloc(get_irg_last_idx(chordal_env->irg));
 
 	/* First, determine the pressure */
-	dom_tree_walk_irg(irg, pressure, NULL, &env);
+	dom_tree_walk_irg(irg, create_borders, NULL, env.chordal_env);
 
 	/* Assign the colors */
 	dom_tree_walk_irg(irg, assign, NULL, &env);
@@ -1023,9 +591,13 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	del_pset(env.pre_colored);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal);
 void be_init_chordal(void)
 {
+	static be_ra_chordal_coloring_t coloring = {
+		be_ra_chordal_color
+	};
 	FIRM_DBG_REGISTER(dbg, "firm.be.chordal");
-}
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal);
+	be_register_chordal_coloring("default", &coloring);
+}