commit the beginning of advanced boolopt (had that laying around for months now ...
authorMatthias Braun <matze@braunis.de>
Sun, 25 May 2008 09:30:08 +0000 (09:30 +0000)
committerMatthias Braun <matze@braunis.de>
Sun, 25 May 2008 09:30:08 +0000 (09:30 +0000)
[r19759]

ir/opt/boolopt.c

index 67d077d..a8251c8 100644 (file)
@@ -1,4 +1,7 @@
 #include <assert.h>
+#include <string.h>
+
+#include "adt/obst.h"
 #include "ircons.h"
 #include "irgmod.h"
 #include "irgwalk.h"
@@ -28,9 +31,13 @@ static int find_cond_pair(ir_node *const l, ir_node *const r, cond_pair *const r
                        ir_node *const rol = get_Cmp_left(ro);
                        ir_node *const ror = get_Cmp_right(ro);
 
+                       if(is_Const(lor) && is_Const_null(lor) && is_Const(ror) && is_Const_null(ror) && get_Proj_proj(l) == pn_Cmp_Lg && get_Proj_proj(r) == pn_Cmp_Lg) {
+                               ir_fprintf(stderr, "found zero zero\n");
+                       }
+
                        /* TODO float */
-                       /* The constants shall be unequal.  Local optimisations handle the equal
-                        * case */
+                       /* The constants shall be unequal.  Local optimisations handle the
+                        * equal case */
                        if (lol == rol && mode_is_int(get_irn_mode(lol)) && lor != ror && is_Const(lor) && is_Const(ror)) {
                                tarval *const tv_l  = get_Const_tarval(lor);
                                tarval *const tv_r  = get_Const_tarval(ror);
@@ -67,148 +74,381 @@ static int find_cond_pair(ir_node *const l, ir_node *const r, cond_pair *const r
        return 0;
 }
 
-static void bool_and(ir_node *const n)
+static ir_node *bool_and(cond_pair* const cpair)
 {
-       ir_node *const l = get_And_left(n);
-       ir_node *const r = get_And_right(n);
-       cond_pair      res;
-       if (find_cond_pair(l, r, &res)) {
-               ir_node *const cmp_lo  = res.cmp_lo;
-               ir_node *const cmp_hi  = res.cmp_hi;
-               pn_Cmp   const pnc_lo  = res.pnc_lo;
-               pn_Cmp   const pnc_hi  = res.pnc_hi;
-               ir_node *const proj_lo = res.proj_lo;
-               ir_node *const proj_hi = res.proj_hi;
-               tarval  *const tv_lo   = res.tv_lo;
-               tarval  *const tv_hi   = res.tv_hi;
-
-               if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
-                               (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
-                       /* x <|<=|== lo | x ==|>=|> hi -> false */
-                       ir_node *const t = new_Const(mode_b, tarval_b_false);
-                       exchange(n, t);
-               } else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
-                                                        (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Ne)) {
-                       /* x <|<=|== lo && x <|<=|!= hi -> x <|<=|== lo */
-                       exchange(n, proj_lo);
-               } else if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ne) &&
-                                                        (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
-                       /* x >=|>|!= lo || x ==|>=|> hi -> x ==|>=|> hi */
-                       exchange(n, proj_hi);
-               } else if (tarval_is_one(tarval_sub(tv_hi, tv_lo))) { /* lo + 1 == hi */
-                       if (pnc_lo == pn_Cmp_Ge && pnc_hi == pn_Cmp_Lt) {
-                               /* x >= c || x < c + 1 -> x == c */
+       ir_node *const cmp_lo  = cpair->cmp_lo;
+       ir_node *const cmp_hi  = cpair->cmp_hi;
+       pn_Cmp   const pnc_lo  = cpair->pnc_lo;
+       pn_Cmp   const pnc_hi  = cpair->pnc_hi;
+       ir_node *const proj_lo = cpair->proj_lo;
+       ir_node *const proj_hi = cpair->proj_hi;
+       tarval  *const tv_lo   = cpair->tv_lo;
+       tarval  *const tv_hi   = cpair->tv_hi;
+
+       if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
+                       (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
+               /* x <|<=|== lo | x ==|>=|> hi -> false */
+               ir_node *const t = new_Const(mode_b, tarval_b_false);
+               return t;
+       } else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
+                                                (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Ne)) {
+               /* x <|<=|== lo && x <|<=|!= hi -> x <|<=|== lo */
+               return proj_lo;
+       } else if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ne) &&
+                                                (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
+               /* x >=|>|!= lo || x ==|>=|> hi -> x ==|>=|> hi */
+               return proj_hi;
+       } else if (tarval_is_one(tarval_sub(tv_hi, tv_lo))) { /* lo + 1 == hi */
+               if (pnc_lo == pn_Cmp_Ge && pnc_hi == pn_Cmp_Lt) {
+                       /* x >= c || x < c + 1 -> x == c */
+                       ir_graph *const irg   = current_ir_graph;
+                       ir_node  *const block = get_nodes_block(cmp_lo);
+                       ir_node  *const p = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Eq);
+                       return p;
+               } else if (pnc_lo == pn_Cmp_Gt) {
+                       if (pnc_hi == pn_Cmp_Ne) {
+                               /* x > c || x != c + 1 -> x > c + 1 */
                                ir_graph *const irg   = current_ir_graph;
-                               ir_node  *const block = get_nodes_block(cmp_lo);
-                               ir_node  *const p = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Eq);
-                               exchange(n, p);
-                       } else if (pnc_lo == pn_Cmp_Gt) {
-                               if (pnc_hi == pn_Cmp_Ne) {
-                                       /* x > c || x != c + 1 -> x > c + 1 */
-                                       ir_graph *const irg   = current_ir_graph;
-                                       ir_node  *const block = get_nodes_block(cmp_hi);
-                                       ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Gt);
-                                       exchange(n, p);
-                               } else if (pnc_hi == pn_Cmp_Lt) {
-                                       /* x > c || x < c + 1 -> false */
-                                       ir_node *const t = new_Const(mode_b, tarval_b_false);
-                                       exchange(n, t);
-                               } else if (pnc_hi == pn_Cmp_Le) {
-                                       /* x > c || x <= c + 1 -> x != c + 1 */
-                                       ir_graph *const irg   = current_ir_graph;
-                                       ir_node  *const block = get_nodes_block(cmp_hi);
-                                       ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Eq);
-                                       exchange(n, p);
-                               }
-                       } else if (pnc_lo == pn_Cmp_Ne && pnc_hi == pn_Cmp_Lt) {
-                               /* x != c || c < c + 1 -> x < c */
+                               ir_node  *const block = get_nodes_block(cmp_hi);
+                               ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Gt);
+                               return p;
+                       } else if (pnc_hi == pn_Cmp_Lt) {
+                               /* x > c || x < c + 1 -> false */
+                               ir_node *const t = new_Const(mode_b, tarval_b_false);
+                               return t;
+                       } else if (pnc_hi == pn_Cmp_Le) {
+                               /* x > c || x <= c + 1 -> x != c + 1 */
                                ir_graph *const irg   = current_ir_graph;
-                               ir_node  *const block = get_nodes_block(cmp_lo);
-                               ir_node  *const p     = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Lt);
-                               exchange(n, p);
+                               ir_node  *const block = get_nodes_block(cmp_hi);
+                               ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Eq);
+                               return p;
                        }
