X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=40ac071526d9058136f9219f5de1f7e5f62c2683;hb=321ae93c651a24f17e2b7540e67a959db803c40d;hp=86f2308d3953b2df921557f3775fe77a5f01ac8c;hpb=a1cf7cc9742645630a1bf5c56c72f542d975645f;p=libfirm

diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c
index 86f2308d3..40ac07152 100644
--- a/ir/be/bechordal.c
+++ b/ir/be/bechordal.c
@@ -28,7 +28,7 @@
 #include "belive_t.h"
 
 #undef DUMP_INTERVALS
-#define DUMP_PRESSURE
+#undef DUMP_PRESSURE
 
 #define TEST_COLORS 2048
 
@@ -42,26 +42,13 @@ typedef struct _border_t {
 	unsigned is_def : 1;			/**< Does this border denote a use or a def. */
 } border_t;
 
-typedef struct _if_edge_t {
-	int src, tgt;
-} if_edge_t;
-
-#define IF_EDGE_HASH(e) ((e)->src)
-
-static int if_edge_cmp(const void *p1, const void *p2, size_t size)
-{
-	const if_edge_t *e1 = p1;
-	const if_edge_t *e2 = p2;
-
-	return !(e1->src == e2->src && e1->tgt == e2->tgt);
-}
-
 typedef struct _env_t {
 	struct obstack obst;	/**< An obstack for temporary storage. */
 	set *phi_if;					/**< The phi interference map. */
 	bitset_t *live;   		/**< A live bitset to use in every block. */
 	bitset_t *processed;	/**< A set marking processed blocks. */
 	bitset_t *colors;			/**< The color mask. */
+	bitset_t *in_colors;	/**< Colors used by live in values. */
 	int colors_n;					/**< The number of colors. */
 } env_t;
 
@@ -131,11 +118,11 @@ static void draw_interval_graphs(ir_node *block,
 				int pos = last_pos - seen[nr];
 				int end_pos = last_pos - b->step;
 				int live_in = is_live_in(block, irn);
-				int live_out = is_live_out(block, irn);
+				int live_end = is_live_end(block, irn);
 				int y_val = y_dist * col;
 
 				int red = 0;
-				int green = live_out;
+				int green = live_end;
 				int blue = live_in;
 
 				fprintf(f, "0 0 0 setrgbcolor\n");
@@ -153,6 +140,22 @@ static void draw_interval_graphs(ir_node *block,
 	}
 }
 
+#ifdef USE_OLD_PHI_INTERFERENCE
+
+typedef struct _if_edge_t {
+	int src, tgt;
+} if_edge_t;
+
+#define IF_EDGE_HASH(e) ((e)->src)
+
+static int if_edge_cmp(const void *p1, const void *p2, size_t size)
+{
+	const if_edge_t *e1 = p1;
+	const if_edge_t *e2 = p2;
+
+	return !(e1->src == e2->src && e1->tgt == e2->tgt);
+}
+
 static INLINE if_edge_t *edge_init(if_edge_t *edge, int src, int tgt)
 {
 	/* Bring the smaller entry to src. */
@@ -181,7 +184,7 @@ static INLINE int are_connected(const env_t *env, int src, int tgt)
 	return set_find(env->phi_if, &edge, sizeof(edge), IF_EDGE_HASH(&edge)) != NULL;
 }
 
-
+#endif /* USE_OLD_PHI_INTERFERENCE */
 
 static INLINE border_t *border_add(env_t *env, struct list_head *head,
 			const ir_node *irn, int step, int is_def)
@@ -201,7 +204,9 @@ static void block_alloc(ir_node *block, void *env_ptr)
 	void *obstack_level = obstack_base(obst);
 	bitset_t *live = env->live;
 	bitset_t *colors = env->colors;
+	bitset_t *in_colors = env->in_colors;
 	bitset_t *used_colors = bitset_malloc(env->colors_n);
+	bitset_t *tmp_colors = bitset_obstack_alloc(obst, env->colors_n);
 	ir_graph *irg = get_irn_irg(block);
 
 	int i, n;
@@ -211,7 +216,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 	border_t *b;
 	struct list_head head;
 	pset *live_in = get_live_in(block);
-	pset *live_out = get_live_out(block);
+	pset *live_end = get_live_end(block);
 	ir_node *idom = get_Block_idom(block);
 
 	/*
@@ -233,6 +238,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 	/* Clear the live and allocate the color bitset. */
 	bitset_clear_all(live);
 	bitset_clear_all(colors);
