Reverted r27368, needed for propagation of changed nodes ...

[libfirm] / ir / opt / ifconv.c

diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c
index 6684c66..52d700e 100644 (file)
--- a/ir/opt/ifconv.c
+++ b/ir/opt/ifconv.c
@@ -27,6 +27,8 @@
 #include "config.h"
 
 #include <assert.h>
+#include <stdbool.h>
+
 #include "iroptimize.h"
 #include "obst.h"
 #include "irnode_t.h"
@@ -54,14 +56,14 @@ typedef struct walker_env {
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
 /**
- * Default callback for Mux creation: allows every Mux to be created.
+ * Default callback for Mux creation: don't allow any Mux nodes
  */
-static int default_allow_ifconv(ir_node *sel, ir_node* phi_list, int i, int j)
+static int default_allow_ifconv(ir_node *sel, ir_node *mux_false,
+                                ir_node *mux_true)
 {
        (void) sel;
-       (void) phi_list;
-       (void) i;
-       (void) j;
+       (void) mux_false;
+       (void) mux_true;
        return 1;
 }
 
@@ -78,7 +80,8 @@ static const ir_settings_if_conv_t default_info = {
  *
  * @param block  the block
  */
-static int can_empty_block(ir_node *block) {
+static bool can_empty_block(ir_node *block)
+{
        return get_Block_mark(block) == 0;
 }
 
@@ -326,7 +329,10 @@ restart:
                                ir_node* sel;
                                ir_node* mux_block;
                                ir_node* phi;
+                               ir_node* p;
                                ir_node* pred1;
+                               bool     supported;
+                               bool     negated;
                                dbg_info* cond_dbg;
 
                                pred1 = get_Block_cfgpred_block(block, j);
@@ -337,8 +343,26 @@ restart:
 
                                if (projx1 == NULL) continue;
 
+                               sel = get_Cond_selector(cond);
                                phi = get_Block_phis(block);
-                               if (!env->params->allow_ifconv(get_Cond_selector(cond), phi, i, j))
+                               supported = true;
+                               negated   = get_Proj_proj(projx0) == pn_Cond_false;
+                               for (p = phi; p != NULL; p = get_Phi_next(p)) {
+                                       ir_node *mux_false;
+                                       ir_node *mux_true;
+                                       if (negated) {
+                                               mux_true  = get_Phi_pred(p, j);
+                                               mux_false = get_Phi_pred(p, i);
+                                       } else {
+                                               mux_true  = get_Phi_pred(p, i);
+                                               mux_false = get_Phi_pred(p, j);
+                                       }
+                                       if (!env->params->allow_ifconv(sel, mux_false, mux_true)) {
+                                               supported = false;
+                                               break;
+                                       }
+                               }
+                               if (!supported)
                                        continue;
 
                                DB((dbg, LEVEL_1, "Found Cond %+F with proj %+F and %+F\n",
@@ -350,8 +374,6 @@ restart:
                                prepare_path(block, j, dependency);
                                arity = get_irn_arity(block);
 
-                               sel = get_Cond_selector(cond);
-
                                mux_block = get_nodes_block(cond);
                                cond_dbg = get_irn_dbg_info(cond);
                                do {
@@ -370,12 +392,12 @@ restart:
                                                 * one block, but not at the same memory node
                                                 */
                                                assert(get_irn_mode(phi) != mode_M);
-                                               if (get_Proj_proj(projx0) == pn_Cond_true) {
-                                                       t = val_i;
-                                                       f = val_j;
-                                               } else {
+                                               if (negated) {
                                                        t = val_j;
                                                        f = val_i;
+                                               } else {
+                                                       t = val_i;
+                                                       f = val_j;
                                                }
 
                                                mux = new_rd_Mux(cond_dbg, mux_block, sel, f, t, get_irn_mode(phi));
@@ -440,7 +462,8 @@ static void init_block_link(ir_node *block, void *env)
  * Daisy-chain all Phis in a block.
  * If a non-movable node is encountered set the has_pinned flag in its block.
  */
-static void collect_phis(ir_node *node, void *env) {
+static void collect_phis(ir_node *node, void *env)
+{
        (void) env;
 
        if (is_Phi(node)) {
@@ -508,27 +531,19 @@ struct pass_t {
 /**
  * Wrapper for running opt_if_conv() as an ir_graph pass.
  */
-static int pass_wrapper(ir_graph *irg, void *context) {
+static int pass_wrapper(ir_graph *irg, void *context)
+{
        struct pass_t *pass = context;
        opt_if_conv(irg, pass->params);
        return 0;
-}  /* pass_wrapper */
+}
 
-ir_graph_pass_t *opt_if_conv_pass(
-       const char *name, int verify, int dump, const ir_settings_if_conv_t *params)
+ir_graph_pass_t *opt_if_conv_pass(const char *name,
+                                  const ir_settings_if_conv_t *params)
 {
-       struct pass_t *pass = xmalloc(sizeof(*pass));
-
-       pass->pass.kind       = k_ir_prog_pass;
-       pass->pass.run_on_irg = pass_wrapper;
-       pass->pass.context    = pass;
-       pass->pass.name       = name ? name : "if_conv";
-       pass->pass.verify     = verify != 0;
-       pass->pass.dump       = dump != 0;
-
+       struct pass_t *pass = XMALLOCZ(struct pass_t);
        pass->params = params;
 
-       INIT_LIST_HEAD(&pass->pass.list);
-
-       return &pass->pass;
+       return def_graph_pass_constructor(
+               &pass->pass, name ? name : "ifconv", pass_wrapper);
 }