X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=7beab1b3d016f563cc4131b662b47c4f29f51cc3;hb=23b71abac8014aa6bfee3b47648fdb8fe8687b8f;hp=e7950b64614c099323bc254ad4354d0d1f294616;hpb=6d53861729ffa5a8bd3ea48b2643ea5438f71d9c;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index e7950b646..7beab1b3d 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -26,6 +26,7 @@
 #include "list.h"
 #include "bitset.h"
 #include "iterator.h"
+#include "bipartite.h"
 
 #include "irmode_t.h"
 #include "irgraph_t.h"
@@ -53,7 +54,7 @@
 
 #define NO_COLOR (-1)
 
-#undef DUMP_INTERVALS
+#define DUMP_INTERVALS
 
 typedef struct _be_chordal_alloc_env_t {
 	be_chordal_env_t *chordal_env;
@@ -159,170 +160,272 @@ static INLINE border_t *border_add(be_chordal_env_t *env, struct list_head *head
  */
 static INLINE int has_reg_class(const be_chordal_env_t *env, const ir_node *irn)
 {
-  return arch_irn_has_reg_class(env->main_env->arch_env, irn, -1, env->cls);
+	// return arch_irn_has_reg_class(env->main_env->arch_env, irn, -1, env->cls);
+	return arch_irn_consider_in_reg_alloc(env->birg->main_env->arch_env, env->cls, irn);
 }
 
 #define has_limited_constr(req, irn) \
 	(arch_get_register_req(arch_env, (req), irn, -1) && (req)->type == arch_register_req_type_limited)
 
-/**
- * Handle register targeting constraints signaled by a Perm.
- * @param alloc_env    Private data for the allocation phase.
- * @param perm         The Perm node guarding the constrained node.
- * @return             The constrained node.
-
-		Pro-coloring works as follows:
-
-         +-----------------------------------+
-         |            Perm                   |
-         +---.-------.--------.---------.----+
-             |       |        |         |
-         +---+--+    |        |         |
-         | Proj |    |        |         |
-         +------+    |        |         |
-                     |        |         |
-                  +--+---+    |         |
-                  | Proj |    |         |
-                  +--.---+    |         |
-                     |        |         |
-                     |     +--+---+     |
-                     |     | Proj |     |
-                     |     +------+     |
-                      |                 |
-                      |             +---+--+
-                       `-.          | Proj | Result:
-                          `._       +---.--+ R1
-                             `.         |
-                               `-.      |
-                                  `._   |
-                                    +`.-+--+
-                                    |Constr| Result:
-                                    +------+ R2
-
-		1) Look at all Projs of the Perm if they have output constraints.
-		   If one has an output constraint, pre-color it, else record it
-		   in the set leftover. Its color has to be chosen after all
-		   constrained nodes are colored. Furthermore record all colors
-		   used in the pre-coloring in the set colors_used.
-
-		2) Look whether the first node not a Proj (this is the constrained
-		   node due to which the Perm has been inserted) has an output
-		   constraint. If yes, pre-color the node accordingly else do nothing
-		   since the node's input constraints are modelled by the Proj's
-		   output constraint.
-
-		   There's one subtle point here: If thenode has an output constraint
-		   and the live range of some Proj ends at that node, we must give
-		   that Proj the color of the constrained node. Otherwise the
-		   available colors may not suffice for the rest of the projs.
-
-		3) At last, color the Projs which have not been colored yet with the
-		   left over colors.
-
-		   So afterwards, everything including the constrained node will
-		   be colored and the assign() phase can complete this coloring.
-		   Note that therefore, we put the pre-colored nodes in a set
-		   called pre_colored().
+typedef struct _operand_t operand_t;
 
- */
-static ir_node *handle_constraints_at_perm(be_chordal_alloc_env_t *alloc_env, ir_node *perm)
-{
-	be_chordal_env_t *env      = alloc_env->chordal_env;
-	firm_dbg_module_t *dbg     = env->dbg;
-	const arch_env_t *arch_env = env->main_env->arch_env;
-
-	pset *leftover        = pset_new_ptr(8);
-	bitset_t *bs          = bitset_alloca(env->cls->n_regs);
-	bitset_t *colors_used = bitset_alloca(env->cls->n_regs);
-	ir_node *irn, *cnstr;
-	int has_cnstr = 0;
-	int col;
+struct _operand_t {
+	ir_node *irn;
+	ir_node *carrier;
+	operand_t *partner;
+	int pos;
 	arch_register_req_t req;
-	const arch_register_t *reg, *cnstr_reg = NULL;
+};
 
-	assert(be_is_Perm(perm));
+typedef struct {
+	operand_t *ops;
+	int n_ops;
+	int use_start;
+	ir_node *next_insn;
+	unsigned has_constraints : 1;
+} insn_t;
 
-	DBG((dbg, LEVEL_2, "Constraints on %+F\n", perm));
+static insn_t *scan_insn(be_chordal_env_t *env, ir_node *irn, struct obstack *obst)
+{
+	const arch_env_t *arch_env = env->birg->main_env->arch_env;
+	operand_t o;
+	insn_t *insn;
+	int i, n;
 
-	/*
-	 * Color constrained Projs first.
-	 */
-	for(irn = sched_next(perm); is_Proj(irn); irn = sched_next(irn)) {
-		arch_register_req_t req;
+	insn = obstack_alloc(obst, sizeof(insn[0]));
+	memset(insn, 0, sizeof(insn[0]));
+
+	insn->next_insn = sched_next(irn);
+	if(get_irn_mode(irn) == mode_T) {
+		ir_node *p;
+
+		for(p = sched_next(irn); is_Proj(p); p = sched_next(p)) {
+			if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, p)) {
+				o.carrier = p;
+				o.irn     = irn;
+				o.pos     = -(get_Proj_proj(p) + 1);
+				o.partner = NULL;
+				arch_get_register_req(arch_env, &o.req, p, -1);
+				obstack_grow(obst, &o, sizeof(o));
+				insn->n_ops++;
+				insn->has_constraints |= arch_register_req_is(&o.req, limited);
+			}
+		}
 
-		if(has_limited_constr(&req, irn)) {
-			bitset_clear_all(bs);
-			req.data.limited(irn, -1, bs);
-			col = bitset_next_set(bs, 0);
-			reg = arch_register_for_index(env->cls, col);
+		insn->next_insn = p;
+	}
 
-			pset_insert_ptr(alloc_env->pre_colored, irn);
-			arch_set_irn_register(arch_env, irn, reg);
-			bitset_set(colors_used, col);
+	else if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, irn)) {
+		o.carrier = irn;
+		o.irn     = irn;
+		o.pos     = -1;
+		o.partner = NULL;
+		arch_get_register_req(arch_env, &o.req, irn, -1);
+		obstack_grow(obst, &o, sizeof(o));
+		insn->n_ops++;
+		insn->has_constraints |= arch_register_req_is(&o.req, limited);
+	}
 
-			DBG((dbg, LEVEL_2, "\tPerm Proj with constraints: %+F set to %s\n", irn, reg->name));
+	insn->use_start = insn->n_ops;
+
+	for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
+		ir_node *op = get_irn_n(irn, i);
+
+		if(arch_irn_consider_in_reg_alloc(arch_env, env->cls, op)) {
+			o.carrier = op;
+			o.irn     = irn;
+			o.pos     = i;
+			o.partner = NULL;
+			arch_get_register_req(arch_env, &o.req, irn, i);
+			obstack_grow(obst, &o, sizeof(o));
+			insn->n_ops++;
+			insn->has_constraints |= arch_register_req_is(&o.req, limited);
 		}
+	}
 
-		else
-			pset_insert_ptr(leftover, irn);
+	insn->ops = obstack_finish(obst);
+	return insn;
+}
 
