return possible;
}
-/**
- * Return the value of a Cmp.
- *
- * The basic idea here is to determine which relations are possible and which
- * one are definitely impossible.
- */
-static ir_tarval *computed_value_Cmp(const ir_node *cmp)
+static ir_tarval *compute_cmp(const ir_node *cmp)
{
ir_node *left = get_Cmp_left(cmp);
ir_node *right = get_Cmp_right(cmp);
return computed_value_Cmp_Confirm(cmp, left, right, relation);
}
+/**
+ * Return the value of a Cmp.
+ *
+ * The basic idea here is to determine which relations are possible and which
+ * one are definitely impossible.
+ */
+static ir_tarval *computed_value_Cmp(const ir_node *cmp)
+{
+ /* we can't construct Constb after lowering mode_b nodes */
+ if (is_irg_state(get_irn_irg(cmp), IR_GRAPH_STATE_MODEB_LOWERED))
+ return tarval_bad;
+
+ return compute_cmp(cmp);
+}
+
/**
* Calculate the value of an integer Div.
* Special case: 0 / b
ir_node *convop = get_Conv_op(a);
ir_mode *convopmode = get_irn_mode(convop);
if (!mode_is_signed(convopmode)) {
- if (tarval_is_all_one(tarval_convert_to(tv, convopmode))) {
- /* Conv(X) & all_one(mode(X)) = Conv(X) */
+ /* Check Conv(all_one) & Const = all_one */
+ ir_tarval *one = get_mode_all_one(convopmode);
+ ir_tarval *conv = tarval_convert_to(one, mode);
+ ir_tarval *and = tarval_and(conv, tv);
+
+ if (tarval_is_all_one(and)) {
+ /* Conv(X) & Const = X */
n = a;
DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND);
return n;
ir_node *n_t, *n_f;
ir_tarval *ts = value_of(sel);
+ if (ts == tarval_bad && is_Cmp(sel)) {
+ /* try again with a direct call to compute_cmp, as we don't care
+ * about the MODEB_LOWERED flag here */
+ ts = compute_cmp(sel);
+ }
+
/* Mux(true, f, t) == t */
if (ts == tarval_b_true) {
n = get_Mux_true(n);
{
ir_node *a = get_Cond_selector(n);
- ir_tarval *ta = value_of(a);
ir_graph *irg = get_irn_irg(n);
+ ir_tarval *ta;
ir_node *jmp;
/* we need block info which is not available in floating irgs */
if (get_irg_pinned(irg) == op_pin_state_floats)
return n;
- if ((ta != tarval_bad) &&
- (get_irn_mode(a) == mode_b) &&
- (get_opt_unreachable_code())) {
+ /* we do not handle switches here */
+ if (get_irn_mode(a) != mode_b)
+ return n;
+
+ ta = value_of(a);
+ if (ta == tarval_bad && is_Cmp(a)) {
+ /* try again with a direct call to compute_cmp, as we don't care
+ * about the MODEB_LOWERED flag here */
+ ta = compute_cmp(a);
+ }
+
+ if (ta != tarval_bad && get_irn_mode(a) == mode_b) {
/* It's a boolean Cond, branching on a boolean constant.
Replace it by a tuple (Bad, Jmp) or (Jmp, Bad) */
ir_node *blk = get_nodes_block(n);
}
/* We might generate an endless loop, so keep it alive. */
add_End_keepalive(get_irg_end(irg), blk);
+ clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE);
}
return n;
} /* transform_node_Cond */
/* Cmp(a==b) and Cmp(c==d) can be optimized to Cmp((a^b)|(c^d)==0) */
if (a_relation == b_relation && a_relation == ir_relation_equal
&& !mode_is_float(get_irn_mode(a_left))
- && !mode_is_float(get_irn_mode(b_left))
- && values_in_mode(get_irn_mode(b_left), get_irn_mode(a_left))) {
- dbg_info *dbgi = get_irn_dbg_info(n);
- ir_node *block = get_nodes_block(n);
- ir_mode *a_mode = get_irn_mode(a_left);
- ir_mode *b_mode = get_irn_mode(b_left);
- ir_node *xora = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
- ir_node *xorb = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
- ir_node *conv = new_rd_Conv(dbgi, block, xorb, a_mode);
- ir_node *or = new_rd_Or(dbgi, block, xora, conv, a_mode);
- ir_graph *irg = get_irn_irg(n);
- ir_node *zero = create_zero_const(irg, a_mode);
- return new_rd_Cmp(dbgi, block, or, zero, ir_relation_equal);
+ && !mode_is_float(get_irn_mode(b_left))) {
+ if (values_in_mode(get_irn_mode(a_left), get_irn_mode(b_left))) {
+ dbg_info *dbgi = get_irn_dbg_info(n);
+ ir_node *block = get_nodes_block(n);
+ ir_mode *a_mode = get_irn_mode(a_left);
+ ir_mode *b_mode = get_irn_mode(b_left);
+ ir_node *xora = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
+ ir_node *xorb = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
+ ir_node *conv = new_rd_Conv(dbgi, block, xora, b_mode);
+ ir_node *or = new_rd_Or(dbgi, block, conv, xorb, b_mode);
+ ir_graph *irg = get_irn_irg(n);
+ ir_node *zero = create_zero_const(irg, b_mode);
+ return new_rd_Cmp(dbgi, block, or, zero, ir_relation_equal);
+ }
+ if (values_in_mode(get_irn_mode(b_left), get_irn_mode(a_left))) {
+ dbg_info *dbgi = get_irn_dbg_info(n);
+ ir_node *block = get_nodes_block(n);
+ ir_mode *a_mode = get_irn_mode(a_left);
+ ir_mode *b_mode = get_irn_mode(b_left);
+ ir_node *xora = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
+ ir_node *xorb = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
+ ir_node *conv = new_rd_Conv(dbgi, block, xorb, a_mode);
+ ir_node *or = new_rd_Or(dbgi, block, xora, conv, a_mode);
+ ir_graph *irg = get_irn_irg(n);
+ ir_node *zero = create_zero_const(irg, a_mode);
+ return new_rd_Cmp(dbgi, block, or, zero, ir_relation_equal);
+ }
}
}
ir_node *n = get_Proj_pred(proj);
ir_node *b = get_Cond_selector(n);
- if (!get_opt_unreachable_code())
- return n;
-
if (mode_is_int(get_irn_mode(b))) {
ir_tarval *tb = value_of(b);
} else {
ir_graph *irg = get_irn_irg(proj);
/* this case will NEVER be taken, kill it */
+ clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE);
return new_r_Bad(irg, mode_X);
}
}
if ((cmp_result & ir_relation_greater) == cmp_result
&& (cmp_result2 & ir_relation_less) == cmp_result2) {
ir_graph *irg = get_irn_irg(proj);
+ clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE);
return new_r_Bad(irg, mode_X);
}
} else if (b_vrp->range_type == VRP_ANTIRANGE) {
if ((cmp_result & ir_relation_less_equal) == cmp_result
&& (cmp_result2 & ir_relation_greater_equal) == cmp_result2) {
ir_graph *irg = get_irn_irg(proj);
+ clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE);
return new_r_Bad(irg, mode_X);
}
}
b_vrp->bits_set
) == ir_relation_equal)) {
ir_graph *irg = get_irn_irg(proj);
+ clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE);
return new_r_Bad(irg, mode_X);
}
tarval_not(b_vrp->bits_not_set))
== ir_relation_equal)) {
ir_graph *irg = get_irn_irg(proj);
+ clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE);
return new_r_Bad(irg, mode_X);
}
}
}
/* for integer modes, we have more */
- if (mode_is_int(mode)) {
+ if (mode_is_int(mode) && !is_Const(left)) {
/* c > 0 : a < c ==> a <= (c-1) a >= c ==> a > (c-1) */
if ((relation == ir_relation_less || relation == ir_relation_greater_equal) &&
tarval_cmp(tv, get_mode_null(mode)) == ir_relation_greater) {
return proj;
} /* transform_node_Proj */
+/**
+ * Test whether a block is unreachable
+ * Note: That this only returns true when
+ * IR_GRAPH_STATE_OPTIMIZE_UNREACHABLE_CODE is set.
+ * This is important, as you easily end up producing invalid constructs in the
+ * unreachable code when optimizing away edges into the unreachable code.
+ * So only set this flag when you iterate localopts to the fixpoint.
+ * When you reach the fixpoint then all unreachable code is dead
+ * (= can't be reached by firm edges) and you won't see the invalid constructs
+ * anymore.
+ */
static bool is_block_unreachable(const ir_node *block)
{
const ir_graph *irg = get_irn_irg(block);
- if (!is_irg_state(irg, IR_GRAPH_STATE_BAD_BLOCK))
+ if (!is_irg_state(irg, IR_GRAPH_STATE_OPTIMIZE_UNREACHABLE_CODE))
return false;
return get_Block_dom_depth(block) < 0;
}
ir_node *bad = NULL;
int i;
- if (!is_irg_state(irg, IR_GRAPH_STATE_BAD_BLOCK))
+ if (!is_irg_state(irg, IR_GRAPH_STATE_OPTIMIZE_UNREACHABLE_CODE))
return block;
for (i = 0; i < arity; ++i) {
- ir_node *pred = get_Block_cfgpred(block, i);
- ir_node *pred_block = get_nodes_block(pred);
- if (!is_Bad(pred) && !is_block_unreachable(pred_block))
+ ir_node *const pred = get_Block_cfgpred(block, i);
+ if (is_Bad(pred) || !is_block_unreachable(get_nodes_block(pred)))
continue;
if (bad == NULL)
bad = new_r_Bad(irg, mode_X);
/* Set phi-operands for bad-block inputs to bad */
for (i = 0; i < n; ++i) {
- ir_node *pred = get_Block_cfgpred(block, i);
- if (is_Bad(pred) || is_block_unreachable(get_nodes_block(pred))) {
- if (bad == NULL)
- bad = new_r_Bad(irg, mode);
- set_irn_n(phi, i, bad);
+ if (!is_Bad(get_Phi_pred(phi, i))) {
+ ir_node *pred = get_Block_cfgpred(block, i);
+ if (is_Bad(pred) || is_block_unreachable(get_nodes_block(pred))) {
+ if (bad == NULL)
+ bad = new_r_Bad(irg, mode);
+ set_irn_n(phi, i, bad);
+ }
}
}
+ /* Move Pin nodes down through Phi nodes. */
+ if (mode == mode_M) {
+ n = get_irn_arity(phi);
+
+ /* Beware of Phi0 */
+ if (n > 0) {
+ ir_node **in;
+ ir_node *new_phi;
+ bool has_pin = false;
+
+ NEW_ARR_A(ir_node *, in, n);
+
+ for (i = 0; i < n; ++i) {
+ ir_node *pred = get_irn_n(phi, i);
+
+ if (is_Pin(pred)) {
+ in[i] = get_Pin_op(pred);
+ has_pin = true;
+ } else if (is_Bad(pred)) {
+ in[i] = pred;
+ } else {
+ return phi;
+ }
+ }
+
+ if (!has_pin)
+ return phi;
+
+ /* Move the Pin nodes "behind" the Phi. */
+ block = get_irn_n(phi, -1);
+ new_phi = new_r_Phi(block, n, in, mode_M);
+ return new_r_Pin(block, new_phi);
+ }
+ }
/* Move Confirms down through Phi nodes. */
- if (mode_is_reference(mode)) {
+ else if (mode_is_reference(mode)) {
n = get_irn_arity(phi);
/* Beware of Phi0 */
ir_node *pred = get_irn_n(phi, 0);
ir_node *bound, *new_phi, *block, **in;
ir_relation relation;
+ bool has_confirm = false;
if (! is_Confirm(pred))
return phi;
for (i = 1; i < n; ++i) {
pred = get_irn_n(phi, i);
- if (! is_Confirm(pred) ||
- get_Confirm_bound(pred) != bound ||
- get_Confirm_relation(pred) != relation)
+ if (is_Confirm(pred) &&
+ get_Confirm_bound(pred) == bound &&
+ get_Confirm_relation(pred) == relation) {
+ in[i] = get_Confirm_value(pred);
+ has_confirm = true;
+ } else if (is_Bad(pred)) {
+ in[i] = pred;
+ } else {
return phi;
- in[i] = get_Confirm_value(pred);
+ }
}
+
+ if (!has_confirm)
+ return phi;
+
/* move the Confirm nodes "behind" the Phi */
block = get_irn_n(phi, -1);
new_phi = new_r_Phi(block, n, in, get_irn_mode(phi));
return false;
}
+/**
+ * returns true for Cmp(x == 0) or Cmp(x != 0)
+ */
+static bool is_cmp_equality_zero(const ir_node *node)
+{
+ ir_relation relation;
+ ir_node *right = get_Cmp_right(node);
+
+ if (!is_Const(right) || !is_Const_null(right))
+ return false;
+ relation = get_Cmp_relation(node);
+ return relation == ir_relation_equal
+ || relation == ir_relation_less_greater
+ || (!mode_is_signed(get_irn_mode(right))
+ && relation == ir_relation_greater);
+}
+
/**
* Transform an Or.
*/
/* we can combine the relations of two compares with the same operands */
if (is_Cmp(a) && is_Cmp(b)) {
ir_node *a_left = get_Cmp_left(a);
- ir_node *a_right = get_Cmp_left(a);
+ ir_node *a_right = get_Cmp_right(a);
ir_node *b_left = get_Cmp_left(b);
ir_node *b_right = get_Cmp_right(b);
if (a_left == b_left && b_left == b_right) {
/* Cmp(a!=b) or Cmp(c!=d) => Cmp((a^b)|(c^d) != 0) */
if (is_cmp_unequal(a) && is_cmp_unequal(b)
&& !mode_is_float(get_irn_mode(a_left))
- && !mode_is_float(get_irn_mode(b_left))
- && values_in_mode(get_irn_mode(b_left), get_irn_mode(a_left))) {
- ir_graph *irg = get_irn_irg(n);
- dbg_info *dbgi = get_irn_dbg_info(n);
- ir_node *block = get_nodes_block(n);
- ir_mode *a_mode = get_irn_mode(a_left);
- ir_mode *b_mode = get_irn_mode(b_left);
- ir_node *xora = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
- ir_node *xorb = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
- ir_node *conv = new_rd_Conv(dbgi, block, xorb, a_mode);
- ir_node *or = new_rd_Or(dbgi, block, xora, conv, a_mode);
- ir_node *zero = create_zero_const(irg, a_mode);
- return new_rd_Cmp(dbgi, block, or, zero, ir_relation_less_greater);
+ && !mode_is_float(get_irn_mode(b_left))) {
+ if (values_in_mode(get_irn_mode(a_left), get_irn_mode(b_left))) {
+ ir_graph *irg = get_irn_irg(n);
+ dbg_info *dbgi = get_irn_dbg_info(n);
+ ir_node *block = get_nodes_block(n);
+ ir_mode *a_mode = get_irn_mode(a_left);
+ ir_mode *b_mode = get_irn_mode(b_left);
+ ir_node *xora = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
+ ir_node *xorb = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
+ ir_node *conv = new_rd_Conv(dbgi, block, xora, b_mode);
+ ir_node *or = new_rd_Or(dbgi, block, conv, xorb, b_mode);
+ ir_node *zero = create_zero_const(irg, b_mode);
+ return new_rd_Cmp(dbgi, block, or, zero, ir_relation_less_greater);
+ }
+ if (values_in_mode(get_irn_mode(b_left), get_irn_mode(a_left))) {
+ ir_graph *irg = get_irn_irg(n);
+ dbg_info *dbgi = get_irn_dbg_info(n);
+ ir_node *block = get_nodes_block(n);
+ ir_mode *a_mode = get_irn_mode(a_left);
+ ir_mode *b_mode = get_irn_mode(b_left);
+ ir_node *xora = new_rd_Eor(dbgi, block, a_left, a_right, a_mode);
+ ir_node *xorb = new_rd_Eor(dbgi, block, b_left, b_right, b_mode);
+ ir_node *conv = new_rd_Conv(dbgi, block, xorb, a_mode);
+ ir_node *or = new_rd_Or(dbgi, block, xora, conv, a_mode);
+ ir_node *zero = create_zero_const(irg, a_mode);
+ return new_rd_Cmp(dbgi, block, or, zero, ir_relation_less_greater);
+ }
}
}
return node;
}
-int ir_mux_is_abs(const ir_node *sel, const ir_node *mux_true,
- const ir_node *mux_false)
+int ir_mux_is_abs(const ir_node *sel, const ir_node *mux_false,
+ const ir_node *mux_true)
{
ir_node *cmp_left;
ir_node *cmp_right;
return 0;
}
-ir_node *ir_get_abs_op(const ir_node *sel, ir_node *mux_true,
- ir_node *mux_false)
+ir_node *ir_get_abs_op(const ir_node *sel, ir_node *mux_false,
+ ir_node *mux_true)
{
ir_node *cmp_left = get_Cmp_left(sel);
return cmp_left == skip_upconv(mux_false) ? mux_false : mux_true;
}
+bool ir_is_optimizable_mux(const ir_node *sel, const ir_node *mux_false,
+ const ir_node *mux_true)
+{
+ /* this code should return true each time transform_node_Mux would
+ * optimize the Mux completely away */
+
+ ir_mode *mode = get_irn_mode(mux_false);
+ if (get_mode_arithmetic(mode) == irma_twos_complement
+ && ir_mux_is_abs(sel, mux_false, mux_true))
+ return true;
+
+ if (is_Cmp(sel) && mode_is_int(mode) && is_cmp_equality_zero(sel)) {
+ const ir_node *cmp_r = get_Cmp_right(sel);
+ const ir_node *cmp_l = get_Cmp_left(sel);
+ const ir_node *f = mux_false;
+ const ir_node *t = mux_true;
+
+ if (is_Const(t) && is_Const_null(t)) {
+ t = mux_false;
+ f = mux_true;
+ }
+
+ if (is_And(cmp_l) && f == cmp_r) {
+ ir_node *and_r = get_And_right(cmp_l);
+ ir_node *and_l;
+
+ if (and_r == t && is_single_bit(and_r))
+ return true;
+ and_l = get_And_left(cmp_l);
+ if (and_l == t && is_single_bit(and_l))
+ return true;
+ }
+ }
+
+ return false;
+}
+
/**
* Optimize a Mux into some simpler cases.
*/
/* implement integer abs: abs(x) = x^(x >>s 31) - (x >>s 31) */
if (get_mode_arithmetic(mode) == irma_twos_complement) {
- int abs = ir_mux_is_abs(sel, t, f);
+ int abs = ir_mux_is_abs(sel, f, t);
if (abs != 0) {
dbg_info *dbgi = get_irn_dbg_info(n);
ir_node *block = get_nodes_block(n);
- ir_node *op = ir_get_abs_op(sel, t, f);
+ ir_node *op = ir_get_abs_op(sel, f, t);
int bits = get_mode_size_bits(mode);
ir_node *shiftconst = new_r_Const_long(irg, mode_Iu, bits-1);
ir_node *sext = new_rd_Shrs(dbgi, block, op, shiftconst, mode);
}
}
- if (is_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX))
- return n;
-
- if (is_Mux(t)) {
- ir_node* block = get_nodes_block(n);
- ir_node* c0 = sel;
- ir_node* c1 = get_Mux_sel(t);
- ir_node* t1 = get_Mux_true(t);
- ir_node* f1 = get_Mux_false(t);
- if (f == f1) {
- /* Mux(cond0, Mux(cond1, x, y), y) -> typical if (cond0 && cond1) x else y */
- ir_node* and_ = new_r_And(block, c0, c1, mode_b);
- ir_node* new_mux = new_r_Mux(block, and_, f1, t1, mode);
- n = new_mux;
- sel = and_;
- f = f1;
- t = t1;
- DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE);
- } else if (f == t1) {
- /* Mux(cond0, Mux(cond1, x, y), x) */
- ir_node* not_c1 = new_r_Not(block, c1, mode_b);
- ir_node* and_ = new_r_And(block, c0, not_c1, mode_b);
- ir_node* new_mux = new_r_Mux(block, and_, t1, f1, mode);
- n = new_mux;
- sel = and_;
- f = t1;
- t = f1;
- DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE);
- }
- } else if (is_Mux(f)) {
- ir_node* block = get_nodes_block(n);
- ir_node* c0 = sel;
- ir_node* c1 = get_Mux_sel(f);
- ir_node* t1 = get_Mux_true(f);
- ir_node* f1 = get_Mux_false(f);
- if (t == t1) {
- /* Mux(cond0, x, Mux(cond1, x, y)) -> typical if (cond0 || cond1) x else y */
- ir_node* or_ = new_r_Or(block, c0, c1, mode_b);
- ir_node* new_mux = new_r_Mux(block, or_, f1, t1, mode);
- n = new_mux;
- sel = or_;
- f = f1;
- t = t1;
- DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE);
- } else if (t == f1) {
- /* Mux(cond0, x, Mux(cond1, y, x)) */
- ir_node* not_c1 = new_r_Not(block, c1, mode_b);
- ir_node* or_ = new_r_Or(block, c0, not_c1, mode_b);
- ir_node* new_mux = new_r_Mux(block, or_, t1, f1, mode);
- n = new_mux;
- sel = or_;
- f = t1;
- t = f1;
- DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE);
- }
- }
-
/* first normalization step: try to move a constant to the false side,
* 0 preferred on false side too */
if (is_Cmp(sel) && is_Const(t) &&
n = new_rd_Mux(get_irn_dbg_info(n), get_nodes_block(n), sel, f, t, mode);
}
- /* note: after normalization, false can only happen on default */
- if (mode == mode_b) {
- dbg_info *dbg = get_irn_dbg_info(n);
- ir_node *block = get_nodes_block(n);
+ /* the following optimisations create new mode_b nodes, so only do them
+ * before mode_b lowering */
+ if (!is_irg_state(irg, IR_GRAPH_STATE_MODEB_LOWERED)) {
+ if (is_Mux(t)) {
+ ir_node* block = get_nodes_block(n);
+ ir_node* c0 = sel;
+ ir_node* c1 = get_Mux_sel(t);
+ ir_node* t1 = get_Mux_true(t);
+ ir_node* f1 = get_Mux_false(t);
+ if (f == f1) {
+ /* Mux(cond0, Mux(cond1, x, y), y) => Mux(cond0 && cond1, x, y) */
+ ir_node* and_ = new_r_And(block, c0, c1, mode_b);
+ ir_node* new_mux = new_r_Mux(block, and_, f1, t1, mode);
+ n = new_mux;
+ sel = and_;
+ f = f1;
+ t = t1;
+ DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE);
+ } else if (f == t1) {
+ /* Mux(cond0, Mux(cond1, x, y), x) */
+ ir_node* not_c1 = new_r_Not(block, c1, mode_b);
+ ir_node* and_ = new_r_And(block, c0, not_c1, mode_b);
+ ir_node* new_mux = new_r_Mux(block, and_, t1, f1, mode);
+ n = new_mux;
+ sel = and_;
+ f = t1;
+ t = f1;
+ DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE);
+ }
+ } else if (is_Mux(f)) {
+ ir_node* block = get_nodes_block(n);
+ ir_node* c0 = sel;
+ ir_node* c1 = get_Mux_sel(f);
+ ir_node* t1 = get_Mux_true(f);
+ ir_node* f1 = get_Mux_false(f);
+ if (t == t1) {
+ /* Mux(cond0, x, Mux(cond1, x, y)) -> typical if (cond0 || cond1) x else y */
+ ir_node* or_ = new_r_Or(block, c0, c1, mode_b);
+ ir_node* new_mux = new_r_Mux(block, or_, f1, t1, mode);
+ n = new_mux;
+ sel = or_;
+ f = f1;
+ t = t1;
+ DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE);
+ } else if (t == f1) {
+ /* Mux(cond0, x, Mux(cond1, y, x)) */
+ ir_node* not_c1 = new_r_Not(block, c1, mode_b);
+ ir_node* or_ = new_r_Or(block, c0, not_c1, mode_b);
+ ir_node* new_mux = new_r_Mux(block, or_, t1, f1, mode);
+ n = new_mux;
+ sel = or_;
+ f = t1;
+ t = f1;
+ DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE);
+ }
+ }
+
+ /* note: after normalization, false can only happen on default */
+ if (mode == mode_b) {
+ dbg_info *dbg = get_irn_dbg_info(n);
+ ir_node *block = get_nodes_block(n);
- if (is_Const(t)) {
- ir_tarval *tv_t = get_Const_tarval(t);
- if (tv_t == tarval_b_true) {
- if (is_Const(f)) {
- /* Muxb(sel, true, false) = sel */
- assert(get_Const_tarval(f) == tarval_b_false);
- DBG_OPT_ALGSIM0(oldn, sel, FS_OPT_MUX_BOOL);
- return sel;
+ if (is_Const(t)) {
+ ir_tarval *tv_t = get_Const_tarval(t);
+ if (tv_t == tarval_b_true) {
+ if (is_Const(f)) {
+ /* Muxb(sel, true, false) = sel */
+ assert(get_Const_tarval(f) == tarval_b_false);
+ DBG_OPT_ALGSIM0(oldn, sel, FS_OPT_MUX_BOOL);
+ return sel;
+ } else {
+ /* Muxb(sel, true, x) = Or(sel, x) */
+ n = new_rd_Or(dbg, block, sel, f, mode_b);
+ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_OR_BOOL);
+ return n;
+ }
+ }
+ } else if (is_Const(f)) {
+ ir_tarval *tv_f = get_Const_tarval(f);
+ if (tv_f == tarval_b_true) {
+ /* Muxb(sel, x, true) = Or(Not(sel), x) */
+ ir_node* not_sel = new_rd_Not(dbg, block, sel, mode_b);
+ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_ORNOT_BOOL);
+ n = new_rd_Or(dbg, block, not_sel, t, mode_b);
+ return n;
} else {
- /* Muxb(sel, true, x) = Or(sel, x) */
- n = new_rd_Or(dbg, block, sel, f, mode_b);
- DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_OR_BOOL);
+ /* Muxb(sel, x, false) = And(sel, x) */
+ assert(tv_f == tarval_b_false);
+ n = new_rd_And(dbg, block, sel, t, mode_b);
+ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_AND_BOOL);
return n;
}
}
- } else if (is_Const(f)) {
- ir_tarval *tv_f = get_Const_tarval(f);
- if (tv_f == tarval_b_true) {
- /* Muxb(sel, x, true) = Or(Not(sel), x) */
- ir_node* not_sel = new_rd_Not(dbg, block, sel, mode_b);
- DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_ORNOT_BOOL);
- n = new_rd_Or(dbg, block, not_sel, t, mode_b);
+ }
+
+ /* more normalization: Mux(sel, 0, 1) is simply a conv from the mode_b
+ * value to integer. */
+ if (is_Const(t) && is_Const(f) && mode_is_int(mode)) {
+ ir_tarval *a = get_Const_tarval(t);
+ ir_tarval *b = get_Const_tarval(f);
+
+ if (tarval_is_one(a) && tarval_is_null(b)) {
+ ir_node *block = get_nodes_block(n);
+ ir_node *conv = new_r_Conv(block, sel, mode);
+ n = conv;
+ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV);
return n;
- } else {
- /* Muxb(sel, x, false) = And(sel, x) */
- assert(tv_f == tarval_b_false);
- n = new_rd_And(dbg, block, sel, t, mode_b);
- DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_AND_BOOL);
+ } else if (tarval_is_null(a) && tarval_is_one(b)) {
+ ir_node *block = get_nodes_block(n);
+ ir_node *not_ = new_r_Not(block, sel, mode_b);
+ ir_node *conv = new_r_Conv(block, not_, mode);
+ n = conv;
+ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV);
return n;
}
}
}
- /* more normalization: Mux(sel, 0, 1) is simply a conv from the mode_b
- * value to integer. */
- if (is_Const(t) && is_Const(f) && mode_is_int(mode)) {
- ir_tarval *a = get_Const_tarval(t);
- ir_tarval *b = get_Const_tarval(f);
+ if (is_Cmp(sel) && mode_is_int(mode) && is_cmp_equality_zero(sel)) {
+ ir_relation relation = get_Cmp_relation(sel);
+ ir_node *cmp_r = get_Cmp_right(sel);
+ ir_node *cmp_l = get_Cmp_left(sel);
+ ir_node *block = get_nodes_block(n);
- if (tarval_is_one(a) && tarval_is_null(b)) {
- ir_node *block = get_nodes_block(n);
- ir_node *conv = new_r_Conv(block, sel, mode);
- n = conv;
- DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV);
- return n;
- } else if (tarval_is_null(a) && tarval_is_one(b)) {
- ir_node *block = get_nodes_block(n);
- ir_node *not_ = new_r_Not(block, sel, mode_b);
- ir_node *conv = new_r_Conv(block, not_, mode);
- n = conv;
- DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV);
- return n;
- }
- }
+ if (is_And(cmp_l) && f == cmp_r) {
+ ir_node *and_r = get_And_right(cmp_l);
+ ir_node *and_l;
- if (is_Cmp(sel)) {
- ir_node *cmp_r = get_Cmp_right(sel);
- if (is_Const(cmp_r) && is_Const_null(cmp_r)) {
- ir_node *block = get_nodes_block(n);
- ir_node *cmp_l = get_Cmp_left(sel);
-
- if (mode_is_int(mode)) {
- ir_relation relation = get_Cmp_relation(sel);
- /* integer only */
- if ((relation == ir_relation_less_greater || relation == ir_relation_equal) && is_And(cmp_l)) {
- /* Mux((a & b) != 0, c, 0) */
- ir_node *and_r = get_And_right(cmp_l);
- ir_node *and_l;
-
- if (and_r == t && f == cmp_r) {
- if (is_Const(t) && tarval_is_single_bit(get_Const_tarval(t))) {
- if (relation == ir_relation_less_greater) {
- /* Mux((a & 2^C) != 0, 2^C, 0) */
- n = cmp_l;
- DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
- } else {
- /* Mux((a & 2^C) == 0, 2^C, 0) */
- n = new_rd_Eor(get_irn_dbg_info(n),
- block, cmp_l, t, mode);
- DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
- }
- return n;
- }
- }
- if (is_Shl(and_r)) {
- ir_node *shl_l = get_Shl_left(and_r);
- if (is_Const(shl_l) && is_Const_one(shl_l)) {
- if (and_r == t && f == cmp_r) {
- if (relation == ir_relation_less_greater) {
- /* (a & (1 << n)) != 0, (1 << n), 0) */
- n = cmp_l;
- DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
- } else {
- /* (a & (1 << n)) == 0, (1 << n), 0) */
- n = new_rd_Eor(get_irn_dbg_info(n),
- block, cmp_l, t, mode);
- DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
- }
- return n;
- }
- }
- }
- and_l = get_And_left(cmp_l);
- if (is_Shl(and_l)) {
- ir_node *shl_l = get_Shl_left(and_l);
- if (is_Const(shl_l) && is_Const_one(shl_l)) {
- if (and_l == t && f == cmp_r) {
- if (relation == ir_relation_less_greater) {
- /* ((1 << n) & a) != 0, (1 << n), 0) */
- n = cmp_l;
- DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
- } else {
- /* ((1 << n) & a) == 0, (1 << n), 0) */
- n = new_rd_Eor(get_irn_dbg_info(n),
- block, cmp_l, t, mode);
- DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
- }
- return n;
- }
- }
- }
+ if (and_r == t && is_single_bit(and_r)) {
+ if (relation == ir_relation_equal) {
+ /* Mux((a & (1<<n)) == 0, (1<<n), 0) == (a&(1<<n)) xor ((1<<n)) */
+ n = new_rd_Eor(get_irn_dbg_info(n),
+ block, cmp_l, t, mode);
+ DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
+ } else {
+ /* Mux((a & (1<<n)) != 0, (1<<n), 0) == a & (1<<n) */
+ n = cmp_l;
+ DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
}
+ return n;
+ }
+ and_l = get_And_left(cmp_l);
+ if (and_l == t && is_single_bit(and_l)) {
+ if (relation == ir_relation_equal) {
+ /* ((1 << n) & a) == 0, (1 << n), 0) */
+ n = new_rd_Eor(get_irn_dbg_info(n),
+ block, cmp_l, t, mode);
+ DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
+ } else {
+ /* ((1 << n) & a) != 0, (1 << n), 0) */
+ n = cmp_l;
+ DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP);
+ }
+ return n;
}
}
}
ir_node *bad = new_r_Bad(irg, mode_X);
ir_mode *mode = get_Load_mode(n);
ir_node *res = new_r_Proj(pred_load, mode, pn_Load_res);
- ir_node *in[pn_Load_max+1] = { mem, res, jmp, bad };
+ ir_node *in[] = { mem, res, jmp, bad };
ir_node *tuple = new_r_Tuple(block, ARRAY_SIZE(in), in);
return tuple;
}
ir_graph *irg = get_irn_irg(n);
ir_node *bad = new_r_Bad(irg, mode_X);
ir_node *res = value;
- ir_node *in[pn_Load_max+1] = { mem, res, jmp, bad };
+ ir_node *in[] = { mem, res, jmp, bad };
ir_node *tuple = new_r_Tuple(block, ARRAY_SIZE(in), in);
return tuple;
}
in a graph. */
#define N_IR_NODES 512
+/** Compares two exception attributes */
+static int node_cmp_exception(const ir_node *a, const ir_node *b)
+{
+ const except_attr *ea = &a->attr.except;
+ const except_attr *eb = &b->attr.except;
+ return ea->pin_state != eb->pin_state;
+}
+
/** Compares the attributes of two Const nodes. */
static int node_cmp_attr_Const(const ir_node *a, const ir_node *b)
{
{
const alloc_attr *pa = &a->attr.alloc;
const alloc_attr *pb = &b->attr.alloc;
- return (pa->where != pb->where) || (pa->type != pb->type);
+ if (pa->where != pb->where || pa->type != pb->type)
+ return 1;
+ return node_cmp_exception(a, b);
}
/** Compares the attributes of two Free nodes. */
{
const call_attr *pa = &a->attr.call;
const call_attr *pb = &b->attr.call;
- return (pa->type != pb->type)
- || (pa->tail_call != pb->tail_call);
+ if (pa->type != pb->type || pa->tail_call != pb->tail_call)
+ return 1;
+ return node_cmp_exception(a, b);
}
/** Compares the attributes of two Sel nodes. */
/* do not CSE Loads with different alignment. Be conservative. */
if (get_Load_unaligned(a) != get_Load_unaligned(b))
return 1;
-
- return get_Load_mode(a) != get_Load_mode(b);
+ if (get_Load_mode(a) != get_Load_mode(b))
+ return 1;
+ return node_cmp_exception(a, b);
}
/** Compares the attributes of two Store nodes. */
/* do not CSE Stores with different alignment. Be conservative. */
if (get_Store_unaligned(a) != get_Store_unaligned(b))
return 1;
-
/* NEVER do CSE on volatile Stores */
- return (get_Store_volatility(a) == volatility_is_volatile ||
- get_Store_volatility(b) == volatility_is_volatile);
+ if (get_Store_volatility(a) == volatility_is_volatile ||
+ get_Store_volatility(b) == volatility_is_volatile)
+ return 1;
+ return node_cmp_exception(a, b);
}
-/** Compares two exception attributes */
-static int node_cmp_exception(const ir_node *a, const ir_node *b)
+static int node_cmp_attr_CopyB(const ir_node *a, const ir_node *b)
{
- const except_attr *ea = &a->attr.except;
- const except_attr *eb = &b->attr.except;
+ if (get_CopyB_type(a) != get_CopyB_type(b))
+ return 1;
- return ea->pin_state != eb->pin_state;
+ return node_cmp_exception(a, b);
}
-#define node_cmp_attr_Bound node_cmp_exception
+static int node_cmp_attr_Bound(const ir_node *a, const ir_node *b)
+{
+ return node_cmp_exception(a, b);
+}
/** Compares the attributes of two Div nodes. */
static int node_cmp_attr_Div(const ir_node *a, const ir_node *b)
{
const div_attr *ma = &a->attr.div;
const div_attr *mb = &b->attr.div;
- return ma->exc.pin_state != mb->exc.pin_state ||
- ma->resmode != mb->resmode ||
- ma->no_remainder != mb->no_remainder;
+ if (ma->resmode != mb->resmode || ma->no_remainder != mb->no_remainder)
+ return 1;
+ return node_cmp_exception(a, b);
}
/** Compares the attributes of two Mod nodes. */
{
const mod_attr *ma = &a->attr.mod;
const mod_attr *mb = &b->attr.mod;
- return ma->exc.pin_state != mb->exc.pin_state ||
- ma->resmode != mb->resmode;
+ if (ma->resmode != mb->resmode)
+ return 1;
+ return node_cmp_exception(a, b);
}
static int node_cmp_attr_Cmp(const ir_node *a, const ir_node *b)
/** Compares the attributes of two Builtin nodes. */
static int node_cmp_attr_Builtin(const ir_node *a, const ir_node *b)
{
- /* no need to compare the type, equal kind means equal type */
- return get_Builtin_kind(a) != get_Builtin_kind(b);
+ if (get_Builtin_kind(a) != get_Builtin_kind(b))
+ return 1;
+ if (get_Builtin_type(a) != get_Builtin_type(b))
+ return 1;
+ return node_cmp_exception(a, b);
}
/** Compares the attributes of two ASM nodes. */
if (cla[i] != clb[i])
return 1;
}
- return 0;
+
+ return node_cmp_exception(a, b);
}
/** Compares the inexistent attributes of two Dummy nodes. */
{
(void) a;
(void) b;
+ /* Dummy nodes never equal by definition */
return 1;
}
+static int node_cmp_attr_InstOf(const ir_node *a, const ir_node *b)
+{
+ if (get_InstOf_type(a) != get_InstOf_type(b))
+ return 1;
+ return node_cmp_exception(a, b);
+}
+
/**
* Set the default node attribute compare operation for an ir_op_ops.
*
break
switch (code) {
- CASE(Const);
- CASE(Proj);
+ CASE(ASM);
CASE(Alloc);
- CASE(Free);
- CASE(SymConst);
+ CASE(Bound);
+ CASE(Builtin);
CASE(Call);
- CASE(Sel);
- CASE(Phi);
- CASE(Cmp);
- CASE(Conv);
CASE(Cast);
- CASE(Load);
- CASE(Store);
+ CASE(Cmp);
CASE(Confirm);
- CASE(ASM);
+ CASE(Const);
+ CASE(Conv);
+ CASE(CopyB);
CASE(Div);
- CASE(Mod);
- CASE(Bound);
- CASE(Builtin);
CASE(Dummy);
- /* FIXME CopyB */
+ CASE(Free);
+ CASE(InstOf);
+ CASE(Load);
+ CASE(Mod);
+ CASE(Phi);
+ CASE(Proj);
+ CASE(Sel);
+ CASE(Store);
+ CASE(SymConst);
default:
/* leave NULL */
break;
/* FIXME: Maybe we could also test whether optimizing the node can
change the control graph. */
- set_irg_doms_inconsistent(irg);
+ clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
return optimize_in_place_2(n);
} /* optimize_in_place */
projects / libfirm / blobdiff