use ffreep st instead of fstp st on athlon
[libfirm] / ir / ir / iropt.c
index c1a40dd..c6c052f 100644 (file)
@@ -1522,7 +1522,7 @@ static ir_node *equivalent_node_Cmp(ir_node *n) {
        ir_node *left  = get_Cmp_left(n);
        ir_node *right = get_Cmp_right(n);
 
-       if (get_irn_op(left) == op_Minus && get_irn_op(right) == op_Minus &&
+       if (is_Minus(left) && is_Minus(right) &&
                !mode_overflow_on_unary_Minus(get_irn_mode(left))) {
                left  = get_Minus_op(left);
                right = get_Minus_op(right);
@@ -2099,36 +2099,41 @@ restart:
        if (mode_is_float(mode) && (get_irg_fp_model(current_ir_graph) & fp_strict_algebraic))
                return n;
 
-       /* Sub(a, Const) -> Add(a, -Const) */
        if (is_Const(b) && get_irn_mode(b) != mode_P) {
-               ir_node* cnst = const_negate(b);
+               /* a - C -> a + (-C) */
+               ir_node *cnst = const_negate(b);
                if (cnst != NULL) {
                        ir_node  *block = get_nodes_block(n);
                        dbg_info *dbgi  = get_irn_dbg_info(n);
                        ir_graph *irg   = get_irn_irg(n);
-                       ir_node  *add   = new_rd_Add(dbgi, irg, block, a, cnst, mode);
 
-                       return add;
+                       n = new_rd_Add(dbgi, irg, block, a, cnst, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
+                       return n;
                }
        }
 
-       if (is_Minus(a)) { /* -a - b -> -(a + b) */
+       if (is_Minus(a)) { /* (-a) - b -> -(a + b) */
                ir_graph *irg   = current_ir_graph;
                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);
-               ir_node  *neg   = new_rd_Minus(dbg, irg, block, add, mode);
-               return neg;
-       } else if (is_Minus(b)) { /* a - -b -> a + b */
+
+               n = new_rd_Minus(dbg, irg, block, add, mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
+               return n;
+       } else if (is_Minus(b)) { /* a - (-b) -> a + b */
                ir_graph *irg   = current_ir_graph;
                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);
-               ir_node  *add   = new_rd_Add(dbg, irg, block, a, right, mode);
-               return add;
+
+               n = new_rd_Add(dbg, irg, block, a, right, mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_MINUS);
+               return n;
        } else if (is_Sub(b)) { /* a - (b - c) -> a + (c - b) */
                ir_graph *irg     = current_ir_graph;
                dbg_info *s_dbg   = get_irn_dbg_info(b);
@@ -2140,12 +2145,14 @@ restart:
                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);
-               ir_node  *add     = new_rd_Add(a_dbg, irg, a_block, a, sub, a_mode);
-               return add;
-       } else if (is_Mul(b)) { /* a - (b * const2) -> a + (b * -const2) */
-               ir_node* m_right = get_Mul_right(b);
+
+               n = new_rd_Add(a_dbg, irg, a_block, a, sub, a_mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
+               return n;
+       } else if (is_Mul(b)) { /* a - (b * C) -> a + (b * -C) */
+               ir_node *m_right = get_Mul_right(b);
                if (is_Const(m_right)) {
-                       ir_nodecnst2 = const_negate(m_right);
+                       ir_node *cnst2 = const_negate(m_right);
                        if (cnst2 != NULL) {
                                ir_graph *irg     = current_ir_graph;
                                dbg_info *m_dbg   = get_irn_dbg_info(b);
@@ -2156,8 +2163,10 @@ restart:
                                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);
-                               ir_node  *add     = new_rd_Add(a_dbg, irg, a_block, a, mul, a_mode);
-                               return add;
+
+                               n = new_rd_Add(a_dbg, irg, a_block, a, mul, a_mode);
+                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_SUB_TO_ADD);
+                               return n;
                        }
                }
        }
@@ -2410,40 +2419,42 @@ static ir_node *transform_node_Mul(ir_node *n) {
                }
        }
        if (is_Minus(a)) {
-               if (is_Const(b)) { /* -a * const -> a * -const */
-                       ir_nodecnst = const_negate(b);
+               if (is_Const(b)) { /* (-a) * const -> a * -const */
+                       ir_node *cnst = const_negate(b);
                        if (cnst != NULL) {
-                               set_Mul_left( n, get_Minus_op(a));
-                               set_Mul_right(n, cnst);
+                               dbg_info *dbgi  = get_irn_dbg_info(n);
+                               ir_node  *block = get_nodes_block(n);
+                               n = new_rd_Mul(dbgi, current_ir_graph, block, get_Minus_op(a), cnst, mode);
+                               DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_1);
                                return n;
                        }
-               } else if (is_Minus(b)) { /* -a * -b -> a * b */
-                       set_Mul_left( n, get_Minus_op(a));
-                       set_Mul_right(n, get_Minus_op(b));
+               } else if (is_Minus(b)) { /* (-a) * (-b) -> a * b */
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
+                       ir_node  *block = get_nodes_block(n);
+                       n = new_rd_Mul(dbgi, current_ir_graph, block, get_Minus_op(a), get_Minus_op(b), mode);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS_MINUS);
                        return n;
-               } else if (is_Sub(b)) { /* -a * (b - c) -> a * (c - b) */
+               } else if (is_Sub(b)) { /* (-a) * (b - c) -> a * (c - b) */
                        ir_node  *sub_l = get_Sub_left(b);
                        ir_node  *sub_r = get_Sub_right(b);
-                       dbg_info *dbgi  = get_irn_dbg_info(b);
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
                        ir_graph *irg   = current_ir_graph;
-                       ir_mode  *mode  = get_irn_mode(b);
-                       ir_node  *block = get_nodes_block(b);
+                       ir_node  *block = get_nodes_block(n);
                        ir_node  *new_b = new_rd_Sub(dbgi, irg, block, sub_r, sub_l, mode);
-                       set_Mul_left( n, get_Minus_op(a));
-                       set_Mul_right(n, new_b);
+                       n = new_rd_Mul(dbgi, irg, block, get_Minus_op(a), new_b, mode);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS);
                        return n;
                }
        } else if (is_Minus(b)) {
-               if (is_Sub(a)) { /* (a - b) * -c -> (b - a) * c */
+               if (is_Sub(a)) { /* (a - b) * (-c) -> (b - a) * c */
                        ir_node  *sub_l = get_Sub_left(a);
                        ir_node  *sub_r = get_Sub_right(a);
-                       dbg_info *dbgi  = get_irn_dbg_info(a);
+                       dbg_info *dbgi  = get_irn_dbg_info(n);
                        ir_graph *irg   = current_ir_graph;
-                       ir_mode  *mode  = get_irn_mode(a);
-                       ir_node  *block = get_nodes_block(a);
+                       ir_node  *block = get_nodes_block(n);
                        ir_node  *new_a = new_rd_Sub(dbgi, irg, block, sub_r, sub_l, mode);
-                       set_Mul_left (n, new_a);
-                       set_Mul_right(n, get_Minus_op(b));
+                       n = new_rd_Mul(dbgi, irg, block, new_a, get_Minus_op(b), mode);
+                       DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_MUL_MINUS);
                        return n;
                }
        }
