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;
/**
* 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;
tarval * tv_hi = cpair->tv_hi;
ir_mode * mode = cpair->lo_mode;
- if (mode_is_reference(mode) && pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Eq &&
+ if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Eq &&
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;
-
- mode = find_unsigned_mode(mode);
- if (! mode)
- return NULL;
- tv_lo = tarval_convert_to(tv_lo, mode);
- if (tv_lo == tarval_bad)
- return NULL;
- block = get_nodes_block(cmp_lo);
- lol = get_Cmp_left(cmp_lo);
- lol = new_r_Conv(block, lol, mode);
- hil = get_Cmp_left(cmp_hi);
- hil = new_r_Conv(block, hil, mode);
- p = new_r_And(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);
- return p;
+ ir_node *lol, *hil, *cmp, *c, *p;
+
+ if (mode_is_reference(mode)) {
+ mode = find_unsigned_mode(mode);
+ if (! mode)
+ return NULL;
+ tv_lo = tarval_convert_to(tv_lo, mode);
+ if (tv_lo == tarval_bad)
+ return NULL;
+ }
+ if (mode_is_int(mode)) {
+ lol = get_Cmp_left(cmp_lo);
+ lol = new_r_Conv(dst_block, lol, mode);
+ hil = get_Cmp_left(cmp_hi);
+ 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(dst_block, p, c);
+ p = new_r_Proj(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;
} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
if (pnc_lo == pn_Cmp_Ge && pnc_hi == pn_Cmp_Lt) {
/* x >= c && x < c + 1 ==> x == c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Eq);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Eq);
return p;
} else if (pnc_lo == pn_Cmp_Gt) {
if (pnc_hi == pn_Cmp_Lg) {
/* x > c && x != c + 1 ==> x > c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Gt);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Gt);
return p;
} else if (pnc_hi == pn_Cmp_Lt) {
/* x > c && x < c + 1 ==> false */
return t;
} else if (pnc_hi == pn_Cmp_Le) {
/* x > c && x <= c + 1 ==> x != c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Eq);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Eq);
return p;
}
} else if (pnc_lo == pn_Cmp_Lg && pnc_hi == pn_Cmp_Lt) {
/* x != c && c < c + 1 ==> x < c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Lt);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Lt);
return p;
}
} else if ((pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ge) &&
sub = new_r_Sub(block, x, c, mode);
subc = new_r_Sub(block, new_Const(tv_hi), c, mode);
cmp = new_r_Cmp(block, sub, subc);
- p = new_r_Proj(block, cmp, mode_b, pnc_hi);
+ p = new_r_Proj(cmp, mode_b, pnc_hi);
return p;
}
}
/**
* 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;
tarval * tv_hi = cpair->tv_hi;
ir_mode * mode = cpair->lo_mode;
- if (mode_is_reference(mode) && pnc_lo == pn_Cmp_Lg && pnc_hi == pn_Cmp_Lg &&
+ if (pnc_lo == pn_Cmp_Lg && pnc_hi == pn_Cmp_Lg &&
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;
-
- mode = find_unsigned_mode(mode);
- if (! mode)
- return NULL;
- tv_lo = tarval_convert_to(tv_lo, mode);
- if (tv_lo == tarval_bad)
- return NULL;
- block = get_nodes_block(cmp_lo);
- lol = get_Cmp_left(cmp_lo);
- lol = new_r_Conv(block, lol, mode);
- hil = get_Cmp_left(cmp_hi);
- hil = new_r_Conv(block, hil, mode);
- p = new_r_Or(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);
- return p;
+ ir_node *lol, *hil, *cmp, *c, *p;
+
+ if (mode_is_reference(mode)) {
+ mode = find_unsigned_mode(mode);
+ if (! mode)
+ return NULL;
+ tv_lo = tarval_convert_to(tv_lo, mode);
+ if (tv_lo == tarval_bad)
+ return NULL;
+ }
+ if (mode_is_int(mode)) {
+ lol = get_Cmp_left(cmp_lo);
+ lol = new_r_Conv(dst_block, lol, mode);
+ hil = get_Cmp_left(cmp_hi);
+ 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(dst_block, p, c);
+ p = new_r_Proj(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;
} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
if (pnc_lo == pn_Cmp_Lt && pnc_hi == pn_Cmp_Ge) {
/* x < c || x >= c + 1 ==> x != c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Lg);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Lg);
return p;
} else if (pnc_lo == pn_Cmp_Le) {
if (pnc_hi == pn_Cmp_Eq) {
/* x <= c || x == c + 1 ==> x <= c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Le);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Le);
return p;
} else if (pnc_hi == pn_Cmp_Ge) {
/* x <= c || x >= c + 1 ==> true */
return t;
} else if (pnc_hi == pn_Cmp_Gt) {
/* x <= c || x > c + 1 ==> x != c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Lg);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Lg);
return p;
}
} else if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Ge) {
/* x == c || x >= c + 1 ==> x >= c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Ge);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Ge);
return p;
}
} else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le) &&
(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);
sub = new_r_Sub(block, x, c, mode);
subc = new_r_Sub(block, new_Const(tv_hi), c, mode);
cmp = new_r_Cmp(block, sub, subc);
- p = new_r_Proj(block, cmp, mode_b, pnc_hi);
+ p = new_r_Proj(cmp, mode_b, pnc_hi);
return p;
}
}
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;
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;
* This can be done, if block contains no Phi node that depends on
* different inputs idx_i and idx_j.
*/
-static int can_fuse_block_inputs(const ir_node *block, int idx_i, int idx_j) {
+static int can_fuse_block_inputs(const ir_node *block, int idx_i, int idx_j)
+{
const ir_node *phi;
for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) {
* Under the preposition that we have a chain of blocks from
* from_block to to_block, collapse them all into to_block.
*/
-static void move_nodes_to_block(ir_node *jmp, ir_node *to_block) {
+static void move_nodes_to_block(ir_node *jmp, ir_node *to_block)
+{
ir_node *new_jmp = NULL;
ir_node *block, *next_block;
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);
* common block (ie. conjunctive normal form) */
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(lower_block,
- get_Proj_pred(cpair.proj_lo), mode_b, cpair.pnc_lo);
+ ir_mode *mode = get_tarval_mode(cpair.tv_lo);
+ ir_node *cmp = get_Proj_pred(cpair.proj_lo);
+ cpair.pnc_lo = get_negated_pnc(cpair.pnc_lo, mode);
+ cpair.proj_lo = new_r_Proj(cmp, mode_b, cpair.pnc_lo);
} else {
- ir_mode *mode = get_tarval_mode(cpair.tv_hi);
+ ir_mode *mode = get_tarval_mode(cpair.tv_hi);
+ ir_node *cmp = get_Proj_pred(cpair.proj_hi);
assert(cpair.proj_hi == cond_selector);
- cpair.pnc_hi = get_negated_pnc(cpair.pnc_hi, mode);
- cpair.proj_hi = new_r_Proj(lower_block,
- get_Proj_pred(cpair.proj_hi), mode_b, cpair.pnc_hi);
+ cpair.pnc_hi = get_negated_pnc(cpair.pnc_hi, mode);
+ cpair.proj_hi = new_r_Proj(cmp, 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(upper_block,
- get_Proj_pred(cpair.proj_lo), mode_b, cpair.pnc_lo);
+ ir_mode *mode = get_tarval_mode(cpair.tv_lo);
+ ir_node *cmp = get_Proj_pred(cpair.proj_lo);
+ cpair.pnc_lo = get_negated_pnc(cpair.pnc_lo, mode);
+ cpair.proj_lo = new_r_Proj(cmp, mode_b, cpair.pnc_lo);
} else {
- ir_mode *mode = get_tarval_mode(cpair.tv_hi);
+ ir_mode *mode = get_tarval_mode(cpair.tv_hi);
+ ir_node *cmp = get_Proj_pred(cpair.proj_hi);
assert(cpair.proj_hi == upper_cond_selector);
- cpair.pnc_hi = get_negated_pnc(cpair.pnc_hi, mode);
- cpair.proj_hi = new_r_Proj(upper_block,
- get_Proj_pred(cpair.proj_hi), mode_b, cpair.pnc_hi);
+ cpair.pnc_hi = get_negated_pnc(cpair.pnc_hi, mode);
+ cpair.proj_hi = new_r_Proj(cmp, mode_b, cpair.pnc_hi);
}
}
/* 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);
}
set_Cond_selector(cond, replacement);
- DB((dbg, LEVEL_1, "%+F: replaced (ub %+F)\n", current_ir_graph, upper_block));
goto restart;
}
}
projects / libfirm / blobdiff