X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcondeval.c;h=54ddc5a465c192f73e839361e9708f57fac3d584;hb=1a4bb21b7aa32f0bcd282d4c1cdb144aca601fa9;hp=1e18533c44313f9c650019128d869a7c974d5eed;hpb=01525f88295aa2b661750896324b4e5db55325f1;p=libfirm diff --git a/ir/opt/condeval.c b/ir/opt/condeval.c index 1e18533c4..54ddc5a46 100644 --- a/ir/opt/condeval.c +++ b/ir/opt/condeval.c @@ -1,20 +1,35 @@ /* - * Project: libFIRM - * File name: ir/opt/cfopt.c - * Purpose: Partial condition evaluation - * Author: Christoph Mallon, Matthias Braun - * Created: 10. Sep. 2006 - * CVS-ID: $Id$ - * Copyright: (c) 1998-2006 Universität Karlsruhe - * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + +/** + * @file + * @brief Partial condition evaluation + * @date 10. Sep. 2006 + * @author Christoph Mallon, Matthias Braun + * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif + +#include "iroptimize.h" #include -#include "array.h" -#include "condeval.h" +#include "array_t.h" #include "debug.h" #include "ircons.h" #include "irgmod.h" @@ -25,7 +40,11 @@ #include "iredges.h" #include "iredges_t.h" #include "irtools.h" +#include "irgraph.h" #include "tv.h" +#include "opt_confirms.h" + +#undef AVOID_PHIB DEBUG_ONLY(static firm_dbg_module_t *dbg); @@ -48,43 +67,11 @@ static void add_pred(ir_node* node, ir_node* x) set_irn_in(node, n + 1, ins); } -/** - * Remove predecessor j from node, which is either a Block or a Phi - * returns true if only one predecessor is left - */ -static int remove_pred(ir_node* node, int j) -{ - int n; - - assert(is_Block(node) || is_Phi(node)); +static ir_node *ssa_second_def; +static ir_node *ssa_second_def_block; - n = get_irn_arity(node); - if (n == 2) { - ir_node* pred = get_irn_n(node, 1 - j); - - if (is_Block(node)) { - pred = get_nodes_block(pred); - edges_reroute(node, pred, current_ir_graph); - } else { - exchange(node, pred); - } - return 1; - } else { - ir_node** ins; - int i; - - NEW_ARR_A(ir_node*, ins, n - 1); - for (i = 0; i < j; i++) - ins[i] = get_irn_n(node, i); - for (i++; i < n; i++) - ins[i - 1] = get_irn_n(node, i); - - set_irn_in(node, n - 1, ins); - return 0; - } -} - -static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode) +static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode, + int first) { int i; int n_cfgpreds; @@ -92,41 +79,52 @@ static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode) ir_node *phi; ir_node **in; - // This is needed because we create bads sometimes + /* This is needed because we create bads sometimes */ if(is_Bad(block)) return new_Bad(); - // already processed this block? + /* the other defs can't be marked for cases where a user of the original + * value is in the same block as the alternative definition. + * In this case we mustn't use the alternative definition. + * So we keep a flag that indicated wether we walked at least 1 block + * away and may use the alternative definition */ + if (block == ssa_second_def_block && !first) { + return ssa_second_def; + } + + /* already processed this block? */ if(irn_visited(block)) { ir_node *value = (ir_node*) get_irn_link(block); return value; } - // blocks with only 1 pred need no phi + irg = get_irn_irg(block); + assert(block != get_irg_start_block(irg)); + + /* a Block with only 1 predecessor needs no Phi */ n_cfgpreds = get_Block_n_cfgpreds(block); if(n_cfgpreds == 1) { ir_node *pred_block = get_Block_cfgpred_block(block, 0); - ir_node *value = search_def_and_create_phis(pred_block, mode); + ir_node *value = search_def_and_create_phis(pred_block, mode, 0); set_irn_link(block, value); mark_irn_visited(block); return value; } - // create a new phi + /* create a new Phi */ NEW_ARR_A(ir_node*, in, n_cfgpreds); for(i = 0; i < n_cfgpreds; ++i) in[i] = new_Unknown(mode); - irg = get_irn_irg(block); phi = new_r_Phi(irg, block, n_cfgpreds, in, mode); set_irn_link(block, phi); mark_irn_visited(block); - // set phi preds + /* set Phi predecessors */ for(i = 0; i < n_cfgpreds; ++i) { ir_node *pred_block = get_Block_cfgpred_block(block, i); - ir_node *pred_val = search_def_and_create_phis(pred_block, mode); + ir_node *pred_val = search_def_and_create_phis(pred_block, mode, 0); set_irn_n(phi, i, pred_val); } @@ -139,57 +137,49 @@ static ir_node *search_def_and_create_phis(ir_node *block, ir_mode *mode) * first value (the users are determined through the out-edges of the value). * Uses the irn_visited flags. Works without using the dominance tree. */ -static void construct_ssa(ir_node * const *blocks, ir_node * const *vals, int n_vals) +static void construct_ssa(ir_node *orig_block, ir_node *orig_val, + ir_node *second_block, ir_node *second_val) { - int i; ir_graph *irg; ir_mode *mode; const ir_edge_t *edge; const ir_edge_t *next; - ir_node *value; - assert(n_vals > 0); + /* no need to do anything */ + if (orig_val == second_val) + return; - irg = get_irn_irg(vals[0]); + irg = get_irn_irg(orig_val); inc_irg_visited(irg); - mode = get_irn_mode(vals[0]); - for(i = 0; i < n_vals; ++i) { - ir_node *value = vals[i]; - ir_node *value_block = blocks[i]; - - assert(get_irn_mode(value) == mode); - - set_irn_link(value_block, value); - mark_irn_visited(value_block); - } - - // Only fix the users of the first, i.e. the original node - value = vals[0]; + mode = get_irn_mode(orig_val); + set_irn_link(orig_block, orig_val); + mark_irn_visited(orig_block); - // this can happen when fixing phi preds, we mustn't fix the users - if(get_nodes_block(value) != blocks[0]) return; + ssa_second_def_block = second_block; + ssa_second_def = second_val; - foreach_out_edge_safe(value, edge, next) { + /* Only fix the users of the first, i.e. the original node */ + foreach_out_edge_safe(orig_val, edge, next) { ir_node *user = get_edge_src_irn(edge); int j = get_edge_src_pos(edge); ir_node *user_block = get_nodes_block(user); ir_node *newval; - // ignore keeps - if(get_irn_op(user) == op_End) + /* ignore keeps */ + if (is_End(user)) continue; DB((dbg, LEVEL_3, ">>> Fixing user %+F (pred %d == %+F)\n", user, j, get_irn_n(user, j))); if(is_Phi(user)) { ir_node *pred_block = get_Block_cfgpred_block(user_block, j); - newval = search_def_and_create_phis(pred_block, mode); + newval = search_def_and_create_phis(pred_block, mode, 1); } else { - newval = search_def_and_create_phis(user_block, mode); + newval = search_def_and_create_phis(user_block, mode, 1); } - // don't fix newly created phis from the SSA construction + /* don't fix newly created Phis from the SSA construction */ if (newval != user) { DB((dbg, LEVEL_4, ">>>> Setting input %d of %+F to %+F\n", j, user, newval)); set_irn_n(user, j, newval); @@ -209,41 +199,117 @@ static void split_critical_edge(ir_node *block, int pos) { set_Block_cfgpred(block, pos, new_jmp); } -typedef struct _condeval_env_t { - ir_node *true_block; - pn_Cmp pnc; - ir_node *cnst; - unsigned long visited_nr; - - ir_node *cnst_pred; /**< the block before the constant */ - int cnst_pos; /**< the pos to the constant block (needed to kill that edge later) */ +typedef struct condeval_env_t { + ir_node *true_block; + ir_node *cmp; /**< The Compare node that might be partial evaluated */ + pn_Cmp pnc; /**< The Compare mode of the Compare node. */ + ir_node *cnst; + tarval *tv; + ir_visited_t visited_nr; + + ir_node *cnst_pred; /**< the block before the constant */ + int cnst_pos; /**< the pos to the constant block (needed to + kill that edge later) */ } condeval_env_t; -static void copy_and_fix(ir_node *block, ir_node *copy_block, int j, const condeval_env_t *env) { +static ir_node *copy_and_fix_node(const condeval_env_t *env, ir_node *block, + ir_node *copy_block, int j, ir_node *node) { + int i, arity; + ir_node *copy; + + /* we can evaluate Phis right now, all other nodes get copied */ + if (is_Phi(node)) { + copy = get_Phi_pred(node, j); + /* we might have to evaluate a Phi-cascade */ + if(get_irn_visited(copy) >= env->visited_nr) { + copy = get_irn_link(copy); + } + } else { + copy = exact_copy(node); + set_nodes_block(copy, copy_block); + + assert(get_irn_mode(copy) != mode_X); + + arity = get_irn_arity(copy); + for(i = 0; i < arity; ++i) { + ir_node *pred = get_irn_n(copy, i); + ir_node *new_pred; + + if(get_nodes_block(pred) != block) + continue; + + if(get_irn_visited(pred) >= env->visited_nr) { + new_pred = get_irn_link(pred); + } else { + new_pred = copy_and_fix_node(env, block, copy_block, j, pred); + } + DB((dbg, LEVEL_2, ">> Set Pred of %+F to %+F\n", copy, new_pred)); + set_irn_n(copy, i, new_pred); + } + } + + set_irn_link(node, copy); + set_irn_visited(node, env->visited_nr); + + return copy; +} + +static void copy_and_fix(const condeval_env_t *env, ir_node *block, + ir_node *copy_block, int j) { const ir_edge_t *edge; /* Look at all nodes in the cond_block and copy them into pred */ foreach_out_edge(block, edge) { ir_node *node = get_edge_src_irn(edge); ir_node *copy; + ir_mode *mode; + + if (is_Block(node)) { + /* Block->Block edge, should be the MacroBlock edge */ + assert(get_Block_MacroBlock(node) == block && "Block->Block edge found"); + continue; + } /* ignore control flow */ - if (get_irn_mode(node) == mode_X) + mode = get_irn_mode(node); + if (mode == mode_X || is_Cond(node)) continue; +#ifdef AVOID_PHIB + /* we may not copy mode_b nodes, because this could produce Phi with + * mode_bs which can't be handled in all backends. Instead we duplicate + * the node and move it to its users */ + if (mode == mode_b) { + const ir_edge_t *edge, *next; + ir_node *pred; + int pn; - /* we can evaluate Phis right now, all other nodes get copied */ - if (is_Phi(node)) { - copy = get_Phi_pred(node, j); - } else { - copy = exact_copy(node); - set_nodes_block(copy, copy_block); + assert(is_Proj(node)); + + pred = get_Proj_pred(node); + pn = get_Proj_proj(node); + + foreach_out_edge_safe(node, edge, next) { + ir_node *cmp_copy; + ir_node *user = get_edge_src_irn(edge); + int pos = get_edge_src_pos(edge); + ir_node *user_block = get_nodes_block(user); + + if(user_block == block) + continue; + + cmp_copy = exact_copy(pred); + set_nodes_block(cmp_copy, user_block); + copy = new_r_Proj(current_ir_graph, user_block, cmp_copy, mode_b, pn); + set_irn_n(user, pos, copy); + } + continue; } +#endif - set_irn_link(node, copy); - set_irn_visited(node, env->visited_nr); + copy = copy_and_fix_node(env, block, copy_block, j, node); /* we might hit values in blocks that have already been processed by a - * recursive find_phi_with_const call */ + * recursive find_phi_with_const() call */ assert(get_irn_visited(copy) <= env->visited_nr); if(get_irn_visited(copy) >= env->visited_nr) { ir_node *prev_copy = get_irn_link(copy); @@ -254,49 +320,104 @@ static void copy_and_fix(ir_node *block, ir_node *copy_block, int j, const conde /* fix data-flow (and reconstruct SSA if needed) */ foreach_out_edge(block, edge) { - ir_node *vals[2]; - ir_node *blocks[2]; - ir_node *node = get_edge_src_irn(edge); + ir_node *copy_node; + ir_mode *mode; - if (get_irn_mode(node) == mode_X) + if (is_Block(node)) { + /* Block->Block edge, should be the MacroBlock edge */ + assert(get_Block_MacroBlock(node) == block && "Block->Block edge found"); + continue; + } + + mode = get_irn_mode(node); + if (mode == mode_X || is_Cond(node)) + continue; +#ifdef AVOID_PHIB + if (mode == mode_b) continue; +#endif DB((dbg, LEVEL_2, ">> Fixing users of %+F\n", node)); - blocks[0] = block; - vals[0] = node; - blocks[1] = copy_block; - vals[1] = get_irn_link(node); - construct_ssa(blocks, vals, 2); + copy_node = get_irn_link(node); + construct_ssa(block, node, copy_block, copy_node); } } -static int eval_cmp(pn_Cmp pnc, tarval *tv1, tarval *tv2) { - pn_Cmp cmp_result = tarval_cmp(tv1, tv2); +/** + * returns whether the cmp evaluates to true or false, or can't be evaluated! + * 1: true, 0: false, -1: can't evaluate + * + * @param pnc the compare mode of the Compare + * @param tv_left the left tarval + * @param tv_right the right tarval + */ +static int eval_cmp_tv(pn_Cmp pnc, tarval *tv_left, tarval *tv_right) { + pn_Cmp cmp_result = tarval_cmp(tv_left, tv_right); - // does the compare evaluate to true? - if(cmp_result == pn_Cmp_False) - return 0; - if((cmp_result & pnc) != cmp_result) + /* does the compare evaluate to true? */ + if (cmp_result == pn_Cmp_False) + return -1; + if ((cmp_result & pnc) != cmp_result) return 0; return 1; } -static ir_node *find_phi_with_const(ir_node *jump, ir_node *value, condeval_env_t *env) { +/** + * returns whether the cmp evaluates to true or false, or can't be evaluated! + * 1: true, 0: false, -1: can't evaluate + * + * @param env the environment + * @param cand the candidate node, either a Const or a Confirm + */ +static int eval_cmp(condeval_env_t *env, ir_node *cand) { + if (is_Const(cand)) { + tarval *tv_cand = get_Const_tarval(cand); + tarval *tv_cmp = get_Const_tarval(env->cnst); + + return eval_cmp_tv(env->pnc, tv_cand, tv_cmp); + } else { /* a Confirm */ + tarval *res = computed_value_Cmp_Confirm(env->cmp, cand, env->cnst, env->pnc); + + if (res == tarval_bad) + return -1; + return res == tarval_b_true; + } +} + +/** + * Check for Const or Confirm with Const. + */ +static int is_Const_or_Confirm(const ir_node *node) { + if (is_Confirm(node)) + node = get_Confirm_bound(node); + return is_Const(node); +} + +/** + * get the tarval of a Const or Confirm with + */ +static tarval *get_Const_or_Confirm_tarval(const ir_node *node) { + if (is_Confirm(node)) { + if (get_Confirm_bound(node)) + node = get_Confirm_bound(node); + } + return get_Const_tarval(node); +} + +static ir_node *find_const_or_confirm(condeval_env_t *env, ir_node *jump, ir_node *value) +{ ir_node *block = get_nodes_block(jump); - if(irn_visited(value)) + if (irn_visited_else_mark(value)) return NULL; - mark_irn_visited(value); - - if(is_Const(value)) { - tarval *tv_const = get_Const_tarval(env->cnst); - tarval *tv = get_Const_tarval(value); - if(!eval_cmp(env->pnc, tv, tv_const)) + if (is_Const_or_Confirm(value)) { + if (eval_cmp(env, value) <= 0) { return NULL; + } DB(( dbg, LEVEL_1, @@ -304,12 +425,12 @@ static ir_node *find_phi_with_const(ir_node *jump, ir_node *value, condeval_env_ env->true_block, block )); - // adjust true_block to point directly towards our jump + /* adjust true_block to point directly towards our jump */ add_pred(env->true_block, jump); split_critical_edge(env->true_block, 0); - // we need a bigger visited nr when going back + /* we need a bigger visited nr when going back */ env->visited_nr++; return block; @@ -318,29 +439,30 @@ static ir_node *find_phi_with_const(ir_node *jump, ir_node *value, condeval_env_ if(is_Phi(value)) { int i, arity; - // the phi has to be in the same block as the jump - if(get_nodes_block(value) != block) + /* the Phi has to be in the same Block as the Jmp */ + if(get_nodes_block(value) != block) { return NULL; + } arity = get_irn_arity(value); for(i = 0; i < arity; ++i) { ir_node *copy_block; ir_node *phi_pred = get_Phi_pred(value, i); - ir_node *cfgpred = get_Block_cfgpred(block, i); + ir_node *cfgpred = get_Block_cfgpred(block, i); - copy_block = find_phi_with_const(cfgpred, phi_pred, env); + copy_block = find_const_or_confirm(env, cfgpred, phi_pred); if(copy_block == NULL) continue; /* copy duplicated nodes in copy_block and fix SSA */ - copy_and_fix(block, copy_block, i, env); + copy_and_fix(env, block, copy_block, i); if(copy_block == get_nodes_block(cfgpred)) { env->cnst_pred = block; - env->cnst_pos = i; + env->cnst_pos = i; } - // return now as we can't process more possibilities in 1 run + /* return now as we can't process more possibilities in 1 run */ return copy_block; } } @@ -348,9 +470,113 @@ static ir_node *find_phi_with_const(ir_node *jump, ir_node *value, condeval_env_ return NULL; } +static ir_node *find_candidate(condeval_env_t *env, ir_node *jump, + ir_node *value) +{ + ir_node *block = get_nodes_block(jump); + + if (irn_visited_else_mark(value)) { + return NULL; + } + + if (is_Const_or_Confirm(value)) { + tarval *tv = get_Const_or_Confirm_tarval(value); + + if (tv != env->tv) + return NULL; + + DB(( + dbg, LEVEL_1, + "> Found condition evaluation candidate %+F->%+F\n", + env->true_block, block + )); + + /* adjust true_block to point directly towards our jump */ + add_pred(env->true_block, jump); + + split_critical_edge(env->true_block, 0); + + /* we need a bigger visited nr when going back */ + env->visited_nr++; + + return block; + } + if(is_Phi(value)) { + int i, arity; + + /* the Phi has to be in the same Block as the Jmp */ + if(get_nodes_block(value) != block) + return NULL; + + arity = get_irn_arity(value); + for(i = 0; i < arity; ++i) { + ir_node *copy_block; + ir_node *phi_pred = get_Phi_pred(value, i); + ir_node *cfgpred = get_Block_cfgpred(block, i); + + copy_block = find_candidate(env, cfgpred, phi_pred); + if(copy_block == NULL) + continue; + + /* copy duplicated nodes in copy_block and fix SSA */ + copy_and_fix(env, block, copy_block, i); + + if(copy_block == get_nodes_block(cfgpred)) { + env->cnst_pred = block; + env->cnst_pos = i; + } + + /* return now as we can't process more possibilities in 1 run */ + return copy_block; + } + } + if(is_Proj(value)) { + ir_node *left; + ir_node *right; + int pnc; + ir_node *cmp = get_Proj_pred(value); + if(!is_Cmp(cmp)) + return NULL; + + left = get_Cmp_left(cmp); + right = get_Cmp_right(cmp); + pnc = get_Proj_proj(value); + + /* we assume that the constant is on the right side, swap left/right + * if needed */ + if(is_Const(left)) { + ir_node *t = left; + left = right; + right = t; + + pnc = get_inversed_pnc(pnc); + } + + if(!is_Const(right)) + return 0; + + if(get_nodes_block(left) != block) { + return 0; + } + + /* negate condition when we're looking for the false block */ + if(env->tv == tarval_b_false) { + pnc = get_negated_pnc(pnc, get_irn_mode(right)); + } + + /* (recursively) look if a pred of a Phi is a constant or a Confirm */ + env->cmp = cmp; + env->pnc = pnc; + env->cnst = right; + + return find_const_or_confirm(env, jump, left); + } + + return NULL; +} /** - * Block-walker: searchs for the following construct + * Block-walker: searches for the following construct * * Const or Phi with constants * | @@ -366,16 +592,14 @@ static void cond_eval(ir_node* block, void* data) { condeval_env_t env; int *changed = data; - ir_graph *irg = current_ir_graph; - ir_node *copy_block; - ir_node *pred; + ir_node *selector; ir_node *projx; ir_node *cond; - ir_node *cmp; - ir_node *left; - ir_node *right; - ir_node *cond_block; - pn_Cmp pnc; + ir_node *copy_block; + int selector_evaluated; + const ir_edge_t *edge, *next; + ir_node* bad; + size_t cnst_pos; if(get_Block_n_cfgpreds(block) != 1) return; @@ -389,110 +613,121 @@ static void cond_eval(ir_node* block, void* data) if (!is_Cond(cond)) return; - pred = get_Cond_selector(cond); - // TODO handle switches - if (get_irn_mode(pred) != mode_b) - return; - if (!is_Proj(pred)) + selector = get_Cond_selector(cond); + /* TODO handle switch Conds */ + if (get_irn_mode(selector) != mode_b) return; - pnc = get_Proj_proj(pred); - cmp = get_Proj_pred(pred); - assert(is_Cmp(cmp)); - - left = get_Cmp_left(cmp); - right = get_Cmp_right(cmp); - assert(get_irn_mode(left) == get_irn_mode(right)); + /* handle cases that can be immediately evaluated */ + selector_evaluated = -1; + if(is_Proj(selector)) { + ir_node *cmp = get_Proj_pred(selector); + if(is_Cmp(cmp)) { + ir_node *left = get_Cmp_left(cmp); + ir_node *right = get_Cmp_right(cmp); + if(is_Const(left) && is_Const(right)) { + int pnc = get_Proj_proj(selector); + tarval *tv_left = get_Const_tarval(left); + tarval *tv_right = get_Const_tarval(right); + + selector_evaluated = eval_cmp_tv(pnc, tv_left, tv_right); + if(selector_evaluated < 0) + return; + } + } + } else if (is_Const_or_Confirm(selector)) { + tarval *tv = get_Const_or_Confirm_tarval(selector); + if(tv == tarval_b_true) { + selector_evaluated = 1; + } else { + assert(tv == tarval_b_false); + selector_evaluated = 0; + } + } - /* we assume that the cond_block is the true case */ + env.cnst_pred = NULL; if (get_Proj_proj(projx) == pn_Cond_false) { - pnc = get_negated_pnc(pnc, get_irn_mode(left)); + env.tv = tarval_b_false; + if(selector_evaluated >= 0) + selector_evaluated = !selector_evaluated; + } else { + env.tv = tarval_b_true; } - /* we assume that the constant is on the right side, swap left/right - * if needed */ - if(is_Const(left)) { - ir_node *t = left; - left = right; - right = t; - - pnc = get_inversed_pnc(pnc); + if(selector_evaluated == 0) { + bad = new_Bad(); + exchange(projx, bad); + *changed = 1; + return; + } else if(selector_evaluated == 1) { + dbg_info *dbgi = get_irn_dbg_info(selector); + ir_node *jmp = new_rd_Jmp(dbgi, current_ir_graph, get_nodes_block(projx)); + exchange(projx, jmp); + *changed = 1; + return; } - if(!is_Const(right)) - return; + /* (recursively) look if a pred of a Phi is a constant or a Confirm */ + env.true_block = block; + inc_irg_visited(current_ir_graph); + env.visited_nr = get_irg_visited(current_ir_graph); - cond_block = get_nodes_block(cond); + copy_block = find_candidate(&env, projx, selector); + if (copy_block == NULL) + return; - // special case: comparing a constant with a constant - if(is_Const(left)) { - tarval *tv1 = get_Const_tarval(left); - tarval *tv2 = get_Const_tarval(right); - ir_node *pred; - if(eval_cmp(pnc, tv1, tv2)) { - pred = new_r_Jmp(irg, cond_block); - } else { - pred = new_Bad(); - } - set_Block_cfgpred(block, 0, pred); - *changed = 1; - set_irg_doms_inconsistent(irg); - set_irg_extblk_inconsistent(irg); - set_irg_loopinfo_inconsistent(irg); - } else { - if(get_nodes_block(left) != cond_block) - return; - - // (recursively) look if a pred of a phi is a constant - env.true_block = block; - env.pnc = pnc; - env.cnst = right; - inc_irg_visited(current_ir_graph); - env.visited_nr = get_irg_visited(irg); - - copy_block = find_phi_with_const(projx, left, &env); - - if(copy_block != NULL) { - /* we have to remove the edge towards the pred as the pred now - * jumps into the true_block. We also have to shorten phis - * in our block because of this */ - const ir_edge_t *edge, *next; + /* we have to remove the edge towards the pred as the pred now + * jumps into the true_block. We also have to shorten Phis + * in our block because of this */ + bad = new_Bad(); + cnst_pos = env.cnst_pos; - /* shorten phis */ - foreach_out_edge_safe(env.cnst_pred, edge, next) { - ir_node *node = get_edge_src_irn(edge); + /* shorten Phis */ + foreach_out_edge_safe(env.cnst_pred, edge, next) { + ir_node *node = get_edge_src_irn(edge); - if(is_Phi(node)) - remove_pred(node, env.cnst_pos); - } + if(is_Phi(node)) + set_Phi_pred(node, cnst_pos, bad); + } - remove_pred(env.cnst_pred, env.cnst_pos); + set_Block_cfgpred(env.cnst_pred, cnst_pos, bad); - // the graph is changed now - *changed = 1; - set_irg_doms_inconsistent(irg); - set_irg_extblk_inconsistent(irg); - set_irg_loopinfo_inconsistent(irg); - } - } + /* the graph is changed now */ + *changed = 1; } void opt_cond_eval(ir_graph* irg) { - int changed; + int changed, rerun; FIRM_DBG_REGISTER(dbg, "firm.opt.condeval"); - //firm_dbg_set_mask(dbg, SET_LEVEL_5); DB((dbg, LEVEL_1, "===> Performing condition evaluation on %+F\n", irg)); - edges_assure(irg); remove_critical_cf_edges(irg); - normalize_proj_nodes(irg); + edges_assure(irg); + ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_IRN_VISITED); + + changed = 0; do { - changed = 0; - irg_block_walk_graph(irg, cond_eval, NULL, &changed); - } while(changed); + rerun = 0; + irg_block_walk_graph(irg, cond_eval, NULL, &rerun); + changed |= rerun; + } while (rerun); + + ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_IRN_VISITED); + + if (changed) { + /* control flow changed, some blocks may become dead */ + set_irg_outs_inconsistent(irg); + set_irg_doms_inconsistent(irg); + set_irg_extblk_inconsistent(irg); + set_irg_loopinfo_inconsistent(irg); + + /* Dead code might be created. Optimize it away as it is dangerous + * to call optimize_df() an dead code. */ + optimize_cf(irg); + } }