@@ -2885,14 +2896,17 @@ static ir_node *transform_node_And(ir_node *n) {
        ir_node *c, *oldn = n;
        ir_node *a = get_And_left(n);
        ir_node *b = get_And_right(n);
+       ir_mode *mode;
 
        HANDLE_BINOP_PHI(tarval_and, a,b,c);
 
+       mode = get_irn_mode(n);
+
        /* 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) {
+               if (pred_a == pred_b) {
                        dbg_info *dbgi  = get_irn_dbg_info(n);
                        ir_node  *block = get_nodes_block(pred_a);
                        pn_Cmp pn_a     = get_Proj_proj(a);
@@ -2900,8 +2914,7 @@ static ir_node *transform_node_And(ir_node *n) {
                        /* yes, we can simply calculate with pncs */
                        pn_Cmp new_pnc  = pn_a & pn_b;
 
-                       return new_rd_Proj(dbgi, current_ir_graph, block, pred_a, mode_b,
-                                          new_pnc);
+                       return new_rd_Proj(dbgi, current_ir_graph, block, pred_a, mode_b, new_pnc);
                }
        }
        if (is_Or(a)) {
@@ -2916,7 +2929,7 @@ static ir_node *transform_node_And(ir_node *n) {
                                        /* (a|b) & ~(a&b) = a^b */
                                        ir_node *block = get_nodes_block(n);
 
-                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, ba, bb, get_irn_mode(n));
+                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, ba, bb, mode);
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_TO_EOR);
                                        return n;
                                }