+static operand_t *find_unpaired_use(insn_t *insn, const operand_t *op, int can_be_constrained)
+{
+	int i;
+	operand_t *res = NULL;
+
+	for(i = insn->use_start; i < insn->n_ops; ++i) {
+		operand_t *op = &insn->ops[i];
+		int has_constraint = arch_register_req_is(&op->req, limited);
+
+		if(!values_interfere(op->carrier, op->irn) && !op->partner && (!has_constraint || can_be_constrained)) {
+			if(arch_register_req_is(&op->req, should_be_same) && op->req.other_same == op->carrier)
+				return op;
+			else
+				res = op;
+		}
 	}
-	cnstr = irn;
 
-	if(has_limited_constr(&req, cnstr)) {
-		bitset_clear_all(bs);
-		req.data.limited(cnstr, -1, bs);
-		col = bitset_next_set(colors_used, 0);
-		reg = arch_register_for_index(env->cls, col);
+	return res;
+}
 
-		arch_set_irn_register(arch_env, cnstr, reg);
-		pset_insert_ptr(alloc_env->pre_colored, cnstr);
+static void pair_up_operands(insn_t *insn)
+{
+	firm_dbg_module_t *dbg = firm_dbg_register("firm.be.chordal.constr");
+	int i;
 
-		DBG((dbg, LEVEL_2, "\tConstrained node: %+F set to %s\n", irn, reg->name));
+	for(i = 0; i < insn->use_start; ++i) {
+		operand_t *op      = &insn->ops[i];
+		int has_constraint = arch_register_req_is(&op->req, limited);
+		operand_t *partner = find_unpaired_use(insn, op, !has_constraint);
 
-		/*
-		 * The color of the constrained node must not be used!
-		 * The Proj which has been assigned that color might
-		 * interfere with the constrained node which leads
-		 * to an invalid register allocation.
-		 */
-		assert(!bitset_is_set(colors_used, reg->index));
+		if(partner) {
+			op->partner = partner;
+			partner->partner = op;
+		}
+	}
+}
+
+static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn)
+{
+	be_chordal_env_t *env  = alloc_env->chordal_env;
+	void *base             = obstack_base(&env->obst);
+	insn_t *insn           = scan_insn(env, irn, &env->obst);
+	ir_node *res           = insn->next_insn;
+
+	if(insn->has_constraints) {
+		firm_dbg_module_t *dbg = firm_dbg_register("firm.be.chordal.constr");
+		const arch_env_t *aenv = env->birg->main_env->arch_env;
+		int n_regs             = env->cls->n_regs;
+		bitset_t *bs           = bitset_alloca(n_regs);
+		ir_node **alloc_nodes  = alloca(n_regs * sizeof(alloc_nodes[0]));
+		bipartite_t *bp        = bipartite_new(n_regs, n_regs);
+		int *assignment        = alloca(n_regs * sizeof(assignment[0]));
+		pmap *partners         = pmap_create();
+
+		int i, n_alloc;
+		long col;
+		const ir_edge_t *edge;
+		ir_node *perm = insert_Perm_after(aenv, env->cls, env->dom_front, sched_prev(irn));
+
+		/* Registers are propagated by insert_Perm_after(). Clean them here! */
+		if(perm) {
+			foreach_out_edge(perm, edge) {
+				ir_node *proj = get_edge_src_irn(edge);
+				arch_set_irn_register(aenv, proj, NULL);
+			}
+		}
+
+
+		be_liveness(env->irg);
+		insn = scan_insn(env, irn, &env->obst);
+
+		DBG((dbg, LEVEL_1, "handling constraints for %+F\n", irn));
 
 		/*
-		 * Look for a Proj not interfering with the constrained node.
-		 * This Proj can be safely set to the constrafined nodes
-		 * color.
+		 * If there was no Perm made, nothing was alive in this register class.
+		 * This means, that the node has no operands, thus no input constraints.
+		 * so it had output constraints. The other results then can be assigned freeliy.
 		 */
-		for(irn = pset_first(leftover); irn; irn = pset_next(leftover)) {
-			if(!values_interfere(irn, cnstr)) {
-
-				DBG((dbg, LEVEL_2, "\tFound Proj not interfering with contr node %+F set to %s\n", irn, reg->name));
-				pset_insert_ptr(alloc_env->pre_colored, irn);
-				arch_set_irn_register(arch_env, irn, reg);
-				bitset_set(colors_used, reg->index);
-				pset_remove_ptr(leftover, irn);
-				pset_break(leftover);
-				break;
+
+		pair_up_operands(insn);
+
+		for(i = 0, n_alloc = 0; i < insn->n_ops; ++i) {
+			operand_t *op = &insn->ops[i];
+			if(arch_register_req_is(&op->req, limited)) {
+				pmap_insert(partners, op->carrier, op->partner ? op->partner->carrier : NULL);
+				alloc_nodes[n_alloc] = op->carrier;
+
+				DBG((dbg, LEVEL_2, "\tassociating %+F and %+F\n", op->carrier, pmap_get(partners, op->carrier)));
+
+				bitset_clear_all(bs);
+				op->req.limited(op->req.limited_env, bs);
+
+				DBG((dbg, LEVEL_2, "\tallowed registers for %+F: %B\n", op->carrier, bs));
+
+				bitset_foreach(bs, col)
+					bipartite_add(bp, n_alloc, col);
+
+				n_alloc++;
 			}
 		}
-	}
 
-	/*
-	 * Color the leftover Projs with the leftover colors.
-	 */
-	for(irn = pset_first(leftover); irn; irn = pset_next(leftover)) {
-		col = bitset_next_clear(colors_used, 0);
-		reg = arch_register_for_index(env->cls, col);
+		if(perm) {
+			foreach_out_edge(perm, edge) {
+				ir_node *proj = get_edge_src_irn(edge);
+
+				assert(is_Proj(proj));
+
+				if(values_interfere(proj, irn)) {
+					assert(n_alloc < n_regs);
+					alloc_nodes[n_alloc] = proj;
+					pmap_insert(partners, proj, NULL);
+
+					bitset_clear_all(bs);
+					arch_get_allocatable_regs(aenv, proj, -1, bs);
+					bitset_foreach(bs, col)
+						bipartite_add(bp, n_alloc, col);
+
+					n_alloc++;
+				}
+			}
+		}
+
+		bipartite_matching(bp, assignment);
+
+		for(i = 0; i < n_alloc; ++i) {
+			int j;
+			ir_node *nodes[2];
+			const arch_register_t *reg;
+
+			assert(assignment[i] >= 0 && "there must have been a register assigned");
+			reg = arch_register_for_index(env->cls, assignment[i]);
+
+			nodes[0] = alloc_nodes[i];
+			nodes[1] = pmap_get(partners, alloc_nodes[i]);
+
+			for(j = 0; j < 2; ++j) {
+				if(!nodes[j])
+					continue;
+
+				arch_set_irn_register(aenv, nodes[j], reg);
+				pset_hinsert_ptr(alloc_env->pre_colored, nodes[j]);
+				DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", nodes[j], reg->name));
+			}
+		}
+
+
+		if(perm) {
+			bitset_clear_all(bs);
+			foreach_out_edge(perm, edge) {
+				ir_node *proj              = get_edge_src_irn(edge);
+				const arch_register_t *reg = arch_get_irn_register(aenv, proj);
 
-		arch_set_irn_register(arch_env, irn, reg);
-		pset_insert_ptr(alloc_env->pre_colored, irn);
-		bitset_set(colors_used, col);
+				if(reg != NULL)
+					bitset_set(bs, reg->index);
+			}
+
+			// bitset_or(bs, alloc_env->ignore_colors);
+			foreach_out_edge(perm, edge) {
+				ir_node *proj              = get_edge_src_irn(edge);
+				const arch_register_t *reg = arch_get_irn_register(aenv, proj);
+
+				DBG((dbg, LEVEL_2, "\tchecking reg of %+F: %s\n", proj, reg ? reg->name : "<none>"));
 
-		DBG((dbg, LEVEL_2, "\tLeft over %+F set to %s\n", irn, reg->name));
+				if(reg == NULL) {
+					col = bitset_next_clear(bs, 0);
+					reg = arch_register_for_index(env->cls, col);
+					bitset_set(bs, reg->index);
+					arch_set_irn_register(aenv, proj, reg);
+					pset_insert_ptr(alloc_env->pre_colored, proj);
+					DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", proj, reg->name));
+				}
+			}
+		}
+
+		pmap_destroy(partners);
 	}
 
-	del_pset(leftover);
-	return cnstr;
+	obstack_free(&env->obst, base);
+	return res;
 }
 
 /**
@@ -334,13 +437,13 @@ static ir_node *handle_constraints_at_perm(be_chordal_alloc_env_t *alloc_env, ir
  */
 static void constraints(ir_node *bl, void *data)
 {
+	firm_dbg_module_t *dbg      = firm_dbg_register("firm.be.chordal.constr");
 	be_chordal_alloc_env_t *env = data;
-	arch_env_t *arch_env        = env->chordal_env->main_env->arch_env;
+	arch_env_t *arch_env        = env->chordal_env->birg->main_env->arch_env;
 	ir_node *irn;
 
-	for(irn = sched_first(bl); !sched_is_end(irn); irn = sched_next(irn)) {
-		if(be_is_Perm(irn))
-			irn = handle_constraints_at_perm(env, irn);
+	for(irn = sched_first(bl); !sched_is_end(irn);) {
+		irn = handle_constraints(env, irn);
 	}
 }
 
@@ -362,6 +465,7 @@ static void pressure(ir_node *block, void *env_ptr)
 
 	be_chordal_alloc_env_t *alloc_env = env_ptr;
 	be_chordal_env_t *env             = alloc_env->chordal_env;
+	const arch_env_t *arch_env        = env->birg->main_env->arch_env;
 	bitset_t *live                    = alloc_env->live;
 	firm_dbg_module_t *dbg            = env->dbg;
 	ir_node *irn;
@@ -463,15 +567,15 @@ static void assign(ir_node *block, void *env_ptr)
 	bitset_t *live              = alloc_env->live;
 	bitset_t *colors            = alloc_env->colors;
 	bitset_t *in_colors         = alloc_env->in_colors;
-	const arch_env_t *arch_env  = env->main_env->arch_env;
+	const arch_env_t *arch_env  = env->birg->main_env->arch_env;
 
 	const ir_node *irn;
 	border_t *b;
 	struct list_head *head = get_block_border_head(env, block);
 	pset *live_in = put_live_in(block, pset_new_ptr_default());
 
-	bitset_clear_all(live);
 	bitset_clear_all(colors);
+	bitset_clear_all(live);
 	bitset_clear_all(in_colors);
 
 	DBG((dbg, LEVEL_4, "Assigning colors for block %+F\n", block));
@@ -504,7 +608,8 @@ static void assign(ir_node *block, void *env_ptr)
 	}
 
 	/*
-	 * Mind that the sequence of defs from back to front defines a perfect
+	 * Mind that the sequence
+	 * of defs from back to front defines a perfect
 	 * elimination order. So, coloring the definitions from first to last
 	 * will work.
 	 */
@@ -520,8 +625,6 @@ static void assign(ir_node *block, void *env_ptr)
 			const arch_register_t *reg;
 			int col = NO_COLOR;
 
-			DBG((dbg, LEVEL_4, "\tcolors in use: %b\n", colors));
-
 			if(pset_find_ptr(alloc_env->pre_colored, irn)) {
 				reg = arch_get_irn_register(arch_env, irn);
 				col = reg->index;
@@ -564,47 +667,51 @@ static void assign(ir_node *block, void *env_ptr)
 
 void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 {
-	int node_count        = get_graph_node_count(chordal_env->irg);
+	be_chordal_alloc_env_t env;
+	char buf[256];
+
 	int colors_n          = arch_register_class_n_regs(chordal_env->cls);
 	ir_graph *irg         = chordal_env->irg;
 
-	be_chordal_alloc_env_t env;
 
 	if(get_irg_dom_state(irg) != dom_consistent)
 		compute_doms(irg);
 
-	env.chordal_env  = chordal_env;
-	env.live         = bitset_malloc(node_count);
-	env.colors       = bitset_malloc(colors_n);
-	env.in_colors    = bitset_malloc(colors_n);
-	env.colors_n     = colors_n;
-	env.pre_colored  = pset_new_ptr_default();
+	env.chordal_env   = chordal_env;
+	env.colors_n      = colors_n;
+	env.colors        = bitset_malloc(colors_n);
+	env.in_colors     = bitset_malloc(colors_n);
+	env.pre_colored   = pset_new_ptr_default();
 
 	/* 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);
+		dump_ir_block_graph_sched(chordal_env->irg, buf);
+	}
+
+	be_numbering(irg);
+	env.live = bitset_malloc(get_graph_node_count(chordal_env->irg));
+
 	/* First, determine the pressure */
 	dom_tree_walk_irg(irg, pressure, NULL, &env);
 
 	/* Assign the colors */
 	dom_tree_walk_irg(irg, assign, NULL, &env);
 
-#ifdef DUMP_INTERVALS
-	{
-		char buf[128];
-    	plotter_t *plotter;
+	be_numbering_done(irg);
 
-		ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", cls->name, irg);
+	if(chordal_env->opts->dump_flags & BE_CH_DUMP_TREE_INTV) {
+    	plotter_t *plotter;
+		ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", chordal_env->cls->name, irg);
     	plotter = new_plotter_ps(buf);
-
-    	draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter, env->arch_env, cls);
+    	draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter);
     	plotter_free(plotter);
 	}
-#endif
 
 	free(env.live);
 	free(env.colors);
 	free(env.in_colors);
-
 	del_pset(env.pre_colored);
 }