X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=057dacdb9bf8e5c4f714eb439e5724e102eeae49;hb=2f7da22ade10e502888999170ef42fcf9a619852;hp=1922608967797487e4aac352601fd5efb600f23f;hpb=702fe1d97f05f26a150804c4196875e4367a648a;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index 192260896..057dacdb9 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -48,7 +48,9 @@
 #include "irop.h"
 #include "irouts.h"
 #include "irgmod.h"
+#include "iropt_dbg.h"
 #include "debug.h"
+#include "array_t.h"
 #include "error.h"
 
 #include "tv_t.h"
@@ -62,9 +64,6 @@
 /* define this to check the consistency of partitions */
 #define CHECK_PARTITIONS
 
-/* define this to disable followers (may be buggy) */
-#undef NO_FOLLOWER
-
 typedef struct node_t            node_t;
 typedef struct partition_t       partition_t;
 typedef struct opcode_key_t      opcode_key_t;
@@ -224,6 +223,7 @@ static void check_all_partitions(environment_t *env) {
 	partition_t *P;
 	node_t      *node;
 
+#ifdef DEBUG_libfirm
 	for (P = env->dbg_list; P != NULL; P = P->dbg_next) {
 		check_partition(P);
 		list_for_each_entry(node_t, node, &P->Follower, node_list) {
@@ -232,6 +232,7 @@ static void check_all_partitions(environment_t *env) {
 			assert(leader != node && leader->part == node->part);
 		}
 	}
+#endif
 }
 
 /**
@@ -499,6 +500,7 @@ static INLINE tarval *get_node_tarval(const ir_node *irn) {
  */
 static INLINE void add_to_worklist(partition_t *X, environment_t *env) {
 	assert(X->on_worklist == 0);
+	DB((dbg, LEVEL_2, "Adding part%d to worklist\n", X->nr));
 	X->wl_next     = env->worklist;
 	X->on_worklist = 1;
 	env->worklist  = X;
@@ -813,12 +815,6 @@ static partition_t *split_no_followers(partition_t *Z, node_t *g, environment_t
 	return Z_prime;
 }  /* split_no_followers */
 
-#ifdef NO_FOLLOWER
-
-#define split(Z, g, env) split_no_followers(*(Z), g, env)
-
-#else
-
 /**
  * Make the Follower -> Leader transition for a node.
  *
@@ -1150,7 +1146,6 @@ static partition_t *split(partition_t **pX, node_t *gg, environment_t *env) {
 
 	return X_prime;
 }  /* split */
-#endif /* NO_FOLLOWER */
 
 /**
  * Returns non-zero if the i'th input of a Phi node is live.
@@ -1891,7 +1886,9 @@ static void compute_Proj_Cmp(node_t *node, ir_node *cmp) {
 		 * NaN != NaN is defined, so we must check this here.
 		 */
 		tv = new_tarval_from_long(pnc & pn_Cmp_Eq, mode_b);
+#ifdef WITH_UNKNOWN
 not_equal:
+#endif
 
 		/* if the node was ONCE evaluated by all constants, but now
 		   this breakes AND we cat by partition a different result, switch to bottom.
@@ -2553,13 +2550,9 @@ static void propagate(environment_t *env) {
 		for (x = fallen; x != NULL; x = x->next)
 			x->on_fallen = 0;
 
-#ifndef NO_FOLLOWER
 		if (old_type_was_T_or_C) {
 			node_t *y, *tmp;
 
-			if (Y->on_worklist == 0)
-				add_to_worklist(Y, env);
-
 			/* check if some nodes will make the leader -> follower transition */
 			list_for_each_entry_safe(node_t, y, tmp, &Y->Leader, node_list) {
 				if (y->type.tv != tarval_top && ! is_con(y->type)) {
@@ -2578,7 +2571,6 @@ static void propagate(environment_t *env) {
 				}
 			}
 		}
-#endif
 		split_by(Y, env);
 	}
 }  /* propagate */
