X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fifconv.c;h=78184eece588af3335b57e6b8d6e1ed8e66111d1;hb=b27ae245166bb695bc4e418ff416d91bc37d0f28;hp=ee24f4804fb7030a99ef1dfeb6b87b9d529b02e2;hpb=9771520fae154447ba69158735a9d7b6b6ed7a1f;p=libfirm diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c index ee24f4804..78184eece 100644 --- a/ir/opt/ifconv.c +++ b/ir/opt/ifconv.c @@ -31,7 +31,7 @@ #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" @@ -189,62 +189,57 @@ static void rewire(ir_node* node, int i, int j, ir_node* new_pred) /** - * 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); } } @@ -261,7 +256,7 @@ static void prepare_path(ir_node* block, int i, const ir_node* dependency) 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; @@ -274,7 +269,7 @@ static void prepare_path(ir_node* block, int i, const ir_node* dependency) */ static void if_conv_walker(ir_node *block, void *ctx) { - walker_env *env = ctx; + walker_env *env = (walker_env*)ctx; int arity; int i; @@ -288,8 +283,10 @@ restart: 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; @@ -315,6 +312,7 @@ restart: dbg_info* cond_dbg; pred1 = get_Block_cfgpred_block(block, j); + if (pred1 == block) continue; if (!is_cdep_on(pred1, dependency)) continue; @@ -348,6 +346,7 @@ restart: cond, projx0, projx1 )); + /* remove critical edges */ env->changed = true; prepare_path(block, i, dependency); prepare_path(block, j, dependency); @@ -355,7 +354,7 @@ restart: 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; @@ -393,12 +392,13 @@ restart: 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 */ @@ -477,6 +477,8 @@ void opt_if_conv(ir_graph *irg) DB((dbg, LEVEL_1, "Running if-conversion on %+F\n", irg)); + env.changed |= remove_bads(irg); + normalize_one_return(irg); remove_critical_cf_edges(irg); @@ -494,9 +496,7 @@ void opt_if_conv(ir_graph *irg) 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); }