X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=81ac0a1618c4b702e6f6a45e64dd01e877dc3a33;hb=4d7a9507baf1737297cd4f7fc91eab209fd5d398;hp=750cfd468771d908f36fbe2c281d6b008a4e8fae;hpb=8786fa72e7744afaaecdab0d002fc821539b79b9;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 750cfd468..81ac0a161 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -62,8 +62,6 @@ typedef struct _be_chordal_alloc_env_t {
 	pset *pre_colored;    /**< Set of precolored nodes. */
 	bitset_t *live;				/**< A liveness bitset. */
 	bitset_t *colors;			/**< The color mask. */
-	bitset_t *valid_colors;	    /**< A mask of colors which shall be considered during allocation.
-								     Registers with the ignore bit on, must not be considered. */
 	bitset_t *in_colors;        /**< Colors used by live in values. */
 	int colors_n;               /**< The number of colors. */
 } be_chordal_alloc_env_t;
@@ -162,7 +160,8 @@ 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) \
@@ -188,7 +187,7 @@ typedef struct {
 
 static insn_t *scan_insn(be_chordal_env_t *env, ir_node *irn, struct obstack *obst)
 {
-	const arch_env_t *arch_env = env->main_env->arch_env;
+	const arch_env_t *arch_env = env->birg->main_env->arch_env;
 	operand_t o;
 	insn_t *insn;
 	int i, n;
@@ -294,9 +293,10 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
 	if(insn->has_constraints) {
 		firm_dbg_module_t *dbg = firm_dbg_register("firm.be.chordal.constr");
-		const arch_env_t *aenv = env->main_env->arch_env;
+		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);
+		bitset_t *non_ignore   = 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]));
@@ -307,6 +307,8 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 		const ir_edge_t *edge;
 		ir_node *perm = insert_Perm_after(aenv, env->cls, env->dom_front, sched_prev(irn));
 
+		arch_put_non_ignore_regs(aenv, env->cls, non_ignore);
+
 		/* Registers are propagated by insert_Perm_after(). Clean them here! */
 		if(perm) {
 			foreach_out_edge(perm, edge) {
@@ -324,14 +326,16 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 		/*
 		 * 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.
+		 * so it had output constraints. The other results then can be assigned freely.
 		 */
 
 		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)) {
+			if(arch_register_req_is(&op->req, limited) && arch_irn_consider_in_reg_alloc(aenv, env->cls, op->carrier)) {
+				const arch_register_t *reg = arch_get_irn_register(aenv, op->carrier);
+
 				pmap_insert(partners, op->carrier, op->partner ? op->partner->carrier : NULL);
 				alloc_nodes[n_alloc] = op->carrier;
 
@@ -339,7 +343,13 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
 				bitset_clear_all(bs);
 				op->req.limited(op->req.limited_env, bs);
-				bitset_and(bs, alloc_env->valid_colors);
+				assert((!reg || bitset_is_set(bs, reg->index)) && "color of pre-colored node is not in its allowed colors");
+				bitset_and(bs, non_ignore);
+
+				/* if the node is pre-colored, explicitly allow the color with which it is pre-colored. */
+				if(reg) {
+					bitset_set(bs, reg->index);
+				}
 
 				DBG((dbg, LEVEL_2, "\tallowed registers for %+F: %B\n", op->carrier, bs));
 
@@ -351,6 +361,18 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 		}
 
 		if(perm) {
+			/* Make the input constraints of the node to output constraints of the Perm's Projs */
+			for(i = insn->use_start; i < insn->n_ops; ++i) {
+				operand_t *op = &insn->ops[i];
+
+				/*
+					If the operand is an "in" operand, constrained and the carrier is a Proj to the Perm,
+					then copy the in constraint to the Perm's out constraint
+				*/
+				if(arch_register_req_is(&op->req, limited) && is_Proj(op->carrier) && perm == get_Proj_pred(op->carrier))
+					be_set_constr_limited(perm, BE_OUT_POS(get_Proj_proj(op->carrier)), &op->req);
+			}
+
 			foreach_out_edge(perm, edge) {
 				ir_node *proj = get_edge_src_irn(edge);
 
@@ -363,7 +385,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
 					bitset_clear_all(bs);
 					arch_get_allocatable_regs(aenv, proj, -1, bs);
-					bitset_and(bs, alloc_env->valid_colors);
+					bitset_and(bs, non_ignore);
 					bitset_foreach(bs, col)
 						bipartite_add(bp, n_alloc, col);
 
@@ -374,7 +396,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 
 		bipartite_matching(bp, assignment);
 
-
+		/* Assign colors obtained from the matching. */
 		for(i = 0; i < n_alloc; ++i) {
 			int j;
 			ir_node *nodes[2];
@@ -397,8 +419,11 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 		}
 
 
+		/* Allocate the non-constrained Projs of the Perm. */
 		if(perm) {
 			bitset_clear_all(bs);
+
+			/* Put the colors of all Projs in a bitset. */
 			foreach_out_edge(perm, edge) {
 				ir_node *proj              = get_edge_src_irn(edge);
 				const arch_register_t *reg = arch_get_irn_register(aenv, proj);
@@ -407,7 +432,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i
 					bitset_set(bs, reg->index);
 			}
 
-			// bitset_or(bs, alloc_env->ignore_colors);
+			/* Assign the not yet assigned Projs of the Perm a suitable color. */
 			foreach_out_edge(perm, edge) {
 				ir_node *proj              = get_edge_src_irn(edge);
 				const arch_register_t *reg = arch_get_irn_register(aenv, proj);
@@ -443,7 +468,7 @@ 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);) {
@@ -469,6 +494,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;
@@ -570,19 +596,17 @@ 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(colors);
 	bitset_clear_all(live);
 	bitset_clear_all(in_colors);
 
-	bitset_copy(colors, alloc_env->valid_colors);
-	bitset_flip_all(colors);
-
 	DBG((dbg, LEVEL_4, "Assigning colors for block %+F\n", block));
 	DBG((dbg, LEVEL_4, "\tusedef chain for block\n"));
 	list_for_each_entry(border_t, b, head, list) {
@@ -613,7 +637,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.
 	 */
@@ -684,12 +709,9 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	env.chordal_env   = chordal_env;
 	env.colors_n      = colors_n;
 	env.colors        = bitset_malloc(colors_n);
-	env.valid_colors  = bitset_malloc(colors_n);
 	env.in_colors     = bitset_malloc(colors_n);
 	env.pre_colored   = pset_new_ptr_default();
 
-	arch_put_non_ignore_regs(chordal_env->main_env->arch_env, chordal_env->cls, env.valid_colors);
-
 	/* Handle register targeting constraints */
 	dom_tree_walk_irg(irg, constraints, NULL, &env);
 
@@ -711,7 +733,6 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 
 	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);
@@ -721,7 +742,5 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env)
 	free(env.live);
 	free(env.colors);
 	free(env.in_colors);
-	free(env.valid_colors);
-
 	del_pset(env.pre_colored);
 }