@@ -2935,13 +2948,74 @@ static ir_node *transform_node_And(ir_node *n) {
                                        /* (a|b) & ~(a&b) = a^b */
                                        ir_node *block = get_nodes_block(n);
 
-                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, aa, ab, get_irn_mode(n));
+                                       n = new_rd_Eor(get_irn_dbg_info(n), current_ir_graph, block, aa, ab, mode);
                                        DBG_OPT_ALGSIM1(oldn, a, b, n, FS_OPT_TO_EOR);
                                        return n;
                                }
                        }
                }
+       }
+       if (is_Eor(a)) {
+               ir_node *al = get_Eor_left(a);
+               ir_node *ar = get_Eor_right(a);
+
+               if (al == b) {
+                       /* (b ^ a) & b -> ~a & b */
+                       dbg_info *dbg  = get_irn_dbg_info(n);
+                       ir_node *block = get_nodes_block(n);
+
+                       ar = new_rd_Minus(dbg, current_ir_graph, block, ar, mode);
+                       n  = new_rd_And(dbg, current_ir_graph, block, ar, b, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+               if (ar == b) {
+                       /* (a ^ b) & b -> ~a & b */
+                       dbg_info *dbg  = get_irn_dbg_info(n);
+                       ir_node *block = get_nodes_block(n);
+
+                       al = new_rd_Minus(dbg, current_ir_graph, block, al, mode);
+                       n  = new_rd_And(dbg, current_ir_graph, block, al, b, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+       }
+       if (is_Eor(b)) {
+               ir_node *bl = get_Eor_left(b);
+               ir_node *br = get_Eor_right(b);
+
+               if (bl == a) {
+                       /* a & (a ^ b) -> a & ~b */
+                       dbg_info *dbg  = get_irn_dbg_info(n);
+                       ir_node *block = get_nodes_block(n);
+
+                       br = new_rd_Minus(dbg, current_ir_graph, block, br, mode);
+                       n  = new_rd_And(dbg, current_ir_graph, block, br, a, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+               if (br == a) {
+                       /* a & (b ^ a) -> a & ~b */
+                       dbg_info *dbg  = get_irn_dbg_info(n);
+                       ir_node *block = get_nodes_block(n);
+
+                       bl = new_rd_Minus(dbg, current_ir_graph, block, bl, mode);
+                       n  = new_rd_And(dbg, current_ir_graph, block, bl, a, mode);
+                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_EOR_TO_NOT);
+                       return n;
+               }
+       }
+       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);
 
+               a = get_Not_op(a);
+               b = get_Not_op(b);
+               n = new_rd_Or(get_irn_dbg_info(n), current_ir_graph, block, a, b, mode);
+               n = new_rd_Not(get_irn_dbg_info(n), current_ir_graph, block, n, mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_DEMORGAN);
+               return n;
        }
 
        n = transform_bitwise_distributive(n, transform_node_And);
@@ -3041,6 +3115,7 @@ static ir_node *transform_node_Not(ir_node *n) {
  * Transform a Minus.
  * Optimize:
  *   -(~x) = x + 1
+ *   -(a-b) = b - a
  */
 static ir_node *transform_node_Minus(ir_node *n) {
        ir_node *c, *oldn = n;
@@ -3050,15 +3125,52 @@ static ir_node *transform_node_Minus(ir_node *n) {
        HANDLE_UNOP_PHI(tarval_neg,a,c);
 
        mode = get_irn_mode(a);
-       if (get_mode_arithmetic(mode) == irma_twos_complement && is_Not(a)) {
-               /* -(~x) = x + 1 */
-               ir_node *op   = get_Not_op(a);
-               tarval *tv    = get_mode_one(mode);
-               ir_node *blk  = get_irn_n(n, -1);
-               ir_node *c    = new_r_Const(current_ir_graph, blk, mode, tv);
-               n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, op, c, mode);
-               DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT);
-       } else if (is_Sub(a)) {
+       if (get_mode_arithmetic(mode) == irma_twos_complement) {
+               /* the following rules are only to twos-complement */
+               if (is_Not(a)) {
+                       /* -(~x) = x + 1 */
+                       ir_node *op   = get_Not_op(a);
+                       tarval *tv    = get_mode_one(mode);
+                       ir_node *blk  = get_irn_n(n, -1);
+                       ir_node *c    = new_r_Const(current_ir_graph, blk, mode, tv);
+                       n = new_rd_Add(get_irn_dbg_info(n), current_ir_graph, blk, op, c, mode);
+                       DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_NOT);
+                       return n;
+               }
+               if (is_Shr(a)) {
+                       ir_node *c = get_Shr_right(a);
+
+                       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) {
+                                       /* -(a >>u (size-1)) = a >>s (size-1) */
+                                       ir_node *v = get_Shr_left(a);
+
+                                       n = new_rd_Shrs(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode);
+                                       DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
+                                       return n;
+                               }
+                       }
+               }
+               if (is_Shrs(a)) {
+                       ir_node *c = get_Shrs_right(a);
+
+                       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) {
+                                       /* -(a >>s (size-1)) = a >>u (size-1) */
+                                       ir_node *v = get_Shrs_left(a);
+
+                                       n = new_rd_Shr(get_irn_dbg_info(n), current_ir_graph, get_irn_n(n, -1), v, c, mode);
+                                       DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_PREDICATE);
+                                       return n;
+                               }
+                       }
+               }
+       }
+       if (is_Sub(a)) {
                /* - (a-b) = b - a */
                ir_node *la  = get_Sub_left(a);
                ir_node *ra  = get_Sub_right(a);
@@ -3066,6 +3178,7 @@ static ir_node *transform_node_Minus(ir_node *n) {
 
                n = new_rd_Sub(get_irn_dbg_info(n), current_ir_graph, blk, ra, la, mode);
                DBG_OPT_ALGSIM2(oldn, a, n, FS_OPT_MINUS_SUB);
+               return n;
        }
 
        return n;
@@ -3943,11 +4056,24 @@ static ir_node *transform_node_Or(ir_node *n) {
        ir_node *a = get_Or_left(n);
        ir_node *b = get_Or_right(n);
 
+       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);
+
+               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);
+               n = new_rd_Not(get_irn_dbg_info(n), current_ir_graph, block, n, mode);
+               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_DEMORGAN);
+               return n;
+       }
+
        /* we can evaluate 2 Projs of the same Cmp */