+               } else if (pnc_lo == pn_Cmp_Ne && pnc_hi == pn_Cmp_Lt) {
+                       /* x != c || c < c + 1 -> x < c */
+                       ir_graph *const irg   = current_ir_graph;
+                       ir_node  *const block = get_nodes_block(cmp_lo);
+                       ir_node  *const p     = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Lt);
+                       return p;
                }
        }
+       return NULL;
 }
 
-static void bool_or(ir_node *const n)
+static ir_node *bool_or(cond_pair *const cpair)
 {
-       ir_node *const l = get_Or_left(n);
-       ir_node *const r = get_Or_right(n);
-       cond_pair      res;
-       if (find_cond_pair(l, r, &res)) {
-               ir_node *const cmp_lo  = res.cmp_lo;
-               ir_node *const cmp_hi  = res.cmp_hi;
-               pn_Cmp   const pnc_lo  = res.pnc_lo;
-               pn_Cmp   const pnc_hi  = res.pnc_hi;
-               ir_node *const proj_lo = res.proj_lo;
-               ir_node *const proj_hi = res.proj_hi;
-               tarval  *const tv_lo   = res.tv_lo;
-               tarval  *const tv_hi   = res.tv_hi;
-
-               if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ne) &&
-                               (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Ne)) {
-                       /* x >=|>|!= lo | x <|<=|!= hi -> true */
-                       ir_node *const t = new_Const(mode_b, tarval_b_true);
-                       exchange(n, t);
-               } else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
-                                                        (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Ne)) {
-                       /* x <|<=|== lo || x <|<=|!= hi -> x <|<=|!= hi */
-                       exchange(n, proj_hi);
-               } else if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ne) &&
-                                                        (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
-                       /* x >=|>|!= lo || x ==|>=|> hi -> x >=|>|!= lo */
-                       exchange(n, proj_lo);
-               } else if (tarval_is_one(tarval_sub(tv_hi, tv_lo))) { /* lo + 1 == hi */
-                       if (pnc_lo == pn_Cmp_Lt && pnc_hi == pn_Cmp_Ge) {
-                               /* x < c || x >= c + 1 -> x != c */
+       ir_node *const cmp_lo  = cpair->cmp_lo;
+       ir_node *const cmp_hi  = cpair->cmp_hi;
+       pn_Cmp   const pnc_lo  = cpair->pnc_lo;
+       pn_Cmp   const pnc_hi  = cpair->pnc_hi;
+       ir_node *const proj_lo = cpair->proj_lo;
+       ir_node *const proj_hi = cpair->proj_hi;
+       tarval  *const tv_lo   = cpair->tv_lo;
+       tarval  *const tv_hi   = cpair->tv_hi;
+
+       if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ne) &&
+                       (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Ne)) {
+               /* x >=|>|!= lo | x <|<=|!= hi -> true */
+               ir_node *const t = new_Const(mode_b, tarval_b_true);
+               return t;
+       } else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
+                                                (pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Ne)) {
+               /* x <|<=|== lo || x <|<=|!= hi -> x <|<=|!= hi */
+               return proj_hi;
+       } else if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ne) &&
+                                                (pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
+               /* x >=|>|!= lo || x ==|>=|> hi -> x >=|>|!= lo */
+               return proj_lo;
+       } else if (tarval_is_one(tarval_sub(tv_hi, tv_lo))) { /* lo + 1 == hi */
+               if (pnc_lo == pn_Cmp_Lt && pnc_hi == pn_Cmp_Ge) {
+                       /* x < c || x >= c + 1 -> x != c */
+                       ir_graph *const irg   = current_ir_graph;
+                       ir_node  *const block = get_nodes_block(cmp_lo);
+                       ir_node  *const p = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Ne);
+                       return p;
+               } else if (pnc_lo == pn_Cmp_Le) {
+                       if (pnc_hi == pn_Cmp_Eq) {
+                               /* x <= c || x == c + 1 -> x <= c + 1 */
                                ir_graph *const irg   = current_ir_graph;
-                               ir_node  *const block = get_nodes_block(cmp_lo);
-                               ir_node  *const p = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Ne);
-                               exchange(n, p);
-                       } else if (pnc_lo == pn_Cmp_Le) {
-                               if (pnc_hi == pn_Cmp_Eq) {
-                                       /* x <= c || x == c + 1 -> x <= c + 1 */
-                                       ir_graph *const irg   = current_ir_graph;
-                                       ir_node  *const block = get_nodes_block(cmp_hi);
-                                       ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Le);
-                                       exchange(n, p);
-                               } else if (pnc_hi == pn_Cmp_Ge) {
-                                       /* x <= c || x >= c + 1 -> true */
-                                       ir_node *const t = new_Const(mode_b, tarval_b_true);
-                                       exchange(n, t);
-                               } else if (pnc_hi == pn_Cmp_Gt) {
-                                       /* x <= c || x > c + 1 -> x != c + 1 */
-                                       ir_graph *const irg   = current_ir_graph;
-                                       ir_node  *const block = get_nodes_block(cmp_hi);
-                                       ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Ne);
-                                       exchange(n, p);
-                               }
-                       } else if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Ge) {
-                               /* x == c || c >= c + 1 -> x >= c */
+                               ir_node  *const block = get_nodes_block(cmp_hi);
+                               ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Le);
+                               return p;
+                       } else if (pnc_hi == pn_Cmp_Ge) {
+                               /* x <= c || x >= c + 1 -> true */
+                               ir_node *const t = new_Const(mode_b, tarval_b_true);
+                               return t;
+                       } else if (pnc_hi == pn_Cmp_Gt) {
+                               /* x <= c || x > c + 1 -> x != c + 1 */
                                ir_graph *const irg   = current_ir_graph;
-                               ir_node  *const block = get_nodes_block(cmp_lo);
-                               ir_node  *const p     = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Ge);
-                               exchange(n, p);
+                               ir_node  *const block = get_nodes_block(cmp_hi);
+                               ir_node  *const p = new_r_Proj(irg, block, cmp_hi, mode_b, pn_Cmp_Ne);
+                               return p;
                        }
