X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=03eeb57addb6c0dc35f22cb3e03915d919476c0f;hb=128d686096cf3f9945d31b6bc9d36bd96ff76955;hp=2ca7947b10c690c95be234f55d21afd4169434da;hpb=1c5a82cb98819fe69b15792da6951bea5bc9cd2d;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index 2ca7947b1..03eeb57ad 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -26,6 +26,7 @@ #include "config.h" #include +#include #include "irnode_t.h" #include "irgraph_t.h" @@ -34,7 +35,8 @@ #include "iropt_t.h" #include "ircons_t.h" #include "irgmod.h" -#include "irvrfy.h" +#include "irverify.h" +#include "iroptimize.h" #include "tv_t.h" #include "dbginfo_t.h" #include "iropt_dbg.h" @@ -42,13 +44,14 @@ #include "irhooks.h" #include "irarch.h" #include "hashptr.h" -#include "opt_confirms.h" #include "opt_polymorphy.h" #include "irtools.h" #include "irhooks.h" #include "array_t.h" #include "vrp.h" #include "firm_types.h" +#include "bitfiddle.h" +#include "be.h" /* Make types visible to allow most efficient access */ #include "entity_t.h" @@ -56,7 +59,7 @@ /** * Returns the tarval of a Const node or tarval_bad for all other nodes. */ -static tarval *default_value_of(const ir_node *n) +static ir_tarval *default_value_of(const ir_node *n) { if (is_Const(n)) return get_Const_tarval(n); /* might return tarval_bad */ @@ -78,7 +81,7 @@ void set_value_of_func(value_of_func func) /** * Return the value of a Constant. */ -static tarval *computed_value_Const(const ir_node *n) +static ir_tarval *computed_value_Const(const ir_node *n) { return get_Const_tarval(n); } /* computed_value_Const */ @@ -86,7 +89,7 @@ static tarval *computed_value_Const(const ir_node *n) /** * Return the value of a 'sizeof', 'alignof' or 'offsetof' SymConst. */ -static tarval *computed_value_SymConst(const ir_node *n) +static ir_tarval *computed_value_SymConst(const ir_node *n) { ir_type *type; ir_entity *ent; @@ -117,13 +120,13 @@ static tarval *computed_value_SymConst(const ir_node *n) /** * Return the value of an Add. */ -static tarval *computed_value_Add(const ir_node *n) +static ir_tarval *computed_value_Add(const ir_node *n) { ir_node *a = get_Add_left(n); ir_node *b = get_Add_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) return tarval_add(ta, tb); @@ -135,13 +138,13 @@ static tarval *computed_value_Add(const ir_node *n) * Return the value of a Sub. * Special case: a - a */ -static tarval *computed_value_Sub(const ir_node *n) +static ir_tarval *computed_value_Sub(const ir_node *n) { - ir_mode *mode = get_irn_mode(n); - ir_node *a = get_Sub_left(n); - ir_node *b = get_Sub_right(n); - tarval *ta; - tarval *tb; + ir_mode *mode = get_irn_mode(n); + ir_node *a = get_Sub_left(n); + ir_node *b = get_Sub_right(n); + ir_tarval *ta; + ir_tarval *tb; /* NaN - NaN != 0 */ if (! mode_is_float(mode)) { @@ -163,14 +166,13 @@ static tarval *computed_value_Sub(const ir_node *n) * Return the value of a Carry. * Special : a op 0, 0 op b */ -static tarval *computed_value_Carry(const ir_node *n) +static ir_tarval *computed_value_Carry(const ir_node *n) { - ir_node *a = get_binop_left(n); - ir_node *b = get_binop_right(n); - ir_mode *m = get_irn_mode(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + ir_mode *m = get_irn_mode(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { tarval_add(ta, tb); @@ -186,17 +188,16 @@ static tarval *computed_value_Carry(const ir_node *n) * Return the value of a Borrow. * Special : a op 0 */ -static tarval *computed_value_Borrow(const ir_node *n) +static ir_tarval *computed_value_Borrow(const ir_node *n) { - ir_node *a = get_binop_left(n); - ir_node *b = get_binop_right(n); - ir_mode *m = get_irn_mode(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + ir_mode *m = get_irn_mode(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { - return tarval_cmp(ta, tb) == pn_Cmp_Lt ? get_mode_one(m) : get_mode_null(m); + return tarval_cmp(ta, tb) == ir_relation_less ? get_mode_one(m) : get_mode_null(m); } else if (tarval_is_null(ta)) { return get_mode_null(m); } @@ -206,10 +207,10 @@ static tarval *computed_value_Borrow(const ir_node *n) /** * Return the value of an unary Minus. */ -static tarval *computed_value_Minus(const ir_node *n) +static ir_tarval *computed_value_Minus(const ir_node *n) { - ir_node *a = get_Minus_op(n); - tarval *ta = value_of(a); + ir_node *a = get_Minus_op(n); + ir_tarval *ta = value_of(a); if (ta != tarval_bad) return tarval_neg(ta); @@ -220,14 +221,13 @@ static tarval *computed_value_Minus(const ir_node *n) /** * Return the value of a Mul. */ -static tarval *computed_value_Mul(const ir_node *n) +static ir_tarval *computed_value_Mul(const ir_node *n) { - ir_node *a = get_Mul_left(n); - ir_node *b = get_Mul_right(n); - ir_mode *mode; - - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_node *a = get_Mul_left(n); + ir_node *b = get_Mul_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); + ir_mode *mode; mode = get_irn_mode(n); if (mode != get_irn_mode(a)) { @@ -251,31 +251,16 @@ static tarval *computed_value_Mul(const ir_node *n) return tarval_bad; } /* computed_value_Mul */ -/** - * Return the value of an Abs. - */ -static tarval *computed_value_Abs(const ir_node *n) -{ - ir_node *a = get_Abs_op(n); - tarval *ta = value_of(a); - - if (ta != tarval_bad) - return tarval_abs(ta); - - return tarval_bad; -} /* computed_value_Abs */ - /** * Return the value of an And. * Special case: a & 0, 0 & b */ -static tarval *computed_value_And(const ir_node *n) +static ir_tarval *computed_value_And(const ir_node *n) { - ir_node *a = get_And_left(n); - ir_node *b = get_And_right(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_node *a = get_And_left(n); + ir_node *b = get_And_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_and (ta, tb); @@ -290,13 +275,12 @@ static tarval *computed_value_And(const ir_node *n) * Return the value of an Or. * Special case: a | 1...1, 1...1 | b */ -static tarval *computed_value_Or(const ir_node *n) +static ir_tarval *computed_value_Or(const ir_node *n) { - ir_node *a = get_Or_left(n); - ir_node *b = get_Or_right(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_node *a = get_Or_left(n); + ir_node *b = get_Or_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_or (ta, tb); @@ -310,12 +294,12 @@ static tarval *computed_value_Or(const ir_node *n) /** * Return the value of an Eor. */ -static tarval *computed_value_Eor(const ir_node *n) +static ir_tarval *computed_value_Eor(const ir_node *n) { ir_node *a = get_Eor_left(n); ir_node *b = get_Eor_right(n); - tarval *ta, *tb; + ir_tarval *ta, *tb; if (a == b) return get_mode_null(get_irn_mode(n)); @@ -332,10 +316,10 @@ static tarval *computed_value_Eor(const ir_node *n) /** * Return the value of a Not. */ -static tarval *computed_value_Not(const ir_node *n) +static ir_tarval *computed_value_Not(const ir_node *n) { - ir_node *a = get_Not_op(n); - tarval *ta = value_of(a); + ir_node *a = get_Not_op(n); + ir_tarval *ta = value_of(a); if (ta != tarval_bad) return tarval_not(ta); @@ -346,13 +330,13 @@ static tarval *computed_value_Not(const ir_node *n) /** * Return the value of a Shl. */ -static tarval *computed_value_Shl(const ir_node *n) +static ir_tarval *computed_value_Shl(const ir_node *n) { ir_node *a = get_Shl_left(n); ir_node *b = get_Shl_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_shl(ta, tb); @@ -363,13 +347,13 @@ static tarval *computed_value_Shl(const ir_node *n) /** * Return the value of a Shr. */ -static tarval *computed_value_Shr(const ir_node *n) +static ir_tarval *computed_value_Shr(const ir_node *n) { ir_node *a = get_Shr_left(n); ir_node *b = get_Shr_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_shr(ta, tb); @@ -380,13 +364,13 @@ static tarval *computed_value_Shr(const ir_node *n) /** * Return the value of a Shrs. */ -static tarval *computed_value_Shrs(const ir_node *n) +static ir_tarval *computed_value_Shrs(const ir_node *n) { ir_node *a = get_Shrs_left(n); ir_node *b = get_Shrs_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_shrs(ta, tb); @@ -397,13 +381,13 @@ static tarval *computed_value_Shrs(const ir_node *n) /** * Return the value of a Rotl. */ -static tarval *computed_value_Rotl(const ir_node *n) +static ir_tarval *computed_value_Rotl(const ir_node *n) { ir_node *a = get_Rotl_left(n); ir_node *b = get_Rotl_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); if ((ta != tarval_bad) && (tb != tarval_bad)) { return tarval_rotl(ta, tb); @@ -414,10 +398,10 @@ static tarval *computed_value_Rotl(const ir_node *n) /** * Return the value of a Conv. */ -static tarval *computed_value_Conv(const ir_node *n) +static ir_tarval *computed_value_Conv(const ir_node *n) { ir_node *a = get_Conv_op(n); - tarval *ta = value_of(a); + ir_tarval *ta = value_of(a); if (ta != tarval_bad) return tarval_convert_to(ta, get_irn_mode(n)); @@ -429,10 +413,10 @@ static tarval *computed_value_Conv(const ir_node *n) * Calculate the value of a Mux: can be evaluated, if the * sel and the right input are known. */ -static tarval *computed_value_Mux(const ir_node *n) +static ir_tarval *computed_value_Mux(const ir_node *n) { ir_node *sel = get_Mux_sel(n); - tarval *ts = value_of(sel); + ir_tarval *ts = value_of(sel); if (ts == get_tarval_b_true()) { ir_node *v = get_Mux_true(n); @@ -449,150 +433,102 @@ static tarval *computed_value_Mux(const ir_node *n) * Calculate the value of a Confirm: can be evaluated, * if it has the form Confirm(x, '=', Const). */ -static tarval *computed_value_Confirm(const ir_node *n) +static ir_tarval *computed_value_Confirm(const ir_node *n) { - /* - * Beware: we might produce Phi(Confirm(x == true), Confirm(x == false)). - * Do NOT optimize them away (jump threading wants them), so wait until - * remove_confirm is activated. - */ - if (get_opt_remove_confirm()) { - if (get_Confirm_cmp(n) == pn_Cmp_Eq) { - tarval *tv = value_of(get_Confirm_bound(n)); - if (tv != tarval_bad) - return tv; - } + if (get_Confirm_relation(n) == ir_relation_equal) { + ir_tarval *tv = value_of(get_Confirm_bound(n)); + if (tv != tarval_bad) + return tv; } return value_of(get_Confirm_value(n)); } /* computed_value_Confirm */ /** - * Return the value of a Proj(Cmp). - * - * This performs a first step of unreachable code elimination. - * Proj can not be computed, but folding a Cmp above the Proj here is - * not as wasteful as folding a Cmp into a Tuple of 16 Consts of which - * only 1 is used. - * There are several case where we can evaluate a Cmp node, see later. + * gives a (conservative) estimation of possible relation when comparing + * left+right */ -static tarval *computed_value_Proj_Cmp(const ir_node *n) +ir_relation ir_get_possible_cmp_relations(const ir_node *left, + const ir_node *right) { - ir_node *cmp = get_Proj_pred(n); - ir_node *left = get_Cmp_left(cmp); - ir_node *right = get_Cmp_right(cmp); - long pn_cmp = get_Proj_proj(n); - ir_mode *mode = get_irn_mode(left); - tarval *tv_l, *tv_r; - - /* - * BEWARE: a == a is NOT always True for floating Point values, as - * NaN != NaN is defined, so we must check this here. - */ - if (left == right && (!mode_is_float(mode) || pn_cmp == pn_Cmp_Lt || pn_cmp == pn_Cmp_Gt)) { - /* This is a trick with the bits used for encoding the Cmp - Proj numbers, the following statement is not the same: - return new_tarval_from_long(pn_cmp == pn_Cmp_Eq, mode_b) */ - return new_tarval_from_long(pn_cmp & pn_Cmp_Eq, mode_b); - } - tv_l = value_of(left); - tv_r = value_of(right); + ir_relation possible = ir_relation_true; + ir_tarval *tv_l = value_of(left); + ir_tarval *tv_r = value_of(right); + ir_mode *mode = get_irn_mode(left); + ir_tarval *min = mode == mode_b ? tarval_b_false : get_mode_min(mode); + ir_tarval *max = mode == mode_b ? tarval_b_true : get_mode_max(mode); + /* both values known - evaluate them */ if ((tv_l != tarval_bad) && (tv_r != tarval_bad)) { - /* - * The predecessors of Cmp are target values. We can evaluate - * the Cmp. - */ - pn_Cmp flags = tarval_cmp(tv_l, tv_r); - if (flags != pn_Cmp_False) { - return new_tarval_from_long (pn_cmp & flags, mode_b); - } - } else if (mode_is_int(mode)) { - /* for integer values, we can check against MIN/MAX */ - pn_Cmp cmp_result; - - if (tv_l == get_mode_min(mode)) { - /* MIN <=/> x. This results in true/false. */ - if (pn_cmp == pn_Cmp_Le) - return tarval_b_true; - else if (pn_cmp == pn_Cmp_Gt) - return tarval_b_false; - } else if (tv_r == get_mode_min(mode)) { - /* x >=/< MIN. This results in true/false. */ - if (pn_cmp == pn_Cmp_Ge) - return tarval_b_true; - else if (pn_cmp == pn_Cmp_Lt) - return tarval_b_false; - } else if (tv_l == get_mode_max(mode)) { - /* MAX >=/< x. This results in true/false. */ - if (pn_cmp == pn_Cmp_Ge) - return tarval_b_true; - else if (pn_cmp == pn_Cmp_Lt) - return tarval_b_false; - } else if (tv_r == get_mode_max(mode)) { - /* x <=/> MAX. This results in true/false. */ - if (pn_cmp == pn_Cmp_Le) - return tarval_b_true; - else if (pn_cmp == pn_Cmp_Gt) - return tarval_b_false; - } - - cmp_result = vrp_cmp(left, right); - if (cmp_result != pn_Cmp_False) { - if (cmp_result == pn_Cmp_Lg) { - if (pn_cmp == pn_Cmp_Eq) { - return tarval_b_false; - } else if (pn_cmp == pn_Cmp_Lg) { - return tarval_b_true; - } - } else { - return new_tarval_from_long(cmp_result & pn_cmp, mode_b); - } - } - } else if (mode_is_reference(mode)) { - /* pointer compare */ - ir_node *s_l = skip_Proj(left); - ir_node *s_r = skip_Proj(right); - - if ((is_Alloc(s_l) && tarval_is_null(tv_r)) || - (tarval_is_null(tv_l) && is_Alloc(s_r))) { - /* - * The predecessors are Allocs and (void*)(0) constants. In Firm Allocs never - * return NULL, they raise an exception. Therefore we can predict - * the Cmp result. - */ - return new_tarval_from_long(pn_cmp & pn_Cmp_Lg, mode_b); - } - } - return computed_value_Cmp_Confirm(cmp, left, right, pn_cmp); -} /* computed_value_Proj_Cmp */ + possible = tarval_cmp(tv_l, tv_r); + /* we can return now, won't get any better */ + return possible; + } + /* a == a is never less or greater (but might be equal or unordered) */ + if (left == right) + possible &= ~ir_relation_less_greater; + /* unordered results only happen for float compares */ + if (!mode_is_float(mode)) + possible &= ~ir_relation_unordered; + /* values can never be less than the least representable number or + * greater than the greatest representable number */ + if (tv_l == min) + possible &= ~ir_relation_greater; + if (tv_l == max) + possible &= ~ir_relation_less; + if (tv_r == max) + possible &= ~ir_relation_greater; + if (tv_r == min) + possible &= ~ir_relation_less; + /* maybe vrp can tell us more */ + possible &= vrp_cmp(left, right); + /* Alloc nodes never return null (but throw an exception) */ + if (is_Alloc(left) && tarval_is_null(tv_r)) + possible &= ~ir_relation_equal; + + return possible; +} /** - * Return the value of a floating point Quot. + * Return the value of a Cmp. + * + * The basic idea here is to determine which relations are possible and which + * one are definitely impossible. */ -static tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) +static ir_tarval *computed_value_Cmp(const ir_node *cmp) { - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_node *left = get_Cmp_left(cmp); + ir_node *right = get_Cmp_right(cmp); + ir_relation possible = ir_get_possible_cmp_relations(left, right); + ir_relation relation = get_Cmp_relation(cmp); - /* cannot optimize 0 / b = 0 because of NaN */ - if (ta != tarval_bad && tb != tarval_bad) - return tarval_quo(ta, tb); - return tarval_bad; -} /* do_computed_value_Quot */ + /* if none of the requested relations is possible, return false */ + if ((possible & relation) == ir_relation_false) + return tarval_b_false; + /* if possible relations are a subset of the requested ones return true */ + if ((possible & ~relation) == ir_relation_false) + return tarval_b_true; + + return computed_value_Cmp_Confirm(cmp, left, right, relation); +} /** - * Calculate the value of an integer Div of two nodes. + * Calculate the value of an integer Div. * Special case: 0 / b */ -static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) +static ir_tarval *do_computed_value_Div(const ir_node *div) { - tarval *ta = value_of(a); - tarval *tb; + const ir_node *a = get_Div_left(div); + const ir_node *b = get_Div_right(div); + const ir_mode *mode = get_Div_resmode(div); + ir_tarval *ta = value_of(a); + ir_tarval *tb; const ir_node *dummy; - /* Compute c1 / c2 or 0 / a, a != 0 */ - if (tarval_is_null(ta) && value_not_zero(b, &dummy)) - return ta; /* 0 / b == 0 */ + /* cannot optimize 0 / b = 0 because of NaN */ + if (!mode_is_float(mode)) { + if (tarval_is_null(ta) && value_not_zero(b, &dummy)) + return ta; /* 0 / b == 0 if b != 0 */ + } tb = value_of(b); if (ta != tarval_bad && tb != tarval_bad) return tarval_div(ta, tb); @@ -603,10 +539,10 @@ static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) * Calculate the value of an integer Mod of two nodes. * Special case: a % 1 */ -static tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) +static ir_tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) { - tarval *ta = value_of(a); - tarval *tb = value_of(b); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); /* Compute a % 1 or c1 % c2 */ if (tarval_is_one(tb)) @@ -616,70 +552,36 @@ static tarval *do_computed_value_Mod(const ir_node *a, const ir_node *b) return tarval_bad; } /* do_computed_value_Mod */ -/** - * Return the value of a Proj(DivMod). - */ -static tarval *computed_value_Proj_DivMod(const ir_node *n) -{ - long proj_nr = get_Proj_proj(n); - - /* compute either the Div or the Mod part */ - if (proj_nr == pn_DivMod_res_div) { - const ir_node *a = get_Proj_pred(n); - return do_computed_value_Div(get_DivMod_left(a), get_DivMod_right(a)); - } else if (proj_nr == pn_DivMod_res_mod) { - const ir_node *a = get_Proj_pred(n); - return do_computed_value_Mod(get_DivMod_left(a), get_DivMod_right(a)); - } - return tarval_bad; -} /* computed_value_Proj_DivMod */ - /** * Return the value of a Proj(Div). */ -static tarval *computed_value_Proj_Div(const ir_node *n) +static ir_tarval *computed_value_Proj_Div(const ir_node *n) { long proj_nr = get_Proj_proj(n); + if (proj_nr != pn_Div_res) + return tarval_bad; - if (proj_nr == pn_Div_res) { - const ir_node *a = get_Proj_pred(n); - return do_computed_value_Div(get_Div_left(a), get_Div_right(a)); - } - return tarval_bad; + return do_computed_value_Div(get_Proj_pred(n)); } /* computed_value_Proj_Div */ /** * Return the value of a Proj(Mod). */ -static tarval *computed_value_Proj_Mod(const ir_node *n) +static ir_tarval *computed_value_Proj_Mod(const ir_node *n) { long proj_nr = get_Proj_proj(n); if (proj_nr == pn_Mod_res) { - const ir_node *a = get_Proj_pred(n); - return do_computed_value_Mod(get_Mod_left(a), get_Mod_right(a)); + const ir_node *mod = get_Proj_pred(n); + return do_computed_value_Mod(get_Mod_left(mod), get_Mod_right(mod)); } return tarval_bad; } /* computed_value_Proj_Mod */ -/** - * Return the value of a Proj(Quot). - */ -static tarval *computed_value_Proj_Quot(const ir_node *n) -{ - long proj_nr = get_Proj_proj(n); - - if (proj_nr == pn_Quot_res) { - const ir_node *a = get_Proj_pred(n); - return do_computed_value_Quot(get_Quot_left(a), get_Quot_right(a)); - } - return tarval_bad; -} /* computed_value_Proj_Quot */ - /** * Return the value of a Proj. */ -static tarval *computed_value_Proj(const ir_node *proj) +static ir_tarval *computed_value_Proj(const ir_node *proj) { ir_node *n = get_Proj_pred(proj); @@ -694,10 +596,10 @@ static tarval *computed_value_Proj(const ir_node *proj) * * @param n The node this should be evaluated */ -tarval *computed_value(const ir_node *n) +ir_tarval *computed_value(const ir_node *n) { vrp_attr *vrp = vrp_get_info(n); - if (vrp && vrp->valid && tarval_cmp(vrp->bits_set, vrp->bits_not_set) == pn_Cmp_Eq) { + if (vrp && vrp->valid && tarval_cmp(vrp->bits_set, vrp->bits_not_set) == ir_relation_equal) { return vrp->bits_set; } if (n->op->ops.computed_value) @@ -726,32 +628,29 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops break switch (code) { - CASE(Const); - CASE(SymConst); CASE(Add); - CASE(Sub); - CASE(Carry); + CASE(And); CASE(Borrow); + CASE(Carry); + CASE(Cmp); + CASE(Confirm); + CASE(Const); + CASE(Conv); + CASE(Eor); CASE(Minus); CASE(Mul); - CASE(Abs); - CASE(And); - CASE(Or); - CASE(Eor); + CASE(Mux); CASE(Not); + CASE(Or); + CASE(Proj); + CASE(Rotl); CASE(Shl); CASE(Shr); CASE(Shrs); - CASE(Rotl); - CASE(Conv); - CASE(Mux); - CASE(Confirm); - CASE_PROJ(Cmp); - CASE_PROJ(DivMod); + CASE(Sub); + CASE(SymConst); CASE_PROJ(Div); CASE_PROJ(Mod); - CASE_PROJ(Quot); - CASE(Proj); default: /* leave NULL */ break; @@ -782,6 +681,7 @@ static ir_node *equivalent_node_Block(ir_node *n) { ir_node *oldn = n; int n_preds; + ir_graph *irg; /* don't optimize dead or labeled blocks */ if (is_Block_dead(n) || has_Block_entity(n)) @@ -793,6 +693,8 @@ static ir_node *equivalent_node_Block(ir_node *n) calls the optimization. */ assert(get_Block_matured(n)); + irg = get_irn_irg(n); + /* Straightening: a single entry Block following a single exit Block can be merged, if it is not the Start block. */ /* !!! Beware, all Phi-nodes of n must have been optimized away. @@ -808,7 +710,7 @@ static ir_node *equivalent_node_Block(ir_node *n) /* Jmp jumps into the block it is in -- deal self cycle. */ n = set_Block_dead(n); DBG_OPT_DEAD_BLOCK(oldn, n); - } else if (get_opt_control_flow_straightening()) { + } else { n = predblock; DBG_OPT_STG(oldn, n); } @@ -820,8 +722,7 @@ static ir_node *equivalent_node_Block(ir_node *n) DBG_OPT_DEAD_BLOCK(oldn, n); } } - } else if ((n_preds == 2) && - (get_opt_control_flow_weak_simplification())) { + } else if (n_preds == 2) { /* Test whether Cond jumps twice to this block * The more general case which more than 2 predecessors is handles * in optimize_cf(), we handle only this special case for speed here. @@ -841,8 +742,8 @@ static ir_node *equivalent_node_Block(ir_node *n) } } } else if (get_opt_unreachable_code() && - (n != get_irg_start_block(current_ir_graph)) && - (n != get_irg_end_block(current_ir_graph)) ) { + (n != get_irg_start_block(irg)) && + (n != get_irg_end_block(irg))) { int i; /* If all inputs are dead, this block is dead too, except if it is @@ -881,7 +782,8 @@ static ir_node *equivalent_node_Jmp(ir_node *n) /* unreachable code elimination */ if (is_Block_dead(get_nodes_block(n))) { - n = get_irg_bad(current_ir_graph); + ir_graph *irg = get_irn_irg(n); + n = get_irg_bad(irg); DBG_OPT_DEAD_BLOCK(oldn, n); } return n; @@ -905,7 +807,7 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n) ir_node *a = get_binop_left(n); ir_node *b = get_binop_right(n); - tarval *tv; + ir_tarval *tv; ir_node *on; /* After running compute_node there is only one constant predecessor. @@ -1003,8 +905,11 @@ static ir_node *equivalent_node_Add(ir_node *n) return n; /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } left = get_Add_left(n); right = get_Add_right(n); @@ -1042,9 +947,9 @@ static ir_node *equivalent_node_left_zero(ir_node *n) { ir_node *oldn = n; - ir_node *a = get_binop_left(n); - ir_node *b = get_binop_right(n); - tarval *tb = value_of(b); + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + ir_tarval *tb = value_of(b); if (tarval_is_null(tb)) { n = a; @@ -1070,14 +975,17 @@ static ir_node *equivalent_node_left_zero(ir_node *n) */ static ir_node *equivalent_node_Sub(ir_node *n) { - ir_node *oldn = n; - ir_node *b; - ir_mode *mode = get_irn_mode(n); - tarval *tb; + ir_node *oldn = n; + ir_node *b; + ir_mode *mode = get_irn_mode(n); + ir_tarval *tb; /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } b = get_Sub_right(n); tb = value_of(b); @@ -1133,8 +1041,8 @@ static ir_node *equivalent_node_Mul(ir_node *n) /* we can handle here only the n * n = n bit cases */ if (get_irn_mode(n) == get_irn_mode(a)) { - ir_node *b = get_Mul_right(n); - tarval *tv; + ir_node *b = get_Mul_right(n); + ir_tarval *tv; /* * Mul is commutative and has again an other neutral element. @@ -1162,16 +1070,16 @@ static ir_node *equivalent_node_Or(ir_node *n) { ir_node *oldn = n; - ir_node *a = get_Or_left(n); - ir_node *b = get_Or_right(n); - tarval *tv; + ir_node *a = get_Or_left(n); + ir_node *b = get_Or_right(n); + ir_tarval *tv; if (a == b) { - n = a; /* Or has it's own neutral element */ + n = a; /* idempotence */ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_OR); return n; } - /* constants are cormalized to right, check this site first */ + /* constants are normalized to right, check this side first */ tv = value_of(b); if (tarval_is_null(tv)) { n = a; @@ -1195,16 +1103,16 @@ static ir_node *equivalent_node_And(ir_node *n) { ir_node *oldn = n; - ir_node *a = get_And_left(n); - ir_node *b = get_And_right(n); - tarval *tv; + ir_node *a = get_And_left(n); + ir_node *b = get_And_right(n); + ir_tarval *tv; if (a == b) { - n = a; /* And has it's own neutral element */ + n = a; /* idempotence */ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_AND); return n; } - /* constants are normalized to right, check this site first */ + /* constants are normalized to right, check this side first */ tv = value_of(b); if (tarval_is_all_one(tv)) { n = a; @@ -1267,13 +1175,11 @@ restart: if (get_Conv_strict(n)) { ir_node *p = a; - /* neither Minus nor Abs nor Confirm change the precision, + /* neither Minus nor Confirm change the precision, so we can "look-through" */ for (;;) { if (is_Minus(p)) { p = get_Minus_op(p); - } else if (is_Abs(p)) { - p = get_Abs_op(p); } else if (is_Confirm(p)) { p = get_Confirm_value(p); } else { @@ -1283,7 +1189,7 @@ restart: } if (is_Conv(p) && get_Conv_strict(p)) { /* we known already, that a_mode == n_mode, and neither - Abs nor Minus change the mode, so the second Conv + Minus change the mode, so the second Conv can be kicked */ assert(get_irn_mode(p) == n_mode); n = a; @@ -1384,22 +1290,6 @@ restart: return n; } /* equivalent_node_Conv */ -/** - * A Cast may be removed if the type of the previous node - * is already the type of the Cast. - */ -static ir_node *equivalent_node_Cast(ir_node *n) -{ - ir_node *oldn = n; - ir_node *pred = get_Cast_op(n); - - if (get_irn_type(pred) == get_Cast_type(n)) { - n = pred; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CAST); - } - return n; -} /* equivalent_node_Cast */ - /** * - fold Phi-nodes, iff they have only one predecessor except * themselves. @@ -1412,13 +1302,18 @@ static ir_node *equivalent_node_Phi(ir_node *n) ir_node *block; ir_node *first_val = NULL; /* to shutup gcc */ - if (!get_opt_normalize()) return n; + if (!get_opt_optimize() && + get_irg_phase_state(get_irn_irg(n)) != phase_building) + return n; n_preds = get_Phi_n_preds(n); block = get_nodes_block(n); - if (is_Block_dead(block)) /* Control dead */ - return get_irg_bad(current_ir_graph); + /* Control dead */ + if (is_Block_dead(block)) { + ir_graph *irg = get_irn_irg(n); + return get_irg_bad(irg); + } if (n_preds == 0) return n; /* Phi of dead Region without predecessors. */ @@ -1427,11 +1322,11 @@ static ir_node *equivalent_node_Phi(ir_node *n) first_val = get_Phi_pred(n, i); if ( (first_val != n) /* not self pointer */ #if 0 - /* BEWARE: when the if is changed to 1, Phi's will ignore it's Bad - * predecessors. Then, Phi nodes in dead code might be removed, causing - * nodes pointing to themself (Add's for instance). - * This is really bad and causes endless recursions in several - * code pathes, so we do NOT optimize such a code. + /* BEWARE: when the if is changed to 1, Phis will ignore their Bad + * predecessors. Then, Phi nodes in unreachable code might be removed, + * causing nodes pointing to themselev (Adds for instance). + * This is really bad and causes endless recursion on several + * code pathes, so we do NOT optimize such code. * This is not that bad as it sounds, optimize_cf() removes bad control flow * (and bad Phi predecessors), so live code is optimized later. */ @@ -1443,8 +1338,9 @@ static ir_node *equivalent_node_Phi(ir_node *n) } if (i >= n_preds) { + ir_graph *irg = get_irn_irg(n); /* A totally Bad or self-referencing Phi (we didn't break the above loop) */ - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } /* search for rest of inputs, determine if any of these @@ -1462,7 +1358,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) } } - if (i >= n_preds) { + if (i >= n_preds && !is_Dummy(first_val)) { /* Fold, if no multiple distinct non-self-referencing inputs */ n = first_val; DBG_OPT_PHI(oldn, n); @@ -1505,7 +1401,10 @@ static ir_node *equivalent_node_Sync(ir_node *n) } } - if (arity == 0) return get_irg_bad(current_ir_graph); + if (arity == 0) { + ir_graph *irg = get_irn_irg(n); + return get_irg_bad(irg); + } if (arity == 1) return get_Sync_pred(n, 0); return n; } /* equivalent_node_Sync */ @@ -1530,10 +1429,10 @@ static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) */ static ir_node *equivalent_node_Proj_Div(ir_node *proj) { - ir_node *oldn = proj; - ir_node *div = get_Proj_pred(proj); - ir_node *b = get_Div_right(div); - tarval *tb = value_of(b); + ir_node *oldn = proj; + ir_node *div = get_Proj_pred(proj); + ir_node *b = get_Div_right(div); + ir_tarval *tb = value_of(b); /* Div is not commutative. */ if (tarval_is_one(tb)) { /* div(x, 1) == x */ @@ -1557,72 +1456,6 @@ static ir_node *equivalent_node_Proj_Div(ir_node *proj) return proj; } /* equivalent_node_Proj_Div */ -/** - * Optimize a / 1.0 = a. - */ -static ir_node *equivalent_node_Proj_Quot(ir_node *proj) -{ - ir_node *oldn = proj; - ir_node *quot = get_Proj_pred(proj); - ir_node *b = get_Quot_right(quot); - tarval *tb = value_of(b); - - /* Div is not commutative. */ - if (tarval_is_one(tb)) { /* Quot(x, 1) == x */ - switch (get_Proj_proj(proj)) { - case pn_Quot_M: - proj = get_Quot_mem(quot); - DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1); - return proj; - - case pn_Quot_res: - proj = get_Quot_left(quot); - DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1); - return proj; - - default: - /* we cannot replace the exception Proj's here, this is done in - transform_node_Proj_Quot() */ - return proj; - } - } - return proj; -} /* equivalent_node_Proj_Quot */ - -/** - * Optimize a / 1 = a. - */ -static ir_node *equivalent_node_Proj_DivMod(ir_node *proj) -{ - ir_node *oldn = proj; - ir_node *divmod = get_Proj_pred(proj); - ir_node *b = get_DivMod_right(divmod); - tarval *tb = value_of(b); - - /* Div is not commutative. */ - if (tarval_is_one(tb)) { /* div(x, 1) == x */ - switch (get_Proj_proj(proj)) { - case pn_DivMod_M: - proj = get_DivMod_mem(divmod); - DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1); - return proj; - - case pn_DivMod_res_div: - proj = get_DivMod_left(divmod); - DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1); - return proj; - - default: - /* we cannot replace the exception Proj's here, this is done in - transform_node_Proj_DivMod(). - Note further that the pn_DivMod_res_div case is handled in - computed_value_Proj(). */ - return proj; - } - } - return proj; -} /* equivalent_node_Proj_DivMod */ - /** * Optimize CopyB(mem, x, x) into a Nop. */ @@ -1641,11 +1474,13 @@ static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); break; - case pn_CopyB_X_except: + case pn_CopyB_X_except: { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - proj = get_irg_bad(current_ir_graph); + proj = get_irg_bad(irg); break; } + } } return proj; } /* equivalent_node_Proj_CopyB */ @@ -1665,14 +1500,13 @@ static ir_node *equivalent_node_Proj_Bound(ir_node *proj) ret_tuple = 1; else if (is_Bound(pred)) { /* - * idx was Bounds checked in the same MacroBlock previously, - * it is still valid if lower <= pred_lower && pred_upper <= upper. + * idx was Bounds checked previously, it is still valid if + * lower <= pred_lower && pred_upper <= upper. */ ir_node *lower = get_Bound_lower(bound); ir_node *upper = get_Bound_upper(bound); if (get_Bound_lower(pred) == lower && - get_Bound_upper(pred) == upper && - get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) { + get_Bound_upper(pred) == upper) { /* * One could expect that we simply return the previous * Bound here. However, this would be wrong, as we could @@ -1689,10 +1523,12 @@ static ir_node *equivalent_node_Proj_Bound(ir_node *proj) DBG_OPT_EXC_REM(proj); proj = get_Bound_mem(bound); break; - case pn_Bound_X_except: + case pn_Bound_X_except: { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - proj = get_irg_bad(current_ir_graph); + proj = get_irg_bad(irg); break; + } case pn_Bound_res: proj = idx; DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); @@ -1720,8 +1556,9 @@ static ir_node *equivalent_node_Proj_Load(ir_node *proj) if (value_not_null(addr, &confirm)) { if (get_Proj_proj(proj) == pn_Load_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } } } @@ -1744,8 +1581,9 @@ static ir_node *equivalent_node_Proj_Store(ir_node *proj) if (value_not_null(addr, &confirm)) { if (get_Proj_proj(proj) == pn_Store_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } } } @@ -1754,7 +1592,7 @@ static ir_node *equivalent_node_Proj_Store(ir_node *proj) } /* equivalent_node_Proj_Store */ /** - * Does all optimizations on nodes that must be done on it's Proj's + * Does all optimizations on nodes that must be done on its Projs * because of creating new nodes. */ static ir_node *equivalent_node_Proj(ir_node *proj) @@ -1764,7 +1602,8 @@ static ir_node *equivalent_node_Proj(ir_node *proj) if (get_irn_mode(proj) == mode_X) { if (is_Block_dead(get_nodes_block(n))) { /* Remove dead control flow -- early gigo(). */ - return get_irg_bad(current_ir_graph); + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); } } if (n->op->ops.equivalent_node_Proj) @@ -1792,9 +1631,9 @@ static ir_node *equivalent_node_Id(ir_node *n) */ static ir_node *equivalent_node_Mux(ir_node *n) { - ir_node *oldn = n, *sel = get_Mux_sel(n); - ir_node *n_t, *n_f; - tarval *ts = value_of(sel); + ir_node *oldn = n, *sel = get_Mux_sel(n); + ir_node *n_t, *n_f; + ir_tarval *ts = value_of(sel); /* Mux(true, f, t) == t */ if (ts == tarval_b_true) { @@ -1830,65 +1669,65 @@ static ir_node *equivalent_node_Mux(ir_node *n) DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ); return n; } - if (is_Proj(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) { - ir_node *cmp = get_Proj_pred(sel); - long proj_nr = get_Proj_proj(sel); - ir_node *f = get_Mux_false(n); - ir_node *t = get_Mux_true(n); + if (is_Cmp(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) { + ir_relation relation = get_Cmp_relation(sel); + ir_node *f = get_Mux_false(n); + ir_node *t = get_Mux_true(n); /* * Note further that these optimization work even for floating point * with NaN's because -NaN == NaN. * However, if +0 and -0 is handled differently, we cannot use the first one. */ - if (is_Cmp(cmp)) { - ir_node *const cmp_l = get_Cmp_left(cmp); - ir_node *const cmp_r = get_Cmp_right(cmp); - - switch (proj_nr) { - case pn_Cmp_Eq: - if ((cmp_l == t && cmp_r == f) || /* Mux(t == f, t, f) -> f */ - (cmp_l == f && cmp_r == t)) { /* Mux(f == t, t, f) -> f */ - n = f; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); - return n; - } - break; + ir_node *const cmp_l = get_Cmp_left(sel); + ir_node *const cmp_r = get_Cmp_right(sel); + + switch (relation) { + case ir_relation_equal: + if ((cmp_l == t && cmp_r == f) || /* Mux(t == f, t, f) -> f */ + (cmp_l == f && cmp_r == t)) { /* Mux(f == t, t, f) -> f */ + n = f; + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); + return n; + } + break; - case pn_Cmp_Lg: - case pn_Cmp_Ne: - if ((cmp_l == t && cmp_r == f) || /* Mux(t != f, t, f) -> t */ - (cmp_l == f && cmp_r == t)) { /* Mux(f != t, t, f) -> t */ - n = t; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); - return n; - } - break; + case ir_relation_less_greater: + case ir_relation_unordered_less_greater: + if ((cmp_l == t && cmp_r == f) || /* Mux(t != f, t, f) -> t */ + (cmp_l == f && cmp_r == t)) { /* Mux(f != t, t, f) -> t */ + n = t; + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); + return n; } + break; + default: + break; + } - /* - * Note: normalization puts the constant on the right side, - * so we check only one case. - */ - if (cmp_l == t && tarval_is_null(value_of(cmp_r))) { - /* Mux(t CMP 0, X, t) */ - if (is_Minus(f) && get_Minus_op(f) == t) { - /* Mux(t CMP 0, -t, t) */ - if (proj_nr == pn_Cmp_Eq) { - /* Mux(t == 0, -t, t) ==> -t */ - n = f; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); - } else if (proj_nr == pn_Cmp_Lg || proj_nr == pn_Cmp_Ne) { - /* Mux(t != 0, -t, t) ==> t */ - n = t; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); - } + /* + * Note: normalization puts the constant on the right side, + * so we check only one case. + */ + if (cmp_l == t && tarval_is_null(value_of(cmp_r))) { + /* Mux(t CMP 0, X, t) */ + if (is_Minus(f) && get_Minus_op(f) == t) { + /* Mux(t CMP 0, -t, t) */ + if (relation == ir_relation_equal) { + /* Mux(t == 0, -t, t) ==> -t */ + n = f; + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); + } else if (relation == ir_relation_less_greater || relation == ir_relation_unordered_less_greater) { + /* Mux(t != 0, -t, t) ==> t */ + n = t; + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_TRANSFORM); } } } } + return n; -} /* equivalent_node_Mux */ +} /** * Remove Confirm nodes if setting is on. @@ -1896,20 +1735,17 @@ static ir_node *equivalent_node_Mux(ir_node *n) */ static ir_node *equivalent_node_Confirm(ir_node *n) { - ir_node *pred = get_Confirm_value(n); - pn_Cmp pnc = get_Confirm_cmp(n); + ir_node *pred = get_Confirm_value(n); + ir_relation relation = get_Confirm_relation(n); - while (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) { + while (is_Confirm(pred) && relation == get_Confirm_relation(pred)) { /* * rare case: two identical Confirms one after another, * replace the second one with the first. */ n = pred; pred = get_Confirm_value(n); - pnc = get_Confirm_cmp(n); } - if (get_opt_remove_confirm()) - return get_Confirm_value(n); return n; } @@ -1964,13 +1800,10 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op CASE(Or); CASE(And); CASE(Conv); - CASE(Cast); CASE(Phi); CASE(Sync); CASE_PROJ(Tuple); CASE_PROJ(Div); - CASE_PROJ(Quot); - CASE_PROJ(DivMod); CASE_PROJ(CopyB); CASE_PROJ(Bound); CASE_PROJ(Load); @@ -2006,8 +1839,8 @@ static int is_const_Phi(ir_node *n) return 1; } /* is_const_Phi */ -typedef tarval *(*tarval_sub_type)(tarval *a, tarval *b, ir_mode *mode); -typedef tarval *(*tarval_binop_type)(tarval *a, tarval *b); +typedef ir_tarval *(*tarval_sub_type)(ir_tarval *a, ir_tarval *b, ir_mode *mode); +typedef ir_tarval *(*tarval_binop_type)(ir_tarval *a, ir_tarval *b); /** * in reality eval_func should be tarval (*eval_func)() but incomplete @@ -2018,7 +1851,7 @@ typedef void (*eval_func)(void); /** * Wrapper for the tarval binop evaluation, tarval_sub has one more parameter. */ -static tarval *do_eval(eval_func eval, tarval *a, tarval *b, ir_mode *mode) +static ir_tarval *do_eval(eval_func eval, ir_tarval *a, ir_tarval *b, ir_mode *mode) { if (eval == (eval_func) tarval_sub) { tarval_sub_type func = (tarval_sub_type)eval; @@ -2042,13 +1875,13 @@ static tarval *do_eval(eval_func eval, tarval *a, tarval *b, ir_mode *mode) * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, eval_func eval, ir_mode *mode, int left) +static ir_node *apply_binop_on_phi(ir_node *phi, ir_tarval *other, eval_func eval, ir_mode *mode, int left) { - tarval *tv; - void **res; - ir_node *pred; - ir_graph *irg; - int i, n = get_irn_arity(phi); + ir_tarval *tv; + void **res; + ir_node *pred; + ir_graph *irg; + int i, n = get_irn_arity(phi); NEW_ARR_A(void *, res, n); if (left) { @@ -2076,10 +1909,10 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, eval_func eval, res[i] = tv; } } - irg = current_ir_graph; + irg = get_irn_irg(phi); for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, (ir_tarval*)res[i]); } return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_binop_on_phi */ @@ -2096,7 +1929,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, eval_func eval, */ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir_mode *mode) { - tarval *tv_l, *tv_r, *tv; + ir_tarval *tv_l, *tv_r, *tv; void **res; ir_node *pred; ir_graph *irg; @@ -2121,10 +1954,10 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir } res[i] = tv; } - irg = current_ir_graph; + irg = get_irn_irg(a); for (i = 0; i < n; ++i) { pred = get_irn_n(a, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, (ir_tarval*)res[i]); } return new_r_Phi(get_nodes_block(a), n, (ir_node **)res, mode); } /* apply_binop_on_2_phis */ @@ -2137,9 +1970,9 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, eval_func eval, ir * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) +static ir_node *apply_unop_on_phi(ir_node *phi, ir_tarval *(*eval)(ir_tarval *)) { - tarval *tv; + ir_tarval *tv; void **res; ir_node *pred; ir_mode *mode; @@ -2159,10 +1992,10 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) res[i] = tv; } mode = get_irn_mode(phi); - irg = current_ir_graph; + irg = get_irn_irg(phi); for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, (ir_tarval*)res[i]); } return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_unop_on_phi */ @@ -2176,7 +2009,7 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) */ static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) { - tarval *tv; + ir_tarval *tv; void **res; ir_node *pred; ir_graph *irg; @@ -2194,10 +2027,10 @@ static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) } res[i] = tv; } - irg = current_ir_graph; + irg = get_irn_irg(phi); for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); - res[i] = new_r_Const_type(irg, res[i], get_Const_type(pred)); + res[i] = new_r_Const(irg, (ir_tarval*)res[i]); } return new_r_Phi(get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_conv_on_phi */ @@ -2348,12 +2181,16 @@ static ir_node *transform_node_Add(ir_node *n) HANDLE_BINOP_PHI((eval_func) tarval_add, a, b, c, mode); /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } if (mode_is_num(mode)) { + ir_graph *irg = get_irn_irg(n); /* the following code leads to endless recursion when Mul are replaced by a simple instruction chain */ - if (!is_irg_state(current_ir_graph, IR_GRAPH_STATE_ARCH_DEP) + if (!is_irg_state(irg, IR_GRAPH_STATE_ARCH_DEP) && a == b && mode_is_int(mode)) { ir_node *block = get_nodes_block(n); @@ -2361,7 +2198,7 @@ static ir_node *transform_node_Add(ir_node *n) get_irn_dbg_info(n), block, a, - new_Const_long(mode, 2), + new_r_Const_long(irg, mode, 2), mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A); return n; @@ -2400,7 +2237,7 @@ static ir_node *transform_node_Add(ir_node *n) } if (op == b) { /* ~x + x = -1 */ - n = new_Const(get_mode_minus_one(mode)); + n = new_r_Const(irg, get_mode_minus_one(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X); return n; } @@ -2410,7 +2247,7 @@ static ir_node *transform_node_Add(ir_node *n) if (op == a) { /* x + ~x = -1 */ - n = new_Const(get_mode_minus_one(mode)); + n = new_r_Const(irg, get_mode_minus_one(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X); return n; } @@ -2422,15 +2259,11 @@ static ir_node *transform_node_Add(ir_node *n) b_vrp = vrp_get_info(b); if (a_vrp && b_vrp) { - tarval *c = tarval_and( - a_vrp->bits_not_set, - b_vrp->bits_not_set - ); + ir_tarval *c = tarval_and(a_vrp->bits_not_set, b_vrp->bits_not_set); if (tarval_is_null(c)) { - dbg_info *dbgi = get_irn_dbg_info(n); - return new_rd_Or(dbgi, get_nodes_block(n), - a, b, mode); + dbg_info *dbgi = get_irn_dbg_info(n); + return new_rd_Or(dbgi, get_nodes_block(n), a, b, mode); } } return n; @@ -2441,9 +2274,9 @@ static ir_node *transform_node_Add(ir_node *n) */ static ir_node *const_negate(ir_node *cnst) { - tarval *tv = tarval_neg(get_Const_tarval(cnst)); - dbg_info *dbgi = get_irn_dbg_info(cnst); - ir_graph *irg = get_irn_irg(cnst); + ir_tarval *tv = tarval_neg(get_Const_tarval(cnst)); + dbg_info *dbgi = get_irn_dbg_info(cnst); + ir_graph *irg = get_irn_irg(cnst); if (tv == tarval_bad) return NULL; return new_rd_Const(dbgi, irg, tv); } @@ -2498,8 +2331,11 @@ restart: HANDLE_BINOP_PHI((eval_func) tarval_sub, a, b, c, mode); /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ - if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) - return n; + if (mode_is_float(mode)) { + ir_graph *irg = get_irn_irg(n); + if (get_irg_fp_model(irg) & fp_strict_algebraic) + return n; + } if (is_Const(b) && !mode_is_reference(get_irn_mode(b))) { /* a - C -> a + (-C) */ @@ -2535,19 +2371,19 @@ restart: /* a - (b - c) -> a + (c - b) * -> (a - b) + c iff (b - c) is a pointer */ dbg_info *s_dbg = get_irn_dbg_info(b); - ir_node *s_block = get_nodes_block(b); ir_node *s_left = get_Sub_left(b); ir_node *s_right = get_Sub_right(b); ir_mode *s_mode = get_irn_mode(b); if (mode_is_reference(s_mode)) { - ir_node *sub = new_rd_Sub(s_dbg, s_block, a, s_left, mode); + ir_node *lowest_block = get_nodes_block(n); /* a and b are live here */ + ir_node *sub = new_rd_Sub(s_dbg, lowest_block, a, s_left, mode); dbg_info *a_dbg = get_irn_dbg_info(n); - ir_node *a_block = get_nodes_block(n); if (s_mode != mode) - s_right = new_r_Conv(a_block, s_right, mode); - n = new_rd_Add(a_dbg, a_block, sub, s_right, mode); + s_right = new_r_Conv(lowest_block, s_right, mode); + n = new_rd_Add(a_dbg, lowest_block, sub, s_right, mode); } else { + ir_node *s_block = get_nodes_block(b); ir_node *sub = new_rd_Sub(s_dbg, s_block, s_right, s_left, s_mode); dbg_info *a_dbg = get_irn_dbg_info(n); ir_node *a_block = get_nodes_block(n); @@ -2602,7 +2438,7 @@ restart: return n; } else if (right == b) { if (mode != get_irn_mode(left)) { - /* This Sub is an effective Cast */ + /* This Sub is an effective Cast */ left = new_r_Conv(get_nodes_block(n), left, mode); } n = left; @@ -2632,7 +2468,7 @@ restart: n = new_r_Minus(get_nodes_block(n), left, l_mode); if (mode != l_mode) { - /* This Sub is an effective Cast */ + /* This Sub is an effective Cast */ n = new_r_Conv(get_nodes_block(n), n, mode); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); @@ -2668,7 +2504,8 @@ restart: ir_node *mb = get_Mul_right(a); if (ma == b) { - ir_node *blk = get_nodes_block(n); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(n); n = new_rd_Mul( get_irn_dbg_info(n), blk, @@ -2677,13 +2514,14 @@ restart: get_irn_dbg_info(n), blk, mb, - new_Const(get_mode_one(mode)), + new_r_Const(irg, get_mode_one(mode)), mode), mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A); return n; } else if (mb == b) { - ir_node *blk = get_nodes_block(n); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(n); n = new_rd_Mul( get_irn_dbg_info(n), blk, @@ -2692,7 +2530,7 @@ restart: get_irn_dbg_info(n), blk, ma, - new_Const(get_mode_one(mode)), + new_r_Const(irg, get_mode_one(mode)), mode), mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A); @@ -2735,12 +2573,13 @@ restart: if (get_mode_arithmetic(mode) == irma_twos_complement) { if (is_Const(a) && is_Not(b)) { /* c - ~X = X + (c+1) */ - tarval *tv = get_Const_tarval(a); + ir_tarval *tv = get_Const_tarval(a); tv = tarval_add(tv, get_mode_one(mode)); if (tv != tarval_bad) { - ir_node *blk = get_nodes_block(n); - ir_node *c = new_Const(tv); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(n); + ir_node *c = new_r_Const(irg, tv); n = new_rd_Add(get_irn_dbg_info(n), blk, get_Not_op(b), c, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_C_NOT_X); return n; @@ -2756,12 +2595,12 @@ restart: */ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { - ir_node *oldn = n; - ir_node *a = get_Mul_left(n); - ir_node *b = get_Mul_right(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); - ir_mode *smode = get_irn_mode(a); + ir_node *oldn = n; + ir_node *a = get_Mul_left(n); + ir_node *b = get_Mul_right(n); + ir_tarval *ta = value_of(a); + ir_tarval *tb = value_of(b); + ir_mode *smode = get_irn_mode(a); if (ta == get_mode_one(smode)) { /* (L)1 * (L)b = (L)b */ @@ -2891,7 +2730,7 @@ static ir_node *transform_node_Mul(ir_node *n) } if (get_mode_arithmetic(mode) == irma_ieee754) { if (is_Const(a)) { - tarval *tv = get_Const_tarval(a); + ir_tarval *tv = get_Const_tarval(a); if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) && !tarval_is_negative(tv)) { /* 2.0 * b = b + b */ @@ -2901,7 +2740,7 @@ static ir_node *transform_node_Mul(ir_node *n) } } else if (is_Const(b)) { - tarval *tv = get_Const_tarval(b); + ir_tarval *tv = get_Const_tarval(b); if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) && !tarval_is_negative(tv)) { /* a * 2.0 = a + a */ @@ -2922,70 +2761,105 @@ static ir_node *transform_node_Div(ir_node *n) ir_mode *mode = get_Div_resmode(n); ir_node *a = get_Div_left(n); ir_node *b = get_Div_right(n); - ir_node *value; + ir_node *value = n; const ir_node *dummy; - if (is_Const(b) && is_const_Phi(a)) { - /* check for Div(Phi, Const) */ - value = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_div, mode, 0); - if (value) { - DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); - goto make_tuple; - } - } - else if (is_Const(a) && is_const_Phi(b)) { - /* check for Div(Const, Phi) */ - value = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_div, mode, 1); - if (value) { - DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); - goto make_tuple; - } - } - else if (is_const_Phi(a) && is_const_Phi(b)) { - /* check for Div(Phi, Phi) */ - value = apply_binop_on_2_phis(a, b, (eval_func) tarval_div, mode); - if (value) { - DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); - goto make_tuple; - } - } - - value = n; - - if (a == b && value_not_zero(a, &dummy)) { - /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */ - value = new_Const(get_mode_one(mode)); - DBG_OPT_CSTEVAL(n, value); - goto make_tuple; - } else { - if (mode_is_signed(mode) && is_Const(b)) { - tarval *tv = get_Const_tarval(b); - - if (tv == get_mode_minus_one(mode)) { - /* a / -1 */ - value = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode); - DBG_OPT_CSTEVAL(n, value); + if (mode_is_int(mode)) { + if (is_Const(b) && is_const_Phi(a)) { + /* check for Div(Phi, Const) */ + value = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_div, mode, 0); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } else if (is_Const(a) && is_const_Phi(b)) { + /* check for Div(Const, Phi) */ + value = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_div, mode, 1); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } else if (is_const_Phi(a) && is_const_Phi(b)) { + /* check for Div(Phi, Phi) */ + value = apply_binop_on_2_phis(a, b, (eval_func) tarval_div, mode); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); goto make_tuple; } } - /* Try architecture dependent optimization */ - value = arch_dep_replace_div_by_const(n); - } - if (value != n) { - ir_node *mem, *blk; + if (a == b && value_not_zero(a, &dummy)) { + ir_graph *irg = get_irn_irg(n); + /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */ + value = new_r_Const(irg, get_mode_one(mode)); + DBG_OPT_CSTEVAL(n, value); + goto make_tuple; + } else { + if (mode_is_signed(mode) && is_Const(b)) { + ir_tarval *tv = get_Const_tarval(b); + + if (tv == get_mode_minus_one(mode)) { + /* a / -1 */ + value = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode); + DBG_OPT_CSTEVAL(n, value); + goto make_tuple; + } + } + /* Try architecture dependent optimization */ + value = arch_dep_replace_div_by_const(n); + } + } else { + assert(mode_is_float(mode)); + + /* Optimize x/c to x*(1/c) */ + if (get_mode_arithmetic(mode) == irma_ieee754) { + ir_tarval *tv = value_of(b); + + if (tv != tarval_bad) { + int rem = tarval_fp_ops_enabled(); + + /* + * Floating point constant folding might be disabled here to + * prevent rounding. + * However, as we check for exact result, doing it is safe. + * Switch it on. + */ + tarval_enable_fp_ops(1); + tv = tarval_div(get_mode_one(mode), tv); + tarval_enable_fp_ops(rem); + + /* Do the transformation if the result is either exact or we are + not using strict rules. */ + if (tv != tarval_bad && + (tarval_ieee754_get_exact() || (get_irg_fp_model(get_irn_irg(n)) & fp_strict_algebraic) == 0)) { + ir_node *block = get_nodes_block(n); + ir_graph *irg = get_irn_irg(block); + ir_node *c = new_r_Const(irg, tv); + dbg_info *dbgi = get_irn_dbg_info(n); + value = new_rd_Mul(dbgi, block, a, c, mode); + + goto make_tuple; + } + } + } + } + + if (value != n) { + ir_node *mem, *blk; + ir_graph *irg; make_tuple: /* Turn Div into a tuple (mem, jmp, bad, value) */ mem = get_Div_mem(n); blk = get_nodes_block(n); + irg = get_irn_irg(blk); /* skip a potential Pin */ mem = skip_Pin(mem); turn_into_tuple(n, pn_Div_max); set_Tuple_pred(n, pn_Div_M, mem); set_Tuple_pred(n, pn_Div_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_Div_X_except, new_Bad()); + set_Tuple_pred(n, pn_Div_X_except, get_irg_bad(irg)); set_Tuple_pred(n, pn_Div_res, value); } return n; @@ -2996,11 +2870,12 @@ make_tuple: */ static ir_node *transform_node_Mod(ir_node *n) { - ir_mode *mode = get_Mod_resmode(n); - ir_node *a = get_Mod_left(n); - ir_node *b = get_Mod_right(n); - ir_node *value; - tarval *tv; + ir_mode *mode = get_Mod_resmode(n); + ir_node *a = get_Mod_left(n); + ir_node *b = get_Mod_right(n); + ir_graph *irg; + ir_node *value; + ir_tarval *tv; if (is_Const(b) && is_const_Phi(a)) { /* check for Div(Phi, Const) */ @@ -3029,8 +2904,9 @@ static ir_node *transform_node_Mod(ir_node *n) value = n; tv = value_of(n); + irg = get_irn_irg(n); if (tv != tarval_bad) { - value = new_Const(tv); + value = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(n, value); goto make_tuple; @@ -3041,16 +2917,16 @@ static ir_node *transform_node_Mod(ir_node *n) if (a == b && value_not_zero(a, &dummy)) { /* BEWARE: we can optimize a%a to 0 only if this cannot cause a exception */ - value = new_Const(get_mode_null(mode)); + value = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, value); goto make_tuple; } else { if (mode_is_signed(mode) && is_Const(b)) { - tarval *tv = get_Const_tarval(b); + ir_tarval *tv = get_Const_tarval(b); if (tv == get_mode_minus_one(mode)) { /* a % -1 = 0 */ - value = new_Const(get_mode_null(mode)); + value = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, value); goto make_tuple; } @@ -3062,260 +2938,25 @@ static ir_node *transform_node_Mod(ir_node *n) if (value != n) { ir_node *mem, *blk; + ir_graph *irg; make_tuple: /* Turn Mod into a tuple (mem, jmp, bad, value) */ mem = get_Mod_mem(n); blk = get_nodes_block(n); + irg = get_irn_irg(blk); /* skip a potential Pin */ mem = skip_Pin(mem); turn_into_tuple(n, pn_Mod_max); set_Tuple_pred(n, pn_Mod_M, mem); set_Tuple_pred(n, pn_Mod_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_Mod_X_except, new_Bad()); + set_Tuple_pred(n, pn_Mod_X_except, get_irg_bad(irg)); set_Tuple_pred(n, pn_Mod_res, value); } return n; } /* transform_node_Mod */ -/** - * Transform a DivMod node. - */ -static ir_node *transform_node_DivMod(ir_node *n) -{ - const ir_node *dummy; - ir_node *a = get_DivMod_left(n); - ir_node *b = get_DivMod_right(n); - ir_mode *mode = get_DivMod_resmode(n); - ir_node *va, *vb; - tarval *ta, *tb; - int evaluated = 0; - - if (is_Const(b) && is_const_Phi(a)) { - /* check for Div(Phi, Const) */ - va = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_div, mode, 0); - vb = apply_binop_on_phi(a, get_Const_tarval(b), (eval_func) tarval_mod, mode, 0); - if (va && vb) { - DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI); - DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI); - goto make_tuple; - } - } - else if (is_Const(a) && is_const_Phi(b)) { - /* check for Div(Const, Phi) */ - va = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_div, mode, 1); - vb = apply_binop_on_phi(b, get_Const_tarval(a), (eval_func) tarval_mod, mode, 1); - if (va && vb) { - DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI); - DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI); - goto make_tuple; - } - } - else if (is_const_Phi(a) && is_const_Phi(b)) { - /* check for Div(Phi, Phi) */ - va = apply_binop_on_2_phis(a, b, (eval_func) tarval_div, mode); - vb = apply_binop_on_2_phis(a, b, (eval_func) tarval_mod, mode); - if (va && vb) { - DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI); - DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI); - goto make_tuple; - } - } - - ta = value_of(a); - tb = value_of(b); - if (tb != tarval_bad) { - if (tb == get_mode_one(get_tarval_mode(tb))) { - va = a; - vb = new_Const(get_mode_null(mode)); - DBG_OPT_CSTEVAL(n, vb); - goto make_tuple; - } else if (ta != tarval_bad) { - tarval *resa, *resb; - resa = tarval_div(ta, tb); - if (resa == tarval_bad) return n; /* Causes exception!!! Model by replacing through - Jmp for X result!? */ - resb = tarval_mod(ta, tb); - if (resb == tarval_bad) return n; /* Causes exception! */ - va = new_Const(resa); - vb = new_Const(resb); - DBG_OPT_CSTEVAL(n, va); - DBG_OPT_CSTEVAL(n, vb); - goto make_tuple; - } else if (mode_is_signed(mode) && tb == get_mode_minus_one(mode)) { - va = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode); - vb = new_Const(get_mode_null(mode)); - DBG_OPT_CSTEVAL(n, va); - DBG_OPT_CSTEVAL(n, vb); - goto make_tuple; - } else { /* Try architecture dependent optimization */ - va = a; - vb = b; - arch_dep_replace_divmod_by_const(&va, &vb, n); - evaluated = va != NULL; - } - } else if (a == b) { - if (value_not_zero(a, &dummy)) { - /* a/a && a != 0 */ - va = new_Const(get_mode_one(mode)); - vb = new_Const(get_mode_null(mode)); - DBG_OPT_CSTEVAL(n, va); - DBG_OPT_CSTEVAL(n, vb); - goto make_tuple; - } else { - /* BEWARE: it is NOT possible to optimize a/a to 1, as this may cause a exception */ - return n; - } - } else if (ta == get_mode_null(mode) && value_not_zero(b, &dummy)) { - /* 0 / non-Const = 0 */ - vb = va = a; - goto make_tuple; - } - - if (evaluated) { /* replace by tuple */ - ir_node *mem, *blk; - -make_tuple: - mem = get_DivMod_mem(n); - /* skip a potential Pin */ - mem = skip_Pin(mem); - - blk = get_nodes_block(n); - turn_into_tuple(n, pn_DivMod_max); - set_Tuple_pred(n, pn_DivMod_M, mem); - set_Tuple_pred(n, pn_DivMod_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_DivMod_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_DivMod_res_div, va); - set_Tuple_pred(n, pn_DivMod_res_mod, vb); - } - - return n; -} /* transform_node_DivMod */ - -/** - * Optimize x / c to x * (1/c) - */ -static ir_node *transform_node_Quot(ir_node *n) -{ - ir_mode *mode = get_Quot_resmode(n); - ir_node *oldn = n; - - if (get_mode_arithmetic(mode) == irma_ieee754) { - ir_node *b = get_Quot_right(n); - tarval *tv = value_of(b); - - if (tv != tarval_bad) { - int rem = tarval_fp_ops_enabled(); - - /* - * Floating point constant folding might be disabled here to - * prevent rounding. - * However, as we check for exact result, doing it is safe. - * Switch it on. - */ - tarval_enable_fp_ops(1); - tv = tarval_quo(get_mode_one(mode), tv); - tarval_enable_fp_ops(rem); - - /* Do the transformation if the result is either exact or we are not - using strict rules. */ - if (tv != tarval_bad && - (tarval_ieee754_get_exact() || (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic) == 0)) { - ir_node *blk = get_nodes_block(n); - ir_node *c = new_Const(tv); - ir_node *a = get_Quot_left(n); - ir_node *m = new_rd_Mul(get_irn_dbg_info(n), blk, a, c, mode); - ir_node *mem = get_Quot_mem(n); - - /* skip a potential Pin */ - mem = skip_Pin(mem); - turn_into_tuple(n, pn_Quot_max); - set_Tuple_pred(n, pn_Quot_M, mem); - set_Tuple_pred(n, pn_Quot_X_regular, new_r_Jmp(blk)); - set_Tuple_pred(n, pn_Quot_X_except, new_Bad()); - set_Tuple_pred(n, pn_Quot_res, m); - DBG_OPT_ALGSIM1(oldn, a, b, m, FS_OPT_FP_INV_MUL); - } - } - } - return n; -} /* transform_node_Quot */ - -/** - * Optimize Abs(x) into x if x is Confirmed >= 0 - * Optimize Abs(x) into -x if x is Confirmed <= 0 - * Optimize Abs(-x) int Abs(x) - */ -static ir_node *transform_node_Abs(ir_node *n) -{ - ir_node *c, *oldn = n; - ir_node *a = get_Abs_op(n); - ir_mode *mode; - - HANDLE_UNOP_PHI(tarval_abs, a, c); - - switch (classify_value_sign(a)) { - case value_classified_negative: - mode = get_irn_mode(n); - - /* - * We can replace the Abs by -x here. - * We even could add a new Confirm here - * (if not twos complement) - * - * Note that -x would create a new node, so we could - * not run it in the equivalent_node() context. - */ - n = new_rd_Minus(get_irn_dbg_info(n), get_nodes_block(n), a, mode); - - DBG_OPT_CONFIRM(oldn, n); - return n; - case value_classified_positive: - /* n is positive, Abs is not needed */ - n = a; - - DBG_OPT_CONFIRM(oldn, n); - return n; - default: - break; - } - if (is_Minus(a)) { - /* Abs(-x) = Abs(x) */ - mode = get_irn_mode(n); - n = new_rd_Abs(get_irn_dbg_info(n), get_nodes_block(n), get_Minus_op(a), mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ABS_MINUS_X); - return n; - } - return n; -} /* transform_node_Abs */ - -/** - * Optimize -a CMP -b into b CMP a. - * This works only for for modes where unary Minus - * cannot Overflow. - * Note that two-complement integers can Overflow - * so it will NOT work. - * - * For == and != can be handled in Proj(Cmp) - */ -static ir_node *transform_node_Cmp(ir_node *n) -{ - ir_node *oldn = n; - ir_node *left = get_Cmp_left(n); - ir_node *right = get_Cmp_right(n); - - if (is_Minus(left) && is_Minus(right) && - !mode_overflow_on_unary_Minus(get_irn_mode(left))) { - ir_node *const new_left = get_Minus_op(right); - ir_node *const new_right = get_Minus_op(left); - n = new_rd_Cmp(get_irn_dbg_info(n), get_nodes_block(n), new_left, new_right); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CMP_OP_OP); - } - return n; -} /* transform_node_Cmp */ - - /** * Transform a Cond node. * @@ -3325,12 +2966,13 @@ static ir_node *transform_node_Cmp(ir_node *n) static ir_node *transform_node_Cond(ir_node *n) { - ir_node *jmp; - ir_node *a = get_Cond_selector(n); - tarval *ta = value_of(a); + ir_node *a = get_Cond_selector(n); + ir_tarval *ta = value_of(a); + ir_graph *irg = get_irn_irg(n); + ir_node *jmp; /* we need block info which is not available in floating irgs */ - if (get_irg_pinned(current_ir_graph) == op_pin_state_floats) + if (get_irg_pinned(irg) == op_pin_state_floats) return n; if ((ta != tarval_bad) && @@ -3342,14 +2984,14 @@ static ir_node *transform_node_Cond(ir_node *n) jmp = new_r_Jmp(blk); turn_into_tuple(n, pn_Cond_max); if (ta == tarval_b_true) { - set_Tuple_pred(n, pn_Cond_false, new_Bad()); + set_Tuple_pred(n, pn_Cond_false, get_irg_bad(irg)); set_Tuple_pred(n, pn_Cond_true, jmp); } else { set_Tuple_pred(n, pn_Cond_false, jmp); - set_Tuple_pred(n, pn_Cond_true, new_Bad()); + set_Tuple_pred(n, pn_Cond_true, get_irg_bad(irg)); } /* We might generate an endless loop, so keep it alive. */ - add_End_keepalive(get_irg_end(current_ir_graph), blk); + add_End_keepalive(get_irg_end(irg), blk); } return n; } /* transform_node_Cond */ @@ -3454,7 +3096,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, set_nodes_block(n, blk); set_binop_left(n, new_n); set_binop_right(n, c); - add_identities(current_ir_graph->value_table, n); + add_identities(n); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_SHIFT_AND); @@ -3465,6 +3107,17 @@ static ir_node *transform_bitwise_distributive(ir_node *n, return n; } +/** + * Create a 0 constant of given mode. + */ +static ir_node *create_zero_const(ir_graph *irg, ir_mode *mode) +{ + ir_tarval *tv = get_mode_null(mode); + ir_node *cnst = new_r_Const(irg, tv); + + return cnst; +} + /** * Transform an And. */ @@ -3476,23 +3129,42 @@ static ir_node *transform_node_And(ir_node *n) ir_mode *mode; vrp_attr *a_vrp, *b_vrp; + if (is_Cmp(a) && is_Cmp(b)) { + ir_node *a_left = 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); + ir_relation a_relation = get_Cmp_relation(a); + ir_relation b_relation = get_Cmp_relation(b); + /* we can combine the relations of two compares with the same + * operands */ + if (a_left == b_left && b_left == b_right) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_relation new_relation = a_relation & b_relation; + return new_rd_Cmp(dbgi, block, a_left, a_right, new_relation); + } + /* Cmp(a==0) and Cmp(b==0) can be optimized to Cmp(a|b==0) */ + if (is_Const(a_right) && is_Const_null(a_right) + && is_Const(b_right) && is_Const_null(b_right) + && 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))) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_mode *mode = get_irn_mode(a_left); + ir_node *n_b_left = get_irn_mode(b_left) != mode ? + new_rd_Conv(dbgi, block, b_left, mode) : b_left; + ir_node *or = new_rd_Or(dbgi, block, a_left, n_b_left, mode); + ir_graph *irg = get_irn_irg(n); + ir_node *zero = create_zero_const(irg, mode); + return new_rd_Cmp(dbgi, block, or, zero, ir_relation_equal); + } + } + mode = get_irn_mode(n); HANDLE_BINOP_PHI((eval_func) tarval_and, a, b, c, mode); - /* we can evaluate 2 Projs of the same Cmp */ - if (mode == mode_b && is_Proj(a) && is_Proj(b)) { - ir_node *pred_a = get_Proj_pred(a); - ir_node *pred_b = get_Proj_pred(b); - if (pred_a == pred_b) { - dbg_info *dbgi = get_irn_dbg_info(n); - pn_Cmp pn_a = get_Proj_proj(a); - pn_Cmp pn_b = get_Proj_proj(b); - /* yes, we can simply calculate with pncs */ - pn_Cmp new_pnc = pn_a & pn_b; - - return new_rd_Proj(dbgi, pred_a, mode_b, new_pnc); - } - } if (is_Or(a)) { if (is_Not(b)) { ir_node *op = get_Not_op(b); @@ -3596,7 +3268,7 @@ static ir_node *transform_node_And(ir_node *n) b_vrp = vrp_get_info(b); if (is_Const(a) && b_vrp && (tarval_cmp(tarval_or(get_Const_tarval(a), - b_vrp->bits_not_set), get_Const_tarval(a)) == pn_Cmp_Eq)) { + b_vrp->bits_not_set), get_Const_tarval(a)) == ir_relation_equal)) { return b; @@ -3604,7 +3276,7 @@ static ir_node *transform_node_And(ir_node *n) a_vrp = vrp_get_info(a); if (is_Const(b) && a_vrp && (tarval_cmp(tarval_or(get_Const_tarval(b), - a_vrp->bits_not_set), get_Const_tarval(b)) == pn_Cmp_Eq)) { + a_vrp->bits_not_set), get_Const_tarval(b)) == ir_relation_equal)) { return a; } @@ -3613,6 +3285,33 @@ static ir_node *transform_node_And(ir_node *n) return n; } /* transform_node_And */ +/* the order of the values is important! */ +typedef enum const_class { + const_const = 0, + const_like = 1, + const_other = 2 +} const_class; + +static const_class classify_const(const ir_node* n) +{ + if (is_Const(n)) return const_const; + if (is_irn_constlike(n)) return const_like; + return const_other; +} + +/** + * Determines whether r is more constlike or has a larger index (in that order) + * than l. + */ +static bool operands_are_normalized(const ir_node *l, const ir_node *r) +{ + const const_class l_order = classify_const(l); + const const_class r_order = classify_const(r); + return + l_order > r_order || + (l_order == r_order && get_irn_idx(l) <= get_irn_idx(r)); +} + /** * Transform an Eor. */ @@ -3623,45 +3322,51 @@ static ir_node *transform_node_Eor(ir_node *n) ir_node *b = get_Eor_right(n); ir_mode *mode = get_irn_mode(n); - HANDLE_BINOP_PHI((eval_func) tarval_eor, a, b, c, mode); + /* 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 *b_left = get_Cmp_left(b); + ir_node *b_right = get_Cmp_right(b); + if (a_left == b_left && b_left == b_right) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_relation a_relation = get_Cmp_relation(a); + ir_relation b_relation = get_Cmp_relation(b); + ir_relation new_relation = a_relation ^ b_relation; + return new_rd_Cmp(dbgi, block, a_left, a_right, new_relation); + } + } - /* we can evaluate 2 Projs of the same Cmp */ - if (mode == mode_b && is_Proj(a) && is_Proj(b)) { - ir_node *pred_a = get_Proj_pred(a); - ir_node *pred_b = get_Proj_pred(b); - if (pred_a == pred_b) { - dbg_info *dbgi = get_irn_dbg_info(n); - pn_Cmp pn_a = get_Proj_proj(a); - pn_Cmp pn_b = get_Proj_proj(b); - /* yes, we can simply calculate with pncs */ - pn_Cmp new_pnc = pn_a ^ pn_b; + HANDLE_BINOP_PHI((eval_func) tarval_eor, a, b, c, mode); - return new_rd_Proj(dbgi, pred_a, mode_b, new_pnc); - } + /* normalize not nodes... ~a ^ b <=> a ^ ~b */ + if (is_Not(a) && operands_are_normalized(get_Not_op(a), b)) { + dbg_info *dbg = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *new_not = new_rd_Not(dbg, block, b, mode); + ir_node *new_left = get_Not_op(a); + n = new_rd_Eor(dbg, block, new_left, new_not, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + return n; + } else if (is_Not(b) && !operands_are_normalized(a, get_Not_op(b))) { + dbg_info *dbg = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *new_not = new_rd_Not(dbg, block, a, mode); + ir_node *new_right = get_Not_op(b); + n = new_rd_Eor(dbg, block, new_not, new_right, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + return n; } - if (a == b) { - /* a ^ a = 0 */ - n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, - get_mode_null(mode)); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A); - } else if (is_Const(b)) { - if (is_Not(a)) { /* ~x ^ const -> x ^ ~const */ - ir_node *cnst = new_Const(tarval_not(get_Const_tarval(b))); - ir_node *not_op = get_Not_op(a); - dbg_info *dbg = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(n); - ir_mode *mode = get_irn_mode(n); - n = new_rd_Eor(dbg, block, not_op, cnst, mode); - return n; - } else if (is_Const_all_one(b)) { /* x ^ 1...1 -> ~1 */ - n = new_r_Not(get_nodes_block(n), a, mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); - } - } else { - n = transform_bitwise_distributive(n, transform_node_Eor); + /* x ^ 1...1 -> ~1 */ + if (is_Const(b) && is_Const_all_one(b)) { + n = new_r_Not(get_nodes_block(n), a, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + return n; } + n = transform_bitwise_distributive(n, transform_node_Eor); return n; } /* transform_node_Eor */ @@ -3677,32 +3382,31 @@ static ir_node *transform_node_Not(ir_node *n) HANDLE_UNOP_PHI(tarval_not,a,c); /* check for a boolean Not */ - if (mode == mode_b && is_Proj(a)) { - ir_node *a_pred = get_Proj_pred(a); - if (is_Cmp(a_pred)) { - /* We negate a Cmp. The Cmp has the negated result anyways! */ - n = new_r_Proj(get_Proj_pred(a), - mode_b, get_negated_pnc(get_Proj_proj(a), mode_b)); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP); - return n; - } + if (is_Cmp(a)) { + dbg_info *dbgi = get_irn_dbg_info(a); + ir_node *block = get_nodes_block(a); + ir_relation relation = get_Cmp_relation(a); + relation = get_negated_relation(relation); + n = new_rd_Cmp(dbgi, block, get_Cmp_left(a), get_Cmp_right(a), relation); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP); + return n; } + + /* normalize ~(a ^ b) => a ^ ~b */ if (is_Eor(a)) { - ir_node *eor_b = get_Eor_right(a); - if (is_Const(eor_b)) { /* ~(x ^ const) -> x ^ ~const */ - ir_node *cnst = new_Const(tarval_not(get_Const_tarval(eor_b))); - ir_node *eor_a = get_Eor_left(a); - dbg_info *dbg = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(n); - ir_mode *mode = get_irn_mode(n); - n = new_rd_Eor(dbg, block, eor_a, cnst, mode); - return n; - } + dbg_info *dbg = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *eor_right = get_Eor_right(a); + ir_node *eor_left = get_Eor_left(a); + eor_right = new_rd_Not(dbg, block, eor_right, mode); + n = new_rd_Eor(dbg, block, eor_left, eor_right, mode); + return n; } + if (get_mode_arithmetic(mode) == irma_twos_complement) { if (is_Minus(a)) { /* ~-x -> x + -1 */ dbg_info *dbg = get_irn_dbg_info(n); - ir_graph *irg = current_ir_graph; + ir_graph *irg = get_irn_irg(n); ir_node *block = get_nodes_block(n); ir_node *add_l = get_Minus_op(a); ir_node *add_r = new_rd_Const(dbg, irg, get_mode_minus_one(mode)); @@ -3719,7 +3423,7 @@ static ir_node *transform_node_Not(ir_node *n) } } return n; -} /* transform_node_Not */ +} /** * Transform a Minus. @@ -3743,10 +3447,11 @@ static ir_node *transform_node_Minus(ir_node *n) /* the following rules are only to twos-complement */ if (is_Not(a)) { /* -(~x) = x + 1 */ - ir_node *op = get_Not_op(a); - tarval *tv = get_mode_one(mode); - ir_node *blk = get_nodes_block(n); - ir_node *c = new_Const(tv); + ir_node *op = get_Not_op(a); + ir_tarval *tv = get_mode_one(mode); + ir_node *blk = get_nodes_block(n); + ir_graph *irg = get_irn_irg(blk); + ir_node *c = new_r_Const(irg, tv); n = new_rd_Add(get_irn_dbg_info(n), blk, op, c, mode); DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT); return n; @@ -3755,7 +3460,7 @@ static ir_node *transform_node_Minus(ir_node *n) ir_node *c = get_Shr_right(a); if (is_Const(c)) { - tarval *tv = get_Const_tarval(c); + ir_tarval *tv = get_Const_tarval(c); if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) { /* -(a >>u (size-1)) = a >>s (size-1) */ @@ -3771,7 +3476,7 @@ static ir_node *transform_node_Minus(ir_node *n) ir_node *c = get_Shrs_right(a); if (is_Const(c)) { - tarval *tv = get_Const_tarval(c); + ir_tarval *tv = get_Const_tarval(c); if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) { /* -(a >>s (size-1)) = a >>u (size-1) */ @@ -3796,13 +3501,14 @@ static ir_node *transform_node_Minus(ir_node *n) } if (is_Mul(a)) { /* -(a * const) -> a * -const */ - ir_node *mul_l = get_Mul_left(a); - ir_node *mul_r = get_Mul_right(a); - tarval *tv = value_of(mul_r); + ir_node *mul_l = get_Mul_left(a); + ir_node *mul_r = get_Mul_right(a); + ir_tarval *tv = value_of(mul_r); if (tv != tarval_bad) { tv = tarval_neg(tv); if (tv != tarval_bad) { - ir_node *cnst = new_Const(tv); + ir_graph *irg = get_irn_irg(n); + ir_node *cnst = new_r_Const(irg, tv); dbg_info *dbg = get_irn_dbg_info(a); ir_node *block = get_nodes_block(a); n = new_rd_Mul(dbg, block, mul_l, cnst, mode); @@ -3815,27 +3521,6 @@ static ir_node *transform_node_Minus(ir_node *n) return n; } /* transform_node_Minus */ -/** - * Transform a Cast_type(Const) into a new Const_type - */ -static ir_node *transform_node_Cast(ir_node *n) -{ - ir_node *oldn = n; - ir_node *pred = get_Cast_op(n); - ir_type *tp = get_irn_type(n); - - if (is_Const(pred) && get_Const_type(pred) != tp) { - n = new_rd_Const_type(NULL, current_ir_graph, get_Const_tarval(pred), tp); - DBG_OPT_CSTEVAL(oldn, n); - } else if (is_SymConst(pred) && get_SymConst_value_type(pred) != tp) { - n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_mode(pred), - get_SymConst_symbol(pred), get_SymConst_kind(pred), tp); - DBG_OPT_CSTEVAL(oldn, n); - } - - return n; -} /* transform_node_Cast */ - /** * Transform a Proj(Load) with a non-null address. */ @@ -3855,8 +3540,9 @@ static ir_node *transform_node_Proj_Load(ir_node *proj) set_irn_pinned(load, op_pin_state_floats); } if (get_Proj_proj(proj) == pn_Load_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } else { ir_node *blk = get_nodes_block(load); return new_r_Jmp(blk); @@ -3886,8 +3572,9 @@ static ir_node *transform_node_Proj_Store(ir_node *proj) set_irn_pinned(store, op_pin_state_floats); } if (get_Proj_proj(proj) == pn_Store_X_except) { + ir_graph *irg = get_irn_irg(proj); DBG_OPT_EXC_REM(proj); - return get_irg_bad(current_ir_graph); + return get_irg_bad(irg); } else { ir_node *blk = get_nodes_block(store); return new_r_Jmp(blk); @@ -3925,14 +3612,17 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) case pn_Div_X_regular: return new_r_Jmp(get_nodes_block(div)); - case pn_Div_X_except: + case pn_Div_X_except: { + ir_graph *irg = get_irn_irg(proj); /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); - return new_Bad(); + return get_irg_bad(irg); + } - case pn_Div_M: + case pn_Div_M: { + ir_graph *irg = get_irn_irg(proj); res = get_Div_mem(div); - new_mem = get_irg_no_mem(current_ir_graph); + new_mem = get_irg_no_mem(irg); if (confirm) { /* This node can only float up to the Confirm block */ @@ -3943,6 +3633,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) set_Div_mem(div, new_mem); return res; } + } } return proj; } /* transform_node_Proj_Div */ @@ -3976,14 +3667,17 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) case pn_Mod_X_regular: return new_r_Jmp(get_irn_n(mod, -1)); - case pn_Mod_X_except: + case pn_Mod_X_except: { + ir_graph *irg = get_irn_irg(proj); /* we found an exception handler, remove it */ DBG_OPT_EXC_REM(proj); - return new_Bad(); + return get_irg_bad(irg); + } - case pn_Mod_M: + case pn_Mod_M: { + ir_graph *irg = get_irn_irg(proj); res = get_Mod_mem(mod); - new_mem = get_irg_no_mem(current_ir_graph); + new_mem = get_irg_no_mem(irg); if (confirm) { /* This node can only float up to the Confirm block */ @@ -3992,11 +3686,13 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) /* this is a Mod without exception, we can remove the memory edge */ set_Mod_mem(mod, new_mem); return res; + } case pn_Mod_res: if (get_Mod_left(mod) == b) { /* a % a = 0 if a != 0 */ - ir_mode *mode = get_irn_mode(proj); - ir_node *res = new_Const(get_mode_null(mode)); + ir_graph *irg = get_irn_irg(proj); + ir_mode *mode = get_irn_mode(proj); + ir_node *res = new_r_Const(irg, get_mode_null(mode)); DBG_OPT_CSTEVAL(mod, res); return res; @@ -4007,215 +3703,132 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) } /* transform_node_Proj_Mod */ /** - * Transform a Proj(DivMod) with a non-zero value. - * Removes the exceptions and routes the memory to the NoMem node. + * Optimizes jump tables (CondIs or CondIu) by removing all impossible cases. */ -static ir_node *transform_node_Proj_DivMod(ir_node *proj) +static ir_node *transform_node_Proj_Cond(ir_node *proj) { - ir_node *divmod = get_Proj_pred(proj); - ir_node *b = get_DivMod_right(divmod); - ir_node *res, *new_mem; - const ir_node *confirm; - long proj_nr; - - if (value_not_zero(b, &confirm)) { - /* DivMod(x, y) && y != 0 */ - proj_nr = get_Proj_proj(proj); - - if (confirm == NULL) { - /* we are sure we have a Const != 0 */ - new_mem = get_DivMod_mem(divmod); - new_mem = skip_Pin(new_mem); - set_DivMod_mem(divmod, new_mem); - set_irn_pinned(divmod, op_pin_state_floats); - } - - switch (proj_nr) { - - case pn_DivMod_X_regular: - return new_r_Jmp(get_nodes_block(divmod)); - - case pn_DivMod_X_except: - /* we found an exception handler, remove it */ - DBG_OPT_EXC_REM(proj); - return new_Bad(); + ir_node *n = get_Proj_pred(proj); + ir_node *b = get_Cond_selector(n); - case pn_DivMod_M: - res = get_DivMod_mem(divmod); - new_mem = get_irg_no_mem(current_ir_graph); + if (!get_opt_unreachable_code()) + return n; - if (confirm) { - /* This node can only float up to the Confirm block */ - new_mem = new_r_Pin(get_nodes_block(confirm), new_mem); - } - /* this is a DivMod without exception, we can remove the memory edge */ - set_DivMod_mem(divmod, new_mem); - return res; + if (mode_is_int(get_irn_mode(b))) { + ir_tarval *tb = value_of(b); - case pn_DivMod_res_mod: - if (get_DivMod_left(divmod) == b) { - /* a % a = 0 if a != 0 */ - ir_mode *mode = get_irn_mode(proj); - ir_node *res = new_Const(get_mode_null(mode)); + if (tb != tarval_bad) { + /* we have a constant switch */ + long num = get_Proj_proj(proj); - DBG_OPT_CSTEVAL(divmod, res); - return res; - } - } - } - return proj; -} /* transform_node_Proj_DivMod */ - -/** - * Optimizes jump tables (CondIs or CondIu) by removing all impossible cases. - */ -static ir_node *transform_node_Proj_Cond(ir_node *proj) -{ - if (get_opt_unreachable_code()) { - ir_node *n = get_Proj_pred(proj); - ir_node *b = get_Cond_selector(n); - - if (mode_is_int(get_irn_mode(b))) { - tarval *tb = value_of(b); - - if (tb != tarval_bad) { - /* we have a constant switch */ - long num = get_Proj_proj(proj); - - if (num != get_Cond_default_proj(n)) { /* we cannot optimize default Proj's yet */ - if (get_tarval_long(tb) == num) { - /* Do NOT create a jump here, or we will have 2 control flow ops - * in a block. This case is optimized away in optimize_cf(). */ - return proj; - } else { - /* this case will NEVER be taken, kill it */ - return get_irg_bad(current_ir_graph); - } + if (num != get_Cond_default_proj(n)) { /* we cannot optimize default Proj's yet */ + if (get_tarval_long(tb) == num) { + /* Do NOT create a jump here, or we will have 2 control flow ops + * in a block. This case is optimized away in optimize_cf(). */ + return proj; + } else { + ir_graph *irg = get_irn_irg(proj); + /* this case will NEVER be taken, kill it */ + return get_irg_bad(irg); } - } else { - long num = get_Proj_proj(proj); - vrp_attr *b_vrp = vrp_get_info(b); - if (num != get_Cond_default_proj(n) && b_vrp) { - /* Try handling with vrp data. We only remove dead parts. */ - tarval *tp = new_tarval_from_long(num, get_irn_mode(b)); - - if (b_vrp->range_type == VRP_RANGE) { - pn_Cmp cmp_result = tarval_cmp(b_vrp->range_bottom, tp); - pn_Cmp cmp_result2 = tarval_cmp(b_vrp->range_top, tp); - - if ((cmp_result & pn_Cmp_Gt) == cmp_result && (cmp_result2 - & pn_Cmp_Lt) == cmp_result2) { - return get_irg_bad(current_ir_graph); - } - } else if (b_vrp->range_type == VRP_ANTIRANGE) { - pn_Cmp cmp_result = tarval_cmp(b_vrp->range_bottom, tp); - pn_Cmp cmp_result2 = tarval_cmp(b_vrp->range_top, tp); - - if ((cmp_result & pn_Cmp_Le) == cmp_result && (cmp_result2 - & pn_Cmp_Ge) == cmp_result2) { - return get_irg_bad(current_ir_graph); - } + } + } else { + long num = get_Proj_proj(proj); + vrp_attr *b_vrp = vrp_get_info(b); + if (num != get_Cond_default_proj(n) && b_vrp) { + /* Try handling with vrp data. We only remove dead parts. */ + ir_tarval *tp = new_tarval_from_long(num, get_irn_mode(b)); + + if (b_vrp->range_type == VRP_RANGE) { + ir_relation cmp_result = tarval_cmp(b_vrp->range_bottom, tp); + ir_relation cmp_result2 = tarval_cmp(b_vrp->range_top, tp); + + if ((cmp_result & ir_relation_greater) == cmp_result && (cmp_result2 + & ir_relation_less) == cmp_result2) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); } - - if (!(tarval_cmp( - tarval_and( b_vrp->bits_set, tp), - b_vrp->bits_set - ) == pn_Cmp_Eq)) { - - return get_irg_bad(current_ir_graph); + } else if (b_vrp->range_type == VRP_ANTIRANGE) { + ir_relation cmp_result = tarval_cmp(b_vrp->range_bottom, tp); + ir_relation cmp_result2 = tarval_cmp(b_vrp->range_top, tp); + + if ((cmp_result & ir_relation_less_equal) == cmp_result && (cmp_result2 + & ir_relation_greater_equal) == cmp_result2) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); } + } - if (!(tarval_cmp( - tarval_and( - tarval_not(tp), - tarval_not(b_vrp->bits_not_set)), - tarval_not(b_vrp->bits_not_set)) - == pn_Cmp_Eq)) { + if (!(tarval_cmp( + tarval_and( b_vrp->bits_set, tp), + b_vrp->bits_set + ) == ir_relation_equal)) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); + } - return get_irg_bad(current_ir_graph); - } + if (!(tarval_cmp( + tarval_and( + tarval_not(tp), + tarval_not(b_vrp->bits_not_set)), + tarval_not(b_vrp->bits_not_set)) + == ir_relation_equal)) { + ir_graph *irg = get_irn_irg(proj); + return get_irg_bad(irg); + } - } } } } return proj; -} /* transform_node_Proj_Cond */ - -/** - * Create a 0 constant of given mode. - */ -static ir_node *create_zero_const(ir_mode *mode) -{ - tarval *tv = get_mode_null(mode); - ir_node *cnst = new_Const(tv); - - return cnst; -} - -/* the order of the values is important! */ -typedef enum const_class { - const_const = 0, - const_like = 1, - const_other = 2 -} const_class; - -static const_class classify_const(const ir_node* n) -{ - if (is_Const(n)) return const_const; - if (is_irn_constlike(n)) return const_like; - return const_other; } /** - * Determines whether r is more constlike or has a larger index (in that order) - * than l. + * return true if the operation returns a value with exactly 1 bit set */ -static int operands_are_normalized(const ir_node *l, const ir_node *r) +static bool is_single_bit(const ir_node *node) { - const const_class l_order = classify_const(l); - const const_class r_order = classify_const(r); - return - l_order > r_order || - (l_order == r_order && get_irn_idx(l) <= get_irn_idx(r)); + /* a first implementation, could be extended with vrp and others... */ + if (is_Shl(node)) { + ir_node *shl_l = get_Shl_left(node); + ir_mode *mode = get_irn_mode(node); + int modulo = get_mode_modulo_shift(mode); + /* this works if we shift a 1 and we have modulo shift */ + if (is_Const(shl_l) && is_Const_one(shl_l) + && 0 < modulo && modulo <= (int)get_mode_size_bits(mode)) { + return true; + } + } else if (is_Const(node)) { + ir_tarval *tv = get_Const_tarval(node); + return tarval_is_single_bit(tv); + } + return false; } /** - * Normalizes and optimizes Cmp nodes. - */ -static ir_node *transform_node_Proj_Cmp(ir_node *proj) -{ - ir_node *n = get_Proj_pred(proj); - ir_node *left = get_Cmp_left(n); - ir_node *right = get_Cmp_right(n); - tarval *tv = NULL; - int changed = 0; - ir_mode *mode = NULL; - long proj_nr = get_Proj_proj(proj); - - /* we can evaluate some cases directly */ - switch (proj_nr) { - case pn_Cmp_False: - return new_Const(get_tarval_b_false()); - case pn_Cmp_True: - return new_Const(get_tarval_b_true()); - case pn_Cmp_Leg: - if (!mode_is_float(get_irn_mode(left))) - return new_Const(get_tarval_b_true()); - break; - default: - break; - } + * Normalizes and optimizes Cmp nodes. + */ +static ir_node *transform_node_Cmp(ir_node *n) +{ + ir_node *left = get_Cmp_left(n); + ir_node *right = get_Cmp_right(n); + ir_mode *mode = get_irn_mode(left); + ir_tarval *tv = NULL; + bool changed = false; + bool changedc = false; + ir_relation relation = get_Cmp_relation(n); + ir_relation possible = ir_get_possible_cmp_relations(left, right); - /* remove Casts of both sides */ - left = skip_Cast(left); - right = skip_Cast(right); + /* mask out impossible relations */ + ir_relation new_relation = relation & possible; + if (new_relation != relation) { + relation = new_relation; + changed = true; + } /* Remove unnecessary conversions */ - /* TODO handle constants */ + /* TODO handle conv+constant */ if (is_Conv(left) && is_Conv(right)) { - ir_mode *mode = get_irn_mode(left); ir_node *op_left = get_Conv_op(left); ir_node *op_right = get_Conv_op(right); ir_mode *mode_left = get_irn_mode(op_left); @@ -4228,29 +3841,43 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) if (mode_left == mode_right) { left = op_left; right = op_right; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV); } else if (smaller_mode(mode_left, mode_right)) { left = new_r_Conv(block, op_left, mode_right); right = op_right; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV); } else if (smaller_mode(mode_right, mode_left)) { left = op_left; right = new_r_Conv(block, op_right, mode_left); - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV); } } } + /* + * Optimize -a CMP -b into b CMP a. + * This works only for modes where unary Minus cannot Overflow. + * Note that two-complement integers can Overflow so it will NOT work. + */ + if (!mode_overflow_on_unary_Minus(mode) && + is_Minus(left) && is_Minus(right)) { + left = get_Minus_op(left); + right = get_Minus_op(right); + relation = get_inversed_relation(relation); + changed = true; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } + /* remove operation on both sides if possible */ - if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { + if (relation == ir_relation_equal || relation == ir_relation_less_greater) { /* * The following operations are NOT safe for floating point operations, for instance * 1.0 + inf == 2.0 + inf, =/=> x == y */ - if (mode_is_int(get_irn_mode(left))) { + if (mode_is_int(mode)) { unsigned lop = get_irn_opcode(left); if (lop == get_irn_opcode(right)) { @@ -4263,7 +3890,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) /* ~a CMP ~b => a CMP b, -a CMP -b ==> a CMP b */ left = get_unop_op(left); right = get_unop_op(right); - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); break; case iro_Add: @@ -4276,25 +3903,25 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) /* X + a CMP X + b ==> a CMP b */ left = lr; right = rr; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } else if (ll == rr) { /* X + a CMP b + X ==> a CMP b */ left = lr; right = rl; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } else if (lr == rl) { /* a + X CMP X + b ==> a CMP b */ left = ll; right = rr; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } else if (lr == rr) { /* a + X CMP b + X ==> a CMP b */ left = ll; right = rl; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } break; @@ -4308,13 +3935,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) /* X - a CMP X - b ==> a CMP b */ left = lr; right = rr; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } else if (lr == rr) { /* a - X CMP b - X ==> a CMP b */ left = ll; right = rl; - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } break; @@ -4323,7 +3950,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) /* a ROTL X CMP b ROTL X ==> a CMP b */ left = get_Rotl_left(left); right = get_Rotl_left(right); - changed |= 1; + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } break; @@ -4343,9 +3970,10 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) lr = tmp; } if (ll == right) { + ir_graph *irg = get_irn_irg(n); left = lr; - right = create_zero_const(get_irn_mode(left)); - changed |= 1; + right = create_zero_const(irg, mode); + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } } @@ -4359,12 +3987,14 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) rr = tmp; } if (rl == left) { + ir_graph *irg = get_irn_irg(n); left = rr; - right = create_zero_const(get_irn_mode(left)); - changed |= 1; + right = create_zero_const(irg, mode); + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } } + if (is_And(left) && is_Const(right)) { ir_node *ll = get_binop_left(left); ir_node *lr = get_binop_right(left); @@ -4376,37 +4006,83 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) ir_node *llr = get_Shr_right(ll); if (is_Const(llr)) { dbg_info *dbg = get_irn_dbg_info(left); + ir_graph *irg = get_irn_irg(left); - tarval *c1 = get_Const_tarval(llr); - tarval *c2 = get_Const_tarval(lr); - tarval *c3 = get_Const_tarval(right); - tarval *mask = tarval_shl(c2, c1); - tarval *value = tarval_shl(c3, c1); + ir_tarval *c1 = get_Const_tarval(llr); + ir_tarval *c2 = get_Const_tarval(lr); + ir_tarval *c3 = get_Const_tarval(right); + ir_tarval *mask = tarval_shl(c2, c1); + ir_tarval *value = tarval_shl(c3, c1); - left = new_rd_And(dbg, block, get_Shr_left(ll), new_Const(mask), mode); - right = new_Const(value); - changed |= 1; + left = new_rd_And(dbg, block, get_Shr_left(ll), new_r_Const(irg, mask), mode); + right = new_r_Const(irg, value); + changed = true; } } } + /* Cmp(Eor(x, y), 0) <=> Cmp(x, y) at least for the ==0,!=0 + * cases */ + if (is_Const(right) && is_Const_null(right) && is_Eor(left)) { + right = get_Eor_right(left); + left = get_Eor_left(left); + changed = true; + } } /* mode_is_int(...) */ - } /* proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg */ + } + + /* Cmp(And(1bit, val), 1bit) "bit-testing" can be replaced + * by the simpler Cmp(And(1bit), val), 0) negated pnc */ + if (mode_is_int(mode) && is_And(left) + && (relation == ir_relation_equal + || (mode_is_signed(mode) && relation == ir_relation_less_greater) + || (!mode_is_signed(mode) && (relation & ir_relation_less_equal) == ir_relation_less))) { + ir_node *and0 = get_And_left(left); + ir_node *and1 = get_And_right(left); + if (and1 == right) { + ir_node *tmp = and0; + and0 = and1; + and1 = tmp; + } + if (and0 == right && is_single_bit(and0)) { + ir_graph *irg = get_irn_irg(n); + relation = + relation == ir_relation_equal ? ir_relation_less_greater : ir_relation_equal; + right = create_zero_const(irg, mode); + changed |= 1; + } + } /* replace mode_b compares with ands/ors */ - if (get_irn_mode(left) == mode_b) { + if (mode == mode_b) { ir_node *block = get_nodes_block(n); ir_node *bres; - switch (proj_nr) { - case pn_Cmp_Le: bres = new_r_Or( block, new_r_Not(block, left, mode_b), right, mode_b); break; - case pn_Cmp_Lt: bres = new_r_And(block, new_r_Not(block, left, mode_b), right, mode_b); break; - case pn_Cmp_Ge: bres = new_r_Or( block, left, new_r_Not(block, right, mode_b), mode_b); break; - case pn_Cmp_Gt: bres = new_r_And(block, left, new_r_Not(block, right, mode_b), mode_b); break; - case pn_Cmp_Lg: bres = new_r_Eor(block, left, right, mode_b); break; - case pn_Cmp_Eq: bres = new_r_Not(block, new_r_Eor(block, left, right, mode_b), mode_b); break; - default: bres = NULL; - } - if (bres) { + switch (relation) { + case ir_relation_less_equal: + bres = new_r_Or(block, new_r_Not(block, left, mode_b), right, mode_b); + break; + case ir_relation_less: + bres = new_r_And(block, new_r_Not(block, left, mode_b), right, mode_b); + break; + case ir_relation_greater_equal: + bres = new_r_Or(block, left, new_r_Not(block, right, mode_b), mode_b); + break; + case ir_relation_greater: + bres = new_r_And(block, left, new_r_Not(block, right, mode_b), mode_b); + break; + case ir_relation_less_greater: + bres = new_r_Eor(block, left, right, mode_b); + break; + case ir_relation_equal: + bres = new_r_Not(block, new_r_Eor(block, left, right, mode_b), mode_b); + break; + default: +#ifdef DEBUG_libfirm + ir_fprintf(stderr, "Optimisation warning, unexpected mode_b Cmp %+F\n", n); +#endif + bres = NULL; + } + if (bres != NULL) { DBG_OPT_ALGSIM0(n, bres, FS_OPT_CMP_TO_BOOL); return bres; } @@ -4419,12 +4095,11 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ if (!operands_are_normalized(left, right)) { ir_node *t = left; - left = right; right = t; - proj_nr = get_inversed_pnc(proj_nr); - changed |= 1; + relation = get_inversed_relation(relation); + changed = true; } /* @@ -4435,7 +4110,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ tv = value_of(right); if (tv != tarval_bad) { - mode = get_irn_mode(right); + ir_mode *mode = get_irn_mode(right); /* TODO extend to arbitrary constants */ if (is_Conv(left) && tarval_is_null(tv)) { @@ -4445,16 +4120,16 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) /* * UpConv(x) REL 0 ==> x REL 0 * Don't do this for float values as it's unclear whether it is a - * win. (on the other side it makes detection/creation of fabs hard) + * win. (on the other side it makes detection/creation of fabs hard) */ if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) && - ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) || + ((relation == ir_relation_equal || relation == ir_relation_less_greater) || mode_is_signed(mode) || !mode_is_signed(op_mode)) && !mode_is_float(mode)) { tv = get_mode_null(op_mode); left = op; mode = op_mode; - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV); } } @@ -4470,60 +4145,53 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ if (is_Minus(left) && (!mode_overflow_on_unary_Minus(mode) || - (mode_is_int(mode) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)))) { + (mode_is_int(mode) && (relation == ir_relation_equal || relation == ir_relation_less_greater)))) { tv = tarval_neg(tv); if (tv != tarval_bad) { left = get_Minus_op(left); - proj_nr = get_inversed_pnc(proj_nr); - changed |= 2; + relation = get_inversed_relation(relation); + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } - } else if (is_Not(left) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)) { + } else if (is_Not(left) && (relation == ir_relation_equal || relation == ir_relation_less_greater)) { /* Not(a) ==/!= c ==> a ==/!= Not(c) */ tv = tarval_not(tv); if (tv != tarval_bad) { left = get_Not_op(left); - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } /* for integer modes, we have more */ if (mode_is_int(mode)) { - /* Ne includes Unordered which is not possible on integers. - * However, frontends often use this wrong, so fix it here */ - if (proj_nr & pn_Cmp_Uo) { - proj_nr &= ~pn_Cmp_Uo; - set_Proj_proj(proj, proj_nr); - } - /* c > 0 : a < c ==> a <= (c-1) a >= c ==> a > (c-1) */ - if ((proj_nr == pn_Cmp_Lt || proj_nr == pn_Cmp_Ge) && - tarval_cmp(tv, get_mode_null(mode)) == pn_Cmp_Gt) { + if ((relation == ir_relation_less || relation == ir_relation_greater_equal) && + tarval_cmp(tv, get_mode_null(mode)) == ir_relation_greater) { tv = tarval_sub(tv, get_mode_one(mode), NULL); if (tv != tarval_bad) { - proj_nr ^= pn_Cmp_Eq; - changed |= 2; + relation ^= ir_relation_equal; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN); } } /* c < 0 : a > c ==> a >= (c+1) a <= c ==> a < (c+1) */ - else if ((proj_nr == pn_Cmp_Gt || proj_nr == pn_Cmp_Le) && - tarval_cmp(tv, get_mode_null(mode)) == pn_Cmp_Lt) { + else if ((relation == ir_relation_greater || relation == ir_relation_less_equal) && + tarval_cmp(tv, get_mode_null(mode)) == ir_relation_less) { tv = tarval_add(tv, get_mode_one(mode)); if (tv != tarval_bad) { - proj_nr ^= pn_Cmp_Eq; - changed |= 2; + relation ^= ir_relation_equal; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN); } } /* the following reassociations work only for == and != */ - if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { + if (relation == ir_relation_equal || relation == ir_relation_less_greater) { #if 0 /* Might be not that good in general */ /* a-b == 0 ==> a == b, a-b != 0 ==> a != b */ @@ -4541,7 +4209,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) /* a-c1 == c2 ==> a == c2+c1, a-c1 != c2 ==> a != c2+c1 */ if (is_Sub(left)) { ir_node *c1 = get_Sub_right(left); - tarval *tv2 = value_of(c1); + ir_tarval *tv2 = value_of(c1); if (tv2 != tarval_bad) { tv2 = tarval_add(tv, value_of(c1)); @@ -4549,7 +4217,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) if (tv2 != tarval_bad) { left = get_Sub_left(left); tv = tv2; - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } @@ -4559,7 +4227,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) ir_node *a_l = get_Add_left(left); ir_node *a_r = get_Add_right(left); ir_node *a; - tarval *tv2; + ir_tarval *tv2; if (is_Const(a_l)) { a = a_r; @@ -4575,35 +4243,27 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) if (tv2 != tarval_bad) { left = a; tv = tv2; - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } } /* -a == c ==> a == -c, -a != c ==> a != -c */ else if (is_Minus(left)) { - tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL); + ir_tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL); if (tv2 != tarval_bad) { left = get_Minus_op(left); tv = tv2; - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } } } /* == or != */ - /* the following reassociations work only for <= */ - else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) { - if (tv != tarval_bad) { - /* c >= 0 : Abs(a) <= c ==> (unsigned)(a + c) <= 2*c */ - if (is_Abs(left)) { // TODO something is missing here - } - } - } } /* mode_is_int */ - if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { + if (relation == ir_relation_equal || relation == ir_relation_less_greater) { switch (get_irn_opcode(left)) { ir_node *c1; @@ -4614,12 +4274,13 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) * And(x, C1) == C2 ==> FALSE if C2 & C1 != C2 * And(x, C1) != C2 ==> TRUE if C2 & C1 != C2 */ - tarval *mask = tarval_and(get_Const_tarval(c1), tv); + ir_tarval *mask = tarval_and(get_Const_tarval(c1), tv); if (mask != tv) { /* TODO: move to constant evaluation */ - tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); - DBG_OPT_CSTEVAL(proj, c1); + ir_graph *irg = get_irn_irg(n); + tv = relation == ir_relation_equal ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_r_Const(irg, tv); + DBG_OPT_CSTEVAL(n, c1); return c1; } @@ -4638,8 +4299,8 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) if (get_Const_tarval(c1) == tv) { /* fine: do the transformation */ tv = get_mode_null(get_tarval_mode(tv)); - proj_nr ^= pn_Cmp_Leg; - changed |= 2; + relation ^= ir_relation_less_equal_greater; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN); } } @@ -4654,9 +4315,10 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ if (! tarval_is_null(get_Const_tarval(c1))) { /* TODO: move to constant evaluation */ - tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); - DBG_OPT_CSTEVAL(proj, c1); + ir_graph *irg = get_irn_irg(n); + tv = relation == ir_relation_equal ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_r_Const(irg, tv); + DBG_OPT_CSTEVAL(n, c1); return c1; } } @@ -4670,25 +4332,26 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ c1 = get_Shl_right(left); if (is_Const(c1)) { - tarval *tv1 = get_Const_tarval(c1); - ir_mode *mode = get_irn_mode(left); - tarval *minus1 = get_mode_all_one(mode); - tarval *amask = tarval_shr(minus1, tv1); - tarval *cmask = tarval_shl(minus1, tv1); - ir_node *sl, *blk; + ir_graph *irg = get_irn_irg(c1); + ir_tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + ir_tarval *minus1 = get_mode_all_one(mode); + ir_tarval *amask = tarval_shr(minus1, tv1); + ir_tarval *cmask = tarval_shl(minus1, tv1); + ir_node *sl, *blk; if (tarval_and(tv, cmask) != tv) { /* condition not met */ - tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); - DBG_OPT_CSTEVAL(proj, c1); + tv = relation == ir_relation_equal ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_r_Const(irg, tv); + DBG_OPT_CSTEVAL(n, c1); return c1; } sl = get_Shl_left(left); blk = get_nodes_block(n); - left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode); + left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_r_Const(irg, amask), mode); tv = tarval_shr(tv, tv1); - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); } break; @@ -4701,25 +4364,26 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ c1 = get_Shr_right(left); if (is_Const(c1)) { - tarval *tv1 = get_Const_tarval(c1); - ir_mode *mode = get_irn_mode(left); - tarval *minus1 = get_mode_all_one(mode); - tarval *amask = tarval_shl(minus1, tv1); - tarval *cmask = tarval_shr(minus1, tv1); - ir_node *sl, *blk; + ir_graph *irg = get_irn_irg(c1); + ir_tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + ir_tarval *minus1 = get_mode_all_one(mode); + ir_tarval *amask = tarval_shl(minus1, tv1); + ir_tarval *cmask = tarval_shr(minus1, tv1); + ir_node *sl, *blk; if (tarval_and(tv, cmask) != tv) { /* condition not met */ - tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); - DBG_OPT_CSTEVAL(proj, c1); + tv = relation == ir_relation_equal ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_r_Const(irg, tv); + DBG_OPT_CSTEVAL(n, c1); return c1; } sl = get_Shr_left(left); blk = get_nodes_block(n); - left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode); + left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_r_Const(irg, amask), mode); tv = tarval_shl(tv, tv1); - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); } break; @@ -4732,11 +4396,12 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) */ c1 = get_Shrs_right(left); if (is_Const(c1)) { - tarval *tv1 = get_Const_tarval(c1); - ir_mode *mode = get_irn_mode(left); - tarval *minus1 = get_mode_all_one(mode); - tarval *amask = tarval_shl(minus1, tv1); - tarval *cond = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1)); + ir_graph *irg = get_irn_irg(c1); + ir_tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + ir_tarval *minus1 = get_mode_all_one(mode); + ir_tarval *amask = tarval_shl(minus1, tv1); + ir_tarval *cond = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1)); ir_node *sl, *blk; cond = tarval_sub(cond, tv1, NULL); @@ -4744,16 +4409,16 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) if (!tarval_is_all_one(cond) && !tarval_is_null(cond)) { /* condition not met */ - tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); - c1 = new_Const(tv); - DBG_OPT_CSTEVAL(proj, c1); + tv = relation == ir_relation_equal ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_r_Const(irg, tv); + DBG_OPT_CSTEVAL(n, c1); return c1; } sl = get_Shrs_left(left); blk = get_nodes_block(n); - left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_Const(amask), mode); + left = new_rd_And(get_irn_dbg_info(left), blk, sl, new_r_Const(irg, amask), mode); tv = tarval_shl(tv, tv1); - changed |= 2; + changedc = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); } break; @@ -4762,28 +4427,31 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) } /* tarval != bad */ } - if (changed & 2) /* need a new Const */ - right = new_Const(tv); + if (changedc) { /* need a new Const */ + ir_graph *irg = get_irn_irg(n); + right = new_r_Const(irg, tv); + changed = true; + } - if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_Const(right) && is_Const_null(right) && is_Proj(left)) { + if ((relation == ir_relation_equal || relation == ir_relation_less_greater) && is_Const(right) && is_Const_null(right) && is_Proj(left)) { ir_node *op = get_Proj_pred(left); - if ((is_Mod(op) && get_Proj_proj(left) == pn_Mod_res) || - (is_DivMod(op) && get_Proj_proj(left) == pn_DivMod_res_mod)) { + if (is_Mod(op) && get_Proj_proj(left) == pn_Mod_res) { ir_node *c = get_binop_right(op); if (is_Const(c)) { - tarval *tv = get_Const_tarval(c); + ir_tarval *tv = get_Const_tarval(c); if (tarval_is_single_bit(tv)) { /* special case: (x % 2^n) CMP 0 ==> x & (2^n-1) CMP 0 */ ir_node *v = get_binop_left(op); ir_node *blk = get_irn_n(op, -1); + ir_graph *irg = get_irn_irg(op); ir_mode *mode = get_irn_mode(v); tv = tarval_sub(tv, get_mode_one(mode), NULL); - left = new_rd_And(get_irn_dbg_info(op), blk, v, new_Const(tv), mode); - changed |= 1; + left = new_rd_And(get_irn_dbg_info(op), blk, v, new_r_Const(irg, tv), mode); + changed = true; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_MOD_TO_AND); } } @@ -4791,15 +4459,15 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) } if (changed) { - ir_node *block = get_nodes_block(n); + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); /* create a new compare */ - n = new_rd_Cmp(get_irn_dbg_info(n), block, left, right); - proj = new_rd_Proj(get_irn_dbg_info(proj), n, get_irn_mode(proj), proj_nr); + n = new_rd_Cmp(dbgi, block, left, right, relation); } - return proj; -} /* transform_node_Proj_Cmp */ + return n; +} /** * Optimize CopyB(mem, x, x) into a Nop. @@ -4843,14 +4511,13 @@ static ir_node *transform_node_Proj_Bound(ir_node *proj) ret_tuple = 1; else if (is_Bound(pred)) { /* - * idx was Bounds checked in the same MacroBlock previously, - * it is still valid if lower <= pred_lower && pred_upper <= upper. + * idx was Bounds checked previously, it is still valid if + * lower <= pred_lower && pred_upper <= upper. */ ir_node *lower = get_Bound_lower(bound); ir_node *upper = get_Bound_upper(bound); if (get_Bound_lower(pred) == lower && - get_Bound_upper(pred) == upper && - get_irn_MacroBlock(bound) == get_irn_MacroBlock(pred)) { + get_Bound_upper(pred) == upper) { /* * One could expect that we simply return the previous * Bound here. However, this would be wrong, as we could @@ -4887,7 +4554,7 @@ static ir_node *transform_node_Proj_Bound(ir_node *proj) } /* transform_node_Proj_Bound */ /** - * Does all optimizations on nodes that must be done on it's Proj's + * Does all optimizations on nodes that must be done on its Projs * because of creating new nodes. */ static ir_node *transform_node_Proj(ir_node *proj) @@ -4912,15 +4579,15 @@ static ir_node *transform_node_Phi(ir_node *phi) /* Beware of Phi0 */ if (n > 0) { - ir_node *pred = get_irn_n(phi, 0); - ir_node *bound, *new_Phi, *block, **in; - pn_Cmp pnc; + ir_node *pred = get_irn_n(phi, 0); + ir_node *bound, *new_phi, *block, **in; + ir_relation relation; if (! is_Confirm(pred)) return phi; - bound = get_Confirm_bound(pred); - pnc = get_Confirm_cmp(pred); + bound = get_Confirm_bound(pred); + relation = get_Confirm_relation(pred); NEW_ARR_A(ir_node *, in, n); in[0] = get_Confirm_value(pred); @@ -4930,18 +4597,18 @@ static ir_node *transform_node_Phi(ir_node *phi) if (! is_Confirm(pred) || get_Confirm_bound(pred) != bound || - get_Confirm_cmp(pred) != pnc) + get_Confirm_relation(pred) != relation) return phi; in[i] = get_Confirm_value(pred); } /* 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 new_r_Confirm(block, new_Phi, bound, pnc); + new_phi = new_r_Phi(block, n, in, get_irn_mode(phi)); + return new_r_Confirm(block, new_phi, bound, relation); } } return phi; -} /* transform_node_Phi */ +} /** * Returns the operands of a commutative bin-op, if one operand is @@ -4978,25 +4645,26 @@ static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) * AND c1 ===> OR if (c1 | c2) == 0x111..11 * OR */ -static ir_node *transform_node_Or_bf_store(ir_node *or) +static ir_node *transform_node_Or_bf_store(ir_node *irn_or) { - ir_node *and, *c1; + ir_node *irn_and, *c1; ir_node *or_l, *c2; ir_node *and_l, *c3; ir_node *value, *c4; ir_node *new_and, *new_const, *block; - ir_mode *mode = get_irn_mode(or); + ir_mode *mode = get_irn_mode(irn_or); - tarval *tv1, *tv2, *tv3, *tv4, *tv; + ir_tarval *tv1, *tv2, *tv3, *tv4, *tv; for (;;) { - get_comm_Binop_Ops(or, &and, &c1); - if (!is_Const(c1) || !is_And(and)) - return or; + ir_graph *irg; + get_comm_Binop_Ops(irn_or, &irn_and, &c1); + if (!is_Const(c1) || !is_And(irn_and)) + return irn_or; - get_comm_Binop_Ops(and, &or_l, &c2); + get_comm_Binop_Ops(irn_and, &or_l, &c2); if (!is_Const(c2)) - return or; + return irn_or; tv1 = get_Const_tarval(c1); tv2 = get_Const_tarval(c2); @@ -5004,26 +4672,26 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) tv = tarval_or(tv1, tv2); if (tarval_is_all_one(tv)) { /* the AND does NOT clear a bit with isn't set by the OR */ - set_Or_left(or, or_l); - set_Or_right(or, c1); + set_Or_left(irn_or, or_l); + set_Or_right(irn_or, c1); /* check for more */ continue; } if (!is_Or(or_l)) - return or; + return irn_or; get_comm_Binop_Ops(or_l, &and_l, &c3); if (!is_Const(c3) || !is_And(and_l)) - return or; + return irn_or; get_comm_Binop_Ops(and_l, &value, &c4); if (!is_Const(c4)) - return or; + return irn_or; /* ok, found the pattern, check for conditions */ - assert(mode == get_irn_mode(and)); + assert(mode == get_irn_mode(irn_and)); assert(mode == get_irn_mode(or_l)); assert(mode == get_irn_mode(and_l)); @@ -5033,28 +4701,29 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) tv = tarval_or(tv4, tv2); if (!tarval_is_all_one(tv)) { /* have at least one 0 at the same bit position */ - return or; + return irn_or; } if (tv3 != tarval_andnot(tv3, tv4)) { /* bit in the or_mask is outside the and_mask */ - return or; + return irn_or; } if (tv1 != tarval_andnot(tv1, tv2)) { /* bit in the or_mask is outside the and_mask */ - return or; + return irn_or; } /* ok, all conditions met */ - block = get_irn_n(or, -1); + block = get_irn_n(irn_or, -1); + irg = get_irn_irg(block); - new_and = new_r_And(block, value, new_Const(tarval_and(tv4, tv2)), mode); + new_and = new_r_And(block, value, new_r_Const(irg, tarval_and(tv4, tv2)), mode); - new_const = new_Const(tarval_or(tv3, tv1)); + new_const = new_r_Const(irg, tarval_or(tv3, tv1)); - set_Or_left(or, new_and); - set_Or_right(or, new_const); + set_Or_left(irn_or, new_and); + set_Or_right(irn_or, new_const); /* check for more */ } @@ -5063,92 +4732,92 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) /** * Optimize an Or(shl(x, c), shr(x, bits - c)) into a Rotl */ -static ir_node *transform_node_Or_Rotl(ir_node *or) +static ir_node *transform_node_Or_Rotl(ir_node *irn_or) { - ir_mode *mode = get_irn_mode(or); + ir_mode *mode = get_irn_mode(irn_or); ir_node *shl, *shr, *block; - ir_node *irn, *x, *c1, *c2, *v, *sub, *n, *rotval; - tarval *tv1, *tv2; + ir_node *irn, *x, *c1, *c2, *n; + ir_tarval *tv1, *tv2; + + /* some backends can't handle rotl */ + if (!be_get_backend_param()->support_rotl) + return irn_or; if (! mode_is_int(mode)) - return or; + return irn_or; - shl = get_binop_left(or); - shr = get_binop_right(or); + shl = get_binop_left(irn_or); + shr = get_binop_right(irn_or); if (is_Shr(shl)) { if (!is_Shl(shr)) - return or; + return irn_or; irn = shl; shl = shr; shr = irn; } else if (!is_Shl(shl)) { - return or; + return irn_or; } else if (!is_Shr(shr)) { - return or; + return irn_or; } x = get_Shl_left(shl); if (x != get_Shr_left(shr)) - return or; + return irn_or; c1 = get_Shl_right(shl); c2 = get_Shr_right(shr); if (is_Const(c1) && is_Const(c2)) { tv1 = get_Const_tarval(c1); if (! tarval_is_long(tv1)) - return or; + return irn_or; tv2 = get_Const_tarval(c2); if (! tarval_is_long(tv2)) - return or; + return irn_or; if (get_tarval_long(tv1) + get_tarval_long(tv2) != (int) get_mode_size_bits(mode)) - return or; + return irn_or; /* yet, condition met */ - block = get_nodes_block(or); + block = get_nodes_block(irn_or); n = new_r_Rotl(block, x, c1, mode); - DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROTL); + DBG_OPT_ALGSIM1(irn_or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROTL); return n; } - if (is_Sub(c1)) { - v = c2; - sub = c1; - rotval = sub; /* a Rot right is not supported, so use a rot left */ - } else if (is_Sub(c2)) { - v = c1; - sub = c2; - rotval = v; - } else return or; - - if (get_Sub_right(sub) != v) - return or; - - c1 = get_Sub_left(sub); - if (!is_Const(c1)) - return or; - - tv1 = get_Const_tarval(c1); - if (! tarval_is_long(tv1)) - return or; - - if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode)) - return or; + /* Note: the obvious rot formulation (a << x) | (a >> (32-x)) gets + * transformed to (a << x) | (a >> -x) by transform_node_shift_modulo() */ + if (!ir_is_negated_value(c1, c2)) { + return irn_or; + } /* yet, condition met */ - block = get_nodes_block(or); - - n = new_r_Rotl(block, x, rotval, mode); - - DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROTL); + block = get_nodes_block(irn_or); + n = new_r_Rotl(block, x, c1, mode); + DBG_OPT_ALGSIM0(irn_or, n, FS_OPT_OR_SHFT_TO_ROTL); return n; } /* transform_node_Or_Rotl */ +static bool is_cmp_unequal_zero(const ir_node *node) +{ + ir_relation relation = get_Cmp_relation(node); + ir_node *left = get_Cmp_left(node); + ir_node *right = get_Cmp_right(node); + ir_mode *mode = get_irn_mode(left); + + if (!is_Const(right) || !is_Const_null(right)) + return false; + if (mode_is_signed(mode)) { + return relation == ir_relation_less_greater; + } else { + return relation == ir_relation_greater; + } +} + /** * Transform an Or. */ @@ -5172,18 +4841,33 @@ static ir_node *transform_node_Or(ir_node *n) return n; } - /* we can evaluate 2 Projs of the same Cmp */ - if (get_irn_mode(n) == mode_b && is_Proj(a) && is_Proj(b)) { - ir_node *pred_a = get_Proj_pred(a); - ir_node *pred_b = get_Proj_pred(b); - if (pred_a == pred_b) { - dbg_info *dbgi = get_irn_dbg_info(n); - pn_Cmp pn_a = get_Proj_proj(a); - pn_Cmp pn_b = get_Proj_proj(b); - /* yes, we can simply calculate with pncs */ - pn_Cmp new_pnc = pn_a | pn_b; - - return new_rd_Proj(dbgi, pred_a, mode_b, new_pnc); + /* 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 *b_left = get_Cmp_left(b); + ir_node *b_right = get_Cmp_right(b); + if (a_left == b_left && b_left == b_right) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_relation a_relation = get_Cmp_relation(a); + ir_relation b_relation = get_Cmp_relation(b); + ir_relation new_relation = a_relation | b_relation; + return new_rd_Cmp(dbgi, block, a_left, a_right, new_relation); + } + /* Cmp(a!=0) or Cmp(b!=0) => Cmp(a|b != 0) */ + if (is_cmp_unequal_zero(a) && is_cmp_unequal_zero(b) + && !mode_is_float(get_irn_mode(a_left)) + && !mode_is_float(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 *mode = get_irn_mode(a_left); + ir_node *n_b_left = get_irn_mode(b_left) != mode ? + new_rd_Conv(dbgi, block, b_left, mode) : b_left; + ir_node *or = new_rd_Or(dbgi, block, a_left, n_b_left, mode); + ir_node *zero = create_zero_const(irg, mode); + return new_rd_Cmp(dbgi, block, or, zero, ir_relation_less_greater); } } @@ -5213,8 +4897,9 @@ static ir_node *transform_node_shift(ir_node *n) { ir_node *left, *right; ir_mode *mode; - tarval *tv1, *tv2, *res; + ir_tarval *tv1, *tv2, *res; ir_node *in[2], *irn, *block; + ir_graph *irg; left = get_binop_left(n); @@ -5233,27 +4918,28 @@ static ir_node *transform_node_shift(ir_node *n) res = tarval_add(tv1, tv2); mode = get_irn_mode(n); + irg = get_irn_irg(n); /* beware: a simple replacement works only, if res < modulo shift */ if (!is_Rotl(n)) { int modulo_shf = get_mode_modulo_shift(mode); if (modulo_shf > 0) { - tarval *modulo = new_tarval_from_long(modulo_shf, - get_tarval_mode(res)); + ir_tarval *modulo = new_tarval_from_long(modulo_shf, + get_tarval_mode(res)); assert(modulo_shf >= (int) get_mode_size_bits(mode)); /* shifting too much */ - if (!(tarval_cmp(res, modulo) & pn_Cmp_Lt)) { + if (!(tarval_cmp(res, modulo) & ir_relation_less)) { if (is_Shrs(n)) { ir_node *block = get_nodes_block(n); dbg_info *dbgi = get_irn_dbg_info(n); ir_mode *smode = get_irn_mode(right); - ir_node *cnst = new_Const_long(smode, get_mode_size_bits(mode) - 1); + ir_node *cnst = new_r_Const_long(irg, smode, get_mode_size_bits(mode) - 1); return new_rd_Shrs(dbgi, block, get_binop_left(left), cnst, mode); } - return new_Const(get_mode_null(mode)); + return new_r_Const(irg, get_mode_null(mode)); } } } else { @@ -5264,7 +4950,7 @@ static ir_node *transform_node_shift(ir_node *n) block = get_nodes_block(n); in[0] = get_binop_left(left); - in[1] = new_Const(res); + in[1] = new_r_Const(irg, res); irn = new_ir_node(NULL, get_Block_irg(block), block, get_irn_op(n), mode, 2, in); @@ -5282,20 +4968,21 @@ static ir_node *transform_node_shift(ir_node *n) */ static ir_node *transform_node_bitop_shift(ir_node *n) { - ir_node *left; - ir_node *right = get_binop_right(n); - ir_mode *mode = get_irn_mode(n); - ir_node *bitop_left; - ir_node *bitop_right; - ir_op *op_left; - ir_node *block; - dbg_info *dbgi; - ir_node *new_shift; - ir_node *new_bitop; - ir_node *new_const; - tarval *tv1; - tarval *tv2; - tarval *tv_shift; + ir_node *left; + ir_node *right = get_binop_right(n); + ir_mode *mode = get_irn_mode(n); + ir_node *bitop_left; + ir_node *bitop_right; + ir_op *op_left; + ir_node *block; + dbg_info *dbgi; + ir_graph *irg; + ir_node *new_shift; + ir_node *new_bitop; + ir_node *new_const; + ir_tarval *tv1; + ir_tarval *tv2; + ir_tarval *tv_shift; assert(is_Shrs(n) || is_Shr(n) || is_Shl(n) || is_Rotl(n)); @@ -5342,7 +5029,8 @@ static ir_node *transform_node_bitop_shift(ir_node *n) } assert(get_tarval_mode(tv_shift) == mode); - new_const = new_Const(tv_shift); + irg = get_irn_irg(n); + new_const = new_r_Const(irg, tv_shift); if (op_left == op_And) { new_bitop = new_rd_And(dbgi, block, new_shift, new_const, mode); @@ -5365,21 +5053,22 @@ static ir_node *transform_node_bitop_shift(ir_node *n) */ static ir_node *transform_node_shl_shr(ir_node *n) { - ir_node *left; - ir_node *right = get_binop_right(n); - ir_node *x; - ir_node *block; - ir_mode *mode; - dbg_info *dbgi; - ir_node *new_const; - ir_node *new_shift; - ir_node *new_and; - tarval *tv_shl; - tarval *tv_shr; - tarval *tv_shift; - tarval *tv_mask; - pn_Cmp pnc; - int need_shrs = 0; + ir_node *left; + ir_node *right = get_binop_right(n); + ir_node *x; + ir_node *block; + ir_mode *mode; + dbg_info *dbgi; + ir_node *new_const; + ir_node *new_shift; + ir_node *new_and; + ir_tarval *tv_shl; + ir_tarval *tv_shr; + ir_tarval *tv_shift; + ir_tarval *tv_mask; + ir_graph *irg; + ir_relation relation; + int need_shrs = 0; assert(is_Shl(n) || is_Shr(n) || is_Shrs(n)); @@ -5400,7 +5089,7 @@ static ir_node *transform_node_shl_shr(ir_node *n) if (is_Shrs(left)) { /* shrs variant only allowed if c1 >= c2 */ - if (! (tarval_cmp(tv_shl, tv_shr) & pn_Cmp_Ge)) + if (! (tarval_cmp(tv_shl, tv_shr) & ir_relation_greater_equal)) return n; tv_mask = tarval_shrs(get_mode_all_one(mode), tv_shr); @@ -5433,30 +5122,116 @@ static ir_node *transform_node_shl_shr(ir_node *n) assert(get_tarval_mode(tv_mask) == mode); block = get_nodes_block(n); + irg = get_irn_irg(block); dbgi = get_irn_dbg_info(n); - pnc = tarval_cmp(tv_shl, tv_shr); - if (pnc == pn_Cmp_Lt || pnc == pn_Cmp_Eq) { + relation = tarval_cmp(tv_shl, tv_shr); + if (relation == ir_relation_less || relation == ir_relation_equal) { tv_shift = tarval_sub(tv_shr, tv_shl, NULL); - new_const = new_Const(tv_shift); + new_const = new_r_Const(irg, tv_shift); if (need_shrs) { new_shift = new_rd_Shrs(dbgi, block, x, new_const, mode); } else { new_shift = new_rd_Shr(dbgi, block, x, new_const, mode); } } else { - assert(pnc == pn_Cmp_Gt); + assert(relation == ir_relation_greater); tv_shift = tarval_sub(tv_shl, tv_shr, NULL); - new_const = new_Const(tv_shift); + new_const = new_r_Const(irg, tv_shift); new_shift = new_rd_Shl(dbgi, block, x, new_const, mode); } - new_const = new_Const(tv_mask); + new_const = new_r_Const(irg, tv_mask); new_and = new_rd_And(dbgi, block, new_shift, new_const, mode); return new_and; } +static ir_tarval *get_modulo_tv_value(ir_tarval *tv, int modulo_val) +{ + ir_mode *mode = get_tarval_mode(tv); + ir_tarval *modulo_tv = new_tarval_from_long(modulo_val, mode); + return tarval_mod(tv, modulo_tv); +} + +typedef ir_node*(*new_shift_func)(dbg_info *dbgi, ir_node *block, + ir_node *left, ir_node *right, ir_mode *mode); + +/** + * Normalisation: if we have a shl/shr with modulo_shift behaviour + * then we can use that to minimize the value of Add(x, const) or + * Sub(Const, x). In particular this often avoids 1 instruction in some + * backends for the Shift(x, Sub(Const, y)) case because it can be replaced + * by Shift(x, Minus(y)) which doesnt't need an explicit Const constructed. + */ +static ir_node *transform_node_shift_modulo(ir_node *n, + new_shift_func new_shift) +{ + ir_mode *mode = get_irn_mode(n); + int modulo = get_mode_modulo_shift(mode); + ir_node *newop = NULL; + ir_mode *mode_right; + ir_node *block; + ir_node *right; + ir_graph *irg; + + if (modulo == 0) + return n; + if (get_mode_arithmetic(mode) != irma_twos_complement) + return n; + if (!is_po2(modulo)) + return n; + + irg = get_irn_irg(n); + block = get_nodes_block(n); + right = get_binop_right(n); + mode_right = get_irn_mode(right); + if (is_Const(right)) { + ir_tarval *tv = get_Const_tarval(right); + ir_tarval *tv_mod = get_modulo_tv_value(tv, modulo); + + if (tv_mod == tv) + return n; + + newop = new_r_Const(irg, tv_mod); + } else if (is_Add(right)) { + ir_node *add_right = get_Add_right(right); + if (is_Const(add_right)) { + ir_tarval *tv = get_Const_tarval(add_right); + ir_tarval *tv_mod = get_modulo_tv_value(tv, modulo); + ir_node *newconst; + if (tv_mod == tv) + return n; + + newconst = new_r_Const(irg, tv_mod); + newop = new_r_Add(block, get_Add_left(right), newconst, + mode_right); + } + } else if (is_Sub(right)) { + ir_node *sub_left = get_Sub_left(right); + if (is_Const(sub_left)) { + ir_tarval *tv = get_Const_tarval(sub_left); + ir_tarval *tv_mod = get_modulo_tv_value(tv, modulo); + ir_node *newconst; + if (tv_mod == tv) + return n; + + newconst = new_r_Const(irg, tv_mod); + newop = new_r_Sub(block, newconst, get_Sub_right(right), + mode_right); + } + } else { + return n; + } + + if (newop != NULL) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *left = get_binop_left(n); + return new_shift(dbgi, block, left, newop, mode); + } + return n; +} + /** * Transform a Shr. */ @@ -5470,6 +5245,8 @@ static ir_node *transform_node_Shr(ir_node *n) HANDLE_BINOP_PHI((eval_func) tarval_shr, left, right, c, mode); n = transform_node_shift(n); + if (is_Shr(n)) + n = transform_node_shift_modulo(n, new_rd_Shr); if (is_Shr(n)) n = transform_node_shl_shr(n); if (is_Shr(n)) @@ -5491,6 +5268,8 @@ static ir_node *transform_node_Shrs(ir_node *n) HANDLE_BINOP_PHI((eval_func) tarval_shrs, a, b, c, mode); n = transform_node_shift(n); + if (is_Shrs(n)) + n = transform_node_shift_modulo(n, new_rd_Shrs); if (is_Shrs(n)) n = transform_node_bitop_shift(n); @@ -5510,6 +5289,8 @@ static ir_node *transform_node_Shl(ir_node *n) HANDLE_BINOP_PHI((eval_func) tarval_shl, a, b, c, mode); n = transform_node_shift(n); + if (is_Shl(n)) + n = transform_node_shift_modulo(n, new_rd_Shl); if (is_Shl(n)) n = transform_node_shl_shr(n); if (is_Shl(n)) @@ -5559,7 +5340,8 @@ static ir_node *transform_node_Conv(ir_node *n) } if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */ - return new_r_Unknown(current_ir_graph, mode); + ir_graph *irg = get_irn_irg(n); + return new_r_Unknown(irg, mode); } if (mode_is_reference(mode) && @@ -5621,7 +5403,7 @@ static ir_node *transform_node_End(ir_node *n) return n; } /* transform_node_End */ -bool is_negated_value(ir_node *a, ir_node *b) +int ir_is_negated_value(const ir_node *a, const ir_node *b) { if (is_Minus(a) && get_Minus_op(a) == b) return true; @@ -5649,7 +5431,7 @@ static ir_node *transform_node_Mux(ir_node *n) ir_mode *mode = get_irn_mode(n); ir_node *t = get_Mux_true(n); ir_node *f = get_Mux_false(n); - ir_graph *irg = current_ir_graph; + ir_graph *irg = get_irn_irg(n); if (is_irg_state(irg, IR_GRAPH_STATE_KEEP_MUX)) return n; @@ -5708,24 +5490,22 @@ static ir_node *transform_node_Mux(ir_node *n) } } - /* first normalization step: move a possible zero to the false case */ - if (is_Proj(sel)) { - ir_node *cmp = get_Proj_pred(sel); + /* 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) && + (!is_Const(f) || (is_Const_null(t) && !is_Const_null(f)))) { + dbg_info *seldbgi = get_irn_dbg_info(sel); + ir_node *block = get_nodes_block(sel); + ir_relation relation = get_Cmp_relation(sel); + ir_node *tmp = t; + t = f; + f = tmp; - if (is_Cmp(cmp)) { - if (is_Const(t) && is_Const_null(t)) { - ir_node *tmp; - - /* Mux(x, 0, y) => Mux(x, y, 0) */ - pn_Cmp pnc = get_Proj_proj(sel); - sel = new_r_Proj(cmp, mode_b, - get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp)))); - n = new_rd_Mux(get_irn_dbg_info(n), get_nodes_block(n), sel, t, f, mode); - tmp = t; - t = f; - f = tmp; - } - } + /* Mux(x, a, b) => Mux(not(x), b, a) */ + relation = get_negated_relation(relation); + sel = new_rd_Cmp(seldbgi, block, get_Cmp_left(sel), + get_Cmp_right(sel), relation); + 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 */ @@ -5734,7 +5514,7 @@ static ir_node *transform_node_Mux(ir_node *n) ir_node *block = get_nodes_block(n); if (is_Const(t)) { - tarval *tv_t = get_Const_tarval(t); + ir_tarval *tv_t = get_Const_tarval(t); if (tv_t == tarval_b_true) { if (is_Const(f)) { /* Muxb(sel, true, false) = sel */ @@ -5749,7 +5529,7 @@ static ir_node *transform_node_Mux(ir_node *n) } } } else if (is_Const(f)) { - tarval *tv_f = get_Const_tarval(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); @@ -5766,11 +5546,11 @@ static ir_node *transform_node_Mux(ir_node *n) } } - /* more normalization: try to normalize Mux(x, C1, C2) into Mux(x, +1/-1, 0) op C2 */ + /* 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)) { - tarval *a = get_Const_tarval(t); - tarval *b = get_Const_tarval(f); - tarval *diff, *min; + 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); @@ -5786,127 +5566,71 @@ static ir_node *transform_node_Mux(ir_node *n) DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV); return n; } - /* TODO: it's not really clear if that helps in general or should be moved - * to backend, especially with the MUX->Conv transformation above */ - if (tarval_cmp(a, b) & pn_Cmp_Gt) { - diff = tarval_sub(a, b, NULL); - min = b; - } else { - diff = tarval_sub(b, a, NULL); - min = a; - } - - if (diff == get_tarval_one(mode)) { - dbg_info *dbg = get_irn_dbg_info(n); - ir_node *block = get_nodes_block(n); - ir_node *t = new_Const(tarval_sub(a, min, NULL)); - ir_node *f = new_Const(tarval_sub(b, min, NULL)); - n = new_rd_Mux(dbg, block, sel, f, t, mode); - n = new_rd_Add(dbg, block, n, new_Const(min), mode); - return n; - } } - if (is_Proj(sel)) { - ir_node *cmp = get_Proj_pred(sel); - long pn = get_Proj_proj(sel); + 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); - /* - * Note: normalization puts the constant on the right side, - * so we check only one case. - * - * Note further that these optimization work even for floating point - * with NaN's because -NaN == NaN. - * However, if +0 and -0 is handled differently, we cannot use the Abs/-Abs - * transformations. - */ - if (is_Cmp(cmp)) { - ir_node *cmp_r = get_Cmp_right(cmp); - if (is_Const(cmp_r) && is_Const_null(cmp_r)) { - ir_node *block = get_nodes_block(n); - ir_node *cmp_l = get_Cmp_left(cmp); - - if (!mode_honor_signed_zeros(mode) && is_negated_value(f, t)) { - /* f = -t */ - - /* NaN's work fine with abs, so it is ok to remove Uo */ - long pnc = pn & ~pn_Cmp_Uo; - - if ( (cmp_l == t && (pnc == pn_Cmp_Ge || pnc == pn_Cmp_Gt)) - || (cmp_l == f && (pnc == pn_Cmp_Le || pnc == pn_Cmp_Lt))) - { - /* Mux(a >/>= 0, a, -a) = Mux(a Abs(a) */ - n = new_rd_Abs(get_irn_dbg_info(n), block, cmp_l, mode); - DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS); - return n; - } else if ((cmp_l == t && (pnc == pn_Cmp_Le || pnc == pn_Cmp_Lt)) - || (cmp_l == f && (pnc == pn_Cmp_Ge || pnc == pn_Cmp_Gt))) - { - /* Mux(a />= 0, -a, a) ==> -Abs(a) */ - n = new_rd_Abs(get_irn_dbg_info(n), block, cmp_l, mode); - n = new_rd_Minus(get_irn_dbg_info(n), block, n, mode); - DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS); - return n; + 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 (mode_is_int(mode)) { - /* integer only */ - if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && 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 (pn == pn_Cmp_Lg) { - /* Mux((a & 2^C) != 0, 2^C, 0) */ + 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, cmp, sel, n, FS_OPT_MUX_TO_BITOP); + DBG_OPT_ALGSIM1(oldn, sel, sel, n, FS_OPT_MUX_TO_BITOP); } else { - /* Mux((a & 2^C) == 0, 2^C, 0) */ + /* (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, cmp, sel, n, FS_OPT_MUX_TO_BITOP); + 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 (pn == pn_Cmp_Lg) { - /* (a & (1 << n)) != 0, (1 << n), 0) */ - n = cmp_l; - DBG_OPT_ALGSIM1(oldn, cmp, 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, cmp, 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 (pn == pn_Cmp_Lg) { - /* ((1 << n) & a) != 0, (1 << n), 0) */ - n = cmp_l; - DBG_OPT_ALGSIM1(oldn, cmp, 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, cmp, 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; } } } @@ -5916,7 +5640,7 @@ static ir_node *transform_node_Mux(ir_node *n) } return n; -} /* transform_node_Mux */ +} /** * optimize Sync nodes that have other syncs as input we simply add the inputs @@ -5957,7 +5681,7 @@ static ir_node *transform_node_Sync(ir_node *n) } /* rehash the sync node */ - add_identities(current_ir_graph->value_table, n); + add_identities(n); return n; } /* transform_node_Sync */ @@ -5970,9 +5694,10 @@ static ir_node *transform_node_Call(ir_node *call) ir_node *callee = get_Call_ptr(call); ir_node *adr, *mem, *res, *bl, **in; ir_type *ctp, *mtp, *tp; + ir_graph *irg; type_dbg_info *tdb; dbg_info *db; - int i, n_res, n_param; + size_t i, n_res, n_param; ir_variadicity var; if (! is_Proj(callee)) @@ -6004,7 +5729,8 @@ static ir_node *transform_node_Call(ir_node *call) NEW_ARR_A(ir_node *, in, n_param + 1); /* FIXME: we don't need a new pointer type in every step */ - tp = get_irg_frame_type(current_ir_graph); + irg = get_irn_irg(call); + tp = get_irg_frame_type(irg); tp = new_type_pointer(tp); set_method_param_type(ctp, 0, tp); @@ -6015,9 +5741,6 @@ static ir_node *transform_node_Call(ir_node *call) } var = get_method_variadicity(mtp); set_method_variadicity(ctp, var); - if (var == variadicity_variadic) { - set_method_first_variadic_param_index(ctp, get_method_first_variadic_param_index(mtp) + 1); - } /* When we resolve a trampoline, the function must be called by a this-call */ set_method_calling_convention(ctp, get_method_calling_convention(mtp) | cc_this_call); set_method_additional_properties(ctp, get_method_additional_properties(mtp)); @@ -6084,37 +5807,33 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops switch (code) { CASE(Add); - CASE(Sub); - CASE(Mul); - CASE_PROJ_EX(Div); - CASE_PROJ_EX(Mod); - CASE_PROJ_EX(DivMod); - CASE(Quot); - CASE(Abs); - CASE_PROJ_EX(Cmp); - CASE_PROJ_EX(Cond); CASE(And); + CASE(Call); + CASE(Cmp); + CASE(Conv); + CASE(End); CASE(Eor); - CASE(Not); CASE(Minus); - CASE(Cast); - CASE_PROJ(Load); - CASE_PROJ(Store); - CASE_PROJ(Bound); - CASE_PROJ(CopyB); - CASE(Proj); - CASE(Phi); + CASE(Mul); + CASE(Mux); + CASE(Not); CASE(Or); + CASE(Phi); + CASE(Proj); + CASE(Rotl); CASE(Sel); + CASE(Shl); CASE(Shr); CASE(Shrs); - CASE(Shl); - CASE(Rotl); - CASE(Conv); - CASE(End); - CASE(Mux); + CASE(Sub); CASE(Sync); - CASE(Call); + CASE_PROJ(Bound); + CASE_PROJ(CopyB); + CASE_PROJ(Load); + CASE_PROJ(Store); + CASE_PROJ_EX(Cond); + CASE_PROJ_EX(Div); + CASE_PROJ_EX(Mod); default: /* leave NULL */; } @@ -6133,63 +5852,61 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops #define N_IR_NODES 512 /** Compares the attributes of two Const nodes. */ -static int node_cmp_attr_Const(ir_node *a, ir_node *b) +static int node_cmp_attr_Const(const ir_node *a, const ir_node *b) { - return (get_Const_tarval(a) != get_Const_tarval(b)) - || (get_Const_type(a) != get_Const_type(b)); -} /* node_cmp_attr_Const */ + return get_Const_tarval(a) != get_Const_tarval(b); +} /** Compares the attributes of two Proj nodes. */ -static int node_cmp_attr_Proj(ir_node *a, ir_node *b) +static int node_cmp_attr_Proj(const ir_node *a, const ir_node *b) { - return a->attr.proj != b->attr.proj; -} /* node_cmp_attr_Proj */ + return a->attr.proj.proj != b->attr.proj.proj; +} /** Compares the attributes of two Alloc nodes. */ -static int node_cmp_attr_Alloc(ir_node *a, ir_node *b) +static int node_cmp_attr_Alloc(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); -} /* node_cmp_attr_Alloc */ +} /** Compares the attributes of two Free nodes. */ -static int node_cmp_attr_Free(ir_node *a, ir_node *b) +static int node_cmp_attr_Free(const ir_node *a, const ir_node *b) { const free_attr *pa = &a->attr.free; const free_attr *pb = &b->attr.free; return (pa->where != pb->where) || (pa->type != pb->type); -} /* node_cmp_attr_Free */ +} /** Compares the attributes of two SymConst nodes. */ -static int node_cmp_attr_SymConst(ir_node *a, ir_node *b) +static int node_cmp_attr_SymConst(const ir_node *a, const ir_node *b) { const symconst_attr *pa = &a->attr.symc; const symconst_attr *pb = &b->attr.symc; return (pa->kind != pb->kind) - || (pa->sym.type_p != pb->sym.type_p) - || (pa->tp != pb->tp); -} /* node_cmp_attr_SymConst */ + || (pa->sym.type_p != pb->sym.type_p); +} /** Compares the attributes of two Call nodes. */ -static int node_cmp_attr_Call(ir_node *a, ir_node *b) +static int node_cmp_attr_Call(const ir_node *a, const ir_node *b) { 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); -} /* node_cmp_attr_Call */ +} /** Compares the attributes of two Sel nodes. */ -static int node_cmp_attr_Sel(ir_node *a, ir_node *b) +static int node_cmp_attr_Sel(const ir_node *a, const ir_node *b) { const ir_entity *a_ent = get_Sel_entity(a); const ir_entity *b_ent = get_Sel_entity(b); return a_ent != b_ent; -} /* node_cmp_attr_Sel */ +} /** Compares the attributes of two Phi nodes. */ -static int node_cmp_attr_Phi(ir_node *a, ir_node *b) +static int node_cmp_attr_Phi(const ir_node *a, const ir_node *b) { /* we can only enter this function if both nodes have the same number of inputs, hence it is enough to check if one of them is a Phi0 */ @@ -6198,48 +5915,48 @@ static int node_cmp_attr_Phi(ir_node *a, ir_node *b) return a->attr.phi.u.pos != b->attr.phi.u.pos; } return 0; -} /* node_cmp_attr_Phi */ +} /** Compares the attributes of two Conv nodes. */ -static int node_cmp_attr_Conv(ir_node *a, ir_node *b) +static int node_cmp_attr_Conv(const ir_node *a, const ir_node *b) { return get_Conv_strict(a) != get_Conv_strict(b); -} /* node_cmp_attr_Conv */ +} /** Compares the attributes of two Cast nodes. */ -static int node_cmp_attr_Cast(ir_node *a, ir_node *b) +static int node_cmp_attr_Cast(const ir_node *a, const ir_node *b) { return get_Cast_type(a) != get_Cast_type(b); -} /* node_cmp_attr_Cast */ +} /** Compares the attributes of two Load nodes. */ -static int node_cmp_attr_Load(ir_node *a, ir_node *b) +static int node_cmp_attr_Load(const ir_node *a, const ir_node *b) { if (get_Load_volatility(a) == volatility_is_volatile || get_Load_volatility(b) == volatility_is_volatile) /* NEVER do CSE on volatile Loads */ return 1; /* do not CSE Loads with different alignment. Be conservative. */ - if (get_Load_align(a) != get_Load_align(b)) + if (get_Load_unaligned(a) != get_Load_unaligned(b)) return 1; return get_Load_mode(a) != get_Load_mode(b); -} /* node_cmp_attr_Load */ +} /** Compares the attributes of two Store nodes. */ -static int node_cmp_attr_Store(ir_node *a, ir_node *b) +static int node_cmp_attr_Store(const ir_node *a, const ir_node *b) { /* do not CSE Stores with different alignment. Be conservative. */ - if (get_Store_align(a) != get_Store_align(b)) + 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); -} /* node_cmp_attr_Store */ +} /** Compares two exception attributes */ -static int node_cmp_exception(ir_node *a, ir_node *b) +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; @@ -6250,52 +5967,48 @@ static int node_cmp_exception(ir_node *a, ir_node *b) #define node_cmp_attr_Bound node_cmp_exception /** Compares the attributes of two Div nodes. */ -static int node_cmp_attr_Div(ir_node *a, ir_node *b) +static int node_cmp_attr_Div(const ir_node *a, const ir_node *b) { - const divmod_attr *ma = &a->attr.divmod; - const divmod_attr *mb = &b->attr.divmod; + 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; -} /* node_cmp_attr_Div */ +} -/** Compares the attributes of two DivMod nodes. */ -static int node_cmp_attr_DivMod(ir_node *a, ir_node *b) +/** Compares the attributes of two Mod nodes. */ +static int node_cmp_attr_Mod(const ir_node *a, const ir_node *b) { - const divmod_attr *ma = &a->attr.divmod; - const divmod_attr *mb = &b->attr.divmod; + 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; -} /* node_cmp_attr_DivMod */ - -/** Compares the attributes of two Mod nodes. */ -static int node_cmp_attr_Mod(ir_node *a, ir_node *b) -{ - return node_cmp_attr_DivMod(a, b); -} /* node_cmp_attr_Mod */ +} -/** Compares the attributes of two Quot nodes. */ -static int node_cmp_attr_Quot(ir_node *a, ir_node *b) +static int node_cmp_attr_Cmp(const ir_node *a, const ir_node *b) { - return node_cmp_attr_DivMod(a, b); -} /* node_cmp_attr_Quot */ + const cmp_attr *ma = &a->attr.cmp; + const cmp_attr *mb = &b->attr.cmp; + return ma->relation != mb->relation; +} /** Compares the attributes of two Confirm nodes. */ -static int node_cmp_attr_Confirm(ir_node *a, ir_node *b) +static int node_cmp_attr_Confirm(const ir_node *a, const ir_node *b) { - /* no need to compare the bound, as this is a input */ - return (get_Confirm_cmp(a) != get_Confirm_cmp(b)); -} /* node_cmp_attr_Confirm */ + const confirm_attr *ma = &a->attr.confirm; + const confirm_attr *mb = &b->attr.confirm; + return ma->relation != mb->relation; +} /** Compares the attributes of two Builtin nodes. */ -static int node_cmp_attr_Builtin(ir_node *a, ir_node *b) +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); -} /* node_cmp_attr_Builtin */ +} /** Compares the attributes of two ASM nodes. */ -static int node_cmp_attr_ASM(ir_node *a, ir_node *b) +static int node_cmp_attr_ASM(const ir_node *a, const ir_node *b) { int i, n; const ir_asm_constraint *ca; @@ -6339,10 +6052,10 @@ static int node_cmp_attr_ASM(ir_node *a, ir_node *b) return 1; } return 0; -} /* node_cmp_attr_ASM */ +} /** Compares the inexistent attributes of two Dummy nodes. */ -static int node_cmp_attr_Dummy(ir_node *a, ir_node *b) +static int node_cmp_attr_Dummy(const ir_node *a, const ir_node *b) { (void) a; (void) b; @@ -6374,6 +6087,7 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) CASE(Call); CASE(Sel); CASE(Phi); + CASE(Cmp); CASE(Conv); CASE(Cast); CASE(Load); @@ -6381,9 +6095,7 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) CASE(Confirm); CASE(ASM); CASE(Div); - CASE(DivMod); CASE(Mod); - CASE(Quot); CASE(Bound); CASE(Builtin); CASE(Dummy); @@ -6417,13 +6129,17 @@ int identities_cmp(const void *elt, const void *key) if (irn_arity_a != get_irn_arity(b)) return 1; + /* blocks are never the same */ + if (is_Block(a)) + return 1; + if (get_irn_pinned(a) == op_pin_state_pinned) { /* for pinned nodes, the block inputs must be equal */ if (get_irn_n(a, -1) != get_irn_n(b, -1)) return 1; } else if (! get_opt_global_cse()) { - /* for block-local CSE both nodes must be in the same MacroBlock */ - if (get_irn_MacroBlock(a) != get_irn_MacroBlock(b)) + /* for block-local CSE both nodes must be in the same Block */ + if (get_nodes_block(a) != get_nodes_block(b)) return 1; } @@ -6459,14 +6175,17 @@ unsigned ir_node_hash(const ir_node *node) } /* ir_node_hash */ -pset *new_identities(void) +void new_identities(ir_graph *irg) { - return new_pset(identities_cmp, N_IR_NODES); + if (irg->value_table != NULL) + del_pset(irg->value_table); + irg->value_table = new_pset(identities_cmp, N_IR_NODES); } /* new_identities */ -void del_identities(pset *value_table) +void del_identities(ir_graph *irg) { - del_pset(value_table); + if (irg->value_table != NULL) + del_pset(irg->value_table); } /* del_identities */ /* Normalize a node by putting constants (and operands with larger @@ -6489,120 +6208,77 @@ void ir_normalize_node(ir_node *n) } } /* ir_normalize_node */ -/** - * Update the nodes after a match in the value table. If both nodes have - * the same MacroBlock but different Blocks, we must ensure that the node - * with the dominating Block (the node that is near to the MacroBlock header - * is stored in the table. - * Because a MacroBlock has only one "non-exception" flow, we don't need - * dominance info here: We known, that one block must dominate the other and - * following the only block input will allow to find it. - */ -static void update_known_irn(ir_node *known_irn, const ir_node *new_ir_node) -{ - ir_node *known_blk, *new_block, *block, *mbh; - - if (get_opt_global_cse()) { - /* Block inputs are meaning less */ - return; - } - known_blk = get_irn_n(known_irn, -1); - new_block = get_irn_n(new_ir_node, -1); - if (known_blk == new_block) { - /* already in the same block */ - return; - } - /* - * We expect the typical case when we built the graph. In that case, the - * known_irn is already the upper one, so checking this should be faster. - */ - block = new_block; - mbh = get_Block_MacroBlock(new_block); - for (;;) { - if (block == known_blk) { - /* ok, we have found it: known_block dominates new_block as expected */ - return; - } - if (block == mbh) { - /* - * We have reached the MacroBlock header NOT founding - * the known_block. new_block must dominate known_block. - * Update known_irn. - */ - set_irn_n(known_irn, -1, new_block); - return; - } - assert(get_Block_n_cfgpreds(block) == 1); - block = get_Block_cfgpred_block(block, 0); - } -} /* update_value_table */ - /* * Return the canonical node computing the same value as n. * Looks up the node in a hash table, enters it in the table * if it isn't there yet. * - * @param value_table the HashSet containing all nodes in the - * current IR graph * @param n the node to look up * * @return a node that computes the same value as n or n if no such * node could be found */ -ir_node *identify_remember(pset *value_table, ir_node *n) +ir_node *identify_remember(ir_node *n) { - ir_node *nn = NULL; + ir_graph *irg = get_irn_irg(n); + pset *value_table = irg->value_table; + ir_node *nn; - if (!value_table) return n; + if (value_table == NULL) + return n; ir_normalize_node(n); /* lookup or insert in hash table with given hash key. */ - nn = pset_insert(value_table, n, ir_node_hash(n)); + nn = (ir_node*)pset_insert(value_table, n, ir_node_hash(n)); if (nn != n) { - update_known_irn(nn, n); - /* n is reachable again */ - edges_node_revival(nn, get_irn_irg(nn)); + edges_node_revival(nn); } return nn; } /* identify_remember */ /** - * During construction we set the op_pin_state_pinned flag in the graph right when the - * optimization is performed. The flag turning on procedure global cse could - * be changed between two allocations. This way we are safe. + * During construction we set the op_pin_state_pinned flag in the graph right + * when the optimization is performed. The flag turning on procedure global + * cse could be changed between two allocations. This way we are safe. * - * @param value_table The value table * @param n The node to lookup */ -static inline ir_node *identify_cons(pset *value_table, ir_node *n) +static inline ir_node *identify_cons(ir_node *n) { ir_node *old = n; - n = identify_remember(value_table, n); - if (n != old && get_irn_MacroBlock(old) != get_irn_MacroBlock(n)) - set_irg_pinned(current_ir_graph, op_pin_state_floats); + n = identify_remember(n); + if (n != old && get_nodes_block(old) != get_nodes_block(n)) { + ir_graph *irg = get_irn_irg(n); + set_irg_pinned(irg, op_pin_state_floats); + } return n; } /* identify_cons */ /* Add a node to the identities value table. */ -void add_identities(pset *value_table, ir_node *node) +void add_identities(ir_node *node) { - if (get_opt_cse() && is_no_Block(node)) - identify_remember(value_table, node); -} /* add_identities */ + if (!get_opt_cse()) + return; + if (is_Block(node)) + return; + + identify_remember(node); +} /* Visit each node in the value table of a graph. */ void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) { - ir_node *node; + ir_node *node; ir_graph *rem = current_ir_graph; current_ir_graph = irg; - foreach_pset(irg->value_table, node) + foreach_pset(irg->value_table, ir_node*, node) { visit(node, env); + } current_ir_graph = rem; } /* visit_all_identities */ @@ -6618,7 +6294,8 @@ static ir_node *gigo(ir_node *node) /* remove garbage blocks by looking at control flow that leaves the block and replacing the control flow by Bad. */ if (get_irn_mode(node) == mode_X) { - ir_node *block = get_nodes_block(skip_Proj(node)); + ir_node *block = get_nodes_block(skip_Proj(node)); + ir_graph *irg = get_irn_irg(block); /* Don't optimize nodes in immature blocks. */ if (!get_Block_matured(block)) @@ -6629,7 +6306,7 @@ static ir_node *gigo(ir_node *node) if (is_Block(block)) { if (is_Block_dead(block)) { /* control flow from dead block is dead */ - return new_Bad(); + return get_irg_bad(irg); } for (i = get_irn_arity(block) - 1; i >= 0; --i) { @@ -6648,7 +6325,7 @@ static ir_node *gigo(ir_node *node) * but can be found by irg_walk()! */ set_Block_dead(block); - return new_Bad(); + return get_irg_bad(irg); } } } @@ -6656,7 +6333,8 @@ static ir_node *gigo(ir_node *node) /* Blocks, Phis and Tuples may have dead inputs, e.g., if one of the blocks predecessors is dead. */ - if (op != op_Block && op != op_Phi && op != op_Tuple) { + if (op != op_Block && op != op_Phi && op != op_Tuple && op != op_Anchor) { + ir_graph *irg = get_irn_irg(node); irn_arity = get_irn_arity(node); /* @@ -6664,21 +6342,21 @@ static ir_node *gigo(ir_node *node) */ if (is_irn_pinned_in_irg(node) && is_Block_dead(get_nodes_block(skip_Proj(node)))) - return new_Bad(); + return get_irg_bad(irg); for (i = 0; i < irn_arity; i++) { ir_node *pred = get_irn_n(node, i); if (is_Bad(pred)) - return new_Bad(); + return get_irg_bad(irg); #if 0 /* Propagating Unknowns here seems to be a bad idea, because sometimes we need a node as a input and did not want that - it kills it's user. + it kills its user. However, it might be useful to move this into a later phase (if you think that optimizing such code is useful). */ if (is_Unknown(pred) && mode_is_data(get_irn_mode(node))) - return new_Unknown(get_irn_mode(node)); + return new_r_Unknown(irg, get_irn_mode(node)); #endif } } @@ -6692,7 +6370,7 @@ static ir_node *gigo(ir_node *node) for (i = 0; i < irn_arity; i++) { if (!is_Bad(get_irn_n(node, i))) break; } - if (i == irn_arity) node = new_Bad(); + if (i == irn_arity) node = get_irg_bad(irg); } #endif return node; @@ -6704,47 +6382,44 @@ static ir_node *gigo(ir_node *node) * reference this one, i.e., right after construction of a node. * * @param n The node to optimize - * - * current_ir_graph must be set to the graph of the node! */ ir_node *optimize_node(ir_node *n) { - tarval *tv; - ir_node *oldn = n; - ir_opcode iro = get_irn_opcode(n); + ir_node *oldn = n; + ir_graph *irg = get_irn_irg(n); + unsigned iro = get_irn_opcode(n); + ir_tarval *tv; /* Always optimize Phi nodes: part of the construction. */ if ((!get_opt_optimize()) && (iro != iro_Phi)) return n; + /* Remove nodes with dead (Bad) input. + Run always for transformation induced Bads. */ + n = gigo(n); + if (n != oldn) { + edges_node_deleted(oldn); + + /* We found an existing, better node, so we can deallocate the old node. */ + irg_kill_node(irg, oldn); + return n; + } + /* constant expression evaluation / constant folding */ if (get_opt_constant_folding()) { /* neither constants nor Tuple values can be evaluated */ if (iro != iro_Const && (get_irn_mode(n) != mode_T)) { - unsigned fp_model = get_irg_fp_model(current_ir_graph); - int old_fp_mode = tarval_fp_ops_enabled(); - - tarval_enable_fp_ops(! (fp_model & fp_no_float_fold)); - /* try to evaluate */ tv = computed_value(n); if (tv != tarval_bad) { ir_node *nw; - ir_type *old_tp = get_irn_type(n); - int i, arity = get_irn_arity(n); - int node_size; + size_t node_size; /* - * Try to recover the type of the new expression. - */ - for (i = 0; i < arity && !old_tp; ++i) - old_tp = get_irn_type(get_irn_n(n, i)); - - /* - * we MUST copy the node here temporary, because it's still needed - * for DBG_OPT_CSTEVAL + * we MUST copy the node here temporarily, because it's still + * needed for DBG_OPT_CSTEVAL */ node_size = offsetof(ir_node, attr) + n->op->attr_size; - oldn = alloca(node_size); + oldn = (ir_node*)alloca(node_size); memcpy(oldn, n, node_size); CLONE_ARR_A(ir_node *, oldn->in, n->in); @@ -6753,19 +6428,15 @@ ir_node *optimize_node(ir_node *n) memcpy(oldn->in, n->in, ARR_LEN(n->in) * sizeof(n->in[0])); /* note the inplace edges module */ - edges_node_deleted(n, current_ir_graph); + edges_node_deleted(n); /* evaluation was successful -- replace the node. */ - irg_kill_node(current_ir_graph, n); - nw = new_Const(tv); + irg_kill_node(irg, n); + nw = new_r_Const(irg, tv); - if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv)) - set_Const_type(nw, old_tp); DBG_OPT_CSTEVAL(oldn, nw); - tarval_enable_fp_ops(old_fp_mode); return nw; } - tarval_enable_fp_ops(old_fp_mode); } } @@ -6785,13 +6456,13 @@ ir_node *optimize_node(ir_node *n) * subexpressions within a block. */ if (get_opt_cse()) - n = identify_cons(current_ir_graph->value_table, n); + n = identify_cons(n); if (n != oldn) { - edges_node_deleted(oldn, current_ir_graph); + edges_node_deleted(oldn); /* We found an existing, better node, so we can deallocate the old node. */ - irg_kill_node(current_ir_graph, oldn); + irg_kill_node(irg, oldn); return n; } @@ -6803,14 +6474,10 @@ ir_node *optimize_node(ir_node *n) (iro == iro_Proj)) /* Flags tested local. */ n = transform_node(n); - /* Remove nodes with dead (Bad) input. - Run always for transformation induced Bads. */ - n = gigo(n); - /* Now we have a legal, useful node. Enter it in hash table for CSE */ if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) { ir_node *o = n; - n = identify_remember(current_ir_graph->value_table, o); + n = identify_remember(o); if (o != n) DBG_OPT_CSE(o, n); } @@ -6826,43 +6493,36 @@ ir_node *optimize_node(ir_node *n) */ ir_node *optimize_in_place_2(ir_node *n) { - tarval *tv; - ir_node *oldn = n; - ir_opcode iro = get_irn_opcode(n); + ir_tarval *tv; + ir_node *oldn = n; + unsigned iro = get_irn_opcode(n); if (!get_opt_optimize() && !is_Phi(n)) return n; + if (iro == iro_Deleted) + return n; + + /* Remove nodes with dead (Bad) input. + Run always for transformation induced Bads. */ + n = gigo(n); + if (is_Bad(n)) + return n; + /* constant expression evaluation / constant folding */ if (get_opt_constant_folding()) { /* neither constants nor Tuple values can be evaluated */ if (iro != iro_Const && get_irn_mode(n) != mode_T) { - unsigned fp_model = get_irg_fp_model(current_ir_graph); - int old_fp_mode = tarval_fp_ops_enabled(); - - tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0); /* try to evaluate */ tv = computed_value(n); if (tv != tarval_bad) { /* evaluation was successful -- replace the node. */ - ir_type *old_tp = get_irn_type(n); - int i, arity = get_irn_arity(n); + ir_graph *irg = get_irn_irg(n); - /* - * Try to recover the type of the new expression. - */ - for (i = 0; i < arity && !old_tp; ++i) - old_tp = get_irn_type(get_irn_n(n, i)); - - n = new_Const(tv); - - if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv)) - set_Const_type(n, old_tp); + n = new_r_Const(irg, tv); DBG_OPT_CSTEVAL(oldn, n); - tarval_enable_fp_ops(old_fp_mode); return n; } - tarval_enable_fp_ops(old_fp_mode); } } @@ -6881,7 +6541,7 @@ ir_node *optimize_in_place_2(ir_node *n) subexpressions within a block. */ if (get_opt_cse()) { ir_node *o = n; - n = identify_remember(current_ir_graph->value_table, o); + n = identify_remember(o); if (o != n) DBG_OPT_CSE(o, n); } @@ -6893,19 +6553,15 @@ ir_node *optimize_in_place_2(ir_node *n) (iro == iro_Proj)) /* Flags tested local. */ n = transform_node(n); - /* Remove nodes with dead (Bad) input. - Run always for transformation induced Bads. */ - n = gigo(n); - /* Now we can verify the node, as it has no dead inputs any more. */ - irn_vrfy(n); + irn_verify(n); /* Now we have a legal, useful node. Enter it in hash table for cse. Blocks should be unique anyways. (Except the successor of start: is cse with the start block!) */ if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) { ir_node *o = n; - n = identify_remember(current_ir_graph->value_table, o); + n = identify_remember(o); if (o != n) DBG_OPT_CSE(o, n); } @@ -6918,17 +6574,18 @@ ir_node *optimize_in_place_2(ir_node *n) */ ir_node *optimize_in_place(ir_node *n) { + ir_graph *irg = get_irn_irg(n); /* Handle graph state */ - assert(get_irg_phase_state(current_ir_graph) != phase_building); + assert(get_irg_phase_state(irg) != phase_building); if (get_opt_global_cse()) - set_irg_pinned(current_ir_graph, op_pin_state_floats); - if (get_irg_outs_state(current_ir_graph) == outs_consistent) - set_irg_outs_inconsistent(current_ir_graph); + set_irg_pinned(irg, op_pin_state_floats); + if (get_irg_outs_state(irg) == outs_consistent) + set_irg_outs_inconsistent(irg); /* FIXME: Maybe we could also test whether optimizing the node can change the control graph. */ - set_irg_doms_inconsistent(current_ir_graph); + set_irg_doms_inconsistent(irg); return optimize_in_place_2(n); } /* optimize_in_place */ @@ -7000,7 +6657,6 @@ ir_op_ops *firm_set_default_operations(ir_opcode code, ir_op_ops *ops) ops = firm_set_default_equivalent_node(code, ops); ops = firm_set_default_transform_node(code, ops); ops = firm_set_default_node_cmp_attr(code, ops); - ops = firm_set_default_get_type(code, ops); ops = firm_set_default_get_type_attr(code, ops); ops = firm_set_default_get_entity_attr(code, ops);