X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=518b90303d6629a3a7e93e22836da0c5f616a840;hb=867b8434caf83434a02a63a18a83016675e130b6;hp=824181077dc6ff56f33bdbe18adf38abccc01ed1;hpb=57298884a0b02e67f3f3e31636ca3382b74abef8;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index 824181077..518b90303 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -48,7 +48,7 @@ #include "opt_confirms.h" #include "opt_polymorphy.h" #include "irtools.h" -#include "xmalloc.h" +#include "array_t.h" /* Make types visible to allow most efficient access */ #include "entity_t.h" @@ -65,6 +65,7 @@ static tarval *default_value_of(const ir_node *n) { value_of_func value_of_ptr = default_value_of; +/* * Set a new value_of function. */ void set_value_of_func(value_of_func func) { if (func != NULL) value_of_ptr = func; @@ -75,14 +76,14 @@ void set_value_of_func(value_of_func func) { /** * Return the value of a Constant. */ -static tarval *computed_value_Const(ir_node *n) { +static tarval *computed_value_Const(const ir_node *n) { return get_Const_tarval(n); } /* computed_value_Const */ /** * Return the value of a 'sizeof', 'alignof' or 'offsetof' SymConst. */ -static tarval *computed_value_SymConst(ir_node *n) { +static tarval *computed_value_SymConst(const ir_node *n) { ir_type *type; ir_entity *ent; @@ -112,14 +113,14 @@ static tarval *computed_value_SymConst(ir_node *n) { /** * Return the value of an Add. */ -static tarval *computed_value_Add(ir_node *n) { +static 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); - if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) + if ((ta != tarval_bad) && (tb != tarval_bad)) return tarval_add(ta, tb); return tarval_bad; @@ -129,21 +130,22 @@ static tarval *computed_value_Add(ir_node *n) { * Return the value of a Sub. * Special case: a - a */ -static tarval *computed_value_Sub(ir_node *n) { - ir_node *a = get_Sub_left(n); - ir_node *b = get_Sub_right(n); - tarval *ta; - tarval *tb; +static 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; /* a - a */ if (a == b && !is_Bad(a)) - return get_mode_null(get_irn_mode(n)); + return get_mode_null(mode); ta = value_of(a); tb = value_of(b); - if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) - return tarval_sub(ta, tb); + if ((ta != tarval_bad) && (tb != tarval_bad)) + return tarval_sub(ta, tb, mode); return tarval_bad; } /* computed_value_Sub */ @@ -152,7 +154,7 @@ static tarval *computed_value_Sub(ir_node *n) { * Return the value of a Carry. * Special : a op 0, 0 op b */ -static tarval *computed_value_Carry(ir_node *n) { +static 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); @@ -174,7 +176,7 @@ static tarval *computed_value_Carry(ir_node *n) { * Return the value of a Borrow. * Special : a op 0 */ -static tarval *computed_value_Borrow(ir_node *n) { +static 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); @@ -193,7 +195,7 @@ static tarval *computed_value_Borrow(ir_node *n) { /** * Return the value of an unary Minus. */ -static tarval *computed_value_Minus(ir_node *n) { +static tarval *computed_value_Minus(const ir_node *n) { ir_node *a = get_Minus_op(n); tarval *ta = value_of(a); @@ -206,7 +208,7 @@ static tarval *computed_value_Minus(ir_node *n) { /** * Return the value of a Mul. */ -static tarval *computed_value_Mul(ir_node *n) { +static 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; @@ -233,78 +235,10 @@ static tarval *computed_value_Mul(ir_node *n) { return tarval_bad; } /* computed_value_Mul */ -/** - * Return the value of a floating point Quot. - */ -static tarval *computed_value_Quot(ir_node *n) { - ir_node *a = get_Quot_left(n); - ir_node *b = get_Quot_right(n); - - tarval *ta = value_of(a); - tarval *tb = value_of(b); - - /* This was missing in original implementation. Why? */ - if ((ta != tarval_bad) && (tb != tarval_bad) && (get_irn_mode(a) == get_irn_mode(b))) { - if (tb != get_mode_null(get_tarval_mode(tb))) /* div by zero: return tarval_bad */ - return tarval_quo(ta, tb); - } - return tarval_bad; -} /* computed_value_Quot */ - -/** - * Calculate the value of an integer Div of two nodes. - * Special case: 0 / b - */ -static tarval *do_computed_value_Div(ir_node *a, ir_node *b) { - tarval *ta = value_of(a); - tarval *tb = value_of(b); - - /* Compute c1 / c2 or 0 / a, a != 0 */ - if (ta != tarval_bad) { - if ((tb != tarval_bad) && (tb != get_mode_null(get_irn_mode(b)))) /* div by zero: return tarval_bad */ - return tarval_div(ta, tb); - else if (ta == get_mode_null(get_tarval_mode(ta))) /* 0 / b == 0 */ - return ta; - } - return tarval_bad; -} /* do_computed_value_Div */ - -/** - * Return the value of an integer Div. - */ -static tarval *computed_value_Div(ir_node *n) { - return do_computed_value_Div(get_Div_left(n), get_Div_right(n)); -} /* computed_value_Div */ - -/** - * Calculate the value of an integer Mod of two nodes. - * Special case: a % 1 - */ -static tarval *do_computed_value_Mod(ir_node *a, ir_node *b) { - tarval *ta = value_of(a); - tarval *tb = value_of(b); - - /* Compute c1 % c2 or a % 1 */ - if (tb != tarval_bad) { - if ((ta != tarval_bad) && (tb != get_mode_null(get_tarval_mode(tb)))) /* div by zero: return tarval_bad */ - return tarval_mod(ta, tb); - else if (tb == get_mode_one(get_tarval_mode(tb))) /* x mod 1 == 0 */ - return get_mode_null(get_irn_mode(a)); - } - return tarval_bad; -} /* do_computed_value_Mod */ - -/** - * Return the value of an integer Mod. - */ -static tarval *computed_value_Mod(ir_node *n) { - return do_computed_value_Mod(get_Mod_left(n), get_Mod_right(n)); -} /* computed_value_Mod */ - /** * Return the value of an Abs. */ -static tarval *computed_value_Abs(ir_node *n) { +static tarval *computed_value_Abs(const ir_node *n) { ir_node *a = get_Abs_op(n); tarval *ta = value_of(a); @@ -318,7 +252,7 @@ static tarval *computed_value_Abs(ir_node *n) { * Return the value of an And. * Special case: a & 0, 0 & b */ -static tarval *computed_value_And(ir_node *n) { +static tarval *computed_value_And(const ir_node *n) { ir_node *a = get_And_left(n); ir_node *b = get_And_right(n); @@ -338,7 +272,7 @@ static tarval *computed_value_And(ir_node *n) { * Return the value of an Or. * Special case: a | 1...1, 1...1 | b */ -static tarval *computed_value_Or(ir_node *n) { +static tarval *computed_value_Or(const ir_node *n) { ir_node *a = get_Or_left(n); ir_node *b = get_Or_right(n); @@ -357,7 +291,7 @@ static tarval *computed_value_Or(ir_node *n) { /** * Return the value of an Eor. */ -static tarval *computed_value_Eor(ir_node *n) { +static tarval *computed_value_Eor(const ir_node *n) { ir_node *a = get_Eor_left(n); ir_node *b = get_Eor_right(n); @@ -378,7 +312,7 @@ static tarval *computed_value_Eor(ir_node *n) { /** * Return the value of a Not. */ -static tarval *computed_value_Not(ir_node *n) { +static tarval *computed_value_Not(const ir_node *n) { ir_node *a = get_Not_op(n); tarval *ta = value_of(a); @@ -391,7 +325,7 @@ static tarval *computed_value_Not(ir_node *n) { /** * Return the value of a Shl. */ -static tarval *computed_value_Shl(ir_node *n) { +static tarval *computed_value_Shl(const ir_node *n) { ir_node *a = get_Shl_left(n); ir_node *b = get_Shl_right(n); @@ -407,7 +341,7 @@ static tarval *computed_value_Shl(ir_node *n) { /** * Return the value of a Shr. */ -static tarval *computed_value_Shr(ir_node *n) { +static tarval *computed_value_Shr(const ir_node *n) { ir_node *a = get_Shr_left(n); ir_node *b = get_Shr_right(n); @@ -423,7 +357,7 @@ static tarval *computed_value_Shr(ir_node *n) { /** * Return the value of a Shrs. */ -static tarval *computed_value_Shrs(ir_node *n) { +static tarval *computed_value_Shrs(const ir_node *n) { ir_node *a = get_Shrs_left(n); ir_node *b = get_Shrs_right(n); @@ -439,7 +373,7 @@ static tarval *computed_value_Shrs(ir_node *n) { /** * Return the value of a Rotl. */ -static tarval *computed_value_Rotl(ir_node *n) { +static tarval *computed_value_Rotl(const ir_node *n) { ir_node *a = get_Rotl_left(n); ir_node *b = get_Rotl_right(n); @@ -455,7 +389,7 @@ static tarval *computed_value_Rotl(ir_node *n) { /** * Return the value of a Conv. */ -static tarval *computed_value_Conv(ir_node *n) { +static tarval *computed_value_Conv(const ir_node *n) { ir_node *a = get_Conv_op(n); tarval *ta = value_of(a); @@ -465,6 +399,45 @@ static tarval *computed_value_Conv(ir_node *n) { return tarval_bad; } /* computed_value_Conv */ +/** + * 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) { + ir_node *sel = get_Mux_sel(n); + tarval *ts = value_of(sel); + + if (ts == get_tarval_b_true()) { + ir_node *v = get_Mux_true(n); + return value_of(v); + } + else if (ts == get_tarval_b_false()) { + ir_node *v = get_Mux_false(n); + return value_of(v); + } + return tarval_bad; +} /* computed_value_Mux */ + +/** + * 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) { + /* + * Beware: we might produce Phi(Confirm(x == true), Confirm(x == false)). + * Do NOT optimize them away (CondEval 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; + } + } + return value_of(get_Confirm_value(n)); +} /* computed_value_Confirm */ + /** * Return the value of a Proj(Cmp). * @@ -474,7 +447,7 @@ static tarval *computed_value_Conv(ir_node *n) { * only 1 is used. * There are several case where we can evaluate a Cmp node, see later. */ -static tarval *computed_value_Proj_Cmp(ir_node *n) { +static tarval *computed_value_Proj_Cmp(const ir_node *n) { ir_node *a = get_Proj_pred(n); ir_node *aa = get_Cmp_left(a); ir_node *ab = get_Cmp_right(a); @@ -549,124 +522,147 @@ static tarval *computed_value_Proj_Cmp(ir_node *n) { * the Cmp result. */ else { - ir_node *aaa = skip_Id(skip_Proj(aa)); - ir_node *aba = skip_Id(skip_Proj(ab)); + ir_node *aaa = skip_Proj(aa); + ir_node *aba = skip_Proj(ab); if ( ( (/* aa is ProjP and aaa is Alloc */ is_Proj(aa) && mode_is_reference(get_irn_mode(aa)) && is_Alloc(aaa)) && ( (/* ab is NULL */ - is_Const(ab) - && mode_is_reference(get_irn_mode(ab)) - && is_Const_null(ab)) + mode_is_reference(get_irn_mode(ab)) + && tarval_is_null(tab)) || (/* ab is other Alloc */ is_Proj(ab) && mode_is_reference(get_irn_mode(ab)) && is_Alloc(aba) && (aaa != aba)))) || (/* aa is NULL and aba is Alloc */ - is_Const(aa) - && mode_is_reference(get_irn_mode(aa)) - && is_Const_null(aa) + mode_is_reference(get_irn_mode(aa)) + && tarval_is_null(taa) && is_Proj(ab) && mode_is_reference(get_irn_mode(ab)) && is_Alloc(aba))) /* 3.: */ - return new_tarval_from_long(proj_nr & pn_Cmp_Ne, mode_b); + return new_tarval_from_long(proj_nr & pn_Cmp_Lg, mode_b); } } return computed_value_Cmp_Confirm(a, aa, ab, proj_nr); } /* computed_value_Proj_Cmp */ /** - * Return the value of a Proj, handle Proj(Cmp), Proj(Div), Proj(Mod), - * Proj(DivMod) and Proj(Quot). + * Return the value of a floating point Quot. */ -static tarval *computed_value_Proj(ir_node *n) { - ir_node *a = get_Proj_pred(n); - long proj_nr; +static tarval *do_computed_value_Quot(const ir_node *a, const ir_node *b) { + tarval *ta = value_of(a); + tarval *tb = value_of(b); - switch (get_irn_opcode(a)) { - case iro_Cmp: - return computed_value_Proj_Cmp(n); - - case iro_DivMod: - /* compute either the Div or the Mod part */ - proj_nr = get_Proj_proj(n); - if (proj_nr == pn_DivMod_res_div) - return do_computed_value_Div(get_DivMod_left(a), get_DivMod_right(a)); - else if (proj_nr == pn_DivMod_res_mod) - return do_computed_value_Mod(get_DivMod_left(a), get_DivMod_right(a)); - break; + /* 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 */ - case iro_Div: - if (get_Proj_proj(n) == pn_Div_res) - return computed_value(a); - break; +/** + * Calculate the value of an integer Div of two nodes. + * Special case: 0 / b + */ +static tarval *do_computed_value_Div(const ir_node *a, const ir_node *b) { + tarval *ta = value_of(a); + tarval *tb; + const ir_node *dummy; - case iro_Mod: - if (get_Proj_proj(n) == pn_Mod_res) - return computed_value(a); - break; + /* Compute c1 / c2 or 0 / a, a != 0 */ + if (tarval_is_null(ta) && value_not_zero(b, &dummy)) + return ta; /* 0 / b == 0 */ + tb = value_of(b); + if (ta != tarval_bad && tb != tarval_bad) + return tarval_div(ta, tb); + return tarval_bad; +} /* do_computed_value_Div */ - case iro_Quot: - if (get_Proj_proj(n) == pn_Quot_res) - return computed_value(a); - break; +/** + * 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) { + tarval *ta = value_of(a); + tarval *tb = value_of(b); - default: - return tarval_bad; - } + /* Compute a % 1 or c1 % c2 */ + if (tarval_is_one(tb)) + return get_mode_null(get_irn_mode(a)); + if (ta != tarval_bad && tb != tarval_bad) + return tarval_mod(ta, tb); return tarval_bad; -} /* computed_value_Proj */ +} /* do_computed_value_Mod */ /** - * Calculate the value of a Mux: can be evaluated, if the - * sel and the right input are known. + * Return the value of a Proj(DivMod). */ -static tarval *computed_value_Mux(ir_node *n) { - ir_node *sel = get_Mux_sel(n); - tarval *ts = value_of(sel); +static tarval *computed_value_Proj_DivMod(const ir_node *n) { + long proj_nr = get_Proj_proj(n); - if (ts == get_tarval_b_true()) { - ir_node *v = get_Mux_true(n); - return value_of(v); + /* 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)); } - else if (ts == get_tarval_b_false()) { - ir_node *v = get_Mux_false(n); - return value_of(v); + return tarval_bad; +} /* computed_value_Proj_DivMod */ + +/** + * Return the value of a Proj(Div). + */ +static tarval *computed_value_Proj_Div(const ir_node *n) { + long proj_nr = get_Proj_proj(n); + + 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; -} /* computed_value_Mux */ +} /* computed_value_Proj_Div */ /** - * Calculate the value of a Psi: can be evaluated, if a condition is true - * and all previous conditions are false. If all conditions are false - * we evaluate to the default one. + * Return the value of a Proj(Mod). */ -static tarval *computed_value_Psi(ir_node *n) { - if (is_Mux(n)) - return computed_value_Mux(n); +static 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)); + } return tarval_bad; -} /* computed_value_Psi */ +} /* computed_value_Proj_Mod */ /** - * Calculate the value of a Confirm: can be evaluated, - * if it has the form Confirm(x, '=', Const). + * Return the value of a Proj(Quot). */ -static tarval *computed_value_Confirm(ir_node *n) { - /* - * Beware: we might produce Phi(Confirm(x == true), Confirm(x == false)). - * Do NOT optimize them away (CondEval wants them), so wait until - * remove_confirm is activated. - */ - if (get_opt_remove_confirm()) { - return get_Confirm_cmp(n) == pn_Cmp_Eq ? - value_of(get_Confirm_bound(n)) : tarval_bad; +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_Confirm */ +} /* computed_value_Proj_Quot */ + +/** + * Return the value of a Proj. + */ +static tarval *computed_value_Proj(const ir_node *proj) { + ir_node *n = get_Proj_pred(proj); + + if (n->op->ops.computed_value_Proj != NULL) + return n->op->ops.computed_value_Proj(proj); + return tarval_bad; +} /* computed_value_Proj */ /** * If the parameter n can be computed, return its value, else tarval_bad. @@ -674,7 +670,7 @@ static tarval *computed_value_Confirm(ir_node *n) { * * @param n The node this should be evaluated */ -tarval *computed_value(ir_node *n) { +tarval *computed_value(const ir_node *n) { if (n->op->ops.computed_value) return n->op->ops.computed_value(n); return tarval_bad; @@ -691,9 +687,13 @@ tarval *computed_value(ir_node *n) { */ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops) { -#define CASE(a) \ - case iro_##a: \ - ops->computed_value = computed_value_##a; \ +#define CASE(a) \ + case iro_##a: \ + ops->computed_value = computed_value_##a; \ + break +#define CASE_PROJ(a) \ + case iro_##a: \ + ops->computed_value_Proj = computed_value_Proj_##a; \ break switch (code) { @@ -701,11 +701,10 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops CASE(SymConst); CASE(Add); CASE(Sub); + CASE(Carry); + CASE(Borrow); CASE(Minus); CASE(Mul); - CASE(Quot); - CASE(Div); - CASE(Mod); CASE(Abs); CASE(And); CASE(Or); @@ -715,18 +714,21 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops CASE(Shr); CASE(Shrs); CASE(Rotl); - CASE(Carry); - CASE(Borrow); CASE(Conv); - CASE(Proj); CASE(Mux); - CASE(Psi); CASE(Confirm); + CASE_PROJ(Cmp); + CASE_PROJ(DivMod); + CASE_PROJ(Div); + CASE_PROJ(Mod); + CASE_PROJ(Quot); + CASE(Proj); default: /* leave NULL */; } return ops; +#undef CASE_PROJ #undef CASE } /* firm_set_default_computed_value */ @@ -767,22 +769,26 @@ static ir_node *equivalent_node_Block(ir_node *n) This should be true, as the block is matured before optimize is called. But what about Phi-cycles with the Phi0/Id that could not be resolved? Remaining Phi nodes are just Ids. */ - if (n_preds == 1 && is_Jmp(get_Block_cfgpred(n, 0))) { - ir_node *predblock = get_nodes_block(get_Block_cfgpred(n, 0)); - if (predblock == oldn) { - /* 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()) { - n = predblock; - DBG_OPT_STG(oldn, n); - } - } else if (n_preds == 1 && is_Cond(skip_Proj(get_Block_cfgpred(n, 0)))) { - ir_node *predblock = get_Block_cfgpred_block(n, 0); - if (predblock == oldn) { - /* Jmp jumps into the block it is in -- deal self cycle. */ - n = set_Block_dead(n); - DBG_OPT_DEAD_BLOCK(oldn, n); + if (n_preds == 1) { + ir_node *pred = skip_Proj(get_Block_cfgpred(n, 0)); + + if (is_Jmp(pred)) { + ir_node *predblock = get_nodes_block(pred); + if (predblock == oldn) { + /* 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()) { + n = predblock; + DBG_OPT_STG(oldn, n); + } + } else if (is_Cond(pred)) { + ir_node *predblock = get_nodes_block(pred); + if (predblock == oldn) { + /* Jmp jumps into the block it is in -- deal self cycle. */ + n = set_Block_dead(n); + DBG_OPT_DEAD_BLOCK(oldn, n); + } } } else if ((n_preds == 2) && (get_opt_control_flow_weak_simplification())) { @@ -793,15 +799,16 @@ static ir_node *equivalent_node_Block(ir_node *n) ir_node *a = get_Block_cfgpred(n, 0); ir_node *b = get_Block_cfgpred(n, 1); - if (is_Proj(a) && - is_Proj(b) && - (get_Proj_pred(a) == get_Proj_pred(b)) && - is_Cond(get_Proj_pred(a)) && - (get_irn_mode(get_Cond_selector(get_Proj_pred(a))) == mode_b)) { - /* Also a single entry Block following a single exit Block. Phis have - twice the same operand and will be optimized away. */ - n = get_nodes_block(get_Proj_pred(a)); - DBG_OPT_IFSIM1(oldn, a, b, n); + if (is_Proj(a) && is_Proj(b)) { + ir_node *cond = get_Proj_pred(a); + + if (cond == get_Proj_pred(b) && is_Cond(cond) && + get_irn_mode(get_Cond_selector(cond)) == mode_b) { + /* Also a single entry Block following a single exit Block. Phis have + twice the same operand and will be optimized away. */ + n = get_nodes_block(cond); + DBG_OPT_IFSIM1(oldn, a, b, n); + } } } else if (get_opt_unreachable_code() && (n != get_irg_start_block(current_ir_graph)) && @@ -839,10 +846,13 @@ static ir_node *equivalent_node_Block(ir_node *n) * Of course this only happens if the Block of the Jmp is dead. */ static ir_node *equivalent_node_Jmp(ir_node *n) { - /* unreachable code elimination */ - if (is_Block_dead(get_nodes_block(n))) - n = new_Bad(); + ir_node *oldn = n; + /* unreachable code elimination */ + if (is_Block_dead(get_nodes_block(n))) { + n = get_irg_bad(current_ir_graph); + DBG_OPT_DEAD_BLOCK(oldn, n); + } return n; } /* equivalent_node_Jmp */ @@ -857,8 +867,7 @@ static ir_node *equivalent_node_Jmp(ir_node *n) { * Optimize operations that are commutative and have neutral 0, * so a op 0 = 0 op a = a. */ -static ir_node *equivalent_node_neutral_zero(ir_node *n) -{ +static ir_node *equivalent_node_neutral_zero(ir_node *n) { ir_node *oldn = n; ir_node *a = get_binop_left(n); @@ -895,8 +904,7 @@ static ir_node *equivalent_node_neutral_zero(ir_node *n) /** * Eor is commutative and has neutral 0. */ -static ir_node *equivalent_node_Eor(ir_node *n) -{ +static ir_node *equivalent_node_Eor(ir_node *n) { ir_node *oldn = n; ir_node *a; ir_node *b; @@ -939,7 +947,6 @@ static ir_node *equivalent_node_Eor(ir_node *n) return n; } } - return n; } @@ -1000,10 +1007,11 @@ static ir_node *equivalent_node_Add(ir_node *n) { 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); + ir_node *a = get_binop_left(n); + ir_node *b = get_binop_right(n); + tarval *tb = value_of(b); - if (is_Const(b) && is_Const_null(b)) { + if (tarval_is_null(tb)) { n = a; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_0); @@ -1029,15 +1037,17 @@ 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; /* 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; - b = get_Sub_right(n); + b = get_Sub_right(n); + tb = value_of(b); /* Beware: modes might be different */ - if (is_Const(b) && is_Const_null(b)) { + if (tarval_is_null(tb)) { ir_node *a = get_Sub_left(n); if (mode == get_irn_mode(a)) { n = a; @@ -1086,85 +1096,27 @@ 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; - /* Mul is commutative and has again an other neutral element. */ - if (is_Const(a) && is_Const_one(a)) { - n = b; - DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1); - } else if (is_Const(b) && is_Const_one(b)) { + /* + * Mul is commutative and has again an other neutral element. + * Constants are place right, so check this case first. + */ + tv = value_of(b); + if (tarval_is_one(tv)) { n = a; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1); + } else { + tv = value_of(a); + if (tarval_is_one(tv)) { + n = b; + DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1); + } } } return n; } /* equivalent_node_Mul */ -/** - * Optimize a / 1 = a. - */ -static ir_node *equivalent_node_Div(ir_node *n) { - ir_node *a = get_Div_left(n); - ir_node *b = get_Div_right(n); - - /* Div is not commutative. */ - if (is_Const(b) && is_Const_one(b)) { /* div(x, 1) == x */ - /* Turn Div into a tuple (mem, bad, a) */ - ir_node *mem = get_Div_mem(n); - ir_node *blk = get_irn_n(n, -1); - 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(current_ir_graph, blk)); - set_Tuple_pred(n, pn_Div_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_Div_res, a); - } - return n; -} /* equivalent_node_Div */ - -/** - * Optimize a / 1.0 = a. - */ -static ir_node *equivalent_node_Quot(ir_node *n) { - ir_node *a = get_Quot_left(n); - ir_node *b = get_Quot_right(n); - - /* Div is not commutative. */ - if (is_Const(b) && is_Const_one(b)) { /* Quot(x, 1) == x */ - /* Turn Quot into a tuple (mem, jmp, bad, a) */ - ir_node *mem = get_Quot_mem(n); - ir_node *blk = get_irn_n(n, -1); - 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(current_ir_graph, blk)); - set_Tuple_pred(n, pn_Quot_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_Quot_res, a); - } - return n; -} /* equivalent_node_Quot */ - -/** - * Optimize a / 1 = a. - */ -static ir_node *equivalent_node_DivMod(ir_node *n) { - ir_node *b = get_DivMod_right(n); - - /* Div is not commutative. */ - if (is_Const(b) && is_Const_one(b)) { /* div(x, 1) == x */ - /* Turn DivMod into a tuple (mem, jmp, bad, a, 0) */ - ir_node *a = get_DivMod_left(n); - ir_node *mem = get_Div_mem(n); - ir_node *blk = get_irn_n(n, -1); - ir_mode *mode = get_DivMod_resmode(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(current_ir_graph, blk)); - set_Tuple_pred(n, pn_DivMod_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_DivMod_res_div, a); - set_Tuple_pred(n, pn_DivMod_res_mod, new_Const(mode, get_mode_null(mode))); - } - return n; -} /* equivalent_node_DivMod */ - /** * Use algebraic simplification a | a = a | 0 = 0 | a = a. */ @@ -1173,16 +1125,25 @@ static ir_node *equivalent_node_Or(ir_node *n) { ir_node *a = get_Or_left(n); ir_node *b = get_Or_right(n); + tarval *tv; if (a == b) { n = a; /* Or has it's own neutral element */ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_OR); - } else if (is_Const(a) && is_Const_null(a)) { - n = b; - DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR); - } else if (is_Const(b) && is_Const_null(b)) { + return n; + } + /* constants are cormalized to right, check this site first */ + tv = value_of(b); + if (tarval_is_null(tv)) { n = a; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR); + return n; + } + tv = value_of(a); + if (tarval_is_null(tv)) { + n = b; + DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_OR); + return n; } return n; @@ -1196,19 +1157,23 @@ static ir_node *equivalent_node_And(ir_node *n) { ir_node *a = get_And_left(n); ir_node *b = get_And_right(n); + tarval *tv; if (a == b) { n = a; /* And has it's own neutral element */ DBG_OPT_ALGSIM0(oldn, n, FS_OPT_AND); return n; } - if (is_Const(a) && is_Const_all_one(a)) { - n = b; + /* constants are cormalized to right, check this site first */ + tv = value_of(b); + if (tarval_is_all_one(tv)) { + n = a; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND); return n; } - if (is_Const(b) && is_Const_all_one(b)) { - n = a; + tv = value_of(a); + if (tarval_is_all_one(tv)) { + n = b; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_AND); return n; } @@ -1228,7 +1193,6 @@ static ir_node *equivalent_node_And(ir_node *n) { return n; } } - return n; } /* equivalent_node_And */ @@ -1255,17 +1219,18 @@ restart: goto restart; } /* else both are strict conv, second is superfluous */ - } else if (is_Proj(a)) { - ir_node *pred = get_Proj_pred(a); - if (is_Load(pred)) { - /* loads always return with the exact precision of n_mode */ - assert(get_Load_mode(pred) == n_mode); - return a; + } else { + if (is_Proj(a)) { + ir_node *pred = get_Proj_pred(a); + if (is_Load(pred)) { + /* loads always return with the exact precision of n_mode */ + assert(get_Load_mode(pred) == n_mode); + return a; + } } + /* leave strict floating point Conv's */ + return n; } - - /* leave strict floating point Conv's */ - return n; } n = a; DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV); @@ -1287,19 +1252,33 @@ restart: if (n_mode == mode_b) { n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */ DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV); + return n; } else if (get_mode_arithmetic(n_mode) == get_mode_arithmetic(a_mode)) { - if (smaller_mode(b_mode, a_mode)) { + if (values_in_mode(b_mode, a_mode)) { n = b; /* ConvS(ConvL(xxxS(...))) == xxxS(...) */ DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV); + return n; } } } + if (mode_is_int(n_mode) && get_mode_arithmetic(a_mode) == irma_ieee754) { + /* ConvI(ConvF(I)) -> I, iff float mantissa >= int mode */ + unsigned int_mantissa = get_mode_size_bits(n_mode) - (mode_is_signed(n_mode) ? 1 : 0); + unsigned float_mantissa = tarval_ieee754_get_mantissa_size(a_mode); + + if (float_mantissa >= int_mantissa) { + n = b; + DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV); + return n; + } + } if (is_Conv(b)) { if (smaller_mode(b_mode, a_mode)) { if (get_Conv_strict(n)) set_Conv_strict(b, 1); n = b; /* ConvA(ConvB(ConvA(...))) == ConvA(...) */ DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV); + return n; } } } @@ -1323,9 +1302,6 @@ static ir_node *equivalent_node_Cast(ir_node *n) { } /* equivalent_node_Cast */ /** - * Several optimizations: - * - no Phi in start block. - * - remove Id operators that are inputs to Phi * - fold Phi-nodes, iff they have only one predecessor except * themselves. */ @@ -1341,17 +1317,11 @@ static ir_node *equivalent_node_Phi(ir_node *n) { n_preds = get_Phi_n_preds(n); block = get_nodes_block(n); - if ((is_Block_dead(block)) || /* Control dead */ - (block == get_irg_start_block(current_ir_graph))) /* There should be no Phi nodes */ - return new_Bad(); /* in the Start Block. */ + if (is_Block_dead(block)) /* Control dead */ + return get_irg_bad(current_ir_graph); if (n_preds == 0) return n; /* Phi of dead Region without predecessors. */ - /* If the Block has a Bad pred, we also have one. */ - for (i = 0; i < n_preds; ++i) - if (is_Bad(get_Block_cfgpred(block, i))) - set_Phi_pred(n, i, new_Bad()); - /* Find first non-self-referencing input */ for (i = 0; i < n_preds; ++i) { first_val = get_Phi_pred(n, i); @@ -1365,7 +1335,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) { * This is not that bad as it sounds, optimize_cf() removes bad control flow * (and bad Phi predecessors), so live code is optimized later. */ - && (! is_Bad(first_val)) + && (! is_Bad(get_Block_cfgpred(block, i))) #endif ) { /* value not dead */ break; /* then found first value. */ @@ -1374,7 +1344,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) { if (i >= n_preds) { /* A totally Bad or self-referencing Phi (we didn't break the above loop) */ - return new_Bad(); + return get_irg_bad(current_ir_graph); } /* search for rest of inputs, determine if any of these @@ -1385,7 +1355,7 @@ static ir_node *equivalent_node_Phi(ir_node *n) { && (scnd_val != first_val) #if 0 /* see above */ - && (! is_Bad(scnd_val)) + && (! is_Bad(get_Block_cfgpred(block, i))) #endif ) { break; @@ -1402,7 +1372,6 @@ static ir_node *equivalent_node_Phi(ir_node *n) { /** * Several optimizations: - * - no Sync in start block. * - fold Sync-nodes, iff they have only one predecessor except * themselves. */ @@ -1435,72 +1404,262 @@ static ir_node *equivalent_node_Sync(ir_node *n) { } } - if (arity == 0) return new_Bad(); + if (arity == 0) return get_irg_bad(current_ir_graph); if (arity == 1) return get_Sync_pred(n, 0); return n; } /* equivalent_node_Sync */ /** - * Optimize Proj(Tuple) and gigo() for ProjX in Bad block, - * ProjX(Load) and ProjX(Store). + * Optimize Proj(Tuple). */ -static ir_node *equivalent_node_Proj(ir_node *proj) { +static ir_node *equivalent_node_Proj_Tuple(ir_node *proj) { + ir_node *oldn = proj; + ir_node *tuple = get_Proj_pred(proj); + + /* Remove the Tuple/Proj combination. */ + proj = get_Tuple_pred(tuple, get_Proj_proj(proj)); + DBG_OPT_TUPLE(oldn, tuple, proj); + + return proj; +} /* equivalent_node_Proj_Tuple */ + +/** + * Optimize a / 1 = a. + */ +static ir_node *equivalent_node_Proj_Div(ir_node *proj) { ir_node *oldn = proj; - ir_node *a = get_Proj_pred(proj); + ir_node *div = get_Proj_pred(proj); + ir_node *b = get_Div_right(div); + tarval *tb = value_of(b); - if (is_Tuple(a)) { - /* Remove the Tuple/Proj combination. */ - if ( get_Proj_proj(proj) <= get_Tuple_n_preds(a) ) { - proj = get_Tuple_pred(a, get_Proj_proj(proj)); - DBG_OPT_TUPLE(oldn, a, proj); - } else { - /* This should not happen! */ - assert(! "found a Proj with higher number than Tuple predecessors"); - proj = new_Bad(); + /* Div is not commutative. */ + if (tarval_is_one(tb)) { /* div(x, 1) == x */ + switch (get_Proj_proj(proj)) { + case pn_Div_M: + proj = get_Div_mem(div); + DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NEUTRAL_1); + return proj; + + case pn_Div_res: + proj = get_Div_left(div); + 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_Div() */ + return proj; } - } else if (get_irn_mode(proj) == mode_X) { - if (is_Block_dead(get_nodes_block(skip_Proj(proj)))) { - /* Remove dead control flow -- early gigo(). */ - proj = new_Bad(); - } else if (get_opt_ldst_only_null_ptr_exceptions()) { - if (is_Load(a)) { - /* get the Load address */ - ir_node *addr = get_Load_ptr(a); - ir_node *blk = get_irn_n(a, -1); - ir_node *confirm; - - if (value_not_null(addr, &confirm)) { - if (confirm == NULL) { - /* this node may float if it did not depend on a Confirm */ - set_irn_pinned(a, op_pin_state_floats); - } - if (get_Proj_proj(proj) == pn_Load_X_except) { - DBG_OPT_EXC_REM(proj); - return new_Bad(); - } else - return new_r_Jmp(current_ir_graph, blk); + } + 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. + */ +static ir_node *equivalent_node_Proj_CopyB(ir_node *proj) { + ir_node *oldn = proj; + ir_node *copyb = get_Proj_pred(proj); + ir_node *a = get_CopyB_dst(copyb); + ir_node *b = get_CopyB_src(copyb); + + if (a == b) { + /* Turn CopyB into a tuple (mem, jmp, bad, bad) */ + switch (get_Proj_proj(proj)) { + case pn_CopyB_M_regular: + proj = get_CopyB_mem(copyb); + DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); + break; + + case pn_CopyB_M_except: + case pn_CopyB_X_except: + DBG_OPT_EXC_REM(proj); + proj = get_irg_bad(current_ir_graph); + break; + } + } + return proj; +} /* equivalent_node_Proj_CopyB */ + +/** + * Optimize Bounds(idx, idx, upper) into idx. + */ +static ir_node *equivalent_node_Proj_Bound(ir_node *proj) { + ir_node *oldn = proj; + ir_node *bound = get_Proj_pred(proj); + ir_node *idx = get_Bound_index(bound); + ir_node *pred = skip_Proj(idx); + int ret_tuple = 0; + + if (idx == get_Bound_lower(bound)) + 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. + */ + 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)) { + /* + * One could expect that we simply return the previous + * Bound here. However, this would be wrong, as we could + * add an exception Proj to a new location then. + * So, we must turn in into a tuple. + */ + ret_tuple = 1; + } + } + if (ret_tuple) { + /* Turn Bound into a tuple (mem, jmp, bad, idx) */ + switch (get_Proj_proj(proj)) { + case pn_Bound_M: + DBG_OPT_EXC_REM(proj); + proj = get_Bound_mem(bound); + break; + case pn_Bound_X_except: + DBG_OPT_EXC_REM(proj); + proj = get_irg_bad(current_ir_graph); + break; + case pn_Bound_res: + proj = idx; + DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); + break; + default: + /* cannot optimize pn_Bound_X_regular, handled in transform ... */ + ; + } + } + return proj; +} /* equivalent_node_Proj_Bound */ + +/** + * Optimize an Exception Proj(Load) with a non-null address. + */ +static ir_node *equivalent_node_Proj_Load(ir_node *proj) { + if (get_opt_ldst_only_null_ptr_exceptions()) { + if (get_irn_mode(proj) == mode_X) { + ir_node *load = get_Proj_pred(proj); + + /* get the Load address */ + const ir_node *addr = get_Load_ptr(load); + const ir_node *confirm; + + if (value_not_null(addr, &confirm)) { + if (get_Proj_proj(proj) == pn_Load_X_except) { + DBG_OPT_EXC_REM(proj); + return get_irg_bad(current_ir_graph); } - } else if (is_Store(a)) { - /* get the load/store address */ - ir_node *addr = get_Store_ptr(a); - ir_node *blk = get_irn_n(a, -1); - ir_node *confirm; - - if (value_not_null(addr, &confirm)) { - if (confirm == NULL) { - /* this node may float if it did not depend on a Confirm */ - set_irn_pinned(a, op_pin_state_floats); - } - if (get_Proj_proj(proj) == pn_Store_X_except) { - DBG_OPT_EXC_REM(proj); - return new_Bad(); - } else - return new_r_Jmp(current_ir_graph, blk); + } + } + } + return proj; +} /* equivalent_node_Proj_Load */ + +/** + * Optimize an Exception Proj(Store) with a non-null address. + */ +static ir_node *equivalent_node_Proj_Store(ir_node *proj) { + if (get_opt_ldst_only_null_ptr_exceptions()) { + if (get_irn_mode(proj) == mode_X) { + ir_node *store = get_Proj_pred(proj); + + /* get the load/store address */ + const ir_node *addr = get_Store_ptr(store); + const ir_node *confirm; + + if (value_not_null(addr, &confirm)) { + if (get_Proj_proj(proj) == pn_Store_X_except) { + DBG_OPT_EXC_REM(proj); + return get_irg_bad(current_ir_graph); } } } } + return proj; +} /* equivalent_node_Proj_Store */ +/** + * Does all optimizations on nodes that must be done on it's Proj's + * because of creating new nodes. + */ +static ir_node *equivalent_node_Proj(ir_node *proj) { + ir_node *n = get_Proj_pred(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); + } + } + if (n->op->ops.equivalent_node_Proj) + return n->op->ops.equivalent_node_Proj(proj); return proj; } /* equivalent_node_Proj */ @@ -1512,7 +1671,7 @@ static ir_node *equivalent_node_Id(ir_node *n) { do { n = get_Id_pred(n); - } while (get_irn_op(n) == op_Id); + } while (is_Id(n)); DBG_OPT_ID(oldn, n); return n; @@ -1558,8 +1717,8 @@ static ir_node *equivalent_node_Mux(ir_node *n) switch (proj_nr) { case pn_Cmp_Eq: - if ((cmp_l == t && cmp_r == f) || /* Psi(t == f, t, f) -> f */ - (cmp_l == f && cmp_r == t)) { /* Psi(f == t, t, f) -> f */ + 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; @@ -1568,8 +1727,8 @@ static ir_node *equivalent_node_Mux(ir_node *n) case pn_Cmp_Lg: case pn_Cmp_Ne: - if ((cmp_l == t && cmp_r == f) || /* Psi(t != f, t, f) -> t */ - (cmp_l == f && cmp_r == t)) { /* Psi(f != t, t, f) -> t */ + 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; @@ -1581,7 +1740,7 @@ static ir_node *equivalent_node_Mux(ir_node *n) * Note: normalization puts the constant on the right side, * so we check only one case. */ - if (cmp_l == t && is_Const(cmp_r) && is_Const_null(cmp_r)) { + 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) */ @@ -1596,44 +1755,10 @@ static ir_node *equivalent_node_Mux(ir_node *n) } } } - } - } - return n; -} /* equivalent_node_Mux */ - -/** - * Returns a equivalent node of a Psi: if a condition is true - * and all previous conditions are false we know its value. - * If all conditions are false its value is the default one. - */ -static ir_node *equivalent_node_Psi(ir_node *n) { - if (is_Mux(n)) - return equivalent_node_Mux(n); - return n; -} /* equivalent_node_Psi */ - -/** - * 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 *equivalent_node_Cmp(ir_node *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))) { - left = get_Minus_op(left); - right = get_Minus_op(right); - set_Cmp_left(n, right); - set_Cmp_right(n, left); + } } return n; -} /* equivalent_node_Cmp */ +} /* equivalent_node_Mux */ /** * Remove Confirm nodes if setting is on. @@ -1643,78 +1768,20 @@ static ir_node *equivalent_node_Confirm(ir_node *n) { ir_node *pred = get_Confirm_value(n); pn_Cmp pnc = get_Confirm_cmp(n); - if (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) { + while (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) { /* * rare case: two identical Confirms one after another, * replace the second one with the first. */ - n = pred; + n = pred; + pred = get_Confirm_value(n); + pnc = get_Confirm_cmp(n); } if (get_opt_remove_confirm()) return get_Confirm_value(n); return n; } -/** - * Optimize CopyB(mem, x, x) into a Nop. - */ -static ir_node *equivalent_node_CopyB(ir_node *n) { - ir_node *a = get_CopyB_dst(n); - ir_node *b = get_CopyB_src(n); - - if (a == b) { - /* Turn CopyB into a tuple (mem, jmp, bad, bad) */ - ir_node *mem = get_CopyB_mem(n); - ir_node *blk = get_nodes_block(n); - turn_into_tuple(n, pn_CopyB_max); - set_Tuple_pred(n, pn_CopyB_M, mem); - set_Tuple_pred(n, pn_CopyB_X_regular, new_r_Jmp(current_ir_graph, blk)); - set_Tuple_pred(n, pn_CopyB_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_CopyB_M_except, new_Bad()); - } - return n; -} /* equivalent_node_CopyB */ - -/** - * Optimize Bounds(idx, idx, upper) into idx. - */ -static ir_node *equivalent_node_Bound(ir_node *n) { - ir_node *idx = get_Bound_index(n); - ir_node *pred = skip_Proj(idx); - int ret_tuple = 0; - - if (is_Bound(pred)) { - /* - * idx was Bounds checked in the same MacroBlock previously, - * it is still valid if lower <= pred_lower && pred_upper <= upper. - */ - ir_node *lower = get_Bound_lower(n); - ir_node *upper = get_Bound_upper(n); - if (get_Bound_lower(pred) == lower && - get_Bound_upper(pred) == upper && - get_irn_MacroBlock(n) == get_irn_MacroBlock(pred)) { - /* - * One could expect that we simply return the previous - * Bound here. However, this would be wrong, as we could - * add an exception Proj to a new location then. - * So, we must turn in into a tuple. - */ - ret_tuple = 1; - } - } - if (ret_tuple) { - /* Turn Bound into a tuple (mem, jmp, bad, idx) */ - ir_node *mem = get_Bound_mem(n); - ir_node *blk = get_nodes_block(n); - turn_into_tuple(n, pn_Bound_max); - set_Tuple_pred(n, pn_Bound_M, mem); - set_Tuple_pred(n, pn_Bound_X_regular, new_r_Jmp(current_ir_graph, blk)); /* no exception */ - set_Tuple_pred(n, pn_Bound_X_except, new_Bad()); /* no exception */ - set_Tuple_pred(n, pn_Bound_res, idx); - } - return n; -} /* equivalent_node_Bound */ - /** * equivalent_node() returns a node equivalent to input n. It skips all nodes that * perform no actual computation, as, e.g., the Id nodes. It does not create @@ -1743,44 +1810,50 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op case iro_##a: \ ops->equivalent_node = equivalent_node_##a; \ break +#define CASE_PROJ(a) \ + case iro_##a: \ + ops->equivalent_node_Proj = equivalent_node_Proj_##a; \ + break switch (code) { CASE(Block); CASE(Jmp); CASE(Raise); - CASE(Or); - CASE(Add); CASE(Eor); - CASE(Sub); + CASE(Add); CASE(Shl); CASE(Shr); CASE(Shrs); CASE(Rotl); + CASE(Sub); CASE(Not); CASE(Minus); CASE(Mul); - CASE(Div); - CASE(Quot); - CASE(DivMod); + 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); + CASE_PROJ(Store); CASE(Proj); CASE(Id); CASE(Mux); - CASE(Psi); - CASE(Cmp); CASE(Confirm); - CASE(CopyB); - CASE(Bound); default: /* leave NULL */; } return ops; #undef CASE +#undef CASE_PROJ } /* firm_set_default_equivalent_node */ /** @@ -1792,12 +1865,31 @@ static int is_const_Phi(ir_node *n) { if (! is_Phi(n) || get_irn_arity(n) == 0) return 0; - for (i = get_irn_arity(n) - 1; i >= 0; --i) + for (i = get_irn_arity(n) - 1; i >= 0; --i) { if (! is_Const(get_irn_n(n, i))) return 0; - return 1; + } + 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); + +/** + * Wrapper for the tarval binop evaluation, tarval_sub has one more parameter. + */ +static tarval *do_eval(tarval *(*eval)(), tarval *a, tarval *b, ir_mode *mode) { + if (eval == tarval_sub) { + tarval_sub_type func = (tarval_sub_type)eval; + + return func(a, b, mode); + } else { + tarval_binop_type func = (tarval_binop_type)eval; + + return func(a, b); + } +} + /** * Apply an evaluator on a binop with a constant operators (and one Phi). * @@ -1809,7 +1901,7 @@ static int is_const_Phi(ir_node *n) { * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(tarval *, tarval *), ir_mode *mode, int left) { +static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(), ir_mode *mode, int left) { tarval *tv; void **res; ir_node *pred; @@ -1821,7 +1913,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)( for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); tv = get_Const_tarval(pred); - tv = eval(other, tv); + tv = do_eval(eval, other, tv, mode); if (tv == tarval_bad) { /* folding failed, bad */ @@ -1833,7 +1925,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)( for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); tv = get_Const_tarval(pred); - tv = eval(tv, other); + tv = do_eval(eval, tv, other, mode); if (tv == tarval_bad) { /* folding failed, bad */ @@ -1861,7 +1953,7 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)( * * @return a new Phi node if the conversion was successful, NULL else */ -static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(tarval *, tarval *), ir_mode *mode) { +static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(), ir_mode *mode) { tarval *tv_l, *tv_r, *tv; void **res; ir_node *pred; @@ -1879,7 +1971,7 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(ta tv_l = get_Const_tarval(pred); pred = get_irn_n(b, i); tv_r = get_Const_tarval(pred); - tv = eval(tv_l, tv_r); + tv = do_eval(eval, tv_l, tv_r, mode); if (tv == tarval_bad) { /* folding failed, bad */ @@ -2129,7 +2221,7 @@ static ir_node *transform_node_Add(ir_node *n) { n = new_rd_Sub( get_irn_dbg_info(n), current_ir_graph, - get_irn_n(n, -1), + get_nodes_block(n), b, get_Minus_op(a), mode); @@ -2140,7 +2232,7 @@ static ir_node *transform_node_Add(ir_node *n) { n = new_rd_Sub( get_irn_dbg_info(n), current_ir_graph, - get_irn_n(n, -1), + get_nodes_block(n), a, get_Minus_op(b), mode); @@ -2154,14 +2246,14 @@ static ir_node *transform_node_Add(ir_node *n) { if (is_Const(b) && is_Const_one(b)) { /* ~x + 1 = -x */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_PLUS_1); return n; } if (op == b) { /* ~x + x = -1 */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_r_Const(current_ir_graph, blk, mode, get_mode_minus_one(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X); return n; @@ -2172,7 +2264,7 @@ static ir_node *transform_node_Add(ir_node *n) { if (op == a) { /* x + ~x = -1 */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_r_Const(current_ir_graph, blk, mode, get_mode_minus_one(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_X_NOT_X); return n; @@ -2224,7 +2316,20 @@ static ir_node *transform_node_Sub(ir_node *n) { if (is_Const(b) && is_Const_null(b) && mode_is_reference(lmode)) { /* a Sub(a, NULL) is a hidden Conv */ dbg_info *dbg = get_irn_dbg_info(n); - return new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode); + n = new_rd_Conv(dbg, current_ir_graph, get_nodes_block(n), a, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_CONV); + return n; + } + + if (mode == lmode && + get_mode_arithmetic(mode) == irma_twos_complement && + is_Const(a) && + get_Const_tarval(a) == get_mode_minus_one(mode)) { + /* -1 - x -> ~x */ + dbg_info *dbg = get_irn_dbg_info(n); + n = new_rd_Not(dbg, current_ir_graph, get_nodes_block(n), b, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_NOT); + return n; } } @@ -2268,18 +2373,30 @@ restart: n = new_rd_Add(dbg, irg, block, a, right, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS); return n; - } else if (is_Sub(b)) { /* a - (b - c) -> a + (c - b) */ + } else if (is_Sub(b)) { + /* a - (b - c) -> a + (c - b) + * -> (a - b) + c iff (b - c) is a pointer */ ir_graph *irg = current_ir_graph; dbg_info *s_dbg = get_irn_dbg_info(b); ir_node *s_block = get_nodes_block(b); - ir_node *s_left = get_Sub_right(b); - ir_node *s_right = get_Sub_left(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); - ir_node *sub = new_rd_Sub(s_dbg, irg, s_block, s_left, s_right, s_mode); - dbg_info *a_dbg = get_irn_dbg_info(n); - ir_node *a_block = get_nodes_block(n); + if (s_mode == mode_P) { + ir_node *sub = new_rd_Sub(s_dbg, irg, s_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(irg, a_block, s_right, mode); + n = new_rd_Add(a_dbg, irg, a_block, sub, s_right, mode); + } else { + ir_node *sub = new_rd_Sub(s_dbg, irg, 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); - n = new_rd_Add(a_dbg, irg, a_block, a, sub, mode); + n = new_rd_Add(a_dbg, irg, a_block, a, sub, mode); + } DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD); return n; } else if (is_Mul(b)) { /* a - (b * C) -> a + (b * -C) */ @@ -2308,7 +2425,7 @@ restart: n = new_rd_Minus( get_irn_dbg_info(n), current_ir_graph, - get_irn_n(n, -1), + get_nodes_block(n), b, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_0_A); @@ -2323,7 +2440,7 @@ restart: if (left == b) { if (mode != get_irn_mode(right)) { /* This Sub is an effective Cast */ - right = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), right, mode); + right = new_r_Conv(get_irn_irg(n), get_nodes_block(n), right, mode); } n = right; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); @@ -2331,7 +2448,7 @@ restart: } else if (right == b) { if (mode != get_irn_mode(left)) { /* This Sub is an effective Cast */ - left = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), left, mode); + left = new_r_Conv(get_irn_irg(n), get_nodes_block(n), left, mode); } n = left; DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); @@ -2348,20 +2465,20 @@ restart: if (left == a) { ir_mode *r_mode = get_irn_mode(right); - n = new_r_Minus(get_irn_irg(n), get_irn_n(n, -1), right, r_mode); + n = new_r_Minus(get_irn_irg(n), get_nodes_block(n), right, r_mode); if (mode != r_mode) { /* This Sub is an effective Cast */ - n = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), n, mode); + n = new_r_Conv(get_irn_irg(n), get_nodes_block(n), n, mode); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); return n; } else if (right == a) { ir_mode *l_mode = get_irn_mode(left); - n = new_r_Minus(get_irn_irg(n), get_irn_n(n, -1), left, l_mode); + n = new_r_Minus(get_irn_irg(n), get_nodes_block(n), left, l_mode); if (mode != l_mode) { /* This Sub is an effective Cast */ - n = new_r_Conv(get_irn_irg(n), get_irn_n(n, -1), n, mode); + n = new_r_Conv(get_irn_irg(n), get_nodes_block(n), n, mode); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_SUB); return n; @@ -2396,7 +2513,7 @@ restart: ir_node *mb = get_Mul_right(a); if (ma == b) { - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Mul( get_irn_dbg_info(n), current_ir_graph, blk, @@ -2411,7 +2528,7 @@ restart: DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MUL_A_X_A); return n; } else if (mb == b) { - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Mul( get_irn_dbg_info(n), current_ir_graph, blk, @@ -2430,7 +2547,7 @@ restart: if (is_Sub(a)) { /* (x - y) - b -> x - (y + b) */ ir_node *x = get_Sub_left(a); ir_node *y = get_Sub_right(a); - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); ir_mode *m_b = get_irn_mode(b); ir_mode *m_y = get_irn_mode(y); ir_mode *add_mode; @@ -2467,7 +2584,7 @@ restart: tv = tarval_add(tv, get_mode_one(mode)); if (tv != tarval_bad) { - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv); n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, get_Not_op(b), c, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_C_NOT_X); @@ -2492,14 +2609,14 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { if (ta == get_mode_one(smode)) { /* (L)1 * (L)b = (L)b */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, b, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1); return n; } else if (ta == get_mode_minus_one(smode)) { /* (L)-1 * (L)b = (L)b */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, b, smode); n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, n, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1); @@ -2514,7 +2631,7 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { } else if (tb == get_mode_minus_one(smode)) { /* (L)a * (L)-1 = (L)-a */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, a, smode); n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, n, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1); @@ -2550,7 +2667,7 @@ static ir_node *transform_node_Mul(ir_node *n) { else if (value_of(b) == get_mode_minus_one(mode)) r = a; if (r) { - n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), r, mode); + n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), r, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1); return n; } @@ -2598,7 +2715,8 @@ 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); - if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) { + if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) + && !tarval_is_negative(tv)) { /* 2.0 * b = b + b */ n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), b, b, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A); @@ -2607,7 +2725,8 @@ static ir_node *transform_node_Mul(ir_node *n) { } else if (is_Const(b)) { tarval *tv = get_Const_tarval(b); - if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) { + if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) + && !tarval_is_negative(tv)) { /* a * 2.0 = a + a */ n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, a, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_ADD_A_A); @@ -2661,9 +2780,9 @@ static ir_node *transform_node_Div(ir_node *n) { DBG_OPT_CSTEVAL(n, value); goto make_tuple; } else { - ir_node *a = get_Div_left(n); - ir_node *b = get_Div_right(n); - ir_node *dummy; + ir_node *a = get_Div_left(n); + ir_node *b = get_Div_right(n); + const ir_node *dummy; if (a == b && value_not_zero(a, &dummy)) { /* BEWARE: we can optimize a/a to 1 only if this cannot cause a exception */ @@ -2676,7 +2795,7 @@ static ir_node *transform_node_Div(ir_node *n) { if (tv == get_mode_minus_one(mode)) { /* a / -1 */ - value = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode); + value = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, mode); DBG_OPT_CSTEVAL(n, value); goto make_tuple; } @@ -2692,11 +2811,10 @@ static ir_node *transform_node_Div(ir_node *n) { make_tuple: /* Turn Div into a tuple (mem, jmp, bad, value) */ mem = get_Div_mem(n); - blk = get_irn_n(n, -1); + blk = get_nodes_block(n); /* skip a potential Pin */ - if (is_Pin(mem)) - mem = get_Pin_op(mem); + 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(current_ir_graph, blk)); @@ -2749,9 +2867,9 @@ static ir_node *transform_node_Mod(ir_node *n) { DBG_OPT_CSTEVAL(n, value); goto make_tuple; } else { - ir_node *a = get_Mod_left(n); - ir_node *b = get_Mod_right(n); - ir_node *dummy; + ir_node *a = get_Mod_left(n); + ir_node *b = get_Mod_right(n); + const ir_node *dummy; if (a == b && value_not_zero(a, &dummy)) { /* BEWARE: we can optimize a%a to 0 only if this cannot cause a exception */ @@ -2780,11 +2898,10 @@ static ir_node *transform_node_Mod(ir_node *n) { make_tuple: /* Turn Mod into a tuple (mem, jmp, bad, value) */ mem = get_Mod_mem(n); - blk = get_irn_n(n, -1); + blk = get_nodes_block(n); /* skip a potential Pin */ - if (is_Pin(mem)) - mem = get_Pin_op(mem); + 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(current_ir_graph, blk)); @@ -2798,13 +2915,13 @@ make_tuple: * Transform a DivMod node. */ static ir_node *transform_node_DivMod(ir_node *n) { - ir_node *dummy; - ir_node *a = get_DivMod_left(n); - ir_node *b = get_DivMod_right(n); - ir_mode *mode = get_DivMod_resmode(n); - tarval *ta, *tb; - int evaluated = 0; - ir_node *va, *vb; + 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) */ @@ -2858,7 +2975,7 @@ static ir_node *transform_node_DivMod(ir_node *n) { 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), current_ir_graph, get_irn_n(n, -1), a, mode); + va = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), a, mode); vb = new_Const(mode, get_mode_null(mode)); DBG_OPT_CSTEVAL(n, va); DBG_OPT_CSTEVAL(n, vb); @@ -2893,10 +3010,9 @@ static ir_node *transform_node_DivMod(ir_node *n) { make_tuple: mem = get_DivMod_mem(n); /* skip a potential Pin */ - if (is_Pin(mem)) - mem = get_Pin_op(mem); + mem = skip_Pin(mem); - blk = get_irn_n(n, -1); + 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(current_ir_graph, blk)); @@ -2917,9 +3033,9 @@ static ir_node *transform_node_Quot(ir_node *n) { if (get_mode_arithmetic(mode) == irma_ieee754) { ir_node *b = get_Quot_right(n); + tarval *tv = value_of(b); - if (is_Const(b)) { - tarval *tv = get_Const_tarval(b); + if (tv != tarval_bad) { int rem; /* @@ -2936,15 +3052,14 @@ static ir_node *transform_node_Quot(ir_node *n) { 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_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv); ir_node *a = get_Quot_left(n); ir_node *m = new_rd_Mul(get_irn_dbg_info(n), current_ir_graph, blk, a, c, mode); ir_node *mem = get_Quot_mem(n); /* skip a potential Pin */ - if (is_Pin(mem)) - mem = get_Pin_op(mem); + 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(current_ir_graph, blk)); @@ -3006,6 +3121,32 @@ static ir_node *transform_node_Abs(ir_node *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), current_ir_graph, + 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. * @@ -3072,7 +3213,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, ir_mode *a_mode = get_irn_mode(a_op); ir_mode *b_mode = get_irn_mode(b_op); if(a_mode == b_mode && (mode_is_int(a_mode) || a_mode == mode_b)) { - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = exact_copy(n); set_binop_left(n, a_op); @@ -3124,7 +3265,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, if (c != NULL) { /* (a sop c) & (b sop c) => (a & b) sop c */ - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); ir_node *new_n = exact_copy(n); set_binop_left(new_n, op1); @@ -3317,7 +3458,7 @@ static ir_node *transform_node_Eor(ir_node *n) { if (a == b) { /* a ^ a = 0 */ - n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), + n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), mode, get_mode_null(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A); } else if (mode == mode_b && @@ -3325,7 +3466,7 @@ static ir_node *transform_node_Eor(ir_node *n) { is_Const(b) && is_Const_one(b) && is_Cmp(get_Proj_pred(a))) { /* The Eor negates a Cmp. The Cmp has the negated result anyways! */ - n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a), + n = new_r_Proj(current_ir_graph, get_nodes_block(n), get_Proj_pred(a), mode_b, get_negated_pnc(get_Proj_proj(a), mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT_BOOL); @@ -3365,7 +3506,7 @@ static ir_node *transform_node_Not(ir_node *n) { is_Proj(a) && is_Cmp(get_Proj_pred(a))) { /* We negate a Cmp. The Cmp has the negated result anyways! */ - n = new_r_Proj(current_ir_graph, get_irn_n(n, -1), get_Proj_pred(a), + n = new_r_Proj(current_ir_graph, get_nodes_block(n), 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; @@ -3396,7 +3537,7 @@ static ir_node *transform_node_Not(ir_node *n) { if (is_Const(add_r) && is_Const_all_one(add_r)) { /* ~(x + -1) = -x */ ir_node *op = get_Add_left(a); - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, get_irn_mode(n)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_MINUS_1); } @@ -3428,7 +3569,7 @@ static ir_node *transform_node_Minus(ir_node *n) { /* -(~x) = x + 1 */ ir_node *op = get_Not_op(a); tarval *tv = get_mode_one(mode); - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); ir_node *c = new_r_Const(current_ir_graph, blk, mode, tv); n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, op, c, mode); DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT); @@ -3444,7 +3585,7 @@ static ir_node *transform_node_Minus(ir_node *n) { /* -(a >>u (size-1)) = a >>s (size-1) */ ir_node *v = get_Shr_left(a); - n = new_rd_Shrs(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode); + n = new_rd_Shrs(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), v, c, mode); DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE); return n; } @@ -3460,7 +3601,7 @@ static ir_node *transform_node_Minus(ir_node *n) { /* -(a >>s (size-1)) = a >>u (size-1) */ ir_node *v = get_Shrs_left(a); - n = new_rd_Shr(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode); + n = new_rd_Shr(get_irn_dbg_info(n), current_ir_graph, get_nodes_block(n), v, c, mode); DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE); return n; } @@ -3471,7 +3612,7 @@ static ir_node *transform_node_Minus(ir_node *n) { /* - (a-b) = b - a */ ir_node *la = get_Sub_left(a); ir_node *ra = get_Sub_right(a); - ir_node *blk = get_irn_n(n, -1); + ir_node *blk = get_nodes_block(n); n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, ra, la, mode); DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_SUB); @@ -3481,9 +3622,10 @@ 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); - if (is_Const(mul_r)) { - tarval *tv = tarval_neg(get_Const_tarval(mul_r)); - if(tv != tarval_bad) { + tarval *tv = value_of(mul_r); + if (tv != tarval_bad) { + tv = tarval_neg(tv); + if (tv != tarval_bad) { ir_node *cnst = new_Const(mode, tv); dbg_info *dbg = get_irn_dbg_info(a); ir_graph *irg = current_ir_graph; @@ -3519,6 +3661,66 @@ static ir_node *transform_node_Cast(ir_node *n) { return n; } /* transform_node_Cast */ +/** + * Transform a Proj(Load) with a non-null address. + */ +static ir_node *transform_node_Proj_Load(ir_node *proj) { + if (get_opt_ldst_only_null_ptr_exceptions()) { + if (get_irn_mode(proj) == mode_X) { + ir_node *load = get_Proj_pred(proj); + + /* get the Load address */ + const ir_node *addr = get_Load_ptr(load); + const ir_node *confirm; + + if (value_not_null(addr, &confirm)) { + if (confirm == NULL) { + /* this node may float if it did not depend on a Confirm */ + set_irn_pinned(load, op_pin_state_floats); + } + if (get_Proj_proj(proj) == pn_Load_X_except) { + DBG_OPT_EXC_REM(proj); + return get_irg_bad(current_ir_graph); + } else { + ir_node *blk = get_nodes_block(load); + return new_r_Jmp(current_ir_graph, blk); + } + } + } + } + return proj; +} /* transform_node_Proj_Load */ + +/** + * Transform a Proj(Store) with a non-null address. + */ +static ir_node *transform_node_Proj_Store(ir_node *proj) { + if (get_opt_ldst_only_null_ptr_exceptions()) { + if (get_irn_mode(proj) == mode_X) { + ir_node *store = get_Proj_pred(proj); + + /* get the load/store address */ + const ir_node *addr = get_Store_ptr(store); + const ir_node *confirm; + + if (value_not_null(addr, &confirm)) { + if (confirm == NULL) { + /* this node may float if it did not depend on a Confirm */ + set_irn_pinned(store, op_pin_state_floats); + } + if (get_Proj_proj(proj) == pn_Store_X_except) { + DBG_OPT_EXC_REM(proj); + return get_irg_bad(current_ir_graph); + } else { + ir_node *blk = get_nodes_block(store); + return new_r_Jmp(current_ir_graph, blk); + } + } + } + } + return proj; +} /* transform_node_Proj_Store */ + /** * Transform a Proj(Div) with a non-zero value. * Removes the exceptions and routes the memory to the NoMem node. @@ -3526,7 +3728,8 @@ static ir_node *transform_node_Cast(ir_node *n) { static ir_node *transform_node_Proj_Div(ir_node *proj) { ir_node *div = get_Proj_pred(proj); ir_node *b = get_Div_right(div); - ir_node *confirm, *res, *new_mem; + ir_node *res, *new_mem; + const ir_node *confirm; long proj_nr; if (value_not_zero(b, &confirm)) { @@ -3534,8 +3737,7 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { if (confirm == NULL) { /* we are sure we have a Const != 0 */ new_mem = get_Div_mem(div); - if (is_Pin(new_mem)) - new_mem = get_Pin_op(new_mem); + new_mem = skip_Pin(new_mem); set_Div_mem(div, new_mem); set_irn_pinned(div, op_pin_state_floats); } @@ -3574,7 +3776,8 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { static ir_node *transform_node_Proj_Mod(ir_node *proj) { ir_node *mod = get_Proj_pred(proj); ir_node *b = get_Mod_right(mod); - ir_node *confirm, *res, *new_mem; + ir_node *res, *new_mem; + const ir_node *confirm; long proj_nr; if (value_not_zero(b, &confirm)) { @@ -3584,8 +3787,7 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { if (confirm == NULL) { /* we are sure we have a Const != 0 */ new_mem = get_Mod_mem(mod); - if (is_Pin(new_mem)) - new_mem = get_Pin_op(new_mem); + new_mem = skip_Pin(new_mem); set_Mod_mem(mod, new_mem); set_irn_pinned(mod, op_pin_state_floats); } @@ -3632,7 +3834,8 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { static ir_node *transform_node_Proj_DivMod(ir_node *proj) { ir_node *divmod = get_Proj_pred(proj); ir_node *b = get_DivMod_right(divmod); - ir_node *confirm, *res, *new_mem; + ir_node *res, *new_mem; + const ir_node *confirm; long proj_nr; if (value_not_zero(b, &confirm)) { @@ -3642,8 +3845,7 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { if (confirm == NULL) { /* we are sure we have a Const != 0 */ new_mem = get_DivMod_mem(divmod); - if (is_Pin(new_mem)) - new_mem = get_Pin_op(new_mem); + new_mem = skip_Pin(new_mem); set_DivMod_mem(divmod, new_mem); set_irn_pinned(divmod, op_pin_state_floats); } @@ -3706,7 +3908,7 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) { return proj; } else { /* this case will NEVER be taken, kill it */ - return new_Bad(); + return get_irg_bad(current_ir_graph); } } } @@ -3981,9 +4183,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { * later and may help to normalize more compares. * Of course this is only possible for integer values. */ - if (is_Const(right)) { + tv = value_of(right); + if (tv != tarval_bad) { mode = get_irn_mode(right); - tv = get_Const_tarval(right); /* TODO extend to arbitrary constants */ if (is_Conv(left) && tarval_is_null(tv)) { @@ -4047,7 +4249,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { /* 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) { - tv = tarval_sub(tv, get_mode_one(mode)); + tv = tarval_sub(tv, get_mode_one(mode), NULL); if (tv != tarval_bad) { proj_nr ^= pn_Cmp_Eq; @@ -4115,7 +4317,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { } if (tv2 != tarval_bad) { - tv2 = tarval_sub(tv, tv2); + tv2 = tarval_sub(tv, tv2, NULL); if (tv2 != tarval_bad) { left = a; @@ -4127,7 +4329,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { } /* -a == c ==> a == -c, -a != c ==> a != -c */ else if (is_Minus(left)) { - tarval *tv2 = tarval_sub(get_mode_null(mode), tv); + tarval *tv2 = tarval_sub(get_mode_null(mode), tv, NULL); if (tv2 != tarval_bad) { left = get_Minus_op(left); @@ -4142,7 +4344,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { 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 (get_irn_op(left) == op_Abs) { // TODO something is missing here + if (is_Abs(left)) { // TODO something is missing here } } } @@ -4284,7 +4486,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { tarval *cond = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1)); ir_node *sl, *blk; - cond = tarval_sub(cond, tv1); + cond = tarval_sub(cond, tv1, NULL); cond = tarval_shrs(tv, cond); if (!tarval_is_all_one(cond) && !tarval_is_null(cond)) { @@ -4326,7 +4528,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { ir_node *blk = get_irn_n(op, -1); ir_mode *mode = get_irn_mode(v); - tv = tarval_sub(tv, get_mode_one(mode)); + tv = tarval_sub(tv, get_mode_one(mode), NULL); left = new_rd_And(get_irn_dbg_info(op), current_ir_graph, blk, v, new_Const(mode, tv), mode); changed |= 1; DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_MOD_TO_AND); @@ -4336,7 +4538,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { } if (changed) { - ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */ + ir_node *block = get_nodes_block(n); /* create a new compare */ n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph, block, left, right); @@ -4346,6 +4548,90 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { return proj; } /* transform_node_Proj_Cmp */ +/** + * Optimize CopyB(mem, x, x) into a Nop. + */ +static ir_node *transform_node_Proj_CopyB(ir_node *proj) { + ir_node *copyb = get_Proj_pred(proj); + ir_node *a = get_CopyB_dst(copyb); + ir_node *b = get_CopyB_src(copyb); + + if (a == b) { + switch (get_Proj_proj(proj)) { + case pn_CopyB_X_regular: + /* Turn CopyB into a tuple (mem, jmp, bad, bad) */ + DBG_OPT_EXC_REM(proj); + proj = new_r_Jmp(current_ir_graph, get_nodes_block(copyb)); + break; + case pn_CopyB_M_except: + case pn_CopyB_X_except: + DBG_OPT_EXC_REM(proj); + proj = get_irg_bad(current_ir_graph); + break; + default: + break; + } + } + return proj; +} /* transform_node_Proj_CopyB */ + +/** + * Optimize Bounds(idx, idx, upper) into idx. + */ +static ir_node *transform_node_Proj_Bound(ir_node *proj) { + ir_node *oldn = proj; + ir_node *bound = get_Proj_pred(proj); + ir_node *idx = get_Bound_index(bound); + ir_node *pred = skip_Proj(idx); + int ret_tuple = 0; + + if (idx == get_Bound_lower(bound)) + 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. + */ + 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)) { + /* + * One could expect that we simply return the previous + * Bound here. However, this would be wrong, as we could + * add an exception Proj to a new location then. + * So, we must turn in into a tuple. + */ + ret_tuple = 1; + } + } + if (ret_tuple) { + /* Turn Bound into a tuple (mem, jmp, bad, idx) */ + switch (get_Proj_proj(proj)) { + case pn_Bound_M: + DBG_OPT_EXC_REM(proj); + proj = get_Bound_mem(bound); + break; + case pn_Bound_X_except: + DBG_OPT_EXC_REM(proj); + proj = get_irg_bad(current_ir_graph); + break; + case pn_Bound_res: + proj = idx; + DBG_OPT_ALGSIM0(oldn, proj, FS_OPT_NOP); + break; + case pn_Bound_X_regular: + DBG_OPT_EXC_REM(proj); + proj = new_r_Jmp(current_ir_graph, get_nodes_block(bound)); + break; + default: + break; + } + } + return proj; +} /* transform_node_Proj_Bound */ + /** * Does all optimizations on nodes that must be done on it's Proj's * because of creating new nodes. @@ -4353,30 +4639,9 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { static ir_node *transform_node_Proj(ir_node *proj) { ir_node *n = get_Proj_pred(proj); - switch (get_irn_opcode(n)) { - case iro_Div: - return transform_node_Proj_Div(proj); - - case iro_Mod: - return transform_node_Proj_Mod(proj); - - case iro_DivMod: - return transform_node_Proj_DivMod(proj); - - case iro_Cond: - return transform_node_Proj_Cond(proj); - - case iro_Cmp: - return transform_node_Proj_Cmp(proj); - - case iro_Tuple: - /* should not happen, but if it does will be optimized away */ - return equivalent_node_Proj(proj); - - default: - /* do nothing */ - return proj; - } + if (n->op->ops.transform_node_Proj) + return n->op->ops.transform_node_Proj(proj); + return proj; } /* transform_node_Proj */ /** @@ -4915,7 +5180,7 @@ static ir_node *transform_node_shl_shr(ir_node *n) { pnc = tarval_cmp(tv_shl, tv_shr); if (pnc == pn_Cmp_Lt || pnc == pn_Cmp_Eq) { - tv_shift = tarval_sub(tv_shr, tv_shl); + tv_shift = tarval_sub(tv_shr, tv_shl, NULL); new_const = new_Const(get_tarval_mode(tv_shift), tv_shift); if (need_shrs) { new_shift = new_rd_Shrs(dbgi, irg, block, x, new_const, mode); @@ -4924,7 +5189,7 @@ static ir_node *transform_node_shl_shr(ir_node *n) { } } else { assert(pnc == pn_Cmp_Gt); - tv_shift = tarval_sub(tv_shl, tv_shr); + tv_shift = tarval_sub(tv_shl, tv_shr, NULL); new_const = new_Const(get_tarval_mode(tv_shift), tv_shift); new_shift = new_rd_Shl(dbgi, irg, block, x, new_const, mode); } @@ -5016,10 +5281,15 @@ static ir_node *transform_node_Rotl(ir_node *n) { */ static ir_node *transform_node_Conv(ir_node *n) { ir_node *c, *oldn = n; - ir_node *a = get_Conv_op(n); + ir_mode *mode = get_irn_mode(n); + ir_node *a = get_Conv_op(n); - if (is_const_Phi(a)) { - c = apply_conv_on_phi(a, get_irn_mode(n)); + if (mode != mode_b && is_const_Phi(a)) { + /* Do NOT optimize mode_b Conv's, this leads to remaining + * Phib nodes later, because the conv_b_lower operation + * is instantly reverted, when it tries to insert a Convb. + */ + c = apply_conv_on_phi(a, mode); if (c) { DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); return c; @@ -5027,10 +5297,34 @@ static ir_node *transform_node_Conv(ir_node *n) { } if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */ - ir_mode *mode = get_irn_mode(n); return new_r_Unknown(current_ir_graph, mode); } + if (mode_is_reference(mode) && + get_mode_size_bits(mode) == get_mode_size_bits(get_irn_mode(a)) && + is_Add(a)) { + ir_node *l = get_Add_left(a); + ir_node *r = get_Add_right(a); + dbg_info *dbgi = get_irn_dbg_info(a); + ir_node *block = get_nodes_block(n); + if(is_Conv(l)) { + ir_node *lop = get_Conv_op(l); + if(get_irn_mode(lop) == mode) { + /* ConvP(AddI(ConvI(P), x)) -> AddP(P, x) */ + n = new_rd_Add(dbgi, current_ir_graph, block, lop, r, mode); + return n; + } + } + if(is_Conv(r)) { + ir_node *rop = get_Conv_op(r); + if(get_irn_mode(rop) == mode) { + /* ConvP(AddI(x, ConvI(P))) -> AddP(x, P) */ + n = new_rd_Add(dbgi, current_ir_graph, block, l, rop, mode); + return n; + } + } + } + return n; } /* transform_node_Conv */ @@ -5053,10 +5347,11 @@ static ir_node *transform_node_End(ir_node *n) { continue; } else if (is_irn_pinned_in_irg(ka) && is_Block_dead(get_nodes_block(ka))) { continue; + } else if (is_Bad(ka)) { + /* no need to keep Bad */ + continue; } - /* FIXME: beabi need to keep a Proj(M) */ - if (is_Phi(ka) || is_irn_keep(ka) || is_Proj(ka)) - in[j++] = ka; + in[j++] = ka; } if (j != n_keepalives) set_End_keepalives(n, j, in); @@ -5091,7 +5386,6 @@ static ir_node *transform_node_Mux(ir_node *n) { ir_node *t = get_Mux_true(n); ir_node *f = get_Mux_false(n); ir_graph *irg = current_ir_graph; - ir_node *conds[1], *vals[2]; /* first normalization step: move a possible zero to the false case */ if (is_Proj(sel)) { @@ -5099,16 +5393,16 @@ static ir_node *transform_node_Mux(ir_node *n) { if (is_Cmp(cmp)) { if (is_Const(t) && is_Const_null(t)) { - /* Psi(x, 0, y) => Psi(x, y, 0) */ + ir_node *tmp; + + /* Mux(x, 0, y) => Mux(x, y, 0) */ pn_Cmp pnc = get_Proj_proj(sel); sel = new_r_Proj(irg, get_nodes_block(cmp), cmp, mode_b, get_negated_pnc(pnc, get_irn_mode(get_Cmp_left(cmp)))); - conds[0] = sel; - vals[0] = f; - vals[1] = t; - n = new_rd_Psi(get_irn_dbg_info(n), irg, get_nodes_block(n), 1, conds, vals, mode); - t = vals[0]; - f = vals[1]; + n = new_rd_Mux(get_irn_dbg_info(n), irg, get_nodes_block(n), sel, t, f, mode); + tmp = t; + t = f; + f = tmp; } } } @@ -5160,10 +5454,10 @@ static ir_node *transform_node_Mux(ir_node *n) { tarval *diff, *min; if (tarval_cmp(a, b) & pn_Cmp_Gt) { - diff = tarval_sub(a, b); + diff = tarval_sub(a, b, NULL); min = b; } else { - diff = tarval_sub(b, a); + diff = tarval_sub(b, a, NULL); min = a; } @@ -5171,12 +5465,9 @@ static ir_node *transform_node_Mux(ir_node *n) { dbg_info *dbg = get_irn_dbg_info(n); ir_node *block = get_nodes_block(n); ir_graph *irg = current_ir_graph; - - - conds[0] = sel; - vals[0] = new_Const(mode, tarval_sub(a, min)); - vals[1] = new_Const(mode, tarval_sub(b, min)); - n = new_rd_Psi(dbg, irg, block, 1, conds, vals, mode); + ir_node *t = new_Const(mode, tarval_sub(a, min, NULL)); + ir_node *f = new_Const(mode, tarval_sub(b, min, NULL)); + n = new_rd_Mux(dbg, irg, block, sel, f, t, mode); n = new_rd_Add(dbg, irg, block, n, new_Const(mode, min), mode); return n; } @@ -5207,7 +5498,7 @@ static ir_node *transform_node_Mux(ir_node *n) { if ( (cmp_l == t && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt)) || (cmp_l == f && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt))) { - /* Psi(a >/>= 0, a, -a) = Psi(a Abs(a) */ + /* Mux(a >/>= 0, a, -a) = Mux(a Abs(a) */ n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block, cmp_l, mode); DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_ABS); @@ -5215,7 +5506,7 @@ static ir_node *transform_node_Mux(ir_node *n) { } else if ((cmp_l == t && (pn == pn_Cmp_Le || pn == pn_Cmp_Lt)) || (cmp_l == f && (pn == pn_Cmp_Ge || pn == pn_Cmp_Gt))) { - /* Psi(a />= 0, -a, a) ==> -Abs(a) */ + /* Mux(a />= 0, -a, a) ==> -Abs(a) */ n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, block, cmp_l, mode); n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, @@ -5228,19 +5519,21 @@ static ir_node *transform_node_Mux(ir_node *n) { if (mode_is_int(mode)) { /* integer only */ if ((pn == pn_Cmp_Lg || pn == pn_Cmp_Eq) && is_And(cmp_l)) { - /* Psi((a & b) != 0, c, 0) */ + /* 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) { - /* Psi((a & 2^C) != 0, 2^C, 0) */ + /* Mux((a & 2^C) != 0, 2^C, 0) */ n = cmp_l; + DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP); } else { - /* Psi((a & 2^C) == 0, 2^C, 0) */ + /* Mux((a & 2^C) == 0, 2^C, 0) */ n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, cmp_l, t, mode); + DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP); } return n; } @@ -5252,10 +5545,12 @@ static ir_node *transform_node_Mux(ir_node *n) { 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), current_ir_graph, block, cmp_l, t, mode); + DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP); } return n; } @@ -5269,10 +5564,12 @@ static ir_node *transform_node_Mux(ir_node *n) { 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), current_ir_graph, block, cmp_l, t, mode); + DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_BITOP); } return n; } @@ -5287,17 +5584,7 @@ static ir_node *transform_node_Mux(ir_node *n) { } /* transform_node_Mux */ /** - * Optimize a Psi into some simpler cases. - */ -static ir_node *transform_node_Psi(ir_node *n) { - if (is_Mux(n)) - return transform_node_Mux(n); - - return n; -} /* transform_node_Psi */ - -/** - * optimize sync nodes that have other syncs as input we simply add the inputs + * optimize Sync nodes that have other syncs as input we simply add the inputs * of the other sync to our own inputs */ static ir_node *transform_node_Sync(ir_node *n) { @@ -5373,29 +5660,43 @@ static ir_node *transform_node(ir_node *n) { */ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops) { -#define CASE(a) \ - case iro_##a: \ - ops->transform_node = transform_node_##a; \ +#define CASE(a) \ + case iro_##a: \ + ops->transform_node = transform_node_##a; \ + break +#define CASE_PROJ(a) \ + case iro_##a: \ + ops->transform_node_Proj = transform_node_Proj_##a; \ + break +#define CASE_PROJ_EX(a) \ + case iro_##a: \ + ops->transform_node = transform_node_##a; \ + ops->transform_node_Proj = transform_node_Proj_##a; \ break switch (code) { CASE(Add); CASE(Sub); CASE(Mul); - CASE(Div); - CASE(Mod); - CASE(DivMod); + CASE_PROJ_EX(Div); + CASE_PROJ_EX(Mod); + CASE_PROJ_EX(DivMod); CASE(Quot); CASE(Abs); - CASE(Cond); + CASE_PROJ_EX(Cmp); + CASE_PROJ_EX(Cond); CASE(And); - CASE(Or); CASE(Eor); - CASE(Minus); CASE(Not); + CASE(Minus); CASE(Cast); + CASE_PROJ(Load); + CASE_PROJ(Store); + CASE_PROJ(Bound); + CASE_PROJ(CopyB); CASE(Proj); CASE(Phi); + CASE(Or); CASE(Sel); CASE(Shr); CASE(Shrs); @@ -5404,13 +5705,14 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops CASE(Conv); CASE(End); CASE(Mux); - CASE(Psi); CASE(Sync); default: /* leave NULL */; } return ops; +#undef CASE_PROJ_EX +#undef CASE_PROJ #undef CASE } /* firm_set_default_transform_node */ @@ -5469,12 +5771,17 @@ static int node_cmp_attr_Call(ir_node *a, ir_node *b) { static int node_cmp_attr_Sel(ir_node *a, ir_node *b) { const ir_entity *a_ent = get_Sel_entity(a); const ir_entity *b_ent = get_Sel_entity(b); +#if 0 return (a_ent->kind != b_ent->kind) || (a_ent->name != b_ent->name) || (a_ent->owner != b_ent->owner) || (a_ent->ld_name != b_ent->ld_name) || (a_ent->type != b_ent->type); +#endif + /* Matze: inlining of functions can produce 2 entities with same type, + * name, etc. */ + return a_ent != b_ent; } /* node_cmp_attr_Sel */ /** Compares the attributes of two Phi nodes. */ @@ -5708,38 +6015,14 @@ int identities_cmp(const void *elt, const void *key) { /* * Calculate a hash value of a node. + * + * @param node The IR-node */ unsigned ir_node_hash(const ir_node *node) { - unsigned h; - int i, irn_arity; - - if (node->op == op_Const) { - /* special value for const, as they only differ in their tarval. */ - h = HASH_PTR(node->attr.con.tv); - h = 9*h + HASH_PTR(get_irn_mode(node)); - } else if (node->op == op_SymConst) { - /* special value for const, as they only differ in their symbol. */ - h = HASH_PTR(node->attr.symc.sym.type_p); - h = 9*h + HASH_PTR(get_irn_mode(node)); - } else { - - /* hash table value = 9*(9*(9*(9*(9*arity+in[0])+in[1])+ ...)+mode)+code */ - h = irn_arity = get_irn_intra_arity(node); - - /* consider all in nodes... except the block if not a control flow. */ - for (i = is_cfop(node) ? -1 : 0; i < irn_arity; i++) { - h = 9*h + HASH_PTR(get_irn_intra_n(node, i)); - } - - /* ...mode,... */ - h = 9*h + HASH_PTR(get_irn_mode(node)); - /* ...and code */ - h = 9*h + HASH_PTR(get_irn_op(node)); - } - - return h; + return node->op->ops.hash(node); } /* ir_node_hash */ + pset *new_identities(void) { return new_pset(identities_cmp, N_IR_NODES); } /* new_identities */ @@ -5840,7 +6123,6 @@ ir_node *identify_remember(pset *value_table, ir_node *n) { if (o != n) { update_known_irn(o, n); - DBG_OPT_CSE(n, o); } return o; @@ -6078,7 +6360,10 @@ ir_node *optimize_node(ir_node *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)) { - n = identify_remember(current_ir_graph->value_table, n); + ir_node *o = n; + n = identify_remember(current_ir_graph->value_table, o); + if (o != n) + DBG_OPT_CSE(o, n); } return n; @@ -6143,7 +6428,10 @@ ir_node *optimize_in_place_2(ir_node *n) { now all nodes are op_pin_state_pinned to blocks, i.e., the cse only finds common subexpressions within a block. */ if (get_opt_cse()) { - n = identify_remember(current_ir_graph->value_table, n); + ir_node *o = n; + n = identify_remember(current_ir_graph->value_table, o); + if (o != n) + DBG_OPT_CSE(o, n); } /* Some more constant expression evaluation. */ @@ -6163,8 +6451,12 @@ ir_node *optimize_in_place_2(ir_node *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)) - n = identify_remember(current_ir_graph->value_table, n); + if (get_opt_cse() && (get_irn_opcode(n) != iro_Block)) { + ir_node *o = n; + n = identify_remember(current_ir_graph->value_table, o); + if (o != n) + DBG_OPT_CSE(o, n); + } return n; } /* optimize_in_place_2 */ @@ -6187,10 +6479,69 @@ ir_node *optimize_in_place(ir_node *n) { return optimize_in_place_2(n); } /* optimize_in_place */ +/** + * Calculate a hash value of a Const node. + */ +static unsigned hash_Const(const ir_node *node) { + unsigned h; + + /* special value for const, as they only differ in their tarval. */ + h = HASH_PTR(node->attr.con.tv); + h = 9*h + HASH_PTR(get_irn_mode(node)); + + return h; +} /* hash_Const */ + +/** + * Calculate a hash value of a SymConst node. + */ +static unsigned hash_SymConst(const ir_node *node) { + unsigned h; + + /* special value for const, as they only differ in their symbol. */ + h = HASH_PTR(node->attr.symc.sym.type_p); + h = 9*h + HASH_PTR(get_irn_mode(node)); + + return h; +} /* hash_SymConst */ + +/** + * Set the default hash operation in an ir_op_ops. + * + * @param code the opcode for the default operation + * @param ops the operations initialized + * + * @return + * The operations. + */ +static ir_op_ops *firm_set_default_hash(ir_opcode code, ir_op_ops *ops) +{ +#define CASE(a) \ + case iro_##a: \ + ops->hash = hash_##a; \ + break + + /* hash function already set */ + if (ops->hash != NULL) + return ops; + + switch (code) { + CASE(Const); + CASE(SymConst); + default: + /* use input/mode default hash if no function was given */ + ops->hash = firm_default_hash; + } + + return ops; +#undef CASE +} + /* * Sets the default operation for an ir_ops. */ ir_op_ops *firm_set_default_operations(ir_opcode code, ir_op_ops *ops) { + ops = firm_set_default_hash(code, ops); ops = firm_set_default_computed_value(code, ops); ops = firm_set_default_equivalent_node(code, ops); ops = firm_set_default_transform_node(code, ops);