+               } else if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Ge) {
+                       /* x == c || c >= c + 1 -> x >= c */
+                       ir_graph *const irg   = current_ir_graph;
+                       ir_node  *const block = get_nodes_block(cmp_lo);
+                       ir_node  *const p     = new_r_Proj(irg, block, cmp_lo, mode_b, pn_Cmp_Ge);
+                       return p;
                }
        }
+       return NULL;
 }
 
 static void bool_walk(ir_node *n, void *env)
 {
        (void)env;
 
-       if (get_irn_mode(n) != mode_b) return;
+       if (get_irn_mode(n) != mode_b)
+               return;
 
        if (is_And(n)) {
-               bool_and(n);
+               ir_node *const l = get_And_left(n);
+               ir_node *const r = get_And_right(n);
+               ir_node *      replacement;
+               cond_pair      cpair;
+               if (!find_cond_pair(l, r, &cpair))
+                       return;
+               replacement = bool_and(&cpair);
+               if (replacement)
+                       exchange(n, replacement);
        } else if (is_Or(n)) {
-               bool_or(n);
+               ir_node *const l = get_Or_left(n);
+               ir_node *const r = get_Or_right(n);
+               ir_node *      replacement;
+               cond_pair      cpair;
+               if (!find_cond_pair(l, r, &cpair))
+                       return;
+               replacement = bool_or(&cpair);
+               if (replacement)
+                       exchange(n, replacement);
+       }
+}
+
+static struct obstack obst;
+
+typedef struct block_info_t {
+       ir_node *phi;   /**< head of the Phi list */
+       int has_pinned; /**< set if the block contains instructions that cannot be
+                            moved */
+} block_info_t;
+
+static block_info_t* get_block_blockinfo(ir_node* block)
+{
+       return get_irn_link(block);
+}
+
+static void create_blockinfos(ir_node *node, void *env)
+{
+       block_info_t *block_info;
+       (void) env;
+
+       /* we visit blocks before any other nodes (from the block) */
+       if (!is_Block(node))
+               return;
+
+       block_info = obstack_alloc(&obst, sizeof(block_info[0]));
+       memset(block_info, 0, sizeof(block_info[0]));
+       set_irn_link(node, block_info);
+}
+
+static void collect_phis(ir_node *node, void *env)
+{
+       (void) env;
+
+       if (is_Phi(node)) {
+               ir_node      *block = get_nodes_block(node);
+               block_info_t *bi    = get_block_blockinfo(block);
+
+               set_irn_link(node, bi->phi);
+               bi->phi = node;
+               return;
        }
+
+       /* Ignore control flow nodes, these will be removed. */
+       if (get_irn_pinned(node) == op_pin_state_pinned &&
+                       !is_Block(node) && !is_cfop(node)) {
+               ir_node      *block = get_nodes_block(node);
+               block_info_t *bi    = get_block_blockinfo(block);
+
+               bi->has_pinned = 1;
+       }
+}
+
+ir_node *skip_empty_block(ir_node *node)
+{
+       ir_node      *block;
+       block_info_t *block_info;
+
+       if(!is_Jmp(node))
+               return node;
+
+       block = get_nodes_block(node);
+       if(get_Block_n_cfgpreds(block) != 1)
+               return node;
+
+       block_info = get_block_blockinfo(block);
+       if(block_info->has_pinned)
+               return node;
+
+       return get_Block_cfgpred(block, 0);
 }
 
