introduce Switch node

[libfirm] / ir / opt / convopt.c

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 9785dea..eb045e9 100644 (file)
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -47,18 +47,20 @@
 #include "irgmod.h"
 #include "irgopt.h"
 #include "irnode_t.h"
+#include "iropt_t.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
 #include "irpass_t.h"
 #include "tv.h"
 #include "vrp.h"
+#include "opt_manage.h"
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
 
 static inline int imin(int a, int b) { return a < b ? a : b; }
 
-static bool is_optimizable_node(const ir_node *node)
+static bool is_optimizable_node(const ir_node *node, ir_mode *dest_mode)
 {
        switch (get_irn_opcode(node)) {
        case iro_Add:
@@ -69,9 +71,17 @@ static bool is_optimizable_node(const ir_node *node)
        case iro_Not:
        case iro_Or:
        case iro_Phi:
-       case iro_Shl:
        case iro_Sub:
                return true;
+       case iro_Shl: {
+               int modulo_shift = get_mode_modulo_shift(dest_mode);
+               int old_shift    = get_mode_modulo_shift(get_irn_mode(node));
+               /* bail out if modulo shift changes */
+               if (modulo_shift != old_shift)
+                       return false;
+               return true;
+       }
+
        default:
                return false;
        }
@@ -116,6 +126,10 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
                return 1;
        }
 
+       if (ir_zero_when_converted(node, dest_mode)) {
+               return -1;
+       }
+
 #if 0 // TODO
        /* Take the minimum of the conversion costs for Phi predecessors as only one
         * branch is actually executed at a time */
@@ -149,7 +163,7 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
                return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
        }
 
-       if (!is_optimizable_node(node)) {
+       if (!is_optimizable_node(node, dest_mode)) {
                return 1;
        }
 
@@ -218,7 +232,7 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                return conv_transform(get_Conv_op(node), dest_mode);
        }
 
-       if (!is_optimizable_node(node)) {
+       if (!is_optimizable_node(node, dest_mode)) {
                return place_conv(node, dest_mode);
        }
 
@@ -285,40 +299,37 @@ static void conv_opt_walker(ir_node *node, void *data)
 
        transformed = conv_transform(pred, mode);
        if (node != transformed) {
-               vrp_attr *vrp;
-
                exchange(node, transformed);
-               vrp = vrp_get_info(transformed);
-               if (vrp && vrp->valid) {
-                       vrp->range_type = VRP_VARYING;
-                       vrp->bits_set = tarval_convert_to(vrp->bits_set, mode);
-                       vrp->bits_not_set = tarval_convert_to(vrp->bits_not_set, mode);
-               }
-
                *changed = true;
        }
 }
 
-int conv_opt(ir_graph *irg)
+static ir_graph_state_t do_deconv(ir_graph *irg)
 {
        bool changed;
-       bool invalidate = false;
        FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
 
        DB((dbg, LEVEL_1, "===> Performing conversion optimization on %+F\n", irg));
 
-       edges_assure(irg);
        do {
                changed = false;
                irg_walk_graph(irg, NULL, conv_opt_walker, &changed);
                local_optimize_graph(irg);
-               invalidate |= changed;
        } while (changed);
 
-       if (invalidate) {
-               set_irg_outs_inconsistent(irg);
-       }
-       return invalidate;
+       return 0;
+}
+
+static optdesc_t opt_deconv = {
+       "deconv",
+       IR_GRAPH_STATE_CONSISTENT_OUT_EDGES,
+       do_deconv,
+};
+
+int conv_opt(ir_graph *irg)
+{
+       perform_irg_optimization(irg, &opt_deconv);
+       return 1;
 }
 
 /* Creates an ir_graph pass for conv_opt. */