@@ -2656,19 +2648,22 @@ static void apply_cf(ir_node *block, void *ctx) {
 		env->modified = 1;
 
 		for (i = n - 1; i >= 0; --i) {
-			ir_node *pred    = get_Block_cfgpred(block, i);
-			node_t  *pred_bl = get_irn_node(get_nodes_block(skip_Proj(pred)));
-
-			if (pred_bl->flagged == 0) {
-				pred_bl->flagged = 3;
-
-				if (pred_bl->type.tv == tarval_reachable) {
-					/*
-					 * We will remove an edge from block to its pred.
-					 * This might leave the pred block as an endless loop
-					 */
-					if (! is_backedge(block, i))
-						keep_alive(pred_bl->node);
+			ir_node *pred = get_Block_cfgpred(block, i);
+
+			if (! is_Bad(pred)) {
+				node_t *pred_bl = get_irn_node(get_nodes_block(skip_Proj(pred)));
+
+				if (pred_bl->flagged == 0) {
+					pred_bl->flagged = 3;
+
+					if (pred_bl->type.tv == tarval_reachable) {
+						/*
+						 * We will remove an edge from block to its pred.
+						 * This might leave the pred block as an endless loop
+						 */
+						if (! is_backedge(block, i))
+							keep_alive(pred_bl->node);
+					}
 				}
 			}
 		}
@@ -2678,6 +2673,7 @@ static void apply_cf(ir_node *block, void *ctx) {
 		if (block != get_irg_end_block(current_ir_graph)) {
 			/* mark dead blocks */
 			set_Block_dead(block);
+			DB((dbg, LEVEL_1, "Removing dead %+F\n", block));
 		} else {
 			/* the endblock is unreachable */
 			set_irn_in(block, 0, NULL);
@@ -2691,6 +2687,8 @@ static void apply_cf(ir_node *block, void *ctx) {
 
 		if (can_exchange(pred)) {
 			ir_node *new_block = get_nodes_block(pred);
+			DB((dbg, LEVEL_1, "Fuse %+F with %+F\n", block, new_block));
+			DBG_OPT_COMBO(block, new_block, FS_OPT_COMBO_CF);
 			exchange(block, new_block);
 			node->node = new_block;
 			env->modified = 1;
@@ -2707,18 +2705,21 @@ static void apply_cf(ir_node *block, void *ctx) {
 		if (node->type.tv == tarval_reachable) {
 			in_X[k++] = pred;
 		} else {
-			node_t *pred_bl = get_irn_node(get_nodes_block(skip_Proj(pred)));
-
-			if (pred_bl->flagged == 0) {
-				pred_bl->flagged = 3;
-
-				if (pred_bl->type.tv == tarval_reachable) {
-					/*
-					 * We will remove an edge from block to its pred.
-					 * This might leave the pred block as an endless loop
-					 */
-					if (! is_backedge(block, i))
-						keep_alive(pred_bl->node);
+			DB((dbg, LEVEL_1, "Removing dead input %d from %+F (%+F)\n", i, block, pred));
+			if (! is_Bad(pred)) {
+				node_t *pred_bl = get_irn_node(get_nodes_block(skip_Proj(pred)));
+
+				if (pred_bl->flagged == 0) {
+					pred_bl->flagged = 3;
+
+					if (pred_bl->type.tv == tarval_reachable) {
+						/*
+						 * We will remove an edge from block to its pred.
+						 * This might leave the pred block as an endless loop
+						 */
+						if (! is_backedge(block, i))
+							keep_alive(pred_bl->node);
+					}
 				}
 			}
 		}
@@ -2739,6 +2740,7 @@ static void apply_cf(ir_node *block, void *ctx) {
 			set_irn_node(c, node);
 			node->node = c;
 			DB((dbg, LEVEL_1, "%+F is replaced by %+F\n", phi, c));
+			DBG_OPT_COMBO(phi, c, FS_OPT_COMBO_CONST);
 			exchange(phi, c);
 			env->modified = 1;
 		} else {
@@ -2757,6 +2759,7 @@ static void apply_cf(ir_node *block, void *ctx) {
 
 				node->node = s;
 				DB((dbg, LEVEL_1, "%+F is replaced by %+F because of cf change\n", phi, s));
+				DBG_OPT_COMBO(phi, s, FS_OPT_COMBO_FOLLOWER);
 				exchange(phi, s);
 				phi_node->node = s;
 				env->modified = 1;
@@ -2773,6 +2776,7 @@ static void apply_cf(ir_node *block, void *ctx) {
 
 		if (can_exchange(pred)) {
 			ir_node *new_block = get_nodes_block(pred);
+			DBG_OPT_COMBO(block, new_block, FS_OPT_COMBO_CF);
 			exchange(block, new_block);
 			node->node = new_block;
 			env->modified = 1;
@@ -2828,11 +2832,12 @@ static void apply_result(ir_node *irn, void *ctx) {
 					node_t *sel = get_irn_node(get_Cond_selector(cond));
 
 					if (is_tarval(sel->type.tv) && tarval_is_constant(sel->type.tv)) {
-						/* Cond selector is a constant, make a Jmp */
+						/* Cond selector is a constant and the Proj is reachable, make a Jmp */
 						ir_node *jmp  = new_r_Jmp(current_ir_graph, block->node);
 						set_irn_node(jmp, node);
 						node->node = jmp;
 						DB((dbg, LEVEL_1, "%+F is replaced by %+F\n", irn, jmp));
+						DBG_OPT_COMBO(irn, jmp, FS_OPT_COMBO_CF);
 						exchange(irn, jmp);
 						env->modified = 1;
 					}
@@ -2853,6 +2858,7 @@ static void apply_result(ir_node *irn, void *ctx) {
 					set_irn_node(c, node);
 					node->node = c;
 					DB((dbg, LEVEL_1, "%+F is replaced by %+F\n", irn, c));
+					DBG_OPT_COMBO(irn, c, FS_OPT_COMBO_CONST);
 					exchange(irn, c);
 					env->modified = 1;
 				}
@@ -2864,6 +2870,7 @@ static void apply_result(ir_node *irn, void *ctx) {
 					node->node = symc;
 
 					DB((dbg, LEVEL_1, "%+F is replaced by %+F\n", irn, symc));
+					DBG_OPT_COMBO(irn, symc, FS_OPT_COMBO_CONST);
 					exchange(irn, symc);
 					env->modified = 1;
 				}
@@ -2874,6 +2881,10 @@ static void apply_result(ir_node *irn, void *ctx) {
 
 				if (leader != irn) {
 					DB((dbg, LEVEL_1, "%+F from part%d is replaced by %+F\n", irn, node->part->nr, leader));
+					if (node->is_follower)
+						DBG_OPT_COMBO(irn, leader, FS_OPT_COMBO_FOLLOWER);
+					else
+						DBG_OPT_COMBO(irn, leader, FS_OPT_COMBO_CONGRUENT);
 					exchange(irn, leader);
 					env->modified = 1;
 				}
@@ -2946,11 +2957,13 @@ static void set_compute_functions(void) {
 }  /* set_compute_functions */
 
 static int dump_partition_hook(FILE *F, ir_node *n, ir_node *local) {
+#ifdef DEBUG_libfirm
 	ir_node *irn = local != NULL ? local : n;
 	node_t *node = get_irn_node(irn);
 
 	ir_fprintf(F, "info2 : \"partition %u type %+F\"\n", node->part->nr, node->type);
 	return 1;
+#endif
 }
 
 void combo(ir_graph *irg) {
@@ -2985,7 +2998,6 @@ void combo(ir_graph *irg) {
 	assure_irg_outs(irg);
 	assure_cf_loop(irg);
 
-
 	/* we have our own value_of function */
 	set_value_of_func(get_node_tarval);