-void opt_bool(ir_graph *irg)
+static void find_cf_and_or_walker(ir_node *block, void *env)
+{
+       int i, i2;
+       int n_cfgpreds = get_Block_n_cfgpreds(block);
+       (void) env;
+
+       if(n_cfgpreds < 2)
+               return;
+
+       /* Find the following structure:
+        *
+        *        upper_block
+        *         /       |
+        *        /        |
+        *   lower_block   |
+        *     /  \        |
+        *   ...   \       |
+        *           block
+        */
+
+restart:
+       for(i = 0; i < n_cfgpreds; ++i) {
+               ir_node      *lower_block;
+               ir_node      *lower_cf;
+               ir_node      *cond;
+               ir_node      *cond_selector;
+               block_info_t *block_info;
+               ir_node      *lower_pred;
+
+               lower_cf = get_Block_cfgpred(block, i);
+               lower_cf = skip_empty_block(lower_cf);
+               if(!is_Proj(lower_cf))
+                       continue;
+
+               lower_block = get_nodes_block(lower_cf);
+               if(get_Block_n_cfgpreds(lower_block) != 1)
+                       continue;
+
+               cond = get_Proj_pred(lower_cf);
+               if(!is_Cond(cond))
+                       continue;
+
+               cond_selector = get_Cond_selector(cond);
+               if(get_irn_mode(cond_selector) != mode_b)
+                       continue;
+
+               /* the block must not produce any side-effects */
+               block_info = get_block_blockinfo(lower_block);
+               if(block_info->has_pinned)
+                       continue;
+
+               lower_pred = get_Block_cfgpred_block(lower_block, 0);
+
+               for(i2 = 0; i2 < n_cfgpreds; ++i2) {
+                       ir_node   *upper_block;
+                       ir_node   *upper_cf;
+                       ir_node   *upper_cond;
+                       ir_node   *upper_cond_selector;
+                       ir_node   *replacement;
+                       ir_graph  *irg;
+                       cond_pair  cpair;
+
+                       upper_cf    = get_Block_cfgpred(block, i2);
+                       upper_cf    = skip_empty_block(upper_cf);
+                       if(is_Bad(upper_cf))
+                               continue;
+                       upper_block = get_nodes_block(upper_cf);
+                       if(upper_block != lower_pred)
+                               continue;
+
+                       assert(is_Proj(upper_cf));
+                       upper_cond = get_Proj_pred(upper_cf);
+                       assert(is_Cond(upper_cond));
+                       upper_cond_selector = get_Cond_selector(upper_cond);
+                       if(get_irn_mode(upper_cond_selector) != mode_b)
+                               continue;
+
+                       /* we have found the structure */
+                       /* TODO: check phis */
+                       if(!find_cond_pair(cond_selector, upper_cond_selector, &cpair))
+                               continue;
+
+                       /* normalize pncs: we need the true case to jump into the
+                        * common block */
+                       irg = current_ir_graph;
+                       if(get_Proj_proj(lower_cf) == pn_Cond_false) {
+                               if(cpair.proj_lo == cond_selector) {
+                                       ir_mode *mode = get_tarval_mode(cpair.tv_lo);
+                                       cpair.pnc_lo  = get_negated_pnc(cpair.pnc_lo, mode);
+                                       cpair.proj_lo = new_r_Proj(irg, lower_block,
+                                                       get_Proj_pred(cpair.proj_lo), mode_b, cpair.pnc_lo);
+                               } else {
+                                       assert(cpair.proj_hi == cond_selector);
+                                       ir_mode *mode = get_tarval_mode(cpair.tv_hi);
+                                       cpair.pnc_hi  = get_negated_pnc(cpair.pnc_hi, mode);
+                                       cpair.proj_hi = new_r_Proj(irg, lower_block,
+                                                       get_Proj_pred(cpair.proj_hi), mode_b, cpair.pnc_hi);
+                               }
+                       }
+                       if(get_Proj_proj(upper_cf) == pn_Cond_false) {
+                               if(cpair.proj_lo == upper_cond_selector) {
+                                       ir_mode *mode = get_tarval_mode(cpair.tv_lo);
+                                       cpair.pnc_lo  = get_negated_pnc(cpair.pnc_lo, mode);
+                                       cpair.proj_lo = new_r_Proj(irg, upper_block,
+                                                       get_Proj_pred(cpair.proj_lo), mode_b, cpair.pnc_lo);
+                               } else {
+                                       assert(cpair.proj_hi == upper_cond_selector);
+                                       ir_mode *mode = get_tarval_mode(cpair.tv_hi);
+                                       cpair.pnc_hi  = get_negated_pnc(cpair.pnc_hi, mode);
+                                       cpair.proj_hi = new_r_Proj(irg, upper_block,
+                                                       get_Proj_pred(cpair.proj_hi), mode_b, cpair.pnc_hi);
+                               }
+                       }
+
+                       /* can we optimize the case? */
+                       replacement = bool_or(&cpair);
+                       if(replacement == NULL)
+                               continue;
+
+                       /* move all nodes from lower block to upper block */
+                       exchange(lower_block, upper_block);
+
+                       set_Block_cfgpred(block, i2, new_Bad());
+
+                       /* the optimisations expected the true case to jump */
+                       if(get_Proj_proj(lower_cf) == pn_Cond_false) {
+                               ir_node *block = get_nodes_block(replacement);
+                               replacement    = new_rd_Not(NULL, current_ir_graph, block,
+                                                           replacement, mode_b);
+                       }
+                       set_Cond_selector(cond, replacement);
+
+                       ir_fprintf(stderr, "replaced (ub %+F)\n", upper_block);
+                       goto restart;
+               }
+       }
+}
+
+void opt_bool(ir_graph *const irg)
 {
        irg_walk_graph(irg, NULL, bool_walk, NULL);
+
+       set_using_irn_link(irg);
+
+       obstack_init(&obst);
+
+       irg_walk_graph(irg, create_blockinfos, collect_phis, NULL);
+
+       irg_block_walk_graph(irg, NULL, find_cf_and_or_walker, NULL);
+
+       obstack_free(&obst, NULL);
+
+       set_irg_outs_inconsistent(irg);
+       set_irg_doms_inconsistent(irg);
+       set_irg_extblk_inconsistent(irg);
+       set_irg_loopinfo_inconsistent(irg);
+
+       clear_using_irn_link(irg);
 }