fix mode_b optimisation with compares
[libfirm] / ir / lower / lower_mode_b.c
index 6e48850..b5a139f 100644 (file)
@@ -35,6 +35,7 @@
 #include "tv.h"
 #include "error.h"
 #include "lowering.h"
+#include "benode_t.h"
 
 static ir_mode *lowered_mode     = NULL;
 static int      lower_direct_cmp = 0;
@@ -49,18 +50,65 @@ static ir_node *create_not(dbg_info *dbgi, ir_node *node)
        return new_rd_Eor(dbgi, irg, block, node, one, lowered_mode);
 }
 
+static ir_node *create_convb(ir_node *node)
+{
+       ir_graph *irg   = current_ir_graph;
+       ir_node  *block = get_nodes_block(node);
+       ir_node  *conv  = new_rd_Conv(NULL, irg, block, node, mode_b);
+
+       return conv;
+}
+
+static ir_node *create_conv_lowered_mode(ir_node *node)
+{
+       ir_graph *irg   = current_ir_graph;
+       ir_node  *block = get_nodes_block(node);
+       ir_node  *conv  = new_rd_Conv(NULL, irg, block, node, lowered_mode);
+
+       return conv;
+}
+
 static ir_node *lower_node(ir_node *node)
 {
        ir_graph *irg   = current_ir_graph;
        dbg_info *dbgi  = get_irn_dbg_info(node);
        ir_op    *op    = get_irn_op(node);
        ir_node  *block = get_nodes_block(node);
+       ir_node  *res;
 
        assert(get_irn_mode(node) == mode_b);
 
+       res = get_irn_link(node);
+       if(res != NULL)
+               return res;
+
        /* TODO: be robust against phi-loops... */
+       if(op == op_Phi) {
+               int       i, arity;
+               ir_node **in;
+               ir_node  *unknown, *new_phi;
+
+               arity = get_irn_arity(node);
+               in    = alloca(arity * sizeof(in[0]));
+               unknown = new_Unknown(lowered_mode);
+               for(i = 0; i < arity; ++i) {
+                       in[i] = unknown;
+               }
+               new_phi = new_rd_Phi(dbgi, irg, block, arity, in,
+                                             lowered_mode);
+               set_irn_link(node, new_phi);
+
+               for(i = 0; i < arity; ++i) {
+                       ir_node *in     = get_irn_n(node, i);
+                       ir_node *low_in = lower_node(in);
+
+                       set_irn_n(new_phi, i, low_in);
+               }
+
+               return new_phi;
+       }
 
-       if(op == op_And || op == op_Or || op == op_Eor || op == op_Phi) {
+       if(op == op_And || op == op_Or || op == op_Eor) {
                int i, arity;
                ir_node *copy = exact_copy(node);
 
@@ -72,13 +120,17 @@ static ir_node *lower_node(ir_node *node)
                        set_irn_n(copy, i, low_in);
                }
                set_irn_mode(copy, lowered_mode);
+
+               set_irn_link(node, copy);
                return copy;
        }
        if(op == op_Not) {
                ir_node *op     = get_Not_op(node);
                ir_node *low_op = lower_node(op);
 
-               return create_not(dbgi, low_op);
+               res = create_not(dbgi, low_op);
+               set_irn_link(node, res);
+               return res;
        }
        if(op == op_Psi) {
                ir_node *cond        = get_Psi_cond(node, 0);
@@ -88,7 +140,7 @@ static ir_node *lower_node(ir_node *node)
                ir_node *v_false     = get_Psi_default(node);
                ir_node *low_v_false = lower_node(v_false);
 
-               ir_node *and0     = new_rd_And(dbgi, irg, block, cond, low_v_true,
+               ir_node *and0     = new_rd_And(dbgi, irg, block, low_cond, low_v_true,
                                               lowered_mode);
 
                ir_node *not_cond = create_not(dbgi, low_cond);
@@ -99,6 +151,7 @@ static ir_node *lower_node(ir_node *node)
                ir_node *or       = new_rd_Or(dbgi, irg, block, and0, and1,
                                              lowered_mode);
 
+               set_irn_link(node, or);
                return or;
        }
        if(op == op_Conv) {
@@ -106,32 +159,33 @@ static ir_node *lower_node(ir_node *node)
                ir_node *one      = new_d_Const(dbgi, lowered_mode, tv_one);
                tarval  *tv_zero  = get_tarval_null(lowered_mode);
                ir_node *zero     = new_d_Const(dbgi, lowered_mode, tv_zero);
-               ir_mode *mode     = get_irn_mode(node);
+               ir_node *pred     = get_Conv_op(node);
+               ir_mode *mode     = get_irn_mode(pred);
                tarval  *tv_zeroc = get_tarval_null(mode);
                ir_node *zero_cmp = new_d_Const(dbgi, mode, tv_zeroc);
 
-               ir_node *cmp      = new_rd_Cmp(dbgi, irg, block, node, zero_cmp);
+               ir_node *cmp      = new_rd_Cmp(dbgi, irg, block, pred, zero_cmp);
                ir_node *proj     = new_rd_Proj(dbgi, irg, block, cmp, mode_b,
                                                pn_Cmp_Lg);
                ir_node *vals[2]  = { one, zero };
                ir_node *psi      = new_rd_Psi(dbgi, irg, block, 1, &proj, vals,
                                               lowered_mode);
 
+               set_irn_link(node, psi);
                return psi;
        }
        if(op == op_Proj) {
-               ir_node *pred  = get_Proj_pred(node);
+               ir_node *pred = get_Proj_pred(node);
 
-               assert(!is_Load(pred));
                if(is_Cmp(pred)) {
-                       ir_mode *mode  = get_irn_mode(pred);
                        ir_node *left  = get_Cmp_left(pred);
                        ir_node *right = get_Cmp_right(pred);
+                       ir_mode *mode  = get_irn_mode(left);
 
-                       if(get_mode_size_bits(mode) < get_mode_size_bits(lowered_mode)
-                                || classify_Const(right) == CNST_NULL) {
+                       if( (mode_is_int(mode) || mode_is_reference(mode)) &&
+                               (get_mode_size_bits(mode) < get_mode_size_bits(lowered_mode)
+                                || classify_Const(right) == CNST_NULL)) {
                                int      pnc      = get_Proj_proj(node);
-                               ir_node *res      = NULL;
                                int      need_not = 0;
                                ir_node *a        = NULL;
                                ir_node *b        = NULL;
@@ -172,6 +226,7 @@ static ir_node *lower_node(ir_node *node)
                                        if(need_not) {
                                                res = create_not(dbgi, res);
                                        }
+                                       set_irn_link(node, res);
                                        return res;
                                }
                        }
@@ -187,41 +242,38 @@ static ir_node *lower_node(ir_node *node)
                        ir_node *psi     = new_rd_Psi(dbgi, irg, block, 1, &node, vals,
                                                      lowered_mode);
 
+                       set_irn_link(node, psi);
                        return psi;
                        }
+               } else if(is_Proj(pred) && is_Call(get_Proj_pred(pred))) {
+                       return create_conv_lowered_mode(node);
+               } else if(is_Proj(pred) && is_Start(get_Proj_pred(pred))) {
+                       return create_conv_lowered_mode(node);
+               } else if (be_is_Barrier(pred)) {
+                       /* nothing to do */
+                       return node;
                }
 
                panic("unexpected projb: %+F (pred: %+F)", node, pred);
-               set_irn_mode(node, lowered_mode);
-               return node;
        }
        if(op == op_Const) {
                tarval *tv = get_Const_tarval(node);
                if(tv == get_tarval_b_true()) {
                        tarval  *tv_one  = get_tarval_one(lowered_mode);
-                       ir_node *one     = new_d_Const(dbgi, lowered_mode, tv_one);
-                       return one;
+                       res              = new_d_Const(dbgi, lowered_mode, tv_one);
                } else if(tv == get_tarval_b_false()) {
                        tarval  *tv_zero = get_tarval_null(lowered_mode);
-                       ir_node *zero    = new_d_Const(dbgi, lowered_mode, tv_zero);
-                       return zero;
+                       res              = new_d_Const(dbgi, lowered_mode, tv_zero);
                } else {
                        panic("invalid boolean const %+F", node);
                }
+               set_irn_link(node, res);
+               return res;
        }
 
        panic("didn't expect %+F to have mode_b", node);
 }
 
-static ir_node *create_convb(ir_node *node)
-{
-       ir_graph *irg   = current_ir_graph;
-       ir_node  *block = get_nodes_block(node);
-       ir_node  *conv  = new_rd_Conv(NULL, irg, block, node, mode_b);
-
-       return conv;
-}
-
 static void lower_mode_b_walker(ir_node *node, void *env)
 {
        int i, arity;
@@ -251,9 +303,18 @@ static void lower_mode_b_walker(ir_node *node, void *env)
        }
 }
 
+static void clear_links(ir_node *node, void *env)
+{
+       (void) env;
+       set_irn_link(node, NULL);
+}
+
 void ir_lower_mode_b(ir_graph *irg, ir_mode *mode, int do_lower_direct_cmp)
 {
        lowered_mode     = mode;
        lower_direct_cmp = do_lower_direct_cmp;
+       set_using_irn_link(irg);
+       irg_walk_graph(irg, clear_links, NULL, NULL);
        irg_walk_graph(irg, lower_mode_b_walker, NULL, NULL);
+       clear_using_irn_link(irg);
 }