* @file ir/opt/ifconv.c
* @brief If conversion
* @author Christoph Mallon
- * @version $Id$
*/
-
#include "config.h"
#include <assert.h>
#include "iroptimize.h"
#include "obst.h"
#include "irnode_t.h"
-#include "cdep.h"
+#include "cdep_t.h"
#include "ircons.h"
#include "irgmod.h"
#include "irgopt.h"
#include "irtools.h"
#include "array_t.h"
#include "irpass_t.h"
+#include "be.h"
-// debug
#include "irdump.h"
#include "debug.h"
* Environment for if-conversion.
*/
typedef struct walker_env {
- const ir_settings_if_conv_t *params; /**< Conversion parameter. */
- int changed; /**< Set if the graph was changed. */
+ arch_allow_ifconv_func allow_ifconv;
+ bool changed; /**< Set if the graph was changed. */
} walker_env;
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
-
-/**
- * Default callback for Mux creation: don't allow any Mux nodes
- */
-static int default_allow_ifconv(ir_node *sel, ir_node *mux_false,
- ir_node *mux_true)
-{
- (void) sel;
- (void) mux_false;
- (void) mux_true;
- return 0;
-}
-
-/**
- * Default options.
- */
-static const ir_settings_if_conv_t default_info = {
- 0, /* doesn't matter for Mux */
- default_allow_ifconv
-};
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
/**
* Returns non-zero if a Block can be emptied.
/**
- * Remove the j-th predecessors from the i-th predecessor of block and add it to block
+ * Remove the j-th predecessor from the i-th predecessor of block and add it to block
*/
static void split_block(ir_node* block, int i, int j)
{
- ir_node* pred_block = get_nodes_block(get_irn_n(block, i));
- int arity = get_irn_arity(block);
- int new_pred_arity;
- ir_node *phi, *next;
- ir_node **ins;
+ ir_node *pred_block = get_nodes_block(get_irn_n(block, i));
+ int arity = get_irn_arity(block);
+ ir_node **ins = ALLOCAN(ir_node*, arity + 1);
+ int new_pred_arity;
+ ir_node *phi;
+ ir_node *next;
ir_node **pred_ins;
- int k;
+ int k;
DB((dbg, LEVEL_1, "Splitting predecessor %d of predecessor %d of %+F\n", j, i, block));
- NEW_ARR_A(ir_node*, ins, arity + 1);
-
for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) {
ir_node* copy = copy_to(get_irn_n(phi, i), pred_block, j);
for (k = 0; k < i; ++k) ins[k] = get_irn_n(phi, k);
ins[k++] = copy;
for (; k < arity; ++k) ins[k] = get_irn_n(phi, k);
- ins[k] = get_irn_n(phi, i);
- assert(k == arity);
- set_irn_in(phi, arity + 1, ins);
+ ins[k++] = get_irn_n(phi, i);
+ set_irn_in(phi, k, ins);
}
for (k = 0; k < i; ++k) ins[k] = get_irn_n(block, k);
ins[k++] = get_irn_n(pred_block, j);
for (; k < arity; ++k) ins[k] = get_irn_n(block, k);
- ins[k] = get_irn_n(block, i);
- assert(k == arity);
- set_irn_in(block, arity + 1, ins);
+ ins[k++] = get_irn_n(block, i);
+ set_irn_in(block, k, ins);
new_pred_arity = get_irn_arity(pred_block) - 1;
- NEW_ARR_A(ir_node*, pred_ins, new_pred_arity);
+ pred_ins = ALLOCAN(ir_node*, new_pred_arity);
for (phi = get_Block_phis(pred_block); phi != NULL; phi = next) {
- for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(phi, k);
- for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(phi, k + 1);
- assert(k == new_pred_arity);
next = get_Phi_next(phi);
- if (new_pred_arity > 1) {
- set_irn_in(phi, new_pred_arity, pred_ins);
- } else {
+ for (k = 0; k != j; ++k) pred_ins[k] = get_irn_n(phi, k);
+ for (; k != new_pred_arity; ++k) pred_ins[k] = get_irn_n(phi, k + 1);
+ if (k == 1) {
exchange(phi, pred_ins[0]);
+ } else {
+ set_irn_in(phi, k, pred_ins);
}
}
- for (k = 0; k < j; ++k) pred_ins[k] = get_irn_n(pred_block, k);
- for (; k < new_pred_arity; ++k) pred_ins[k] = get_irn_n(pred_block, k + 1);
- assert(k == new_pred_arity);
- if (new_pred_arity > 1) {
- set_irn_in(pred_block, new_pred_arity, pred_ins);
- } else {
+ for (k = 0; k != j; ++k) pred_ins[k] = get_irn_n(pred_block, k);
+ for (; k != new_pred_arity; ++k) pred_ins[k] = get_irn_n(pred_block, k + 1);
+ if (k == 1) {
exchange(pred_block, get_nodes_block(pred_ins[0]));
+ } else {
+ set_irn_in(pred_block, k, pred_ins);
}
}
for (j = 0; j < pred_arity; ++j) {
ir_node* pred_pred = get_nodes_block(get_irn_n(pred, j));
- if (is_cdep_on(pred_pred, dependency)) {
+ if (pred_pred != dependency && is_cdep_on(pred_pred, dependency)) {
prepare_path(pred, j, dependency);
split_block(block, i, j);
break;
*/
static void if_conv_walker(ir_node *block, void *ctx)
{
- walker_env *env = ctx;
+ walker_env *env = (walker_env*)ctx;
int arity;
int i;
ir_cdep* cdep;
pred0 = get_Block_cfgpred_block(block, i);
- for (cdep = find_cdep(pred0); cdep != NULL; cdep = cdep->next) {
- const ir_node* dependency = cdep->node;
+ if (pred0 == block) continue;
+
+ for (cdep = find_cdep(pred0); cdep != NULL; cdep = get_cdep_next(cdep)) {
+ const ir_node* dependency = get_cdep_node(cdep);
ir_node* projx0 = walk_to_projx(pred0, dependency);
ir_node* cond;
int j;
dbg_info* cond_dbg;
pred1 = get_Block_cfgpred_block(block, j);
+ if (pred1 == block) continue;
if (!is_cdep_on(pred1, dependency)) continue;
mux_true = get_Phi_pred(p, i);
mux_false = get_Phi_pred(p, j);
}
- if (!env->params->allow_ifconv(sel, mux_false, mux_true)) {
+ if (mux_true == mux_false)
+ continue;
+ ir_mode *mode = get_irn_mode(mux_true);
+ if (mode == mode_M
+ || !env->allow_ifconv(sel, mux_false, mux_true)) {
supported = false;
break;
}
cond, projx0, projx1
));
- env->changed = 1;
+ /* remove critical edges */
+ env->changed = true;
prepare_path(block, i, dependency);
prepare_path(block, j, dependency);
arity = get_irn_arity(block);
mux_block = get_nodes_block(cond);
cond_dbg = get_irn_dbg_info(cond);
- do {
+ do { /* generate Mux nodes in mux_block for Phis in block */
ir_node* val_i = get_irn_n(phi, i);
ir_node* val_j = get_irn_n(phi, j);
ir_node* mux;
phi = next_phi;
} while (phi != NULL);
+ /* move mux operands into mux_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
+#if 0
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 */
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 (except Raise), these will be removed.
*/
}
}
-void opt_if_conv(ir_graph *irg, const ir_settings_if_conv_t *params)
+void opt_if_conv(ir_graph *irg)
{
- walker_env env;
+ walker_env env;
+ const backend_params *be_params = be_get_backend_param();
+
+ assure_irg_properties(irg,
+ IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+ | IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE
+ | IR_GRAPH_PROPERTY_NO_BADS
+ | IR_GRAPH_PROPERTY_ONE_RETURN);
/* get the parameters */
- env.params = (params != NULL ? params : &default_info);
- env.changed = 0;
+ env.allow_ifconv = be_params->allow_ifconv;
+ env.changed = false;
FIRM_DBG_REGISTER(dbg, "firm.opt.ifconv");
DB((dbg, LEVEL_1, "Running if-conversion on %+F\n", irg));
- normalize_one_return(irg);
- remove_critical_cf_edges(irg);
-
compute_cdep(irg);
ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
if (env.changed) {
local_optimize_graph(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);
-}
-
-struct pass_t {
- ir_graph_pass_t pass;
- const ir_settings_if_conv_t *params;
-};
-/**
- * Wrapper for running opt_if_conv() as an ir_graph pass.
- */
-static int pass_wrapper(ir_graph *irg, void *context)
-{
- struct pass_t *pass = context;
- opt_if_conv(irg, pass->params);
- return 0;
+ confirm_irg_properties(irg,
+ IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+ | IR_GRAPH_PROPERTY_ONE_RETURN);
}
-ir_graph_pass_t *opt_if_conv_pass(const char *name,
- const ir_settings_if_conv_t *params)
+ir_graph_pass_t *opt_if_conv_pass(const char *name)
{
- struct pass_t *pass = XMALLOCZ(struct pass_t);
- pass->params = params;
-
- return def_graph_pass_constructor(
- &pass->pass, name ? name : "ifconv", pass_wrapper);
+ return def_graph_pass(name ? name : "ifconv", opt_if_conv);
}