X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepeephole.c;h=25ec92282dce282b4ad405eb402ba961c12439d7;hb=2e291eab8268af551488b1f4fb4d9ca61b625e33;hp=48e32bfd9af268a70a74d882f3c32b7e9ad23968;hpb=8539e8b01310e681fc80a7135eb30b09a76cbf47;p=libfirm diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c index 48e32bfd9..25ec92282 100644 --- a/ir/be/bepeephole.c +++ b/ir/be/bepeephole.c @@ -32,6 +32,8 @@ #include "iredges_t.h" #include "irgwalk.h" #include "irprintf.h" +#include "ircons.h" +#include "irgmod.h" #include "error.h" #include "beirg_t.h" @@ -58,9 +60,9 @@ static void clear_reg_value(ir_node *node) if(!mode_is_data(get_irn_mode(node))) return; - reg = arch_get_irn_register(arch_env, node); + reg = arch_get_irn_register(node); if(reg == NULL) { - panic("No register assigned at %+F\n", node); + panic("No register assigned at %+F", node); } if(arch_register_type_is(reg, virtual)) return; @@ -83,9 +85,9 @@ static void set_reg_value(ir_node *node) if(!mode_is_data(get_irn_mode(node))) return; - reg = arch_get_irn_register(arch_env, node); + reg = arch_get_irn_register(node); if(reg == NULL) { - panic("No register assigned at %+F\n", node); + panic("No register assigned at %+F", node); } if(arch_register_type_is(reg, virtual)) return; @@ -123,6 +125,19 @@ static void set_uses(ir_node *node) } } +void be_peephole_new_node(ir_node * nw) +{ + be_liveness_introduce(lv, nw); +} + +/** + * must be called from peephole optimisations before a node will be killed + * and its users will be redirected to new_node. + * so bepeephole can update it's internal state. + * + * Note: killing a node and rewiring os only allowed if new_node produces + * the same registers as old_node. + */ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node) { const arch_register_t *reg; @@ -130,39 +145,47 @@ void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_node) unsigned reg_idx; unsigned cls_idx; - DBG((dbg, LEVEL_1, "About to exchange %+F with %+F\n", old_node, new_node)); + DBG((dbg, LEVEL_1, "About to exchange and kill %+F with %+F\n", old_node, new_node)); - if(old_node == current_node) { - if(is_Proj(new_node)) { - current_node = get_Proj_pred(new_node); - } else { - current_node = new_node; - } + if (current_node == old_node) { + /* next node to be processed will be killed. Its scheduling predecessor + * must be processed next. */ + current_node = sched_next(current_node); + assert (!is_Bad(current_node)); } - if(!mode_is_data(get_irn_mode(old_node))) + if (!mode_is_data(get_irn_mode(old_node))) return; - reg = arch_get_irn_register(arch_env, old_node); - if(reg == NULL) { - panic("No register assigned at %+F\n", old_node); + reg = arch_get_irn_register(old_node); + if (reg == NULL) { + panic("No register assigned at %+F", old_node); } + assert(reg == arch_get_irn_register(new_node) && + "KILLING a node and replacing by different register is not allowed"); + cls = arch_register_get_class(reg); reg_idx = arch_register_get_index(reg); cls_idx = arch_register_class_index(cls); - if(register_values[cls_idx][reg_idx] == old_node) { + if (register_values[cls_idx][reg_idx] == old_node) { register_values[cls_idx][reg_idx] = new_node; } be_liveness_remove(lv, old_node); } -void be_peephole_after_exchange(ir_node *new_node) +void be_peephole_exchange(ir_node *old, ir_node *nw) { - be_liveness_introduce(lv, new_node); + be_peephole_before_exchange(old, nw); + sched_remove(old); + exchange(old, nw); + be_peephole_new_node(nw); } +/** + * block-walker: run peephole optimization on the given block. + */ static void process_block(ir_node *block, void *data) { unsigned n_classes; @@ -191,70 +214,68 @@ static void process_block(ir_node *block, void *data) for( ; !sched_is_begin(current_node); current_node = sched_prev(current_node)) { ir_op *op; - ir_node *last; - peephole_opt_func func; + peephole_opt_func peephole_node; - if(is_Phi(current_node)) + assert(!is_Bad(current_node)); + if (is_Phi(current_node)) break; clear_defs(current_node); set_uses(current_node); - op = get_irn_op(current_node); - func = (peephole_opt_func) op->ops.generic; - if(func == NULL) + op = get_irn_op(current_node); + peephole_node = (peephole_opt_func)op->ops.generic; + if (peephole_node == NULL) continue; - last = current_node; - func(current_node); - /* was the current node replaced? */ - if(current_node != last) { - set_uses(current_node); - } + peephole_node(current_node); + assert(!is_Bad(current_node)); + } +} + +static void kill_node_and_preds(ir_node *node) +{ + int arity, i; + + arity = get_irn_arity(node); + for (i = 0; i < arity; ++i) { + ir_node *pred = get_irn_n(node, i); + + set_irn_n(node, i, new_Bad()); + if (get_irn_n_edges(pred) != 0) + continue; + + kill_node_and_preds(pred); } + + if (!is_Proj(node)) + sched_remove(node); + kill_node(node); } /** * Walk through the block schedule and skip all barrier nodes. */ -static void skip_barrier(ir_node *ret_blk) { +static void skip_barrier(ir_node *ret_blk, ir_graph *irg) { ir_node *irn; sched_foreach_reverse(ret_blk, irn) { - int i; - - for (i = get_irn_arity(irn) - 1; i >= 0; --i) { - ir_node *proj = get_irn_n(irn, i); + const ir_edge_t *edge, *next; - if (is_Proj(proj)) { - ir_node *barrier = get_Proj_pred(proj); + if (!be_is_Barrier(irn)) + continue; - if (be_is_Barrier(barrier)) { - int pn = (int)get_Proj_proj(proj); - ir_node *pred = get_irn_n(barrier, pn); + foreach_out_edge_safe(irn, edge, next) { + ir_node *proj = get_edge_src_irn(edge); + int pn = (int)get_Proj_proj(proj); + ir_node *pred = get_irn_n(irn, pn); - set_irn_n(irn, i, pred); - if (sched_is_scheduled(barrier)) - sched_remove(barrier); - } - } + edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg); + edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg); } - for (i = get_irn_deps(irn) - 1; i >= 0; --i) { - ir_node *proj = get_irn_dep(irn, i); - - if (is_Proj(proj)) { - ir_node *barrier = get_Proj_pred(proj); - - if (be_is_Barrier(barrier)) { - int pn = (int)get_Proj_proj(proj); - ir_node *pred = get_irn_n(barrier, pn); - set_irn_dep(irn, i, pred); - if (sched_is_scheduled(barrier)) - sched_remove(barrier); - } - } - } + kill_node_and_preds(irn); + break; } } @@ -271,14 +292,57 @@ static void kill_barriers(ir_graph *irg) { ir_node *be_ret = get_Block_cfgpred(end_blk, i); ir_node *ret_blk = get_nodes_block(be_ret); - skip_barrier(ret_blk); + skip_barrier(ret_blk, irg); } /* skip the barrier on the start block */ start_blk = get_irg_start_block(irg); - skip_barrier(start_blk); + skip_barrier(start_blk, irg); } +/* + * Tries to optimize a beIncSp node with it's previous IncSP node. + * Must be run from a be_peephole_opt() context. + */ +ir_node *be_peephole_IncSP_IncSP(ir_node *node) +{ + int pred_offs; + int curr_offs; + int offs; + ir_node *pred = be_get_IncSP_pred(node); + + if (!be_is_IncSP(pred)) + return node; + + if (get_irn_n_edges(pred) > 1) + return node; + + pred_offs = be_get_IncSP_offset(pred); + curr_offs = be_get_IncSP_offset(node); + + if (pred_offs == BE_STACK_FRAME_SIZE_EXPAND) { + if (curr_offs != BE_STACK_FRAME_SIZE_SHRINK) { + return node; + } + offs = 0; + } else if (pred_offs == BE_STACK_FRAME_SIZE_SHRINK) { + if (curr_offs != BE_STACK_FRAME_SIZE_EXPAND) { + return node; + } + offs = 0; + } else if (curr_offs == BE_STACK_FRAME_SIZE_EXPAND || + curr_offs == BE_STACK_FRAME_SIZE_SHRINK) { + return node; + } else { + offs = curr_offs + pred_offs; + } + + /* add node offset to pred and remove our IncSP */ + be_set_IncSP_offset(pred, offs); + + be_peephole_exchange(node, pred); + return pred; +} void be_peephole_opt(be_irg_t *birg) { @@ -319,4 +383,4 @@ void be_init_peephole(void) FIRM_DBG_REGISTER(dbg, "firm.be.peephole"); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillbelady); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_peephole);