X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=81f9edc4c427cb957858185005fd87e9e16a12e5;hb=a999e1baedb84dc9b83059708699dac1c7fdb9a2;hp=bd7fed373bb332a7ccad03eb318b14cb39090063;hpb=43892e6c6e0b64dcec8988ac794f94175b783af3;p=libfirm diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c index bd7fed373..81f9edc4c 100644 --- a/ir/ir/iropt.c +++ b/ir/ir/iropt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -178,7 +178,7 @@ static tarval *computed_value_Minus(ir_node *n) { ir_node *a = get_Minus_op(n); tarval *ta = value_of(a); - if ((ta != tarval_bad) && mode_is_signed(get_irn_mode(a))) + if (ta != tarval_bad) return tarval_neg(ta); return tarval_bad; @@ -534,25 +534,25 @@ static tarval *computed_value_Proj_Cmp(ir_node *n) { ir_node *aba = skip_Id(skip_Proj(ab)); if ( ( (/* aa is ProjP and aaa is Alloc */ - (get_irn_op(aa) == op_Proj) - && (mode_is_reference(get_irn_mode(aa))) - && (get_irn_op(aaa) == op_Alloc)) + is_Proj(aa) + && mode_is_reference(get_irn_mode(aa)) + && is_Alloc(aaa)) && ( (/* ab is NULL */ - (get_irn_op(ab) == op_Const) - && (mode_is_reference(get_irn_mode(ab))) - && (get_Const_tarval(ab) == get_mode_null(get_irn_mode(ab)))) + is_Const(ab) + && mode_is_reference(get_irn_mode(ab)) + && is_Const_null(ab)) || (/* ab is other Alloc */ - (get_irn_op(ab) == op_Proj) - && (mode_is_reference(get_irn_mode(ab))) - && (get_irn_op(aba) == op_Alloc) + is_Proj(ab) + && mode_is_reference(get_irn_mode(ab)) + && is_Alloc(aba) && (aaa != aba)))) || (/* aa is NULL and aba is Alloc */ - (get_irn_op(aa) == op_Const) - && (mode_is_reference(get_irn_mode(aa))) - && (get_Const_tarval(aa) == get_mode_null(get_irn_mode(aa))) - && (get_irn_op(ab) == op_Proj) - && (mode_is_reference(get_irn_mode(ab))) - && (get_irn_op(aba) == op_Alloc))) + is_Const(aa) + && mode_is_reference(get_irn_mode(aa)) + && is_Const_null(aa) + && 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); } @@ -734,7 +734,7 @@ 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) && (get_irn_op(get_Block_cfgpred(n, 0)) == op_Jmp)) { + 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. */ @@ -744,8 +744,7 @@ static ir_node *equivalent_node_Block(ir_node *n) n = predblock; DBG_OPT_STG(oldn, n); } - } else if ((n_preds == 1) && - (get_irn_op(skip_Proj(get_Block_cfgpred(n, 0))) == op_Cond)) { + } 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. */ @@ -761,10 +760,10 @@ 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 ((get_irn_op(a) == op_Proj) && - (get_irn_op(b) == op_Proj) && + if (is_Proj(a) && + is_Proj(b) && (get_Proj_pred(a) == get_Proj_pred(b)) && - (get_irn_op(get_Proj_pred(a)) == op_Cond) && + 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. */ @@ -890,7 +889,7 @@ static ir_node *equivalent_node_Add(ir_node *n) { left = get_Add_left(n); right = get_Add_right(n); - if (get_irn_op(left) == op_Sub) { + if (is_Sub(left)) { if (get_Sub_right(left) == right) { /* (a - x) + x */ @@ -901,7 +900,7 @@ static ir_node *equivalent_node_Add(ir_node *n) { } } } - if (get_irn_op(right) == op_Sub) { + if (is_Sub(right)) { if (get_Sub_right(right) == left) { /* x + (a - x) */ @@ -1160,7 +1159,6 @@ static ir_node *equivalent_node_And(ir_node *n) { static ir_node *equivalent_node_Conv(ir_node *n) { ir_node *oldn = n; ir_node *a = get_Conv_op(n); - ir_node *b; ir_mode *n_mode = get_irn_mode(n); ir_mode *a_mode = get_irn_mode(a); @@ -1175,26 +1173,30 @@ static ir_node *equivalent_node_Conv(ir_node *n) { return n; } /* else both are strict conv, second is superflous */ - } else { - /* leave strict floating point Conv's */ - return n; + } 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; } n = a; DBG_OPT_ALGSIM0(oldn, n, FS_OPT_CONV); - } else if (get_irn_op(a) == op_Conv) { /* Conv(Conv(b)) */ - ir_mode *b_mode; - - b = get_Conv_op(a); - n_mode = get_irn_mode(n); - b_mode = get_irn_mode(b); + } else if (is_Conv(a)) { /* Conv(Conv(b)) */ + ir_node *b = get_Conv_op(a); + ir_mode *b_mode = get_irn_mode(b); if (n_mode == b_mode) { if (n_mode == mode_b) { n = b; /* Convb(Conv*(xxxb(...))) == xxxb(...) */ DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV); } else if (mode_is_int(n_mode)) { - if (smaller_mode(b_mode, a_mode)){ + if (get_mode_size_bits(b_mode) <= get_mode_size_bits(a_mode)) { n = b; /* ConvS(ConvL(xxxS(...))) == xxxS(...) */ DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_CONV); } @@ -1347,7 +1349,7 @@ static ir_node *equivalent_node_Proj(ir_node *proj) { ir_node *oldn = proj; ir_node *a = get_Proj_pred(proj); - if (get_irn_op(a) == op_Tuple) { + 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)); @@ -1362,9 +1364,7 @@ static ir_node *equivalent_node_Proj(ir_node *proj) { /* Remove dead control flow -- early gigo(). */ proj = new_Bad(); } else if (get_opt_ldst_only_null_ptr_exceptions()) { - ir_op *op = get_irn_op(a); - - if (op == op_Load) { + if (is_Load(a)) { /* get the Load address */ ir_node *addr = get_Load_ptr(a); ir_node *blk = get_irn_n(a, -1); @@ -1381,7 +1381,7 @@ static ir_node *equivalent_node_Proj(ir_node *proj) { } else return new_r_Jmp(current_ir_graph, blk); } - } else if (op == op_Store) { + } 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); @@ -1442,7 +1442,7 @@ static ir_node *equivalent_node_Mux(ir_node *n) n = get_Mux_true(n); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_MUX_EQ); } - else if (get_irn_op(sel) == op_Proj && !mode_honor_signed_zeros(get_irn_mode(n))) { + else if (is_Proj(sel) && !mode_honor_signed_zeros(get_irn_mode(n))) { ir_node *cmp = get_Proj_pred(sel); long proj_nr = get_Proj_proj(sel); ir_node *b = get_Mux_false(n); @@ -1456,11 +1456,11 @@ static ir_node *equivalent_node_Mux(ir_node *n) * with NaN's because -NaN == NaN. * However, if +0 and -0 is handled differently, we cannot use the first one. */ - if (get_irn_op(cmp) == op_Cmp && get_Cmp_left(cmp) == a) { + if (is_Cmp(cmp) && get_Cmp_left(cmp) == a) { ir_node *cmp_r = get_Cmp_right(cmp); if (is_Const(cmp_r) && is_Const_null(cmp_r)) { /* Mux(a CMP 0, X, a) */ - if (get_irn_op(b) == op_Minus && get_Minus_op(b) == a) { + if (is_Minus(b) && get_Minus_op(b) == a) { /* Mux(a CMP 0, -a, a) */ if (proj_nr == pn_Cmp_Eq) { /* Mux(a == 0, -a, a) ==> -a */ @@ -1531,7 +1531,7 @@ static ir_node *equivalent_node_Confirm(ir_node *n) { ir_node *pred = get_Confirm_value(n); pn_Cmp pnc = get_Confirm_cmp(n); - if (get_irn_op(pred) == op_Confirm && pnc == get_Confirm_cmp(pred)) { + if (is_Confirm(pred) && pnc == get_Confirm_cmp(pred)) { /* * rare case: two identical Confirms one after another, * replace the second one with the first. @@ -1695,7 +1695,7 @@ static ir_op_ops *firm_set_default_equivalent_node(ir_opcode code, ir_op_ops *op static int is_const_Phi(ir_node *n) { int i; - if (! is_Phi(n)) + if (! is_Phi(n) || get_irn_arity(n) == 0) return 0; for (i = get_irn_arity(n) - 1; i >= 0; --i) if (! is_Const(get_irn_n(n, i))) @@ -1709,15 +1709,15 @@ static int is_const_Phi(ir_node *n) { * @param phi the Phi node * @param other the other operand * @param eval an evaluator function + * @param mode the mode of the result, may be different from the mode of the Phi! * @param left if non-zero, other is the left operand, else the right * * @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 *), int left) { +static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)(tarval *, tarval *), ir_mode *mode, int left) { tarval *tv; void **res; ir_node *pred; - ir_mode *mode; ir_graph *irg; int i, n = get_irn_arity(phi); @@ -1747,7 +1747,6 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)( res[i] = tv; } } - mode = get_irn_mode(phi); irg = current_ir_graph; for (i = 0; i < n; ++i) { pred = get_irn_n(phi, i); @@ -1757,6 +1756,50 @@ static ir_node *apply_binop_on_phi(ir_node *phi, tarval *other, tarval *(*eval)( return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_binop_on_phi */ +/** + * Apply an evaluator on a binop with two constant Phi. + * + * @param a the left Phi node + * @param b the right Phi node + * @param eval an evaluator function + * @param mode the mode of the result, may be different from the mode of the Phi! + * + * @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) { + tarval *tv_l, *tv_r, *tv; + void **res; + ir_node *pred; + ir_graph *irg; + int i, n; + + if (get_nodes_block(a) != get_nodes_block(b)) + return NULL; + + n = get_irn_arity(a); + NEW_ARR_A(void *, res, n); + + for (i = 0; i < n; ++i) { + pred = get_irn_n(a, i); + tv_l = get_Const_tarval(pred); + pred = get_irn_n(b, i); + tv_r = get_Const_tarval(pred); + tv = eval(tv_l, tv_r); + + if (tv == tarval_bad) { + /* folding failed, bad */ + return NULL; + } + res[i] = tv; + } + irg = current_ir_graph; + for (i = 0; i < n; ++i) { + pred = get_irn_n(a, i); + res[i] = new_r_Const_type(irg, get_irg_start_block(irg), mode, res[i], get_Const_type(pred)); + } + return new_r_Phi(irg, get_nodes_block(a), n, (ir_node **)res, mode); +} /* apply_binop_on_2_phis */ + /** * Apply an evaluator on a unop with a constant operator (a Phi). * @@ -1795,6 +1838,41 @@ static ir_node *apply_unop_on_phi(ir_node *phi, tarval *(*eval)(tarval *)) { return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode); } /* apply_unop_on_phi */ +/** + * Apply a conversion on a constant operator (a Phi). + * + * @param phi the Phi node + * + * @return a new Phi node if the conversion was successful, NULL else + */ +static ir_node *apply_conv_on_phi(ir_node *phi, ir_mode *mode) { + tarval *tv; + void **res; + ir_node *pred; + ir_graph *irg; + int i, n = get_irn_arity(phi); + + NEW_ARR_A(void *, res, n); + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + tv = get_Const_tarval(pred); + tv = tarval_convert_to(tv, mode); + + if (tv == tarval_bad) { + /* folding failed, bad */ + return 0; + } + res[i] = tv; + } + irg = current_ir_graph; + for (i = 0; i < n; ++i) { + pred = get_irn_n(phi, i); + res[i] = new_r_Const_type(irg, get_irg_start_block(irg), + mode, res[i], get_Const_type(pred)); + } + return new_r_Phi(irg, get_nodes_block(phi), n, (ir_node **)res, mode); +} /* apply_conv_on_phi */ + /** * Transform AddP(P, ConvIs(Iu)), AddP(P, ConvIu(Is)) and * SubP(P, ConvIs(Iu)), SubP(P, ConvIu(Is)). @@ -1804,13 +1882,13 @@ static ir_node *transform_node_AddSub(ir_node *n) { ir_mode *mode = get_irn_mode(n); if (mode_is_reference(mode)) { - ir_node *left = get_binop_left(n); - ir_node *right = get_binop_right(n); - int ref_bits = get_mode_size_bits(mode); + ir_node *left = get_binop_left(n); + ir_node *right = get_binop_right(n); + unsigned ref_bits = get_mode_size_bits(mode); - if (get_irn_op(left) == op_Conv) { + if (is_Conv(left)) { ir_mode *mode = get_irn_mode(left); - int bits = get_mode_size_bits(mode); + unsigned bits = get_mode_size_bits(mode); if (ref_bits == bits && mode_is_int(mode) && @@ -1831,9 +1909,9 @@ static ir_node *transform_node_AddSub(ir_node *n) { } } - if (get_irn_op(right) == op_Conv) { + if (is_Conv(right)) { ir_mode *mode = get_irn_mode(right); - int bits = get_mode_size_bits(mode); + unsigned bits = get_mode_size_bits(mode); if (ref_bits == bits && mode_is_int(mode) && @@ -1857,26 +1935,30 @@ static ir_node *transform_node_AddSub(ir_node *n) { return n; } /* transform_node_AddSub */ -#define HANDLE_BINOP_PHI(op,a,b,c) \ - c = NULL; \ - if (is_Const(b) && is_const_Phi(a)) { \ - /* check for Op(Phi, Const) */ \ - c = apply_binop_on_phi(a, get_Const_tarval(b), op, 0); \ - } \ - else if (is_Const(a) && is_const_Phi(b)) { \ - /* check for Op(Const, Phi) */ \ - c = apply_binop_on_phi(b, get_Const_tarval(a), op, 1); \ - } \ - if (c) { \ - DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ - return c; \ +#define HANDLE_BINOP_PHI(eval, a, b, c, mode) \ + c = NULL; \ + if (is_Const(b) && is_const_Phi(a)) { \ + /* check for Op(Phi, Const) */ \ + c = apply_binop_on_phi(a, get_Const_tarval(b), eval, mode, 0);\ + } \ + else if (is_Const(a) && is_const_Phi(b)) { \ + /* check for Op(Const, Phi) */ \ + c = apply_binop_on_phi(b, get_Const_tarval(a), eval, mode, 1);\ + } \ + else if (is_const_Phi(a) && is_const_Phi(b)) { \ + /* check for Op(Phi, Phi) */ \ + c = apply_binop_on_2_phis(a, b, eval, mode); \ + } \ + if (c) { \ + DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ + return c; \ } -#define HANDLE_UNOP_PHI(op,a,c) \ +#define HANDLE_UNOP_PHI(eval, a, c) \ c = NULL; \ if (is_const_Phi(a)) { \ /* check for Op(Phi) */ \ - c = apply_unop_on_phi(a, op); \ + c = apply_unop_on_phi(a, eval); \ if (c) { \ DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); \ return c; \ @@ -1901,9 +1983,8 @@ static ir_node *transform_node_Add(ir_node *n) { a = get_Add_left(n); b = get_Add_right(n); - HANDLE_BINOP_PHI(tarval_add, a,b,c); - mode = get_irn_mode(n); + HANDLE_BINOP_PHI(tarval_add, a, b, c, mode); /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) @@ -1911,7 +1992,7 @@ static ir_node *transform_node_Add(ir_node *n) { if (mode_is_num(mode)) { /* the following code leads to endless recursion when Mul are replaced by a simple instruction chain */ - if (!get_opt_arch_dep_running() && a == b && mode_is_int(mode)) { + if (!is_arch_dep_running() && a == b && mode_is_int(mode)) { ir_node *block = get_irn_n(n, -1); n = new_rd_Mul( @@ -1946,74 +2027,6 @@ static ir_node *transform_node_Add(ir_node *n) { DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B); return n; } - if (! get_opt_reassociation()) { - /* do NOT execute this code if reassociation is enabled, it does the inverse! */ - if (is_Mul(a)) { - ir_node *ma = get_Mul_left(a); - ir_node *mb = get_Mul_right(a); - - if (b == ma) { - ir_node *blk = get_irn_n(n, -1); - n = new_rd_Mul( - get_irn_dbg_info(n), current_ir_graph, blk, - ma, - new_rd_Add( - get_irn_dbg_info(n), current_ir_graph, blk, - mb, - new_r_Const_long(current_ir_graph, blk, mode, 1), - mode), - mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A); - return n; - } else if (b == mb) { - ir_node *blk = get_irn_n(n, -1); - n = new_rd_Mul( - get_irn_dbg_info(n), current_ir_graph, blk, - mb, - new_rd_Add( - get_irn_dbg_info(n), current_ir_graph, blk, - ma, - new_r_Const_long(current_ir_graph, blk, mode, 1), - mode), - mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A); - return n; - } - } - if (is_Mul(b)) { - ir_node *ma = get_Mul_left(b); - ir_node *mb = get_Mul_right(b); - - if (a == ma) { - ir_node *blk = get_irn_n(n, -1); - n = new_rd_Mul( - get_irn_dbg_info(n), current_ir_graph, blk, - ma, - new_rd_Add( - get_irn_dbg_info(n), current_ir_graph, blk, - mb, - new_r_Const_long(current_ir_graph, blk, mode, 1), - mode), - mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A); - return n; - } - if (a == mb) { - ir_node *blk = get_irn_n(n, -1); - n = new_rd_Mul( - get_irn_dbg_info(n), current_ir_graph, blk, - mb, - new_rd_Add( - get_irn_dbg_info(n), current_ir_graph, blk, - ma, - new_r_Const_long(current_ir_graph, blk, mode, 1), - mode), - mode); - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A); - return n; - } - } - } if (get_mode_arithmetic(mode) == irma_twos_complement) { /* Here we rely on constants be on the RIGHT side */ if (is_Not(a)) { @@ -2038,7 +2051,7 @@ static ir_node *transform_node_Add(ir_node *n) { ir_node *op = get_Not_op(b); if (op == a) { - /* ~x + x = -1 */ + /* x + ~x = -1 */ ir_node *blk = get_irn_n(n, -1); 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); @@ -2050,7 +2063,9 @@ static ir_node *transform_node_Add(ir_node *n) { return n; } /* transform_node_Add */ -/* returns -cnst */ +/** + * returns -cnst or NULL if impossible + */ static ir_node *const_negate(ir_node *cnst) { tarval *tv = tarval_neg(get_Const_tarval(cnst)); dbg_info *dbgi = get_irn_dbg_info(cnst); @@ -2084,7 +2099,7 @@ static ir_node *transform_node_Sub(ir_node *n) { mode = get_irn_mode(n); restart: - HANDLE_BINOP_PHI(tarval_sub, a,b,c); + HANDLE_BINOP_PHI(tarval_sub, a, b, c, mode); /* for FP these optimizations are only allowed if fp_strict_algebraic is disabled */ if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic)) @@ -2109,7 +2124,6 @@ restart: dbg_info *dbg = get_irn_dbg_info(n); ir_node *block = get_nodes_block(n); ir_node *left = get_Minus_op(a); - ir_mode *mode = get_irn_mode(n); ir_node *add = new_rd_Add(dbg, irg, block, left, b, mode); n = new_rd_Minus(dbg, irg, block, add, mode); @@ -2120,7 +2134,6 @@ restart: dbg_info *dbg = get_irn_dbg_info(n); ir_node *block = get_nodes_block(n); ir_node *right = get_Minus_op(b); - ir_mode *mode = get_irn_mode(n); n = new_rd_Add(dbg, irg, block, a, right, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS); @@ -2135,9 +2148,8 @@ restart: 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); - ir_mode *a_mode = get_irn_mode(n); - n = new_rd_Add(a_dbg, irg, a_block, a, sub, a_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) */ @@ -2153,9 +2165,8 @@ restart: ir_node *mul = new_rd_Mul(m_dbg, irg, m_block, m_left, cnst2, m_mode); dbg_info *a_dbg = get_irn_dbg_info(n); ir_node *a_block = get_nodes_block(n); - ir_mode *a_mode = get_irn_mode(n); - n = new_rd_Add(a_dbg, irg, a_block, a, mul, a_mode); + n = new_rd_Add(a_dbg, irg, a_block, a, mul, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD); return n; } @@ -2232,16 +2243,16 @@ restart: if (mode == get_irn_mode(b)) { ir_mode *ma, *mb; - - a = get_Conv_op(a); - b = get_Conv_op(b); + ir_node *op_a = get_Conv_op(a); + ir_node *op_b = get_Conv_op(b); /* check if it's allowed to skip the conv */ - ma = get_irn_mode(a); - mb = get_irn_mode(b); + ma = get_irn_mode(op_a); + mb = get_irn_mode(op_b); if (mode_is_reference(ma) && mode_is_reference(mb)) { /* SubInt(ConvInt(aP), ConvInt(bP)) -> SubInt(aP,bP) */ + a = op_a; b = op_b; set_Sub_left(n, a); set_Sub_right(n, b); @@ -2250,7 +2261,7 @@ restart: } } /* do NOT execute this code if reassociation is enabled, it does the inverse! */ - if (get_opt_reassociation() && get_irn_op(a) == op_Mul) { + if (!is_reassoc_running() && is_Mul(a)) { ir_node *ma = get_Mul_left(a); ir_node *mb = get_Mul_right(a); @@ -2286,21 +2297,22 @@ restart: return n; } } - if (is_Sub(a)) { - ir_node *x = get_Sub_left(a); - ir_node *y = get_Sub_right(a); - ir_node *blk = get_irn_n(n, -1); - ir_mode *m_b = get_irn_mode(b); - ir_mode *m_y = get_irn_mode(y); + 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_mode *m_b = get_irn_mode(b); + ir_mode *m_y = get_irn_mode(y); + ir_mode *add_mode; ir_node *add; /* Determine the right mode for the Add. */ if (m_b == m_y) - mode = m_b; + add_mode = m_b; else if (mode_is_reference(m_b)) - mode = m_b; + add_mode = m_b; else if (mode_is_reference(m_y)) - mode = m_y; + add_mode = m_y; else { /* * Both modes are different but none is reference, @@ -2311,7 +2323,7 @@ restart: return n; } - add = new_r_Add(current_ir_graph, blk, y, b, mode); + add = new_r_Add(current_ir_graph, blk, y, b, add_mode); n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, x, add, mode); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_SUB_X_Y_Z); @@ -2349,12 +2361,14 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { ir_mode *smode = get_irn_mode(a); if (ta == get_mode_one(smode)) { + /* (L)1 * (L)b = (L)b */ ir_node *blk = get_irn_n(n, -1); 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); 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); @@ -2362,12 +2376,14 @@ static ir_node *transform_node_Mul2n(ir_node *n, ir_mode *mode) { return n; } if (tb == get_mode_one(smode)) { + /* (L)a * (L)1 = (L)a */ ir_node *blk = get_irn_n(a, -1); n = new_rd_Conv(get_irn_dbg_info(n), current_ir_graph, blk, a, mode); DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_NEUTRAL_1); return n; } else if (tb == get_mode_minus_one(smode)) { + /* (L)a * (L)-1 = (L)-a */ ir_node *blk = get_irn_n(n, -1); 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); @@ -2394,7 +2410,7 @@ static ir_node *transform_node_Mul(ir_node *n) { if (mode != get_irn_mode(a)) return transform_node_Mul2n(n, mode); - HANDLE_BINOP_PHI(tarval_mul, a,b,c); + HANDLE_BINOP_PHI(tarval_mul, a, b, c, mode); if (mode_is_signed(mode)) { ir_node *r = NULL; @@ -2453,7 +2469,8 @@ static ir_node *transform_node_Mul(ir_node *n) { if (is_Const(a)) { tarval *tv = get_Const_tarval(a); if (tarval_ieee754_get_exponent(tv) == 1 && tarval_ieee754_zero_mantissa(tv)) { - n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), b, b, mode); + /* 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); return n; } @@ -2461,7 +2478,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)) { - n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, a, mode); + /* 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); return n; } @@ -2474,10 +2492,39 @@ static ir_node *transform_node_Mul(ir_node *n) { * Transform a Div Node. */ static ir_node *transform_node_Div(ir_node *n) { - tarval *tv = value_of(n); ir_mode *mode = get_Div_resmode(n); - ir_node *value = n; + ir_node *a = get_Div_left(n); + ir_node *b = get_Div_right(n); + ir_node *value; + tarval *tv; + + if (is_Const(b) && is_const_Phi(a)) { + /* check for Div(Phi, Const) */ + value = apply_binop_on_phi(a, get_Const_tarval(b), tarval_div, mode, 0); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + else if (is_Const(a) && is_const_Phi(b)) { + /* check for Div(Const, Phi) */ + value = apply_binop_on_phi(b, get_Const_tarval(a), tarval_div, mode, 1); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + else if (is_const_Phi(a) && is_const_Phi(b)) { + /* check for Div(Phi, Phi) */ + value = apply_binop_on_2_phis(a, b, tarval_div, mode); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + value = n; + tv = value_of(n); if (tv != tarval_bad) { value = new_Const(get_tarval_mode(tv), tv); @@ -2533,10 +2580,39 @@ make_tuple: * Transform a Mod node. */ static ir_node *transform_node_Mod(ir_node *n) { - tarval *tv = value_of(n); ir_mode *mode = get_Mod_resmode(n); - ir_node *value = n; + ir_node *a = get_Mod_left(n); + ir_node *b = get_Mod_right(n); + ir_node *value; + tarval *tv; + + if (is_Const(b) && is_const_Phi(a)) { + /* check for Div(Phi, Const) */ + value = apply_binop_on_phi(a, get_Const_tarval(b), tarval_mod, mode, 0); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + else if (is_Const(a) && is_const_Phi(b)) { + /* check for Div(Const, Phi) */ + value = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + else if (is_const_Phi(a) && is_const_Phi(b)) { + /* check for Div(Phi, Phi) */ + value = apply_binop_on_2_phis(a, b, tarval_mod, mode); + if (value) { + DBG_OPT_ALGSIM0(n, value, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + value = n; + tv = value_of(n); if (tv != tarval_bad) { value = new_Const(get_tarval_mode(tv), tv); @@ -2596,14 +2672,48 @@ static ir_node *transform_node_DivMod(ir_node *n) { ir_node *a = get_DivMod_left(n); ir_node *b = get_DivMod_right(n); ir_mode *mode = get_DivMod_resmode(n); - tarval *ta = value_of(a); - tarval *tb = value_of(b); + tarval *ta, *tb; int evaluated = 0; + ir_node *va, *vb; + + if (is_Const(b) && is_const_Phi(a)) { + /* check for Div(Phi, Const) */ + va = apply_binop_on_phi(a, get_Const_tarval(b), tarval_div, mode, 0); + vb = apply_binop_on_phi(a, get_Const_tarval(b), tarval_mod, mode, 0); + if (va && vb) { + DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI); + DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + else if (is_Const(a) && is_const_Phi(b)) { + /* check for Div(Const, Phi) */ + va = apply_binop_on_phi(b, get_Const_tarval(a), tarval_div, mode, 1); + vb = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1); + if (va && vb) { + DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI); + DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + else if (is_const_Phi(a) && is_const_Phi(b)) { + /* check for Div(Phi, Phi) */ + va = apply_binop_on_2_phis(a, b, tarval_div, mode); + vb = apply_binop_on_2_phis(a, b, tarval_mod, mode); + if (va && vb) { + DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI); + DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI); + goto make_tuple; + } + } + ta = value_of(a); + tb = value_of(b); if (tb != tarval_bad) { if (tb == get_mode_one(get_tarval_mode(tb))) { - b = new_Const(mode, get_mode_null(mode)); - DBG_OPT_CSTEVAL(n, b); + va = a; + vb = new_Const(mode, get_mode_null(mode)); + DBG_OPT_CSTEVAL(n, vb); goto make_tuple; } else if (ta != tarval_bad) { tarval *resa, *resb; @@ -2612,28 +2722,30 @@ static ir_node *transform_node_DivMod(ir_node *n) { Jmp for X result!? */ resb = tarval_mod(ta, tb); if (resb == tarval_bad) return n; /* Causes exception! */ - a = new_Const(mode, resa); - b = new_Const(mode, resb); - DBG_OPT_CSTEVAL(n, a); - DBG_OPT_CSTEVAL(n, b); + va = new_Const(mode, resa); + vb = new_Const(mode, resb); + DBG_OPT_CSTEVAL(n, va); + DBG_OPT_CSTEVAL(n, vb); goto make_tuple; } else if (mode_is_signed(mode) && tb == get_mode_minus_one(mode)) { - a = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode); - b = new_Const(mode, get_mode_null(mode)); - DBG_OPT_CSTEVAL(n, a); - DBG_OPT_CSTEVAL(n, b); + va = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), a, mode); + vb = new_Const(mode, get_mode_null(mode)); + DBG_OPT_CSTEVAL(n, va); + DBG_OPT_CSTEVAL(n, vb); goto make_tuple; } else { /* Try architecture dependent optimization */ - arch_dep_replace_divmod_by_const(&a, &b, n); - evaluated = a != NULL; + va = a; + vb = b; + arch_dep_replace_divmod_by_const(&va, &vb, n); + evaluated = va != NULL; } } else if (a == b) { if (value_not_zero(a, &dummy)) { /* a/a && a != 0 */ - a = new_Const(mode, get_mode_one(mode)); - b = new_Const(mode, get_mode_null(mode)); - DBG_OPT_CSTEVAL(n, a); - DBG_OPT_CSTEVAL(n, b); + va = new_Const(mode, get_mode_one(mode)); + vb = new_Const(mode, get_mode_null(mode)); + DBG_OPT_CSTEVAL(n, va); + DBG_OPT_CSTEVAL(n, vb); goto make_tuple; } else { /* BEWARE: it is NOT possible to optimize a/a to 1, as this may cause a exception */ @@ -2641,7 +2753,7 @@ static ir_node *transform_node_DivMod(ir_node *n) { } } else if (ta == get_mode_null(mode) && value_not_zero(b, &dummy)) { /* 0 / non-Const = 0 */ - b = a; + vb = va = a; goto make_tuple; } @@ -2659,8 +2771,8 @@ make_tuple: 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, b); + set_Tuple_pred(n, pn_DivMod_res_div, va); + set_Tuple_pred(n, pn_DivMod_res_mod, vb); } return n; @@ -2709,14 +2821,18 @@ static ir_node *transform_node_Quot(ir_node *n) { /** * Optimize Abs(x) into x if x is Confirmed >= 0 * Optimize Abs(x) into -x if x is Confirmed <= 0 + * Optimize Abs(-x) int Abs(x) */ static ir_node *transform_node_Abs(ir_node *n) { - ir_node *oldn = n; - ir_node *a = get_Abs_op(n); - value_classify_sign sign = classify_value_sign(a); + ir_node *c, *oldn = n; + ir_node *a = get_Abs_op(n); + ir_mode *mode; - if (sign == value_classified_negative) { - ir_mode *mode = get_irn_mode(n); + HANDLE_UNOP_PHI(tarval_abs, a, c); + + switch (classify_value_sign(a)) { + case value_classified_negative: + mode = get_irn_mode(n); /* * We can replace the Abs by -x here. @@ -2726,16 +2842,27 @@ static ir_node *transform_node_Abs(ir_node *n) { * not run it in the equivalent_node() context. */ n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, - get_irn_n(n, -1), a, mode); + get_nodes_block(n), a, mode); DBG_OPT_CONFIRM(oldn, n); - } else if (sign == value_classified_positive) { + return n; + case value_classified_positive: /* n is positive, Abs is not needed */ n = a; DBG_OPT_CONFIRM(oldn, n); + return n; + default: + break; + } + if (is_Minus(a)) { + /* Abs(-x) = Abs(x) */ + mode = get_irn_mode(n); + n = new_rd_Abs(get_irn_dbg_info(n), current_ir_graph, + get_nodes_block(n), get_Minus_op(a), mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ABS_MINUS_X); + return n; } - return n; } /* transform_node_Abs */ @@ -2826,7 +2953,8 @@ static ir_node *transform_bitwise_distributive(ir_node *n, ir_node *b_left = get_binop_left(b); ir_node *b_right = get_binop_right(b); ir_node *c = NULL; - ir_node *op1, *op2; + ir_node *op1 = NULL; + ir_node *op2 = NULL; if (is_op_commutative(op)) { if (a_left == b_left) { @@ -2870,6 +2998,7 @@ static ir_node *transform_bitwise_distributive(ir_node *n, set_irn_n(n, -1, blk); set_binop_left(n, new_n); set_binop_right(n, c); + add_identities(current_ir_graph->value_table, n); } DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_SHIFT_AND); @@ -2889,9 +3018,8 @@ static ir_node *transform_node_And(ir_node *n) { ir_node *b = get_And_right(n); ir_mode *mode; - HANDLE_BINOP_PHI(tarval_and, a,b,c); - mode = get_irn_mode(n); + HANDLE_BINOP_PHI(tarval_and, a, b, c, mode); /* we can evaluate 2 Projs of the same Cmp */ if (mode == mode_b && is_Proj(a) && is_Proj(b)) { @@ -3023,10 +3151,10 @@ static ir_node *transform_node_Eor(ir_node *n) { ir_node *b = get_Eor_right(n); ir_mode *mode = get_irn_mode(n); - HANDLE_BINOP_PHI(tarval_eor, a,b,c); + HANDLE_BINOP_PHI(tarval_eor, a, b, c, mode); /* we can evaluate 2 Projs of the same Cmp */ - if(get_irn_mode(n) == mode_b && is_Proj(a) && is_Proj(b)) { + if (mode == mode_b && is_Proj(a) && is_Proj(b)) { ir_node *pred_a = get_Proj_pred(a); ir_node *pred_b = get_Proj_pred(b); if(pred_a == pred_b) { @@ -3047,22 +3175,29 @@ static ir_node *transform_node_Eor(ir_node *n) { n = new_rd_Const(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), mode, get_mode_null(mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_A_A); - } else if ((mode == mode_b) - && (get_irn_op(a) == op_Proj) - && (get_irn_mode(a) == mode_b) - && is_Const(b) && is_Const_one(b) - && (get_irn_op(get_Proj_pred(a)) == op_Cmp)) { + } else if (mode == mode_b && + is_Proj(a) && + 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), mode_b, get_negated_pnc(get_Proj_proj(a), mode)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT_BOOL); - } else if (mode == mode_b && is_Const(b) && is_Const_one(b)) { - /* The Eor is a Not. Replace it by a Not. */ - /* ????!!!Extend to bitfield 1111111. */ - n = new_r_Not(current_ir_graph, get_irn_n(n, -1), a, mode_b); - - DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + } else if (is_Const(b)) { + if (is_Not(a)) { /* ~x ^ const -> x ^ ~const */ + ir_node *cnst = new_Const(mode, tarval_not(get_Const_tarval(b))); + ir_node *not_op = get_Not_op(a); + dbg_info *dbg = get_irn_dbg_info(n); + ir_graph *irg = current_ir_graph; + ir_node *block = get_nodes_block(n); + ir_mode *mode = get_irn_mode(n); + n = new_rd_Eor(dbg, irg, block, not_op, cnst, mode); + return n; + } else if (is_Const_all_one(b)) { /* x ^ 1...1 -> ~1 */ + n = new_r_Not(current_ir_graph, get_nodes_block(n), a, mode); + DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT); + } } else { n = transform_bitwise_distributive(n, transform_node_Eor); } @@ -3075,29 +3210,51 @@ static ir_node *transform_node_Eor(ir_node *n) { */ static ir_node *transform_node_Not(ir_node *n) { ir_node *c, *oldn = n; - ir_node *a = get_Not_op(n); - ir_op *op_a = get_irn_op(a); + ir_node *a = get_Not_op(n); + ir_mode *mode = get_irn_mode(n); HANDLE_UNOP_PHI(tarval_not,a,c); /* check for a boolean Not */ - if ( (get_irn_mode(n) == mode_b) - && (op_a == op_Proj) - && (get_irn_op(get_Proj_pred(a)) == op_Cmp)) { + if (mode == mode_b && + 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), mode_b, get_negated_pnc(get_Proj_proj(a), mode_b)); DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_CMP); - return n; + return n; } - if (op_a == op_Sub) { - ir_node *sub_r = get_Sub_right(a); - if (is_Const(sub_r) && is_Const_one(sub_r)) { - /* ~(x-1) = -x */ - ir_node *op = get_Sub_left(a); - ir_node *blk = get_irn_n(n, -1); - 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); + if (is_Eor(a)) { + ir_node *eor_b = get_Eor_right(a); + if (is_Const(eor_b)) { /* ~(x ^ const) -> x ^ ~const */ + ir_node *cnst = new_Const(mode, tarval_not(get_Const_tarval(eor_b))); + ir_node *eor_a = get_Eor_left(a); + dbg_info *dbg = get_irn_dbg_info(n); + ir_graph *irg = current_ir_graph; + ir_node *block = get_nodes_block(n); + ir_mode *mode = get_irn_mode(n); + n = new_rd_Eor(dbg, irg, block, eor_a, cnst, mode); + return n; + } + } + if (get_mode_arithmetic(mode) == irma_twos_complement) { + if (is_Minus(a)) { /* ~-x -> x + -1 */ + dbg_info *dbg = get_irn_dbg_info(n); + ir_graph *irg = current_ir_graph; + ir_node *block = get_nodes_block(n); + ir_node *add_l = get_Minus_op(a); + ir_node *add_r = new_rd_Const(dbg, irg, block, mode, get_mode_minus_one(mode)); + n = new_rd_Add(dbg, irg, block, add_l, add_r, mode); + } else if (is_Add(a)) { + ir_node *add_r = get_Add_right(a); + 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); + 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); + } } } return n; @@ -3108,6 +3265,9 @@ static ir_node *transform_node_Not(ir_node *n) { * Optimize: * -(~x) = x + 1 * -(a-b) = b - a + * -(a >>u (size-1)) = a >>s (size-1) + * -(a >>s (size-1)) = a >>u (size-1) + * -(a * const) -> a * -const */ static ir_node *transform_node_Minus(ir_node *n) { ir_node *c, *oldn = n; @@ -3135,7 +3295,7 @@ static ir_node *transform_node_Minus(ir_node *n) { if (is_Const(c)) { tarval *tv = get_Const_tarval(c); - if (tarval_is_long(tv) && get_tarval_long(tv) == get_mode_size_bits(mode) - 1) { + if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) { /* -(a >>u (size-1)) = a >>s (size-1) */ ir_node *v = get_Shr_left(a); @@ -3151,7 +3311,7 @@ static ir_node *transform_node_Minus(ir_node *n) { if (is_Const(c)) { tarval *tv = get_Const_tarval(c); - if (tarval_is_long(tv) && get_tarval_long(tv) == get_mode_size_bits(mode) - 1) { + if (tarval_is_long(tv) && get_tarval_long(tv) == (int) get_mode_size_bits(mode) - 1) { /* -(a >>s (size-1)) = a >>u (size-1) */ ir_node *v = get_Shrs_left(a); @@ -3173,6 +3333,21 @@ static ir_node *transform_node_Minus(ir_node *n) { return 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)); + ir_node *cnst = new_Const(mode, tv); + dbg_info *dbg = get_irn_dbg_info(a); + ir_graph *irg = current_ir_graph; + ir_node *block = get_nodes_block(a); + n = new_rd_Mul(dbg, irg, block, mul_l, cnst, mode); + DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_MUL_C); + return n; + } + } + return n; } /* transform_node_Minus */ @@ -3184,13 +3359,13 @@ static ir_node *transform_node_Cast(ir_node *n) { ir_node *pred = get_Cast_op(n); ir_type *tp = get_irn_type(n); - if (get_irn_op(pred) == op_Const && get_Const_type(pred) != tp) { + if (is_Const(pred) && get_Const_type(pred) != tp) { n = new_rd_Const_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_irn_mode(pred), get_Const_tarval(pred), tp); DBG_OPT_CSTEVAL(oldn, n); - } else if ((get_irn_op(pred) == op_SymConst) && (get_SymConst_value_type(pred) != tp)) { - n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_SymConst_symbol(pred), - get_SymConst_kind(pred), tp); + } else if (is_SymConst(pred) && get_SymConst_value_type(pred) != tp) { + n = new_rd_SymConst_type(NULL, current_ir_graph, get_irn_n(pred, -1), get_irn_mode(pred), + get_SymConst_symbol(pred), get_SymConst_kind(pred), tp); DBG_OPT_CSTEVAL(oldn, n); } @@ -3209,6 +3384,15 @@ static ir_node *transform_node_Proj_Div(ir_node *proj) { if (value_not_zero(b, &confirm)) { /* div(x, y) && y != 0 */ + 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); + set_Div_mem(div, new_mem); + set_irn_pinned(div, op_pin_state_floats); + } + proj_nr = get_Proj_proj(proj); switch (proj_nr) { case pn_Div_X_regular: @@ -3250,6 +3434,15 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { /* mod(x, y) && y != 0 */ proj_nr = get_Proj_proj(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); + set_Mod_mem(mod, new_mem); + set_irn_pinned(mod, op_pin_state_floats); + } + switch (proj_nr) { case pn_Mod_X_regular: @@ -3268,9 +3461,8 @@ static ir_node *transform_node_Proj_Mod(ir_node *proj) { /* This node can only float up to the Confirm block */ new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem); } - set_irn_pinned(mod, op_pin_state_floats); /* this is a Mod without exception, we can remove the memory edge */ - set_Mod_mem(mod, get_irg_no_mem(current_ir_graph)); + set_Mod_mem(mod, new_mem); return res; case pn_Mod_res: if (get_Mod_left(mod) == b) { @@ -3300,6 +3492,15 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { /* DivMod(x, y) && y != 0 */ proj_nr = get_Proj_proj(proj); + if (confirm == NULL) { + /* we are sure we have a Const != 0 */ + new_mem = get_DivMod_mem(divmod); + if (is_Pin(new_mem)) + new_mem = get_Pin_op(new_mem); + set_DivMod_mem(divmod, new_mem); + set_irn_pinned(divmod, op_pin_state_floats); + } + switch (proj_nr) { case pn_DivMod_X_regular: @@ -3318,9 +3519,8 @@ static ir_node *transform_node_Proj_DivMod(ir_node *proj) { /* This node can only float up to the Confirm block */ new_mem = new_r_Pin(current_ir_graph, get_nodes_block(confirm), new_mem); } - set_irn_pinned(divmod, op_pin_state_floats); /* this is a DivMod without exception, we can remove the memory edge */ - set_DivMod_mem(divmod, get_irg_no_mem(current_ir_graph)); + set_DivMod_mem(divmod, new_mem); return res; case pn_DivMod_res_mod: @@ -3368,33 +3568,75 @@ static ir_node *transform_node_Proj_Cond(ir_node *proj) { return proj; } /* transform_node_Proj_Cond */ +/** + * Create a 0 constant of given mode. + */ +static ir_node *create_zero_const(ir_mode *mode) { + tarval *tv = get_mode_null(mode); + ir_node *cnst = new_Const(mode, tv); + + return cnst; +} + +/* the order of the values is important! */ +typedef enum const_class { + const_const = 0, + const_like = 1, + const_other = 2 +} const_class; + +static const_class classify_const(const ir_node* n) +{ + if (is_Const(n)) return const_const; + if (is_irn_constlike(n)) return const_like; + return const_other; +} + +/** + * Determines whether r is more constlike or has a larger index (in that order) + * than l. + */ +static int operands_are_normalized(const ir_node *l, const ir_node *r) +{ + const const_class l_order = classify_const(l); + const const_class r_order = classify_const(r); + return + l_order > r_order || + (l_order == r_order && get_irn_idx(l) <= get_irn_idx(r)); +} + /** * Normalizes and optimizes Cmp nodes. */ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { - ir_node *n = get_Proj_pred(proj); - ir_node *left = get_Cmp_left(n); - ir_node *right = get_Cmp_right(n); - ir_node *c = NULL; - tarval *tv = NULL; - int changed = 0; - ir_mode *mode = NULL; - long proj_nr = get_Proj_proj(proj); - - /* we can evaluate this direct */ - switch(proj_nr) { + ir_node *n = get_Proj_pred(proj); + ir_node *left = get_Cmp_left(n); + ir_node *right = get_Cmp_right(n); + tarval *tv = NULL; + int changed = 0; + ir_mode *mode = NULL; + long proj_nr = get_Proj_proj(proj); + + /* we can evaluate some cases directly */ + switch (proj_nr) { case pn_Cmp_False: return new_Const(mode_b, get_tarval_b_false()); case pn_Cmp_True: return new_Const(mode_b, get_tarval_b_true()); case pn_Cmp_Leg: - if(!mode_is_float(get_irn_mode(left))) + if (!mode_is_float(get_irn_mode(left))) return new_Const(mode_b, get_tarval_b_true()); break; default: break; } + /* remove Casts */ + if (is_Cast(left)) + left = get_Cast_op(left); + if (is_Cast(right)) + right = get_Cast_op(right); + /* Remove unnecessary conversions */ /* TODO handle constants */ if (is_Conv(left) && is_Conv(right)) { @@ -3404,7 +3646,8 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { ir_mode *mode_left = get_irn_mode(op_left); ir_mode *mode_right = get_irn_mode(op_right); - if (smaller_mode(mode_left, mode) && smaller_mode(mode_right, mode)) { + if (smaller_mode(mode_left, mode) && smaller_mode(mode_right, mode) + && mode_left != mode_b && mode_right != mode_b) { ir_graph *irg = current_ir_graph; ir_node *block = get_nodes_block(n); @@ -3412,149 +3655,172 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { left = op_left; right = op_right; changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV_CONV); } else if (smaller_mode(mode_left, mode_right)) { left = new_r_Conv(irg, block, op_left, mode_right); right = op_right; changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV); } else if (smaller_mode(mode_right, mode_left)) { left = op_left; right = new_r_Conv(irg, block, op_right, mode_left); changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV); } } } - /* TODO extend to arbitrary constants */ - if (is_Conv(left) && is_Const(right) && is_Const_null(right)) { - ir_mode* mode = get_irn_mode(left); - ir_node* op = get_Conv_op(left); - ir_mode* op_mode = get_irn_mode(op); - - if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) && - (mode_is_signed(mode) || !mode_is_signed(op_mode))) { - ir_node *null = new_Const(op_mode, get_mode_null(op_mode)); - set_Cmp_left( n, op); - set_Cmp_right(n, null); - return proj; - } - } - - /* remove Casts */ - if (is_Cast(left)) - left = get_Cast_op(left); - if (is_Cast(right)) - right = get_Cast_op(right); - /* remove operation of both sides if possible */ if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { - ir_opcode lop = get_irn_opcode(left); - - if (lop == get_irn_opcode(right)) { - ir_node *ll, *lr, *rl, *rr; - - /* same operation on both sides, try to remove */ - switch (lop) { - case iro_Not: - case iro_Minus: - /* ~a CMP ~b => a CMP b, -a CMP -b ==> a CMP b */ - left = get_unop_op(left); - right = get_unop_op(right); - changed |= 1; - break; - case iro_Add: - ll = get_Add_left(left); - lr = get_Add_right(left); - rl = get_Add_left(right); - rr = get_Add_right(right); - - if (ll == rl) { - /* X + a CMP X + b ==> a CMP b */ - left = lr; - right = rr; - changed |= 1; - } else if (ll == rr) { - /* X + a CMP b + X ==> a CMP b */ - left = lr; - right = rl; - changed |= 1; - } else if (lr == rl) { - /* a + X CMP X + b ==> a CMP b */ - left = ll; - right = rr; - changed |= 1; - } else if (lr == rr) { - /* a + X CMP b + X ==> a CMP b */ - left = ll; - right = rl; + /* + * The following operations are NOT safe for floating point operations, for instance + * 1.0 + inf == 2.0 + inf, =/=> x == y + */ + if (mode_is_int(get_irn_mode(left))) { + unsigned lop = get_irn_opcode(left); + + if (lop == get_irn_opcode(right)) { + ir_node *ll, *lr, *rl, *rr; + + /* same operation on both sides, try to remove */ + switch (lop) { + case iro_Not: + case iro_Minus: + /* ~a CMP ~b => a CMP b, -a CMP -b ==> a CMP b */ + left = get_unop_op(left); + right = get_unop_op(right); changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + break; + case iro_Add: + ll = get_Add_left(left); + lr = get_Add_right(left); + rl = get_Add_left(right); + rr = get_Add_right(right); + + if (ll == rl) { + /* X + a CMP X + b ==> a CMP b */ + left = lr; + right = rr; + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } else if (ll == rr) { + /* X + a CMP b + X ==> a CMP b */ + left = lr; + right = rl; + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } else if (lr == rl) { + /* a + X CMP X + b ==> a CMP b */ + left = ll; + right = rr; + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } else if (lr == rr) { + /* a + X CMP b + X ==> a CMP b */ + left = ll; + right = rl; + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } + break; + case iro_Sub: + ll = get_Sub_left(left); + lr = get_Sub_right(left); + rl = get_Sub_left(right); + rr = get_Sub_right(right); + + if (ll == rl) { + /* X - a CMP X - b ==> a CMP b */ + left = lr; + right = rr; + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } else if (lr == rr) { + /* a - X CMP b - X ==> a CMP b */ + left = ll; + right = rl; + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } + break; + case iro_Rot: + if (get_Rot_right(left) == get_Rot_right(right)) { + /* a ROT X CMP b ROT X ==> a CMP b */ + left = get_Rot_left(left); + right = get_Rot_left(right); + changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); + } + break; + default: + break; } - break; - case iro_Sub: - ll = get_Sub_left(left); - lr = get_Sub_right(left); - rl = get_Sub_left(right); - rr = get_Sub_right(right); - - if (ll == rl) { - /* X - a CMP X - b ==> a CMP b */ - left = lr; - right = rr; - changed |= 1; - } else if (lr == rr) { - /* a - X CMP b - X ==> a CMP b */ - left = ll; - right = rl; + } + + /* X+A == A, A+X == A, A-X == A -> X == 0 */ + if (is_Add(left) || is_Sub(left)) { + ir_node *ll = get_binop_left(left); + ir_node *lr = get_binop_right(left); + + if (lr == right && is_Add(left)) { + ir_node *tmp = ll; + ll = lr; + lr = tmp; + } + if (ll == right) { + left = lr; + right = create_zero_const(get_irn_mode(left)); changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } - break; - case iro_Rot: - if (get_Rot_right(left) == get_Rot_right(right)) { - /* a ROT X CMP b ROT X */ - left = get_Rot_left(left); - right = get_Rot_left(right); + } + if (is_Add(right) || is_Sub(right)) { + ir_node *rl = get_binop_left(right); + ir_node *rr = get_binop_right(right); + + if (rr == left && is_Add(right)) { + ir_node *tmp = rl; + rl = rr; + rr = tmp; + } + if (rl == left) { + left = rr; + right = create_zero_const(get_irn_mode(left)); changed |= 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_OP); } - break; - default: - break; } - } - } + } /* mode_is_int(...) */ + } /* proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg */ + /* replace mode_b compares with ands/ors */ if (get_irn_mode(left) == mode_b) { ir_graph *irg = current_ir_graph; ir_node *block = get_nodes_block(n); + ir_node *bres; switch (proj_nr) { - case pn_Cmp_Le: return new_r_Or( irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); - case pn_Cmp_Lt: return new_r_And(irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); - case pn_Cmp_Ge: return new_r_Or( irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); - case pn_Cmp_Gt: return new_r_And(irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); - case pn_Cmp_Lg: return new_r_Eor(irg, block, left, right, mode_b); - case pn_Cmp_Eq: return new_r_Not(irg, block, new_r_Eor(irg, block, left, right, mode_b), mode_b); + case pn_Cmp_Le: bres = new_r_Or( irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); break; + case pn_Cmp_Lt: bres = new_r_And(irg, block, new_r_Not(irg, block, left, mode_b), right, mode_b); break; + case pn_Cmp_Ge: bres = new_r_Or( irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); break; + case pn_Cmp_Gt: bres = new_r_And(irg, block, left, new_r_Not(irg, block, right, mode_b), mode_b); break; + case pn_Cmp_Lg: bres = new_r_Eor(irg, block, left, right, mode_b); break; + case pn_Cmp_Eq: bres = new_r_Not(irg, block, new_r_Eor(irg, block, left, right, mode_b), mode_b); break; + default: bres = NULL; + } + if (bres) { + DBG_OPT_ALGSIM0(n, bres, FS_OPT_CMP_TO_BOOL); + return bres; } } - if (!get_opt_reassociation()) - return proj; - /* * First step: normalize the compare op * by placing the constant on the right side * or moving the lower address node to the left. - * We ignore the case that both are constants - * this case should be optimized away. */ - if (is_Const(right)) { - c = right; - } else if (is_Const(left)) { - c = left; - left = right; - right = c; - - proj_nr = get_inversed_pnc(proj_nr); - changed |= 1; - } else if (get_irn_idx(left) > get_irn_idx(right)) { + if (!operands_are_normalized(left, right)) { ir_node *t = left; left = right; @@ -3570,9 +3836,28 @@ 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 (c) { - mode = get_irn_mode(c); - tv = get_Const_tarval(c); + if (is_Const(right)) { + mode = get_irn_mode(right); + tv = get_Const_tarval(right); + + /* TODO extend to arbitrary constants */ + if (is_Conv(left) && tarval_is_null(tv)) { + ir_node *op = get_Conv_op(left); + ir_mode *op_mode = get_irn_mode(op); + + /* + * UpConv(x) REL 0 ==> x REL 0 + */ + if (get_mode_size_bits(mode) > get_mode_size_bits(op_mode) && + ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) || + mode_is_signed(mode) || !mode_is_signed(op_mode))) { + tv = get_mode_null(op_mode); + left = op; + mode = op_mode; + changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CONV); + } + } if (tv != tarval_bad) { /* the following optimization is possible on modes without Overflow @@ -3592,13 +3877,16 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { left = get_Minus_op(left); proj_nr = get_inversed_pnc(proj_nr); changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } else if (is_Not(left) && (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg)) { + /* Not(a) ==/!= c ==> a ==/!= Not(c) */ tv = tarval_not(tv); if (tv != tarval_bad) { left = get_Not_op(left); changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } @@ -3619,6 +3907,7 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { if (tv != tarval_bad) { proj_nr ^= pn_Cmp_Eq; changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN); } } /* c < 0 : a > c ==> a >= (c+1) a <= c ==> a < (c+1) */ @@ -3629,26 +3918,28 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { if (tv != tarval_bad) { proj_nr ^= pn_Cmp_Eq; changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN); } } /* the following reassociations work only for == and != */ if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { +#if 0 /* Might be not that good in general */ /* a-b == 0 ==> a == b, a-b != 0 ==> a != b */ if (tarval_is_null(tv) && is_Sub(left)) { - right =get_Sub_right(left); + right = get_Sub_right(left); left = get_Sub_left(left); tv = value_of(right); changed = 1; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } +#endif if (tv != tarval_bad) { - ir_op *op = get_irn_op(left); - /* a-c1 == c2 ==> a == c2+c1, a-c1 != c2 ==> a != c2+c1 */ - if (op == op_Sub) { + if (is_Sub(left)) { ir_node *c1 = get_Sub_right(left); tarval *tv2 = value_of(c1); @@ -3659,17 +3950,18 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { left = get_Sub_left(left); tv = tv2; changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } } /* a+c1 == c2 ==> a == c2-c1, a+c1 != c2 ==> a != c2-c1 */ - else if (op == op_Add) { + else if (is_Add(left)) { ir_node *a_l = get_Add_left(left); ir_node *a_r = get_Add_right(left); ir_node *a; tarval *tv2; - if (get_irn_op(a_l) == op_Const) { + if (is_Const(a_l)) { a = a_r; tv2 = value_of(a_l); } else { @@ -3684,17 +3976,19 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { left = a; tv = tv2; changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } } /* -a == c ==> a == -c, -a != c ==> a != -c */ - else if (op == op_Minus) { + else if (is_Minus(left)) { tarval *tv2 = tarval_sub(get_mode_null(mode), tv); if (tv2 != tarval_bad) { left = get_Minus_op(left); tv = tv2; changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_OP_C); } } } @@ -3702,52 +3996,206 @@ static ir_node *transform_node_Proj_Cmp(ir_node *proj) { /* the following reassociations work only for <= */ else if (proj_nr == pn_Cmp_Le || proj_nr == pn_Cmp_Lt) { if (tv != tarval_bad) { - ir_op *op = get_irn_op(left); - /* c >= 0 : Abs(a) <= c ==> (unsigned)(a + c) <= 2*c */ - if (op == op_Abs) { + if (get_irn_op(left) == op_Abs) { // TODO something is missing here } } } } /* mode_is_int */ - /* - * optimization for AND: - * Optimize: - * And(x, C) == C ==> And(x, C) != 0 - * And(x, C) != C ==> And(X, C) == 0 - * - * if C is a single Bit constant. - */ - if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_And(left)) { - if (tarval_is_single_bit(tv)) { - /* check for Constant's match. We have check hare the tarvals, - because our const might be changed */ - ir_node *la = get_And_left(left); - ir_node *ra = get_And_right(left); - if ((is_Const(la) && get_Const_tarval(la) == tv) || - (is_Const(ra) && get_Const_tarval(ra) == tv)) { - /* fine: do the transformation */ - tv = get_mode_null(get_tarval_mode(tv)); - proj_nr ^= pn_Cmp_Leg; - changed |= 2; + if (proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) { + switch (get_irn_opcode(left)) { + ir_node *c1; + + case iro_And: + c1 = get_And_right(left); + if (is_Const(c1)) { + /* + * And(x, C1) == C2 ==> FALSE if C2 & C1 != C2 + * And(x, C1) != C2 ==> TRUE if C2 & C1 != C2 + */ + tarval *mask = tarval_and(get_Const_tarval(c1), tv); + if (mask != tv) { + /* TODO: move to constant evaluation */ + tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_Const(mode_b, tv); + DBG_OPT_CSTEVAL(proj, c1); + return c1; + } + + if (tarval_is_single_bit(tv)) { + /* + * optimization for AND: + * Optimize: + * And(x, C) == C ==> And(x, C) != 0 + * And(x, C) != C ==> And(X, C) == 0 + * + * if C is a single Bit constant. + */ + + /* check for Constant's match. We have check hare the tarvals, + because our const might be changed */ + if (get_Const_tarval(c1) == tv) { + /* fine: do the transformation */ + tv = get_mode_null(get_tarval_mode(tv)); + proj_nr ^= pn_Cmp_Leg; + changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_CNST_MAGN); + } + } } - } + break; + case iro_Or: + c1 = get_Or_right(left); + if (is_Const(c1) && tarval_is_null(tv)) { + /* + * Or(x, C) == 0 && C != 0 ==> FALSE + * Or(x, C) != 0 && C != 0 ==> TRUE + */ + if (! tarval_is_null(get_Const_tarval(c1))) { + /* TODO: move to constant evaluation */ + tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_Const(mode_b, tv); + DBG_OPT_CSTEVAL(proj, c1); + return c1; + } + } + break; + case iro_Shl: + /* + * optimize x << c1 == c into x & (-1 >>u c1) == c >> c1 if c & (-1 << c1) == c + * FALSE else + * optimize x << c1 != c into x & (-1 >>u c1) != c >> c1 if c & (-1 << c1) == c + * TRUE else + */ + c1 = get_Shl_right(left); + if (is_Const(c1)) { + tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + tarval *minus1 = get_mode_all_one(mode); + tarval *amask = tarval_shr(minus1, tv1); + tarval *cmask = tarval_shl(minus1, tv1); + ir_node *sl, *blk; + + if (tarval_and(tv, cmask) != tv) { + /* condition not met */ + tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_Const(mode_b, tv); + DBG_OPT_CSTEVAL(proj, c1); + return c1; + } + sl = get_Shl_left(left); + blk = get_nodes_block(n); + left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode); + tv = tarval_shr(tv, tv1); + changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); + } + break; + case iro_Shr: + /* + * optimize x >>u c1 == c into x & (-1 << c1) == c << c1 if c & (-1 >>u c1) == c + * FALSE else + * optimize x >>u c1 != c into x & (-1 << c1) != c << c1 if c & (-1 >>u c1) == c + * TRUE else + */ + c1 = get_Shr_right(left); + if (is_Const(c1)) { + tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + tarval *minus1 = get_mode_all_one(mode); + tarval *amask = tarval_shl(minus1, tv1); + tarval *cmask = tarval_shr(minus1, tv1); + ir_node *sl, *blk; + + if (tarval_and(tv, cmask) != tv) { + /* condition not met */ + tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_Const(mode_b, tv); + DBG_OPT_CSTEVAL(proj, c1); + return c1; + } + sl = get_Shr_left(left); + blk = get_nodes_block(n); + left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode); + tv = tarval_shl(tv, tv1); + changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); + } + break; + case iro_Shrs: + /* + * optimize x >>s c1 == c into x & (-1 << c1) == c << c1 if (c >>s (BITS - c1)) \in {0,-1} + * FALSE else + * optimize x >>s c1 != c into x & (-1 << c1) != c << c1 if (c >>s (BITS - c1)) \in {0,-1} + * TRUE else + */ + c1 = get_Shrs_right(left); + if (is_Const(c1)) { + tarval *tv1 = get_Const_tarval(c1); + ir_mode *mode = get_irn_mode(left); + tarval *minus1 = get_mode_all_one(mode); + tarval *amask = tarval_shl(minus1, tv1); + tarval *cond = new_tarval_from_long(get_mode_size_bits(mode), get_tarval_mode(tv1)); + ir_node *sl, *blk; + + cond = tarval_sub(cond, tv1); + cond = tarval_shrs(tv, cond); + + if (!tarval_is_all_one(cond) && !tarval_is_null(cond)) { + /* condition not met */ + tv = proj_nr == pn_Cmp_Eq ? get_tarval_b_false() : get_tarval_b_true(); + c1 = new_Const(mode_b, tv); + DBG_OPT_CSTEVAL(proj, c1); + return c1; + } + sl = get_Shrs_left(left); + blk = get_nodes_block(n); + left = new_rd_And(get_irn_dbg_info(left), current_ir_graph, blk, sl, new_Const(mode, amask), mode); + tv = tarval_shl(tv, tv1); + changed |= 2; + DBG_OPT_ALGSIM0(n, n, FS_OPT_CMP_SHF_TO_AND); + } + break; + } /* switch */ } } /* tarval != bad */ } + if (changed & 2) /* need a new Const */ + right = new_Const(mode, tv); + + if ((proj_nr == pn_Cmp_Eq || proj_nr == pn_Cmp_Lg) && is_Const(right) && is_Const_null(right) && is_Proj(left)) { + ir_node *op = get_Proj_pred(left); + + if ((is_Mod(op) && get_Proj_proj(left) == pn_Mod_res) || + (is_DivMod(op) && get_Proj_proj(left) == pn_DivMod_res_mod)) { + ir_node *c = get_binop_right(op); + + if (is_Const(c)) { + tarval *tv = get_Const_tarval(c); + + if (tarval_is_single_bit(tv)) { + /* special case: (x % 2^n) CMP 0 ==> x & (2^n-1) CMP 0 */ + ir_node *v = get_binop_left(op); + ir_node *blk = get_irn_n(op, -1); + ir_mode *mode = get_irn_mode(v); + + tv = tarval_sub(tv, get_mode_one(mode)); + 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); + } + } + } + } + if (changed) { ir_node *block = get_irn_n(n, -1); /* Beware of get_nodes_Block() */ - if (changed & 2) /* need a new Const */ - right = new_Const(mode, tv); - /* create a new compare */ n = new_rd_Cmp(get_irn_dbg_info(n), current_ir_graph, block, left, right); - - set_Proj_pred(proj, n); - set_Proj_proj(proj, proj_nr); + proj = new_rd_Proj(get_irn_dbg_info(proj), current_ir_graph, block, n, get_irn_mode(proj), proj_nr); } return proj; @@ -3839,7 +4287,7 @@ static void get_comm_Binop_Ops(ir_node *binop, ir_node **a, ir_node **c) { assert(is_op_commutative(get_irn_op(binop))); - if (get_irn_op(op_a) == op_Const) { + if (is_Const(op_a)) { *a = op_b; *c = op_a; } else { @@ -3962,16 +4410,16 @@ static ir_node *transform_node_Or_Rot(ir_node *or) { shl = get_binop_left(or); shr = get_binop_right(or); - if (get_irn_op(shl) == op_Shr) { - if (get_irn_op(shr) != op_Shl) + if (is_Shr(shl)) { + if (!is_Shl(shr)) return or; irn = shl; shl = shr; shr = irn; - } else if (get_irn_op(shl) != op_Shl) { + } else if (!is_Shl(shl)) { return or; - } else if (get_irn_op(shr) != op_Shr) { + } else if (!is_Shr(shr)) { return or; } x = get_Shl_left(shl); @@ -3980,7 +4428,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) { c1 = get_Shl_right(shl); c2 = get_Shr_right(shr); - if (get_irn_op(c1) == op_Const && get_irn_op(c2) == op_Const) { + if (is_Const(c1) && is_Const(c2)) { tv1 = get_Const_tarval(c1); if (! tarval_is_long(tv1)) return or; @@ -3990,7 +4438,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) { return or; if (get_tarval_long(tv1) + get_tarval_long(tv2) - != get_mode_size_bits(mode)) + != (int) get_mode_size_bits(mode)) return or; /* yet, condition met */ @@ -4000,7 +4448,7 @@ static ir_node *transform_node_Or_Rot(ir_node *or) { DBG_OPT_ALGSIM1(or, shl, shr, n, FS_OPT_OR_SHFT_TO_ROT); return n; - } else if (get_irn_op(c1) == op_Sub) { + } else if (is_Sub(c1)) { v = c2; sub = c1; @@ -4008,14 +4456,14 @@ static ir_node *transform_node_Or_Rot(ir_node *or) { return or; c1 = get_Sub_left(sub); - if (get_irn_op(c1) != op_Const) + if (!is_Const(c1)) return or; tv1 = get_Const_tarval(c1); if (! tarval_is_long(tv1)) return or; - if (get_tarval_long(tv1) != get_mode_size_bits(mode)) + if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode)) return or; /* yet, condition met */ @@ -4026,19 +4474,19 @@ static ir_node *transform_node_Or_Rot(ir_node *or) { DBG_OPT_ALGSIM0(or, n, FS_OPT_OR_SHFT_TO_ROT); return n; - } else if (get_irn_op(c2) == op_Sub) { + } else if (is_Sub(c2)) { v = c1; sub = c2; c1 = get_Sub_left(sub); - if (get_irn_op(c1) != op_Const) + if (!is_Const(c1)) return or; tv1 = get_Const_tarval(c1); if (! tarval_is_long(tv1)) return or; - if (get_tarval_long(tv1) != get_mode_size_bits(mode)) + if (get_tarval_long(tv1) != (int) get_mode_size_bits(mode)) return or; /* yet, condition met */ @@ -4061,12 +4509,13 @@ static ir_node *transform_node_Or(ir_node *n) { ir_node *c, *oldn = n; ir_node *a = get_Or_left(n); ir_node *b = get_Or_right(n); + ir_mode *mode; if (is_Not(a) && is_Not(b)) { /* ~a | ~b = ~(a&b) */ ir_node *block = get_nodes_block(n); - ir_mode *mode = get_irn_mode(n); + mode = get_irn_mode(n); a = get_Not_op(a); b = get_Not_op(b); n = new_rd_And(get_irn_dbg_info(n), current_ir_graph, block, a, b, mode); @@ -4092,7 +4541,8 @@ static ir_node *transform_node_Or(ir_node *n) { } } - HANDLE_BINOP_PHI(tarval_or, a,b,c); + mode = get_irn_mode(n); + HANDLE_BINOP_PHI(tarval_or, a, b, c, mode); n = transform_node_Or_bf_store(n); n = transform_node_Or_Rot(n); @@ -4109,7 +4559,7 @@ static ir_node *transform_node_Or(ir_node *n) { static ir_node *transform_node(ir_node *n); /** - * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl. + * Optimize (a >> c1) >> c2), works for Shr, Shrs, Shl, Rot. * * Should be moved to reassociation? */ @@ -4171,10 +4621,11 @@ static ir_node *transform_node_shift(ir_node *n) { */ static ir_node *transform_node_Shr(ir_node *n) { ir_node *c, *oldn = n; - ir_node *a = get_Shr_left(n); - ir_node *b = get_Shr_right(n); + ir_node *a = get_Shr_left(n); + ir_node *b = get_Shr_right(n); + ir_mode *mode = get_irn_mode(n); - HANDLE_BINOP_PHI(tarval_shr, a, b, c); + HANDLE_BINOP_PHI(tarval_shr, a, b, c, mode); return transform_node_shift(n); } /* transform_node_Shr */ @@ -4183,10 +4634,11 @@ static ir_node *transform_node_Shr(ir_node *n) { */ static ir_node *transform_node_Shrs(ir_node *n) { ir_node *c, *oldn = n; - ir_node *a = get_Shrs_left(n); - ir_node *b = get_Shrs_right(n); + ir_node *a = get_Shrs_left(n); + ir_node *b = get_Shrs_right(n); + ir_mode *mode = get_irn_mode(n); - HANDLE_BINOP_PHI(tarval_shrs, a, b, c); + HANDLE_BINOP_PHI(tarval_shrs, a, b, c, mode); return transform_node_shift(n); } /* transform_node_Shrs */ @@ -4195,13 +4647,50 @@ static ir_node *transform_node_Shrs(ir_node *n) { */ static ir_node *transform_node_Shl(ir_node *n) { ir_node *c, *oldn = n; - ir_node *a = get_Shl_left(n); - ir_node *b = get_Shl_right(n); + ir_node *a = get_Shl_left(n); + ir_node *b = get_Shl_right(n); + ir_mode *mode = get_irn_mode(n); - HANDLE_BINOP_PHI(tarval_shl, a, b, c); + HANDLE_BINOP_PHI(tarval_shl, a, b, c, mode); return transform_node_shift(n); } /* transform_node_Shl */ +/** + * Transform a Rot. + */ +static ir_node *transform_node_Rot(ir_node *n) { + ir_node *c, *oldn = n; + ir_node *a = get_Rot_left(n); + ir_node *b = get_Rot_right(n); + ir_mode *mode = get_irn_mode(n); + + HANDLE_BINOP_PHI(tarval_rot, a, b, c, mode); + return transform_node_shift(n); +} /* transform_node_Rot */ + +/** + * Transform a Conv. + */ +static ir_node *transform_node_Conv(ir_node *n) { + ir_node *c, *oldn = n; + ir_node *a = get_Conv_op(n); + + if (is_const_Phi(a)) { + c = apply_conv_on_phi(a, get_irn_mode(n)); + if (c) { + DBG_OPT_ALGSIM0(oldn, c, FS_OPT_CONST_PHI); + return c; + } + } + + 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); + } + + return n; +} /* transform_node_Conv */ + /** * Remove dead blocks and nodes in dead blocks * in keep alive list. We do not generate a new End node. @@ -4295,7 +4784,7 @@ static ir_node *transform_node_Mux(ir_node *n) { } } - if (get_irn_op(sel) == op_Proj && !mode_honor_signed_zeros(mode)) { + if (is_Proj(sel) && !mode_honor_signed_zeros(mode)) { ir_node *cmp = get_Proj_pred(sel); long pn = get_Proj_proj(sel); ir_node *f = get_Mux_false(n); @@ -4338,53 +4827,6 @@ static ir_node *transform_node_Mux(ir_node *n) { return n; } } - - if (mode_is_int(mode) && mode_is_signed(mode) && - get_mode_arithmetic(mode) == irma_twos_complement) { - ir_node *x = get_Cmp_left(cmp); - - /* the following optimization works only with signed integer two-complement mode */ - - if (mode == get_irn_mode(x)) { - /* - * FIXME: this restriction is two rigid, as it would still - * work if mode(x) = Hs and mode == Is, but at least it removes - * all wrong cases. - */ - if ((pn == pn_Cmp_Lt || pn == pn_Cmp_Le) && - is_Const(t) && is_Const_all_one(t) && - is_Const(f) && is_Const_null(f)) { - /* - * Mux(x:T Shrs(x, sizeof_bits(T) - 1) - * Conditions: - * T must be signed. - */ - n = new_rd_Shrs(get_irn_dbg_info(n), - current_ir_graph, block, x, - new_r_Const_long(current_ir_graph, block, mode_Iu, - get_mode_size_bits(mode) - 1), - mode); - DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_SHR); - return n; - } else if ((pn == pn_Cmp_Gt || pn == pn_Cmp_Ge) && - is_Const(t) && is_Const_one(t) && - is_Const(f) && is_Const_null(f)) { - /* - * Mux(x:T >/>= 0, 0, 1) -> Shr(-x, sizeof_bits(T) - 1) - * Conditions: - * T must be signed. - */ - n = new_rd_Shr(get_irn_dbg_info(n), - current_ir_graph, block, - new_r_Minus(current_ir_graph, block, x, mode), - new_r_Const_long(current_ir_graph, block, mode_Iu, - get_mode_size_bits(mode) - 1), - mode); - DBG_OPT_ALGSIM1(oldn, cmp, sel, n, FS_OPT_MUX_TO_SHR); - return n; - } - } - } } } } @@ -4401,6 +4843,42 @@ static ir_node *transform_node_Psi(ir_node *n) { return n; } /* transform_node_Psi */ +/** + * 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) { + int i, arity; + + arity = get_irn_arity(n); + for(i = 0; i < get_irn_arity(n); /*empty*/) { + int i2, arity2; + ir_node *in = get_irn_n(n, i); + if(!is_Sync(in)) { + ++i; + continue; + } + + /* set sync input 0 instead of the sync */ + set_irn_n(n, i, get_irn_n(in, 0)); + /* so we check this input again for syncs */ + + /* append all other inputs of the sync to our sync */ + arity2 = get_irn_arity(in); + for(i2 = 1; i2 < arity2; ++i2) { + ir_node *in_in = get_irn_n(in, i2); + add_irn_n(n, in_in); + /* increase arity so we also check the new inputs for syncs */ + arity++; + } + } + + /* rehash the sync node */ + add_identities(current_ir_graph->value_table, n); + + return n; +} + /** * Tries several [inplace] [optimizing] transformations and returns an * equivalent node. The difference to equivalent_node() is that these @@ -4462,9 +4940,12 @@ static ir_op_ops *firm_set_default_transform_node(ir_opcode code, ir_op_ops *ops CASE(Shr); CASE(Shrs); CASE(Shl); + CASE(Rot); + CASE(Conv); CASE(End); CASE(Mux); CASE(Psi); + CASE(Sync); default: /* leave NULL */; } @@ -4757,30 +5238,23 @@ void del_identities(pset *value_table) { } /* del_identities */ /** - * Normalize a node by putting constants (and operands with smaller + * Normalize a node by putting constants (and operands with larger * node index) on the right * * @param n The node to normalize */ static void normalize_node(ir_node *n) { - if (get_opt_reassociation()) { - if (is_op_commutative(get_irn_op(n))) { - ir_node *l = get_binop_left(n); - ir_node *r = get_binop_right(n); - int l_idx = get_irn_idx(l); - int r_idx = get_irn_idx(r); - - /* For commutative operators perform a OP b == b OP a but keep - constants on the RIGHT side. This helps greatly in some optimizations. - Moreover we use the idx number to make the form deterministic. */ - if (is_irn_constlike(l)) - l_idx = -l_idx; - if (is_irn_constlike(r)) - r_idx = -r_idx; - if (l_idx < r_idx) { - set_binop_left(n, r); - set_binop_right(n, l); - } + if (is_op_commutative(get_irn_op(n))) { + ir_node *l = get_binop_left(n); + ir_node *r = get_binop_right(n); + + /* For commutative operators perform a OP b == b OP a but keep + * constants on the RIGHT side. This helps greatly in some + * optimizations. Moreover we use the idx number to make the form + * deterministic. */ + if (!operands_are_normalized(l, r)) { + set_binop_left(n, r); + set_binop_right(n, l); } } } /* normalize_node */ @@ -5066,7 +5540,7 @@ ir_node *optimize_in_place_2(ir_node *n) { ir_node *oldn = n; ir_opcode iro = get_irn_opcode(n); - if (!get_opt_optimize() && (get_irn_op(n) != op_Phi)) return n; + if (!get_opt_optimize() && !is_Phi(n)) return n; /* constant expression evaluation / constant folding */ if (get_opt_constant_folding()) {