Ignore generated files.

[libfirm] / ir / opt / boolopt.c

diff --git a/ir/opt/boolopt.c b/ir/opt/boolopt.c
index c404e65..7b39212 100644 (file)
--- a/ir/opt/boolopt.c
+++ b/ir/opt/boolopt.c
@@ -83,8 +83,6 @@ static int find_cond_pair(ir_node *const l, ir_node *const r, cond_pair *const r
                            pnc_l == pnc_r &&
                            (pnc_l == pn_Cmp_Lg || pnc_l == pn_Cmp_Eq)) {
                                /* lo == (lol !=|== NULL) && ro == (rol !=|== NULL) */
-                               DB((dbg, LEVEL_1, "found <null null>\n"));
-
                                res->cmp_lo  = lo;
                                res->cmp_hi  = ro;
                                res->pnc_lo  = pnc_l;
@@ -141,7 +139,7 @@ static int find_cond_pair(ir_node *const l, ir_node *const r, cond_pair *const r
 /**
  * Handle (lo pnc_lo x) AND (hi pnc_hi x)
  */
-static ir_node *bool_and(cond_pair* const cpair)
+static ir_node *bool_and(cond_pair* const cpair, ir_node *dst_block)
 {
        ir_node *const cmp_lo  = cpair->cmp_lo;
        ir_node *const cmp_hi  = cpair->cmp_hi;
@@ -157,7 +155,7 @@ static ir_node *bool_and(cond_pair* const cpair)
            tarval_is_null(tv_lo) && tarval_is_null(tv_hi) &&
            mode == get_tarval_mode(tv_hi)) {
                /* p == NULL && q == NULL ==> (p&q) == NULL) */
-               ir_node *block, *lol, *hil, *cmp, *c, *p;
+               ir_node *lol, *hil, *cmp, *c, *p;
 
                if (mode_is_reference(mode)) {
                        mode = find_unsigned_mode(mode);
@@ -168,19 +166,22 @@ static ir_node *bool_and(cond_pair* const cpair)
                                return NULL;
                }
                if (mode_is_int(mode)) {
-                       block = get_nodes_block(cmp_lo);
                        lol   = get_Cmp_left(cmp_lo);
-                       lol   = new_r_Conv(block, lol, mode);
+                       lol   = new_r_Conv(dst_block, lol, mode);
                        hil   = get_Cmp_left(cmp_hi);
-                       hil   = new_r_Conv(block, hil, mode);
-                       p     = new_r_And(block, lol, hil, mode);
+                       hil   = new_r_Conv(dst_block, hil, mode);
+                       p     = new_r_And(dst_block, lol, hil, mode);
                        c     = new_Const(tv_lo);
-                       cmp   = new_r_Cmp(block, p, c);
-                       p     = new_r_Proj(block, cmp, mode_b, pn_Cmp_Eq);
+                       cmp   = new_r_Cmp(dst_block, p, c);
+                       p     = new_r_Proj(dst_block, cmp, mode_b, pn_Cmp_Eq);
                        return p;
                }
        }
 
+       /* the following tests expect one common operand */
+       if (get_Cmp_left(cmp_lo) !=  get_Cmp_left(cmp_hi))
+               return 0;
+
        /* TODO: for now reject float modes */
        if (! mode_is_int(mode))
                return 0;
@@ -274,7 +275,7 @@ static ir_node *bool_and(cond_pair* const cpair)
 /**
  * Handle (lo pnc_lo x) OR (hi pnc_hi x)
  */
-static ir_node *bool_or(cond_pair *const cpair)
+static ir_node *bool_or(cond_pair *const cpair, ir_node *dst_block)
 {
        ir_node *const cmp_lo  = cpair->cmp_lo;
        ir_node *const cmp_hi  = cpair->cmp_hi;
@@ -290,7 +291,7 @@ static ir_node *bool_or(cond_pair *const cpair)
                tarval_is_null(tv_lo) && tarval_is_null(tv_hi) &&
                mode == get_tarval_mode(tv_hi)) {
                /* p != NULL || q != NULL ==> (p|q) != NULL) */
-               ir_node *block, *lol, *hil, *cmp, *c, *p;
+               ir_node *lol, *hil, *cmp, *c, *p;
 
                if (mode_is_reference(mode)) {
                        mode = find_unsigned_mode(mode);
@@ -301,19 +302,22 @@ static ir_node *bool_or(cond_pair *const cpair)
                                return NULL;
                }
                if (mode_is_int(mode)) {
-                       block = get_nodes_block(cmp_lo);
                        lol   = get_Cmp_left(cmp_lo);
-                       lol   = new_r_Conv(block, lol, mode);
+                       lol   = new_r_Conv(dst_block, lol, mode);
                        hil   = get_Cmp_left(cmp_hi);
-                       hil   = new_r_Conv(block, hil, mode);
-                       p     = new_r_Or(block, lol, hil, mode);
+                       hil   = new_r_Conv(dst_block, hil, mode);
+                       p     = new_r_Or(dst_block, lol, hil, mode);
                        c     = new_Const(tv_lo);
-                       cmp   = new_r_Cmp(block, p, c);
-                       p     = new_r_Proj(block, cmp, mode_b, pn_Cmp_Lg);
+                       cmp   = new_r_Cmp(dst_block, p, c);
+                       p     = new_r_Proj(dst_block, cmp, mode_b, pn_Cmp_Lg);
                        return p;
                }
        }
 
+       /* the following tests expect one common operand */
+       if (get_Cmp_left(cmp_lo) !=  get_Cmp_left(cmp_hi))
+               return 0;
+
        /* TODO: for now reject float modes */
        if (! mode_is_int(mode))
                return 0;
@@ -364,18 +368,18 @@ static ir_node *bool_or(cond_pair *const cpair)
                   (pnc_hi == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ge) &&
                   get_mode_arithmetic(mode) == irma_twos_complement) {
                /* works for two-complements only */
-               /* x <|\= lo  || x >|>= hi ==> (x - lo) >u|>=u (hi-lo) */
-               if (pnc_lo == pn_Cmp_Lt) {
-                       /* must convert to <= */
+               /* x <|<= lo  || x >|>= hi ==> (x - lo) >u|>=u (hi-lo) */
+               if (pnc_lo == pn_Cmp_Le) {
+                       /* must convert to < */
                        ir_mode *mode = get_tarval_mode(tv_lo);
-                       tarval *n = tarval_sub(tv_lo, get_mode_one(mode), NULL);
-                       if (n != tarval_bad && tarval_cmp(n, tv_lo) == pn_Cmp_Lt) {
+                       tarval *n = tarval_add(tv_lo, get_mode_one(mode));
+                       if (n != tarval_bad && tarval_cmp(n, tv_lo) == pn_Cmp_Gt) {
                                /* no overflow */
                                tv_lo = n;
-                               pnc_lo = pn_Cmp_Le;
+                               pnc_lo = pn_Cmp_Lt;
                        }
                }
-               if (pnc_lo == pn_Cmp_Le) {
+               if (pnc_lo == pn_Cmp_Lt) {
                        /* all fine */
                        ir_node *const block = get_nodes_block(cmp_hi);
                        ir_node *      x     = get_Cmp_left(cmp_hi);
@@ -421,7 +425,7 @@ static void bool_walk(ir_node *n, void *ctx)
                cond_pair      cpair;
                if (!find_cond_pair(l, r, &cpair))
                        return;
-               replacement = bool_and(&cpair);
+               replacement = bool_and(&cpair, get_nodes_block(n));
                if (replacement) {
                        exchange(n, replacement);
                        env->changed = 1;
@@ -433,7 +437,7 @@ static void bool_walk(ir_node *n, void *ctx)
                cond_pair      cpair;
                if (!find_cond_pair(l, r, &cpair))
                        return;
-               replacement = bool_or(&cpair);
+               replacement = bool_or(&cpair, get_nodes_block(n));
                if (replacement) {
                        exchange(n, replacement);
                        env->changed = 1;
@@ -639,6 +643,8 @@ restart:
                        upper_block = get_nodes_block(upper_cf);
                        if (upper_block != lower_pred)
                                continue;
+                       if (!block_dominates(upper_block, block))
+                               continue;
 
                        assert(is_Proj(upper_cf));
                        upper_cond = get_Proj_pred(upper_cf);
@@ -693,12 +699,15 @@ restart:
                        }
 
                        /* can we optimize the case? */
-                       replacement = bool_or(&cpair);
+                       replacement = bool_or(&cpair, upper_block);
                        if (replacement == NULL)
                                continue;
 
                        env->changed = 1;
 
+                       DB((dbg, LEVEL_1, "boolopt: %+F: fusing (ub %+F lb %+F)\n",
+                               current_ir_graph, upper_block, lower_block));
+
                        /* move all expressions on the path to lower/upper block */
                        move_nodes_to_block(get_Block_cfgpred(block, up_idx), upper_block);
                        move_nodes_to_block(get_Block_cfgpred(block, low_idx), lower_block);
@@ -716,7 +725,6 @@ restart:
                        }
                        set_Cond_selector(cond, replacement);
 
-                       DB((dbg, LEVEL_1, "%+F: replaced (ub %+F)\n", current_ir_graph, upper_block));
                        goto restart;
                }
        }