Fixed r22124:
[libfirm] / ir / opt / combo.c
index 6ea1d31..2fc87e3 100644 (file)
@@ -48,6 +48,7 @@
 #include "irop.h"
 #include "irouts.h"
 #include "irgmod.h"
+#include "iropt_dbg.h"
 #include "debug.h"
 #include "error.h"
 
@@ -62,9 +63,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;
@@ -813,12 +811,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 +1142,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.
@@ -2555,7 +2546,6 @@ 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;
 
@@ -2580,7 +2570,6 @@ static void propagate(environment_t *env) {
                                }
                        }
                }
-#endif
                split_by(Y, env);
        }
 }  /* propagate */
@@ -2658,19 +2647,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);
+                                       }
                                }
                        }
                }
@@ -2680,6 +2672,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);
@@ -2693,6 +2686,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;
@@ -2709,18 +2704,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);
+                                       }
                                }
                        }
                }
@@ -2741,6 +2739,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 {
@@ -2759,6 +2758,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;
@@ -2775,6 +2775,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;
@@ -2830,11 +2831,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;
                                        }
@@ -2855,6 +2857,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;
                                }
@@ -2866,6 +2869,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;
                                }
@@ -2876,6 +2880,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;
                                }