* @author Christoph Mallon
* @version $Id$
*/
-
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <assert.h>
+#include <stdbool.h>
+
#include "iroptimize.h"
#include "obst.h"
#include "irnode_t.h"
#include "cdep.h"
#include "ircons.h"
-#include "irdom.h"
#include "irgmod.h"
#include "irgopt.h"
#include "irgwalk.h"
#include "irtools.h"
-#include "array.h"
-#include "xmalloc.h"
+#include "array_t.h"
+#include "irpass_t.h"
+#include "be.h"
-// debug
#include "irdump.h"
#include "debug.h"
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
-
-/** allow every Psi to be created. */
-static int default_allow_ifconv(ir_node *sel, ir_node* phi_list, int i, int j)
-{
- (void) sel;
- (void) phi_list;
- (void) i;
- (void) j;
- return 1;
-}
-
/**
- * Default options.
+ * Environment for if-conversion.
*/
-static const ir_settings_if_conv_t default_info = {
- 0, /* doesn't matter for Psi */
- default_allow_ifconv
-};
+typedef struct walker_env {
+ arch_allow_ifconv_func allow_ifconv;
+ bool changed; /**< Set if the graph was changed. */
+} walker_env;
+
+DEBUG_ONLY(static firm_dbg_module_t *dbg);
/**
* Returns non-zero if a Block can be emptied.
+ *
+ * @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;
}
-
+/**
+ * Find the ProjX node leading from block dependency to block start.
+ *
+ * @param start a block that is control depended on dependency
+ * @param dependency the block that decides whether start is executed
+ *
+ * @return a ProjX node that represent the decision control flow or
+ * NULL is start is not dependent at all or a block on the way
+ * cannot be emptied
+ */
static ir_node* walk_to_projx(ir_node* start, const ir_node* dependency)
{
int arity;
arity = get_irn_arity(start);
for (i = 0; i < arity; ++i) {
ir_node* pred = get_irn_n(start, i);
- ir_node* pred_block = get_nodes_block(pred);
+ ir_node* pred_block = get_nodes_block(skip_Proj(pred));
if (pred_block == dependency) {
if (is_Proj(pred)) {
assert(get_irn_mode(pred) == mode_X);
+ /* we found it */
return pred;
}
+ /* Not a Proj? Should not happen. */
return NULL;
}
if (is_Proj(pred)) {
assert(get_irn_mode(pred) == mode_X);
+ /* another Proj but not from the control block */
return NULL;
}
/**
- * Copies the DAG starting at node to the ith predecessor block of src_block
- * -if the node isn't in the src_block, this is a nop and the node is returned
- * -if the node is a phi in the src_block, the ith predecessor of the phi is
- * returned
- * otherwise returns the copy of the passed node
+ * Recursively copies the DAG starting at node to the i-th predecessor
+ * block of src_block
+ * - if node isn't in the src_block, recursion ends and node is returned
+ * - if node is a Phi in the src_block, the i-th predecessor of this Phi is
+ * returned and recursion ends
+ * otherwise returns a copy of the passed node created in the i-th predecessor of
+ * src_block.
+ *
+ * @param node a root of a DAG
+ * @param src_block the block of the DAG
+ * @param i the position of the predecessor the DAG
+ * is moved to
+ *
+ * @return the root of the copied DAG
*/
static ir_node* copy_to(ir_node* node, ir_node* src_block, int i)
{
ir_node* dst_block;
ir_node* copy;
- int arity;
int j;
- if (get_nodes_block(node) != src_block) return node;
- if (get_irn_op(node) == op_Phi) return get_irn_n(node, i);
+ if (get_nodes_block(node) != src_block) {
+ /* already outside src_block, do not copy */
+ return node;
+ }
+ if (is_Phi(node)) {
+ /* move through the Phi to the i-th predecessor */
+ return get_irn_n(node, i);
+ }
+ /* else really need a copy */
copy = exact_copy(node);
dst_block = get_nodes_block(get_irn_n(src_block, i));
set_nodes_block(copy, dst_block);
DB((dbg, LEVEL_1, "Copying node %+F to block %+F, copy is %+F\n",
node, dst_block, copy));
- arity = get_irn_arity(node);
- for (j = 0; j < arity; ++j) {
+ /* move recursively all predecessors */
+ for (j = get_irn_arity(node) - 1; j >= 0; --j) {
set_irn_n(copy, j, copy_to(get_irn_n(node, j), src_block, i));
DB((dbg, LEVEL_2, "-- pred %d is %+F\n", j, get_irn_n(copy, j)));
}
/**
- * Remove predecessors i and j from node and add predecessor new_pred
+ * Remove predecessors i and j (i < j) from a node and
+ * add an additional predecessor new_pred.
+ *
+ * @param node the node whose inputs are changed
+ * @param i the first index to remove
+ * @param j the second index to remove
+ * @param new_pred a node that is added as a new input to node
*/
static void rewire(ir_node* node, int i, int j, ir_node* new_pred)
{
/**
- * Remove the jth predecessors from the ith predecessor of block and add it to block
+ * Remove the j-th predecessors from the i-th predecessor of block and add it to block
*/
static void split_block(ir_node* block, int i, int j)
{
}
}
-
-static void if_conv_walker(ir_node* block, void* env)
+/**
+ * Block walker: Search for diamonds and do the if conversion.
+ */
+static void if_conv_walker(ir_node *block, void *ctx)
{
- ir_settings_if_conv_t* opt_info = env;
+ walker_env *env = ctx;
int arity;
int i;
if (projx0 == NULL) continue;
cond = get_Proj_pred(projx0);
- if (get_irn_op(cond) != op_Cond) continue;
+ if (! is_Cond(cond))
+ continue;
/* We only handle boolean decisions, no switches */
if (get_irn_mode(get_Cond_selector(cond)) != mode_b) continue;
for (j = i + 1; j < arity; ++j) {
ir_node* projx1;
- ir_node* conds[1];
- ir_node* psi_block;
+ 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);
if (projx1 == NULL) continue;
+ sel = get_Cond_selector(cond);
phi = get_Block_phis(block);
- if (!opt_info->allow_ifconv(get_Cond_selector(cond), phi, i, j)) continue;
+ 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->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",
cond, projx0, projx1
));
+ env->changed = true;
prepare_path(block, i, dependency);
prepare_path(block, j, dependency);
arity = get_irn_arity(block);
- conds[0] = get_Cond_selector(cond);
-
- psi_block = get_nodes_block(cond);
+ mux_block = get_nodes_block(cond);
cond_dbg = get_irn_dbg_info(cond);
do {
ir_node* val_i = get_irn_n(phi, i);
ir_node* val_j = get_irn_n(phi, j);
- ir_node* psi;
+ ir_node* mux;
ir_node* next_phi;
if (val_i == val_j) {
- psi = val_i;
- DB((dbg, LEVEL_2, "Generating no psi, because both values are equal\n"));
+ mux = val_i;
+ DB((dbg, LEVEL_2, "Generating no Mux, because both values are equal\n"));
} else {
- ir_node* vals[2];
+ ir_node *t, *f;
/* Something is very fishy if two predecessors of a PhiM point into
* one block, but not at the same memory node
*/
assert(get_irn_mode(phi) != mode_M);
- if (get_Proj_proj(projx0) == pn_Cond_true) {
- vals[0] = val_i;
- vals[1] = val_j;
+ if (negated) {
+ t = val_j;
+ f = val_i;
} else {
- vals[0] = val_j;
- vals[1] = val_i;
+ t = val_i;
+ f = val_j;
}
- psi = new_rd_Psi(cond_dbg, current_ir_graph, psi_block, 1, conds, vals, get_irn_mode(phi));
- DB((dbg, LEVEL_2, "Generating %+F for %+F\n", psi, phi));
+ mux = new_rd_Mux(cond_dbg, mux_block, sel, f, t, get_irn_mode(phi));
+ DB((dbg, LEVEL_2, "Generating %+F for %+F\n", mux, phi));
}
next_phi = get_Phi_next(phi);
if (arity == 2) {
- exchange(phi, psi);
+ exchange(phi, mux);
} else {
- rewire(phi, i, j, psi);
+ rewire(phi, i, j, mux);
}
-
phi = next_phi;
} while (phi != NULL);
- exchange(get_nodes_block(get_irn_n(block, i)), psi_block);
- exchange(get_nodes_block(get_irn_n(block, j)), psi_block);
+ exchange(get_nodes_block(get_irn_n(block, i)), mux_block);
+ exchange(get_nodes_block(get_irn_n(block, j)), mux_block);
if (arity == 2) {
unsigned mark;
#if 1
- DB((dbg, LEVEL_1, "Welding block %+F and %+F\n", block, psi_block));
- /* copy the block-info from the Psi-block to the block before merging */
+ DB((dbg, LEVEL_1, "Welding block %+F and %+F\n", block, mux_block));
+ /* copy the block-info from the Mux-block to the block before merging */
- mark = get_Block_mark(psi_block) | get_Block_mark(block);
+ mark = get_Block_mark(mux_block) | get_Block_mark(block);
set_Block_mark(block, mark);
- set_Block_phis(block, get_Block_phis(psi_block));
+ set_Block_phis(block, get_Block_phis(mux_block));
- set_irn_in(block, get_irn_arity(psi_block), get_irn_in(psi_block) + 1);
- exchange_cdep(psi_block, block);
- exchange(psi_block, block);
+ set_irn_in(block, get_irn_arity(mux_block), get_irn_in(mux_block) + 1);
+ exchange_cdep(mux_block, block);
+ exchange(mux_block, block);
#else
- DB((dbg, LEVEL_1, "Welding block %+F to %+F\n", block, psi_block));
- mark = get_Block_mark(psi_block) | get_Block_mark(block);
- /* mark both block just to be sure, should be enough to mark psi_block */
- set_Block_mark(psi_block, mark);
- exchange(block, psi_block);
+ DB((dbg, LEVEL_1, "Welding block %+F to %+F\n", block, mux_block));
+ mark = get_Block_mark(mux_block) | get_Block_mark(block);
+ /* mark both block just to be sure, should be enough to mark mux_block */
+ set_Block_mark(mux_block, mark);
+ exchange(block, mux_block);
#endif
return;
} else {
- rewire(block, i, j, new_r_Jmp(current_ir_graph, psi_block));
+ rewire(block, i, j, new_r_Jmp(mux_block));
goto restart;
}
}
}
/**
- * Block walker: clear block mark and Phi list
+ * Block walker: clear block marks and Phi lists.
*/
static void init_block_link(ir_node *block, void *env)
{
/**
- * Daisy-chain all phis in a block
+ * 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)) {
add_Block_phi(block, node);
} else {
- if (is_no_Block(node) && get_irn_pinned(node) == op_pin_state_pinned) {
+ if (!is_Block(node) && get_irn_pinned(node) == op_pin_state_pinned) {
/*
- * Ignore control flow nodes, these will be removed.
- * This ignores Raise. That is surely bad. FIXME.
+ * Ignore control flow nodes (except Raise), these will be removed.
*/
- if (!is_cfop(node)) {
+ if (!is_cfop(node) && !is_Raise(node)) {
ir_node *block = get_nodes_block(node);
DB((dbg, LEVEL_2, "Node %+F in block %+F is unmovable\n", node, block));
}
}
-static void optimise_psis_0(ir_node* psi, void* env)
-{
- ir_node* t;
- ir_node* f;
-
- (void) env;
-
- if (!is_Psi(psi)) return;
-
- t = get_Psi_val(psi, 0);
- f = get_Psi_default(psi);
-
- DB((dbg, LEVEL_3, "Simplify %+F T=%+F F=%+F\n", psi, t, f));
-
- if (is_Unknown(t)) {
- DB((dbg, LEVEL_3, "Replace Psi with unknown operand by %+F\n", f));
- exchange(psi, f);
- return;
- }
- if (is_Unknown(f)) {
- DB((dbg, LEVEL_3, "Replace Psi with unknown operand by %+F\n", t));
- exchange(psi, t);
- return;
- }
-
- if (is_Psi(t)) {
- ir_graph* irg = current_ir_graph;
- ir_node* block = get_nodes_block(psi);
- ir_mode* mode = get_irn_mode(psi);
- ir_node* c0 = get_Psi_cond(psi, 0);
- ir_node* c1 = get_Psi_cond(t, 0);
- ir_node* t1 = get_Psi_val(t, 0);
- ir_node* f1 = get_Psi_default(t);
- if (f == f1) {
- /* Psi(c0, Psi(c1, x, y), y) -> typical if (c0 && c1) x else y */
- ir_node* and_ = new_r_And(irg, block, c0, c1, mode_b);
- ir_node* vals[2] = { t1, f1 };
- ir_node* new_psi = new_r_Psi(irg, block, 1, &and_, vals, mode);
- exchange(psi, new_psi);
- } else if (f == t1) {
- /* Psi(c0, Psi(c1, x, y), x) */
- ir_node* not_c1 = new_r_Not(irg, block, c1, mode_b);
- ir_node* and_ = new_r_And(irg, block, c0, not_c1, mode_b);
- ir_node* vals[2] = { f1, t1 };
- ir_node* new_psi = new_r_Psi(irg, block, 1, &and_, vals, mode);
- exchange(psi, new_psi);
- }
- } else if (is_Psi(f)) {
- ir_graph* irg = current_ir_graph;
- ir_node* block = get_nodes_block(psi);
- ir_mode* mode = get_irn_mode(psi);
- ir_node* c0 = get_Psi_cond(psi, 0);
- ir_node* c1 = get_Psi_cond(f, 0);
- ir_node* t1 = get_Psi_val(f, 0);
- ir_node* f1 = get_Psi_default(f);
- if (t == t1) {
- /* Psi(c0, x, Psi(c1, x, y)) -> typical if (c0 || c1) x else y */
- ir_node* or_ = new_r_Or(irg, block, c0, c1, mode_b);
- ir_node* vals[2] = { t1, f1 };
- ir_node* new_psi = new_r_Psi(irg, block, 1, &or_, vals, mode);
- exchange(psi, new_psi);
- } else if (t == f1) {
- /* Psi(c0, x, Psi(c1, y, x)) */
- ir_node* not_c1 = new_r_Not(irg, block, c1, mode_b);
- ir_node* or_ = new_r_Or(irg, block, c0, not_c1, mode_b);
- ir_node* vals[2] = { f1, t1 };
- ir_node* new_psi = new_r_Psi(irg, block, 1, &or_, vals, mode);
- exchange(psi, new_psi);
- }
- }
-}
-
-
-static void optimise_psis_1(ir_node* psi, void* env)
+void opt_if_conv(ir_graph *irg)
{
- ir_node* t;
- ir_node* f;
- ir_mode* mode;
-
- (void) env;
-
- if (!is_Psi(psi)) return;
-
- t = get_Psi_val(psi, 0);
- f = get_Psi_default(psi);
-
- DB((dbg, LEVEL_3, "Simplify %+F T=%+F F=%+F\n", psi, t, f));
-
- mode = get_irn_mode(psi);
-
- if (is_Const(t) && is_Const(f) && (mode_is_int(mode))) {
- ir_node* block = get_nodes_block(psi);
- ir_node* c = get_Psi_cond(psi, 0);
- tarval* tv_t = get_Const_tarval(t);
- tarval* tv_f = get_Const_tarval(f);
- if (tarval_is_one(tv_t) && tarval_is_null(tv_f)) {
- ir_node* conv = new_r_Conv(current_ir_graph, block, c, mode);
- exchange(psi, conv);
- } else if (tarval_is_null(tv_t) && tarval_is_one(tv_f)) {
- ir_node* not_ = new_r_Not(current_ir_graph, block, c, mode_b);
- ir_node* conv = new_r_Conv(current_ir_graph, block, not_, mode);
- exchange(psi, conv);
- }
- }
-}
-
-
-void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params)
-{
- ir_settings_if_conv_t p;
+ walker_env env;
+ const backend_params *be_params = be_get_backend_param();
/* get the parameters */
- p = (params != NULL ? *params : default_info);
+ env.allow_ifconv = be_params->allow_ifconv;
+ env.changed = false;
FIRM_DBG_REGISTER(dbg, "firm.opt.ifconv");
remove_critical_cf_edges(irg);
compute_cdep(irg);
- assure_doms(irg);
- set_using_block_mark(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
irg_block_walk_graph(irg, init_block_link, NULL, NULL);
irg_walk_graph(irg, collect_phis, NULL, NULL);
- irg_block_walk_graph(irg, NULL, if_conv_walker, &p);
-
- clear_using_block_mark(irg);
+ irg_block_walk_graph(irg, NULL, if_conv_walker, &env);
- local_optimize_graph(irg);
+ ir_free_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
- irg_walk_graph(irg, NULL, optimise_psis_0, NULL);
-#if 1
- irg_walk_graph(irg, NULL, optimise_psis_1, NULL);
-#endif
+ if (env.changed) {
+ local_optimize_graph(irg);
- /* TODO: graph might be changed, handle more graceful */
- set_irg_outs_inconsistent(irg);
- set_irg_extblk_inconsistent(irg);
- set_irg_loopinfo_inconsistent(irg);
- free_dom(irg);
+ /* graph has changed, invalidate analysis info */
+ set_irg_outs_inconsistent(irg);
+ set_irg_extblk_inconsistent(irg);
+ set_irg_loopinfo_inconsistent(irg);
+ set_irg_doms_inconsistent(irg);
+ }
free_cdep(irg);
}
+
+ir_graph_pass_t *opt_if_conv_pass(const char *name)
+{
+ return def_graph_pass(name ? name : "ifconv", opt_if_conv);
+}
projects / libfirm / blobdiff