-       if(get_irn_mode(n) == mode_b && is_Proj(a) && is_Proj(b)) {
+       if (get_irn_mode(n) == mode_b && is_Proj(a) && is_Proj(b)) {
                ir_node *pred_a = get_Proj_pred(a);
                ir_node *pred_b = get_Proj_pred(b);
-               if(pred_a == pred_b) {
+               if (pred_a == pred_b) {
                        dbg_info *dbgi  = get_irn_dbg_info(n);
                        ir_node  *block = get_nodes_block(pred_a);
                        pn_Cmp pn_a     = get_Proj_proj(a);
@@ -4622,6 +4748,35 @@ void del_identities(pset *value_table) {
        del_pset(value_table);
 }  /* del_identities */
 
+/**
+ * Normalize a node by putting constants (and operands with smaller
+ * 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);
+                       }
+               }
+       }
+}  /* normalize_node */
+
 /**
  * Return the canonical node computing the same value as n.
  *
@@ -4639,18 +4794,7 @@ static INLINE ir_node *identify(pset *value_table, ir_node *n) {
 
        if (!value_table) return 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);
-
-                       /* for commutative operators perform  a OP b == b OP a */
-                       if (get_irn_idx(l) > get_irn_idx(r)) {
-                               set_binop_left(n, r);
-                               set_binop_right(n, l);
-                       }
-               }
-       }
+       normalize_node(n);
 
        o = pset_find(value_table, n, ir_node_hash(n));
        if (!o) return n;
@@ -4684,27 +4828,7 @@ ir_node *identify_remember(pset *value_table, ir_node *n) {
 
        if (!value_table) return 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);
-                       }
-               }
-       }
-
+       normalize_node(n);
        /* lookup or insert in hash table with given hash key. */
        o = pset_insert(value_table, n, ir_node_hash(n));
 
@@ -4736,7 +4860,7 @@ void visit_all_identities(ir_graph *irg, irg_walk_func visit, void *env) {
  * Garbage in, garbage out. If a node has a dead input, i.e., the
  * Bad node is input to the node, return the Bad node.
  */
-static INLINE ir_node *gigo(ir_node *node) {
+static ir_node *gigo(ir_node *node) {
        int i, irn_arity;
        ir_op *op = get_irn_op(node);
 
@@ -4865,9 +4989,9 @@ ir_node *optimize_node(ir_node *n) {
 
                                /* evaluation was successful -- replace the node. */
                                irg_kill_node(current_ir_graph, n);
-                               nw = new_Const(get_tarval_mode (tv), tv);
+                               nw = new_Const(get_tarval_mode(tv), tv);
 
-                               if (old_tp && get_type_mode(old_tp) == get_tarval_mode (tv))
+                               if (old_tp && get_type_mode(old_tp) == get_tarval_mode(tv))
                                        set_Const_type(nw, old_tp);
                                DBG_OPT_CSTEVAL(oldn, nw);
                                tarval_enable_fp_ops(old_fp_mode);