Ignore generated files.

[libfirm] / ir / opt / reassoc.c

diff --git a/ir/opt/reassoc.c b/ir/opt/reassoc.c
index 9651628..5927a37 100644 (file)
--- a/ir/opt/reassoc.c
+++ b/ir/opt/reassoc.c
@@ -36,10 +36,12 @@
 #include "irgwalk.h"
 #include "irouts.h"
 #include "reassoc_t.h"
+#include "opt_init.h"
 #include "irhooks.h"
 #include "irloop.h"
 #include "pdeq.h"
 #include "debug.h"
+#include "irpass.h"
 
 //#define NEW_REASSOC
 
@@ -220,7 +222,7 @@ static ir_mode *get_mode_from_ops(ir_node *op1, ir_node *op2)
 static int reassoc_commutative(ir_node **node)
 {
        ir_node *n     = *node;
-       ir_op *op      = get_irn_op(n);
+       ir_op   *op    = get_irn_op(n);
        ir_node *block = get_nodes_block(n);
        ir_node *t1, *c1;
 
@@ -304,6 +306,55 @@ static int reassoc_commutative(ir_node **node)
                        }
                }
        }
+       if (get_irn_op(c1) == op) {
+               ir_node *t = c1;
+               c1 = t1;
+               t1 = t;
+       }
+       if (get_irn_op(t1) == op) {
+               ir_node *l = get_binop_left(t1);
+               ir_node *r = get_binop_right(t1);
+               const_class_t c_r;
+
+               if (r == c1) {
+                       ir_node *t = r;
+                       r = l;
+                       l = t;
+               }
+               c_r = get_const_class(r, block);
+               if (c_r != NO_CONSTANT) {
+                       /*
+                        * Beware: don't do the following op if a constant was
+                        * placed below, else we will fall into a loop.
+                        */
+                       return 0;
+               }
+
+               if (l == c1) {
+                       /* convert x .OP. (x .OP. y) => y .OP. (x .OP. x) */
+                       ir_mode *mode_res = get_irn_mode(n);
+                       ir_mode *mode_c1  = get_irn_mode(c1);
+                       ir_node *irn, *in[2];
+
+                       in[0] = c1;
+                       in[1] = c1;
+
+                       in[1] = optimize_node(new_ir_node(NULL, current_ir_graph, block, op, mode_c1, 2, in));
+                       in[0] = r;
+
+                       irn   = optimize_node(new_ir_node(NULL, current_ir_graph, block, op, mode_res, 2, in));
+
+                       DBG((dbg, LEVEL_5, "Applied: %n .%s. (%n .%s. %n) => %n .%s. (%n .%s. %n)\n",
+                               c1, get_irn_opname(n), l, get_irn_opname(n), r,
+                               r, get_irn_opname(n), c1, get_irn_opname(n), c1));
+
+                       if (n != irn) {
+                               exchange(n, irn);
+                               *node = irn;
+                               return 1;
+                       }
+               }
+       }
        return 0;
 }  /* reassoc_commutative */
 
@@ -780,7 +831,8 @@ static int move_consts_up(ir_node **node) {
                        dbg = dbg == get_irn_dbg_info(l) ? dbg : NULL;
                        goto transform;
                }
-       } else if (get_irn_op(r) == op) {
+       }
+       if (get_irn_op(r) == op) {
                /* l .op. (a .op. b) */
                a = get_binop_left(r);
                b = get_binop_right(r);
@@ -932,6 +984,11 @@ int optimize_reassociation(ir_graph *irg)
        return env.changes;
 }  /* optimize_reassociation */
 
+/* create a pass for the reassociation */
+ir_graph_pass_t *optimize_reassociation_pass(const char *name) {
+       return def_graph_pass_ret(name ? name : "reassoc", optimize_reassociation);
+}  /* optimize_reassociation_pass */
+
 /* Sets the default reassociation operation for an ir_op_ops. */
 ir_op_ops *firm_set_default_reassoc(ir_opcode code, ir_op_ops *ops)
 {