+	bitset_clear_all(in_colors);
 
 	INIT_LIST_HEAD(&head);
 
@@ -240,7 +246,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 	 * Make final uses of all values live out of the block.
 	 * They are neccessary to build up real intervals.
 	 */
-	for(irn = pset_first(live_out); irn; irn = pset_next(live_out)) {
+	for(irn = pset_first(live_end); irn; irn = pset_next(live_end)) {
 		DBG((dbg, LEVEL_3, "Making live: %n/%d\n", irn, get_irn_graph_nr(irn)));
 		bitset_set(live, get_irn_graph_nr(irn));
 		if(!is_Phi(irn) && is_allocatable_irn(irn))
@@ -269,6 +275,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 			bitset_clear(live, nr);
 			border_add(env, &head, irn, step, 1);
 
+#ifdef USE_OLD_PHI_INTERFERENCE
 			if(is_phi_operand(irn)) {
 				unsigned long elm;
 				bitset_foreach(live, elm) {
@@ -280,6 +287,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 					}
 				}
 			}
+#endif
 		}
 
 		/*
@@ -319,6 +327,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 			/* Mark the color of the live in value as used. */
 			assert(is_color(col) && "Node must have been assigned a color.");
 			bitset_set(colors, col);
+			bitset_set(in_colors, col);
 			bitset_set(used_colors, col);
 
 			/* Mark the value live in. */
@@ -349,7 +358,21 @@ static void block_alloc(ir_node *block, void *env_ptr)
 		 */
 		if(b->is_def && !is_live_in(block, irn)) {
 			ra_node_info_t *ri = get_ra_node_info(irn);
-			int col = bitset_next_clear(colors, 0);
+			int col = NO_COLOR;
+
+			/*
+			 * Try to assign live out values colors which are not used by live
+			 * in values.
+			 */
+			if(is_live_out(block, irn)) {
+				bitset_copy(tmp_colors, colors);
+				bitset_andnot(tmp_colors, in_colors);
+				col = bitset_next_clear(tmp_colors, 0);
+			}
+
+			/* If a color is not yet assigned, do it now. */
+			if(!is_color(col))
+				col = bitset_next_clear(colors, 0);
 
 			assert(!is_color(get_irn_color(irn)) && "Color must not have assigned");
 			assert(!bitset_is_set(live, nr) && "Value def must not have been encountered");
@@ -416,7 +439,7 @@ static void block_alloc(ir_node *block, void *env_ptr)
 void be_ra_chordal_init(void)
 {
 	dbg = firm_dbg_register(DBG_BERA);
-	/* firm_dbg_set_mask(dbg, -1); */
+	firm_dbg_set_mask(dbg, -1);
 }
 
 void be_ra_chordal(ir_graph *irg)
@@ -428,10 +451,15 @@ void be_ra_chordal(ir_graph *irg)
 		compute_doms(irg);
 
 	obstack_init(&env->obst);
+
+#ifdef USE_OLD_PHI_INTERFERENCE
 	env->phi_if = new_set(if_edge_cmp, node_count);
+#endif /* USE_OLD_PHI_INTERFERENCE */
+
 	env->live = bitset_obstack_alloc(&env->obst, node_count);
 	env->processed = bitset_obstack_alloc(&env->obst, get_graph_block_count(irg));
 	env->colors = bitset_obstack_alloc(&env->obst, TEST_COLORS);
+	env->in_colors = bitset_obstack_alloc(&env->obst, TEST_COLORS);
 	env->colors_n = TEST_COLORS;
 
 	irg_block_walk_graph(irg, block_alloc, NULL, env);
@@ -449,10 +477,14 @@ void be_ra_chordal_done(ir_graph *irg)
 
 int phi_ops_interfere(const ir_node *a, const ir_node *b)
 {
+#ifdef USE_OLD_PHI_INTERFERENCE
 	ir_graph *irg = get_irn_irg(a);
 	env_t *env = get_irg_ra_link(irg);
 
 	assert(irg == get_irn_irg(b) && "Both nodes must be in the same graph");
 
 	return are_connected(env, get_irn_graph_nr(a), get_irn_graph_nr(b));
+#else
+	return values_interfere(a, b);
+#endif /* USE_OLD_PHI_INTERFERENCE */
 }