X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=bd60eb809148a6abc6f8fec192e15ca23f6a2ddd;hb=8711df01fa5919e55a10ac1e8a594bde1a2b6e46;hp=b67e8ed4c2ba6a196e3b459f725c110198ee93b5;hpb=b7bf9774e5e704382bdf3eb7c09bc5755d4f067e;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index b67e8ed4c..bd60eb809 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -21,7 +21,6 @@ * @file * @brief iropt --- optimizations intertwined with IR construction. * @author Christian Schaefer, Goetz Lindenmaier, Michael Beck - * @version $Id$ */ #include "config.h" @@ -44,7 +43,6 @@ #include "irhooks.h" #include "irarch.h" #include "hashptr.h" -#include "opt_polymorphy.h" #include "irtools.h" #include "irhooks.h" #include "array_t.h" @@ -53,7 +51,6 @@ #include "bitfiddle.h" #include "be.h" -/* Make types visible to allow most efficient access */ #include "entity_t.h" static bool is_Or_Eor_Add(const ir_node *node) @@ -85,7 +82,6 @@ static ir_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) @@ -588,6 +584,15 @@ ir_relation ir_get_possible_cmp_relations(const ir_node *left, /* Alloc nodes never return null (but throw an exception) */ if (is_Alloc(left) && tarval_is_null(tv_r)) possible &= ~ir_relation_equal; + /* stuff known through confirm nodes */ + if (is_Confirm(left) && get_Confirm_bound(left) == right) { + possible &= get_Confirm_relation(left); + } + if (is_Confirm(right) && get_Confirm_bound(right) == left) { + ir_relation relation = get_Confirm_relation(right); + relation = get_inversed_relation(relation); + possible &= relation; + } return possible; } @@ -609,6 +614,17 @@ static ir_tarval *compute_cmp(const ir_node *cmp) return computed_value_Cmp_Confirm(cmp, left, right, relation); } +/** + * some people want to call compute_cmp directly, in this case we have to + * test the constant folding flag again + */ +static ir_tarval *compute_cmp_ext(const ir_node *cmp) +{ + if (!get_opt_constant_folding()) + return tarval_bad; + return compute_cmp(cmp); +} + /** * Return the value of a Cmp. * @@ -720,16 +736,7 @@ ir_tarval *computed_value(const ir_node *n) return tarval_bad; } -/** - * Set the default computed_value evaluator 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_computed_value(ir_opcode code, ir_op_ops *ops) +void firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \ @@ -768,8 +775,6 @@ static ir_op_ops *firm_set_default_computed_value(ir_opcode code, ir_op_ops *ops /* leave NULL */ break; } - - return ops; #undef CASE_PROJ #undef CASE } @@ -1249,7 +1254,7 @@ restart: 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); + unsigned float_mantissa = get_mode_mantissa_size(a_mode); if (float_mantissa >= int_mantissa) { n = b; @@ -1477,7 +1482,7 @@ static ir_node *equivalent_node_Mux(ir_node *n) if (ts == tarval_bad && is_Cmp(sel)) { /* try again with a direct call to compute_cmp, as we don't care * about the MODEB_LOWERED flag here */ - ts = compute_cmp(sel); + ts = compute_cmp_ext(sel); } /* Mux(true, f, t) == t */ @@ -1608,16 +1613,7 @@ ir_node *equivalent_node(ir_node *n) return n; } -/** - * Sets the default equivalent node operation for 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_equivalent_node(ir_opcode code, ir_op_ops *ops) +void firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \ @@ -1655,8 +1651,6 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op /* leave NULL */ break; } - - return ops; #undef CASE #undef CASE_PROJ } @@ -2461,6 +2455,55 @@ static bool complement_values(const ir_node *a, const ir_node *b) return false; } +typedef ir_tarval *(tv_fold_binop_func)(ir_tarval *a, ir_tarval *b); + +/** + * for associative operations fold: + * op(op(x, c0), c1) to op(x, op(c0, c1)) with constants folded. + * This is a "light" version of the reassociation phase + */ +static ir_node *fold_constant_associativity(ir_node *node, + tv_fold_binop_func fold) +{ + ir_graph *irg; + ir_op *op; + ir_node *left; + ir_node *right = get_binop_right(node); + ir_node *left_right; + ir_node *left_left; + ir_tarval *c0; + ir_tarval *c1; + ir_tarval *new_c; + ir_node *new_const; + ir_node *new_node; + if (!is_Const(right)) + return node; + + op = get_irn_op(node); + left = get_binop_left(node); + if (get_irn_op(left) != op) + return node; + + left_right = get_binop_right(left); + if (!is_Const(left_right)) + return node; + + left_left = get_binop_left(left); + c0 = get_Const_tarval(left_right); + c1 = get_Const_tarval(right); + irg = get_irn_irg(node); + if (get_tarval_mode(c0) != get_tarval_mode(c1)) + return node; + new_c = fold(c0, c1); + if (new_c == tarval_bad) + return node; + new_const = new_r_Const(irg, new_c); + new_node = exact_copy(node); + set_binop_left(new_node, left_left); + set_binop_right(new_node, new_const); + return new_node; +} + /** * Transform an Or. */ @@ -2472,6 +2515,10 @@ static ir_node *transform_node_Or_(ir_node *n) ir_node *c; ir_mode *mode; + n = fold_constant_associativity(n, tarval_or); + if (n != oldn) + return n; + if (is_Not(a) && is_Not(b)) { /* ~a | ~b = ~(a&b) */ ir_node *block = get_nodes_block(n); @@ -2576,6 +2623,10 @@ static ir_node *transform_node_Eor_(ir_node *n) ir_mode *mode = get_irn_mode(n); ir_node *c; + n = fold_constant_associativity(n, tarval_eor); + if (n != oldn) + return n; + /* 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); @@ -2643,8 +2694,6 @@ static ir_node *transform_node_Eor(ir_node *n) return transform_node_Eor_(n); } - - /** * Do the AddSub optimization, then Transform * Constant folding on Phi @@ -2662,6 +2711,10 @@ static ir_node *transform_node_Add(ir_node *n) ir_node *c; ir_node *oldn = n; + n = fold_constant_associativity(n, tarval_add); + if (n != oldn) + return n; + n = transform_node_AddSub(n); if (n != oldn) return n; @@ -2680,6 +2733,21 @@ static ir_node *transform_node_Add(ir_node *n) } } + if (is_Const(b) && get_mode_arithmetic(mode) == irma_twos_complement) { + ir_tarval *tv = get_Const_tarval(b); + ir_tarval *min = get_mode_min(mode); + /* if all bits are set, then this has the same effect as a Not. + * Note that the following == gives false for different modes which + * is exactly what we want */ + if (tv == min) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_graph *irg = get_irn_irg(n); + ir_node *block = get_nodes_block(n); + ir_node *cnst = new_r_Const(irg, min); + return new_rd_Eor(dbgi, block, a, cnst, mode); + } + } + HANDLE_BINOP_PHI((eval_func) tarval_add, a, b, c, mode); /* for FP the following optimizations are only allowed if @@ -3149,7 +3217,8 @@ static ir_node *transform_node_Mul(ir_node *n) ir_node *a = get_Mul_left(n); ir_node *b = get_Mul_right(n); - if (is_Bad(a) || is_Bad(b)) + n = fold_constant_associativity(n, tarval_mul); + if (n != oldn) return n; if (mode != get_irn_mode(a)) @@ -3230,10 +3299,11 @@ static ir_node *transform_node_Mul(ir_node *n) return n; } } - if (get_mode_arithmetic(mode) == irma_ieee754) { + if (get_mode_arithmetic(mode) == irma_ieee754 + || get_mode_arithmetic(mode) == irma_x86_extended_float) { if (is_Const(a)) { ir_tarval *tv = get_Const_tarval(a); - if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) + if (tarval_get_exponent(tv) == 1 && tarval_zero_mantissa(tv) && !tarval_is_negative(tv)) { /* 2.0 * b = b + b */ n = new_rd_Add(get_irn_dbg_info(n), get_nodes_block(n), b, b, mode); @@ -3243,7 +3313,7 @@ static ir_node *transform_node_Mul(ir_node *n) } else if (is_Const(b)) { ir_tarval *tv = get_Const_tarval(b); - if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv) + if (tarval_get_exponent(tv) == 1 && tarval_zero_mantissa(tv) && !tarval_is_negative(tv)) { /* a * 2.0 = a + a */ n = new_rd_Add(get_irn_dbg_info(n), get_nodes_block(n), a, a, mode); @@ -3467,7 +3537,6 @@ make_tuple: */ static ir_node *transform_node_Cond(ir_node *n) { - ir_node *a = get_Cond_selector(n); ir_graph *irg = get_irn_irg(n); ir_tarval *ta; @@ -3477,15 +3546,11 @@ static ir_node *transform_node_Cond(ir_node *n) if (get_irg_pinned(irg) == op_pin_state_floats) return n; - /* we do not handle switches here */ - if (get_irn_mode(a) != mode_b) - return n; - ta = value_of(a); if (ta == tarval_bad && is_Cmp(a)) { /* try again with a direct call to compute_cmp, as we don't care * about the MODEB_LOWERED flag here */ - ta = compute_cmp(a); + ta = compute_cmp_ext(a); } if (ta != tarval_bad && get_irn_mode(a) == mode_b) { @@ -3508,6 +3573,48 @@ static ir_node *transform_node_Cond(ir_node *n) return n; } +static ir_node *transform_node_Switch(ir_node *n) +{ + ir_node *op = get_Switch_selector(n); + ir_tarval *val = value_of(op); + if (val != tarval_bad) { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_graph *irg = get_irn_irg(n); + unsigned n_outs = get_Switch_n_outs(n); + ir_node *block = get_nodes_block(n); + ir_node *bad = new_r_Bad(irg, mode_X); + ir_node **in = XMALLOCN(ir_node*, n_outs); + const ir_switch_table *table = get_Switch_table(n); + size_t n_entries = ir_switch_table_get_n_entries(table); + long jmp_pn = 0; + size_t i; + unsigned o; + for (i = 0; i < n_entries; ++i) { + const ir_switch_table_entry *entry + = ir_switch_table_get_entry_const(table, i); + ir_tarval *min = entry->min; + ir_tarval *max = entry->max; + if (entry->pn == 0) + continue; + if ((min == max && min == val) + || (tarval_cmp(val, min) != ir_relation_less + && tarval_cmp(val, max) != ir_relation_greater)) { + jmp_pn = entry->pn; + break; + } + } + for (o = 0; o < n_outs; ++o) { + if (o == (unsigned)jmp_pn) { + in[o] = new_rd_Jmp(dbgi, block); + } else { + in[o] = bad; + } + } + return new_r_Tuple(block, (int)n_outs, in); + } + return n; +} + /** * normalisation: (x & c1) >> c2 to (x >> c2) & (c1 >> c2) * (we can use: @@ -3608,6 +3715,10 @@ static ir_node *transform_node_And(ir_node *n) ir_node *b = get_And_right(n); ir_mode *mode; + n = fold_constant_associativity(n, tarval_and); + if (n != oldn) + return n; + if (is_Cmp(a) && is_Cmp(b)) { ir_node *a_left = get_Cmp_left(a); ir_node *a_right = get_Cmp_right(a); @@ -3963,27 +4074,25 @@ static ir_node *transform_node_Minus(ir_node *n) */ 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); + 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; + /* 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) { - ir_graph *irg = get_irn_irg(proj); - DBG_OPT_EXC_REM(proj); - return new_r_Bad(irg, mode_X); - } else { - ir_node *blk = get_nodes_block(load); - return new_r_Jmp(blk); - } + 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) { + ir_graph *irg = get_irn_irg(proj); + DBG_OPT_EXC_REM(proj); + return new_r_Bad(irg, mode_X); + } else { + ir_node *blk = get_nodes_block(load); + return new_r_Jmp(blk); } } } @@ -3995,27 +4104,25 @@ static ir_node *transform_node_Proj_Load(ir_node *proj) */ 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); + 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; + /* 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) { - ir_graph *irg = get_irn_irg(proj); - DBG_OPT_EXC_REM(proj); - return new_r_Bad(irg, mode_X); - } else { - ir_node *blk = get_nodes_block(store); - return new_r_Jmp(blk); - } + 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) { + ir_graph *irg = get_irn_irg(proj); + DBG_OPT_EXC_REM(proj); + return new_r_Bad(irg, mode_X); + } else { + ir_node *blk = get_nodes_block(store); + return new_r_Jmp(blk); } } } @@ -4139,87 +4246,6 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) return proj; } -/** - * Optimizes jump tables (CondIs or CondIu) by removing all impossible cases. - */ -static ir_node *transform_node_Proj_Cond(ir_node *proj) -{ - ir_node *n = get_Proj_pred(proj); - ir_node *b = get_Cond_selector(n); - - if (mode_is_int(get_irn_mode(b))) { - ir_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 { - ir_graph *irg = get_irn_irg(proj); - /* this case will NEVER be taken, kill it */ - clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE); - return new_r_Bad(irg, mode_X); - } - } - } 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); - clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE); - return new_r_Bad(irg, mode_X); - } - } else if (b_vrp->range_type == VRP_ANTIRANGE) { - 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); - clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE); - return new_r_Bad(irg, mode_X); - } - } - - if (!(tarval_cmp( - tarval_and( b_vrp->bits_set, tp), - b_vrp->bits_set - ) == ir_relation_equal)) { - ir_graph *irg = get_irn_irg(proj); - clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE); - return new_r_Bad(irg, mode_X); - } - - 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); - clear_irg_state(irg, IR_GRAPH_STATE_NO_UNREACHABLE_CODE); - return new_r_Bad(irg, mode_X); - } - } - } - } - return proj; -} - /** * return true if the operation returns a value with exactly 1 bit set */ @@ -4242,6 +4268,26 @@ static bool is_single_bit(const ir_node *node) return false; } +/** + * checks if node just flips a bit in another node and returns that other node + * if so. @p tv should be a value having just 1 bit set + */ +static ir_node *flips_bit(const ir_node *node, ir_tarval *tv) +{ + if (is_Not(node)) + return get_Not_op(node); + if (is_Eor(node)) { + ir_node *right = get_Eor_right(node); + if (is_Const(right)) { + ir_tarval *right_tv = get_Const_tarval(right); + ir_mode *mode = get_irn_mode(node); + if (tarval_and(right_tv, tv) != get_mode_null(mode)) + return get_Eor_left(node); + } + } + return NULL; +} + /** * Normalizes and optimizes Cmp nodes. */ @@ -4489,25 +4535,53 @@ static ir_node *transform_node_Cmp(ir_node *n) } } - /* 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 + if (mode_is_int(mode) && is_And(left)) { + /* a complicated Cmp(And(1bit, val), 1bit) "bit-testing" can be replaced + * by the simpler Cmp(And(1bit, val), 0) negated pnc */ + if (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; + || (!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; + goto is_bittest; + } + } + + if (is_Const(right) && is_Const_null(right) && + (relation == ir_relation_equal + || (relation == ir_relation_less_greater) + || (!mode_is_signed(mode) && relation == ir_relation_greater))) { +is_bittest: { + /* instead of flipping the bit before the bit-test operation negate + * pnc */ + ir_node *and0 = get_And_left(left); + ir_node *and1 = get_And_right(left); + if (is_Const(and1)) { + ir_tarval *tv = get_Const_tarval(and1); + if (tarval_is_single_bit(tv)) { + ir_node *flipped = flips_bit(and0, tv); + if (flipped != NULL) { + dbg_info *dbgi = get_irn_dbg_info(left); + ir_node *block = get_nodes_block(left); + relation = get_negated_relation(relation); + left = new_rd_And(dbgi, block, flipped, and1, mode); + changed |= 1; + } + } + } + } } } @@ -4571,6 +4645,43 @@ static ir_node *transform_node_Cmp(ir_node *n) if (tv != tarval_bad) { ir_mode *mode = get_irn_mode(right); + /* cmp(mux(x, cf, ct), c2) can be eliminated: + * cmp(ct,c2) | cmp(cf,c2) | result + * -----------|------------|-------- + * true | true | True + * false | false | False + * true | false | x + * false | true | not(x) + */ + if (is_Mux(left)) { + ir_node *mux_true = get_Mux_true(left); + ir_node *mux_false = get_Mux_false(left); + if (is_Const(mux_true) && is_Const(mux_false)) { + /* we can fold true/false constant separately */ + ir_tarval *tv_true = get_Const_tarval(mux_true); + ir_tarval *tv_false = get_Const_tarval(mux_false); + ir_relation r_true = tarval_cmp(tv_true, tv); + ir_relation r_false = tarval_cmp(tv_false, tv); + if (r_true != ir_relation_false + || r_false != ir_relation_false) { + bool rel_true = (r_true & relation) != 0; + bool rel_false = (r_false & relation) != 0; + ir_node *cond = get_Mux_sel(left); + if (rel_true == rel_false) { + relation = rel_true ? ir_relation_true + : ir_relation_false; + } else if (rel_true) { + return cond; + } else { + dbg_info *dbgi = get_irn_dbg_info(n); + ir_node *block = get_nodes_block(n); + ir_node *notn = new_rd_Not(dbgi, block, cond, mode_b); + return notn; + } + } + } + } + /* TODO extend to arbitrary constants */ if (is_Conv(left) && tarval_is_null(tv)) { ir_node *op = get_Conv_op(left); @@ -5157,9 +5268,6 @@ static ir_node *transform_node_Phi(ir_node *phi) return phi; } -/* forward */ -static ir_node *transform_node(ir_node *n); - /** * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl, Rotl. * @@ -5248,7 +5356,7 @@ static ir_node *transform_node_shift(ir_node *n) DBG_OPT_ALGSIM0(n, irn, FS_OPT_REASSOC_SHIFT); - return transform_node(irn); + return irn; } /** @@ -5769,6 +5877,92 @@ bool ir_is_optimizable_mux(const ir_node *sel, const ir_node *mux_false, return false; } +/** + * Optimize a Mux(c, 0, 1) node (sometimes called a "set" instruction) + */ +static ir_node *transform_Mux_set(ir_node *n) +{ + ir_node *cond = get_Mux_sel(n); + ir_mode *dest_mode; + ir_mode *mode; + ir_node *left; + ir_node *right; + ir_relation relation; + bool need_not; + dbg_info *dbgi; + ir_node *block; + ir_graph *irg; + ir_node *a; + ir_node *b; + unsigned bits; + ir_tarval *tv; + ir_node *shift_cnt; + ir_node *res; + + if (!is_Cmp(cond)) + return n; + left = get_Cmp_left(cond); + mode = get_irn_mode(left); + if (!mode_is_int(mode) && !mode_is_reference(mode)) + return n; + dest_mode = get_irn_mode(n); + if (!mode_is_int(dest_mode) && !mode_is_reference(dest_mode)) + return n; + right = get_Cmp_right(cond); + relation = get_Cmp_relation(cond) & ~ir_relation_unordered; + if (get_mode_size_bits(mode) >= get_mode_size_bits(dest_mode) + && !(mode_is_signed(mode) && is_Const(right) && is_Const_null(right) + && relation != ir_relation_greater)) + return n; + + need_not = false; + switch (relation) { + case ir_relation_less: + /* a < b -> (a - b) >> 31 */ + a = left; + b = right; + break; + case ir_relation_less_equal: + /* a <= b -> ~(a - b) >> 31 */ + a = right; + b = left; + need_not = true; + break; + case ir_relation_greater: + /* a > b -> (b - a) >> 31 */ + a = right; + b = left; + break; + case ir_relation_greater_equal: + /* a >= b -> ~(a - b) >> 31 */ + a = left; + b = right; + need_not = true; + break; + default: + return n; + } + + dbgi = get_irn_dbg_info(n); + block = get_nodes_block(n); + irg = get_irn_irg(block); + bits = get_mode_size_bits(dest_mode); + tv = new_tarval_from_long(bits-1, mode_Iu); + shift_cnt = new_rd_Const(dbgi, irg, tv); + + if (mode != dest_mode) { + a = new_rd_Conv(dbgi, block, a, dest_mode); + b = new_rd_Conv(dbgi, block, b, dest_mode); + } + + res = new_rd_Sub(dbgi, block, a, b, dest_mode); + if (need_not) { + res = new_rd_Not(dbgi, block, res, dest_mode); + } + res = new_rd_Shr(dbgi, block, res, shift_cnt, dest_mode); + return res; +} + /** * Optimize a Mux into some simpler cases. */ @@ -5817,7 +6011,13 @@ static ir_node *transform_node_Mux(ir_node *n) 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); + return new_rd_Mux(get_irn_dbg_info(n), get_nodes_block(n), sel, f, t, mode); + } + + if (is_Const(f) && is_Const_null(f) && is_Const(t) && is_Const_one(t)) { + n = transform_Mux_set(n); + if (n != oldn) + return n; } /* the following optimisations create new mode_b nodes, so only do them @@ -5831,23 +6031,15 @@ static ir_node *transform_node_Mux(ir_node *n) ir_node* f1 = get_Mux_false(t); if (f == f1) { /* Mux(cond0, Mux(cond1, x, y), y) => Mux(cond0 && cond1, x, y) */ - ir_node* and_ = new_r_And(block, c0, c1, mode_b); - ir_node* new_mux = new_r_Mux(block, and_, f1, t1, mode); - n = new_mux; - sel = and_; - f = f1; - t = t1; - DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE); + ir_node* and_ = new_r_And(block, c0, c1, mode_b); + DBG_OPT_ALGSIM0(oldn, t1, FS_OPT_MUX_COMBINE); + return new_r_Mux(block, and_, f1, t1, mode); } else if (f == t1) { /* Mux(cond0, Mux(cond1, x, y), x) */ ir_node* not_c1 = new_r_Not(block, c1, mode_b); ir_node* and_ = new_r_And(block, c0, not_c1, mode_b); - ir_node* new_mux = new_r_Mux(block, and_, t1, f1, mode); - n = new_mux; - sel = and_; - f = t1; - t = f1; - DBG_OPT_ALGSIM0(oldn, t, FS_OPT_MUX_COMBINE); + DBG_OPT_ALGSIM0(oldn, f1, FS_OPT_MUX_COMBINE); + return new_r_Mux(block, and_, t1, f1, mode); } } else if (is_Mux(f)) { ir_node* block = get_nodes_block(n); @@ -5857,23 +6049,15 @@ static ir_node *transform_node_Mux(ir_node *n) ir_node* f1 = get_Mux_false(f); if (t == t1) { /* Mux(cond0, x, Mux(cond1, x, y)) -> typical if (cond0 || cond1) x else y */ - ir_node* or_ = new_r_Or(block, c0, c1, mode_b); - ir_node* new_mux = new_r_Mux(block, or_, f1, t1, mode); - n = new_mux; - sel = or_; - f = f1; - t = t1; - DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE); + ir_node* or_ = new_r_Or(block, c0, c1, mode_b); + DBG_OPT_ALGSIM0(oldn, f1, FS_OPT_MUX_COMBINE); + return new_r_Mux(block, or_, f1, t1, mode); } else if (t == f1) { /* Mux(cond0, x, Mux(cond1, y, x)) */ ir_node* not_c1 = new_r_Not(block, c1, mode_b); ir_node* or_ = new_r_Or(block, c0, not_c1, mode_b); - ir_node* new_mux = new_r_Mux(block, or_, t1, f1, mode); - n = new_mux; - sel = or_; - f = t1; - t = f1; - DBG_OPT_ALGSIM0(oldn, f, FS_OPT_MUX_COMBINE); + DBG_OPT_ALGSIM0(oldn, t1, FS_OPT_MUX_COMBINE); + return new_r_Mux(block, or_, t1, f1, mode); } } @@ -5914,28 +6098,6 @@ static ir_node *transform_node_Mux(ir_node *n) } } } - - /* more normalization: Mux(sel, 0, 1) is simply a conv from the mode_b - * value to integer. */ - if (is_Const(t) && is_Const(f) && mode_is_int(mode)) { - ir_tarval *a = get_Const_tarval(t); - ir_tarval *b = get_Const_tarval(f); - - if (tarval_is_one(a) && tarval_is_null(b)) { - ir_node *block = get_nodes_block(n); - ir_node *conv = new_r_Conv(block, sel, mode); - n = conv; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV); - return n; - } else if (tarval_is_null(a) && tarval_is_one(b)) { - ir_node *block = get_nodes_block(n); - ir_node *not_ = new_r_Not(block, sel, mode_b); - ir_node *conv = new_r_Conv(block, not_, mode); - n = conv; - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_CONV); - return n; - } - } } if (is_Cmp(sel) && mode_is_int(mode) && is_cmp_equality_zero(sel)) { @@ -6180,40 +6342,7 @@ static ir_node *transform_node_Call(ir_node *call) return res; } -/** - * Tries several [inplace] [optimizing] transformations and returns an - * equivalent node. The difference to equivalent_node() is that these - * transformations _do_ generate new nodes, and thus the old node must - * not be freed even if the equivalent node isn't the old one. - */ -static ir_node *transform_node(ir_node *n) -{ - ir_node *oldn; - - /* - * Transform_node is the only "optimizing transformation" that might - * return a node with a different opcode. We iterate HERE until fixpoint - * to get the final result. - */ - do { - oldn = n; - if (n->op->ops.transform_node != NULL) - n = n->op->ops.transform_node(n); - } while (oldn != n); - - return n; -} - -/** - * Sets the default transform node operation for 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_transform_node(ir_opcode code, ir_op_ops *ops) +void firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \ @@ -6235,6 +6364,7 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops CASE(Block); CASE(Call); CASE(Cmp); + CASE(Cond); CASE(Conv); CASE(End); CASE(Eor); @@ -6246,29 +6376,82 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops CASE(Phi); CASE(Proj); CASE(Rotl); - CASE(Sel); CASE(Shl); CASE(Shr); CASE(Shrs); CASE(Sub); + CASE(Switch); CASE(Sync); CASE_PROJ(Bound); CASE_PROJ(CopyB); CASE_PROJ(Store); - CASE_PROJ_EX(Cond); CASE_PROJ_EX(Div); CASE_PROJ_EX(Load); CASE_PROJ_EX(Mod); default: break; } - - return ops; #undef CASE_PROJ_EX #undef CASE_PROJ #undef CASE } +/** + * Tries several [inplace] [optimizing] transformations and returns an + * equivalent node. The difference to equivalent_node() is that these + * transformations _do_ generate new nodes, and thus the old node must + * not be freed even if the equivalent node isn't the old one. + */ +static ir_node *transform_node(ir_node *n) +{ + ir_node *old_n; + unsigned iro; +restart: + old_n = n; + iro = get_irn_opcode_(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) { + /* try to evaluate */ + ir_tarval *tv = computed_value(n); + if (tv != tarval_bad) { + /* evaluation was successful -- replace the node. */ + ir_graph *irg = get_irn_irg(n); + + n = new_r_Const(irg, tv); + + DBG_OPT_CSTEVAL(old_n, n); + return n; + } + } + } + + /* remove unnecessary nodes */ + if (get_opt_constant_folding() || + (iro == iro_Phi) || /* always optimize these nodes. */ + (iro == iro_Id) || /* ... */ + (iro == iro_Proj) || /* ... */ + (iro == iro_Block)) { /* Flags tested local. */ + n = equivalent_node(n); + if (n != old_n) + goto restart; + } + + /* Some more constant expression evaluation. */ + if (get_opt_algebraic_simplification() || + (iro == iro_Cond) || + (iro == iro_Proj)) { /* Flags tested local. */ + if (n->op->ops.transform_node != NULL) { + n = n->op->ops.transform_node(n); + if (n != old_n) { + goto restart; + } + } + } + + return n; +} /* **************** Common Subexpression Elimination **************** */ @@ -6328,7 +6511,7 @@ 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; - if (pa->type != pb->type || pa->tail_call != pb->tail_call) + if (pa->type != pb->type) return 1; return node_cmp_exception(a, b); } @@ -6344,11 +6527,11 @@ static int node_cmp_attr_Sel(const ir_node *a, const ir_node *b) /** Compares the attributes of two Phi nodes. */ 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 */ - if (is_Phi0(a)) { - /* check the Phi0 pos attribute */ - return a->attr.phi.u.pos != b->attr.phi.u.pos; + (void) b; + /* do not CSE Phi-nodes without any inputs when building new graphs */ + if (get_irn_arity(a) == 0 && + get_irg_phase_state(get_irn_irg(a)) == phase_building) { + return 1; } return 0; } @@ -6454,7 +6637,8 @@ static int node_cmp_attr_Builtin(const ir_node *a, const ir_node *b) /** Compares the attributes of two ASM nodes. */ static int node_cmp_attr_ASM(const ir_node *a, const ir_node *b) { - int i, n; + size_t n; + size_t i; const ir_asm_constraint *ca; const ir_asm_constraint *cb; ident **cla, **clb; @@ -6517,16 +6701,7 @@ static int node_cmp_attr_InstOf(const ir_node *a, const ir_node *b) return node_cmp_exception(a, b); } -/** - * Set the default node attribute compare operation for 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_node_cmp_attr(ir_opcode code, ir_op_ops *ops) +void firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \ @@ -6560,15 +6735,9 @@ static ir_op_ops *firm_set_default_node_cmp_attr(ir_opcode code, ir_op_ops *ops) /* leave NULL */ break; } - - return ops; #undef CASE } -/* - * Compare function for two nodes in the value table. Gets two - * nodes as parameters. Returns 0 if the nodes are a Common Sub Expression. - */ int identities_cmp(const void *elt, const void *key) { ir_node *a = (ir_node *)elt; @@ -6633,17 +6802,11 @@ int identities_cmp(const void *elt, const void *key) return 0; } -/* - * Calculate a hash value of a node. - * - * @param node The IR-node - */ unsigned ir_node_hash(const ir_node *node) { return node->op->ops.hash(node); } - void new_identities(ir_graph *irg) { if (irg->value_table != NULL) @@ -6657,8 +6820,6 @@ void del_identities(ir_graph *irg) del_pset(irg->value_table); } -/* Normalize a node by putting constants (and operands with larger - * node index) on the right (operator side). */ void ir_normalize_node(ir_node *n) { if (is_op_commutative(get_irn_op(n))) { @@ -6677,16 +6838,6 @@ void ir_normalize_node(ir_node *n) } } -/* - * 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 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(ir_node *n) { ir_graph *irg = get_irn_irg(n); @@ -6727,7 +6878,6 @@ static inline ir_node *identify_cons(ir_node *n) return n; } -/* Add a node to the identities value table. */ void add_identities(ir_node *node) { if (!get_opt_cse()) @@ -6738,7 +6888,6 @@ void add_identities(ir_node *node) 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; @@ -6751,13 +6900,6 @@ void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) current_ir_graph = rem; } -/** - * These optimizations deallocate nodes from the obstack. - * It can only be called if it is guaranteed that no other nodes - * reference this one, i.e., right after construction of a node. - * - * @param n The node to optimize - */ ir_node *optimize_node(ir_node *n) { ir_node *oldn = n; @@ -6834,12 +6976,13 @@ ir_node *optimize_node(ir_node *n) free the node. */ iro = get_irn_opcode(n); if (get_opt_algebraic_simplification() || - (iro == iro_Cond) || - (iro == iro_Proj)) /* Flags tested local. */ + (iro == iro_Cond) || + (iro == iro_Proj)) { /* Flags tested local. */ n = transform_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)) { + if (get_opt_cse()) { ir_node *o = n; n = identify_remember(o); if (o != n) @@ -6849,75 +6992,42 @@ ir_node *optimize_node(ir_node *n) return n; } - -/** - * These optimizations never deallocate nodes (in place). This can cause dead - * nodes lying on the obstack. Remove these by a dead node elimination, - * i.e., a copying garbage collection. - */ ir_node *optimize_in_place_2(ir_node *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) + if (is_Deleted(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) { - /* try to evaluate */ - tv = computed_value(n); - if (tv != tarval_bad) { - /* evaluation was successful -- replace the node. */ - ir_graph *irg = get_irn_irg(n); - - n = new_r_Const(irg, tv); - - DBG_OPT_CSTEVAL(oldn, n); - return n; - } - } - } - - /* remove unnecessary nodes */ - if (get_opt_constant_folding() || - (iro == iro_Phi) || /* always optimize these nodes. */ - (iro == iro_Id) || /* ... */ - (iro == iro_Proj) || /* ... */ - (iro == iro_Block) ) /* Flags tested local. */ - n = equivalent_node(n); - /** common subexpression elimination **/ /* Checks whether n is already available. */ - /* The block input is used to distinguish different subexpressions. Right - now all nodes are op_pin_state_pinned to blocks, i.e., the cse only finds common - subexpressions within a block. */ + /* The block input is used to distinguish different subexpressions. + * Right 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()) { ir_node *o = n; - n = identify_remember(o); - if (o != n) + n = identify_remember(n); + if (n != o) { DBG_OPT_CSE(o, n); + /* we have another existing node now, we do not optimize it here */ + return n; + } } - /* Some more constant expression evaluation. */ - iro = get_irn_opcode(n); - if (get_opt_constant_folding() || - (iro == iro_Cond) || - (iro == iro_Proj)) /* Flags tested local. */ - n = transform_node(n); + n = transform_node(n); /* Now we can verify the node, as it has no dead inputs any more. */ 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)) { + * Blocks should be unique anyways. (Except the successor of start: + * is cse with the start block!) + * + * Note: This is only necessary because some of the optimisations + * operate in-place (set_XXX_bla, turn_into_tuple, ...) which is considered + * bad practice and should be fixed sometime. + */ + if (get_opt_cse()) { ir_node *o = n; n = identify_remember(o); if (o != n) @@ -6927,9 +7037,6 @@ ir_node *optimize_in_place_2(ir_node *n) return n; } -/** - * Wrapper for external use, set proper status bits after optimization. - */ ir_node *optimize_in_place(ir_node *n) { ir_graph *irg = get_irn_irg(n); @@ -6953,7 +7060,7 @@ 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.tarval); + h = hash_ptr(node->attr.con.tarval); return h; } @@ -6966,21 +7073,12 @@ static unsigned hash_SymConst(const ir_node *node) unsigned h; /* all others are pointers */ - h = HASH_PTR(node->attr.symc.sym.type_p); + h = hash_ptr(node->attr.symc.sym.type_p); return h; } -/** - * 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(unsigned code, ir_op_ops *ops) +void firm_set_default_hash(unsigned code, ir_op_ops *ops) { #define CASE(a) \ case iro_##a: \ @@ -6989,7 +7087,7 @@ static ir_op_ops *firm_set_default_hash(unsigned code, ir_op_ops *ops) /* hash function already set */ if (ops->hash != NULL) - return ops; + return; switch (code) { CASE(Const); @@ -6998,23 +7096,5 @@ static ir_op_ops *firm_set_default_hash(unsigned code, ir_op_ops *ops) /* 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(unsigned 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); - ops = firm_set_default_node_cmp_attr(code, ops); - ops = firm_set_default_get_type_attr(code, ops); - ops = firm_set_default_get_entity_attr(code, ops); - - return ops; -}