X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepeephole.c;h=e5f9cc724b2d257425bf9866ea9849bad0e16e04;hb=51d8477e3b9f11aa3d8f38ef386ab46a63b26a0b;hp=b31a8202bd1b025417a7b28b9e5ba117eee649c7;hpb=7f40bd1250b868879e10d8789f9867d09e20e647;p=libfirm diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c index b31a8202b..e5f9cc724 100644 --- a/ir/be/bepeephole.c +++ b/ir/be/bepeephole.c @@ -23,23 +23,22 @@ * @author Matthias Braun * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "bepeephole.h" #include "iredges_t.h" #include "irgwalk.h" #include "irprintf.h" +#include "ircons.h" #include "irgmod.h" #include "error.h" -#include "beirg_t.h" +#include "beirg.h" #include "belive_t.h" -#include "bearch_t.h" -#include "benode_t.h" -#include "besched_t.h" +#include "bearch.h" +#include "benode.h" +#include "besched.h" #include "bemodule.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -56,21 +55,21 @@ static void clear_reg_value(ir_node *node) unsigned reg_idx; unsigned cls_idx; - if(!mode_is_data(get_irn_mode(node))) + if (!mode_is_data(get_irn_mode(node))) return; - reg = arch_get_irn_register(arch_env, node); - if(reg == NULL) { - panic("No register assigned at %+F\n", node); + reg = arch_get_irn_register(node); + if (reg == NULL) { + panic("No register assigned at %+F", node); } - if(arch_register_type_is(reg, virtual)) + if (arch_register_type_is(reg, virtual)) return; cls = arch_register_get_class(reg); reg_idx = arch_register_get_index(reg); cls_idx = arch_register_class_index(cls); //assert(register_values[cls_idx][reg_idx] != NULL); - DBG((dbg, LEVEL_1, "Clear Register %s\n", reg->name)); + DB((dbg, LEVEL_1, "Clear Register %s\n", reg->name)); register_values[cls_idx][reg_idx] = NULL; } @@ -81,27 +80,27 @@ static void set_reg_value(ir_node *node) unsigned reg_idx; unsigned cls_idx; - if(!mode_is_data(get_irn_mode(node))) + if (!mode_is_data(get_irn_mode(node))) return; - reg = arch_get_irn_register(arch_env, node); - if(reg == NULL) { - panic("No register assigned at %+F\n", node); + reg = arch_get_irn_register(node); + if (reg == NULL) { + panic("No register assigned at %+F", node); } - if(arch_register_type_is(reg, virtual)) + if (arch_register_type_is(reg, virtual)) return; cls = arch_register_get_class(reg); reg_idx = arch_register_get_index(reg); cls_idx = arch_register_class_index(cls); - DBG((dbg, LEVEL_1, "Set Register %s: %+F\n", reg->name, node)); + DB((dbg, LEVEL_1, "Set Register %s: %+F\n", reg->name, node)); register_values[cls_idx][reg_idx] = node; } static void clear_defs(ir_node *node) { /* clear values defined */ - if(get_irn_mode(node) == mode_T) { + if (get_irn_mode(node) == mode_T) { const ir_edge_t *edge; foreach_out_edge(node, edge) { ir_node *proj = get_edge_src_irn(edge); @@ -118,52 +117,74 @@ static void set_uses(ir_node *node) /* set values used */ arity = get_irn_arity(node); - for(i = 0; i < arity; ++i) { + for (i = 0; i < arity; ++i) { ir_node *in = get_irn_n(node, i); set_reg_value(in); } } -void be_peephole_before_exchange(const ir_node *old_node, ir_node *new_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. + */ +static void be_peephole_before_exchange(const ir_node *old_node, + ir_node *new_node) { const arch_register_t *reg; const arch_register_class_t *cls; unsigned reg_idx; unsigned cls_idx; - DBG((dbg, LEVEL_1, "About to exchange %+F with %+F\n", old_node, new_node)); + DB((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; @@ -173,77 +194,103 @@ static void process_block(ir_node *block, void *data) /* construct initial register assignment */ n_classes = arch_env_get_n_reg_class(arch_env); - for(i = 0; i < n_classes; ++i) { + for (i = 0; i < n_classes; ++i) { const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i); unsigned n_regs = arch_register_class_n_regs(cls); memset(register_values[i], 0, sizeof(ir_node*) * n_regs); } assert(lv->nodes && "live sets must be computed"); - DBG((dbg, LEVEL_1, "\nProcessing block %+F (from end)\n", block)); + DB((dbg, LEVEL_1, "\nProcessing block %+F (from end)\n", block)); be_lv_foreach(lv, block, be_lv_state_end, l) { ir_node *node = be_lv_get_irn(lv, block, l); set_reg_value(node); } - DBG((dbg, LEVEL_1, "\nstart processing\n")); + DB((dbg, LEVEL_1, "\nstart processing\n")); /* walk the block from last insn to the first */ current_node = sched_last(block); - for( ; !sched_is_begin(current_node); + 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); - } + DB((dbg, LEVEL_2, "optimize %+F\n", 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, ir_graph *irg) { +static void skip_barrier(ir_node *ret_blk, ir_graph *irg) +{ ir_node *irn; sched_foreach_reverse(ret_blk, irn) { - if (be_is_Barrier(irn)) { - const ir_edge_t *edge, *next; - - 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); - - edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg); - edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg); - } - sched_remove(irn); - kill_node(irn); - break; + const ir_edge_t *edge, *next; + + if (!be_is_Barrier(irn)) + continue; + + foreach_out_edge_safe(irn, edge, next) { + ir_node *proj = get_edge_src_irn(edge); + int pn; + ir_node *pred; + + if (is_Anchor(proj)) + continue; + + pn = (int) get_Proj_proj(proj); + pred = get_irn_n(irn, pn); + + edges_reroute_kind(proj, pred, EDGE_KIND_NORMAL, irg); + edges_reroute_kind(proj, pred, EDGE_KIND_DEP, irg); } + + kill_node_and_preds(irn); + break; } } /** * Kill the Barrier nodes for better peephole optimization. */ -static void kill_barriers(ir_graph *irg) { +static void kill_barriers(ir_graph *irg) +{ ir_node *end_blk = get_irg_end_block(irg); ir_node *start_blk; int i; @@ -261,8 +308,31 @@ static void kill_barriers(ir_graph *irg) { skip_barrier(start_blk, irg); } +/** + * Check whether the node has only one user. Explicitly ignore the anchor. + */ +static int has_only_one_user(ir_node *node) +{ + int n = get_irn_n_edges(node); + const ir_edge_t *edge; + + if (n <= 1) + return 1; + + if (n > 2) + return 0; + + foreach_out_edge(node, edge) { + ir_node *src = get_edge_src_irn(edge); + if (is_Anchor(src)) + return 1; + } + + return 0; +} + /* - * Tries to optimize a beIncSp node with it's previous IncSP node. + * Tries to optimize a beIncSP node with its previous IncSP node. * Must be run from a be_peephole_opt() context. */ ir_node *be_peephole_IncSP_IncSP(ir_node *node) @@ -275,7 +345,7 @@ ir_node *be_peephole_IncSP_IncSP(ir_node *node) if (!be_is_IncSP(pred)) return node; - if (get_irn_n_edges(pred) > 1) + if (!has_only_one_user(pred)) return node; pred_offs = be_get_IncSP_offset(pred); @@ -301,15 +371,7 @@ ir_node *be_peephole_IncSP_IncSP(ir_node *node) /* add node offset to pred and remove our IncSP */ be_set_IncSP_offset(pred, offs); - be_peephole_before_exchange(node, pred); - - /* rewire dependency/data edges */ - edges_reroute_kind(node, pred, EDGE_KIND_DEP, current_ir_graph); - edges_reroute(node, pred, current_ir_graph); - sched_remove(node); - be_kill_node(node); - - be_peephole_after_exchange(pred); + be_peephole_exchange(node, pred); return pred; } @@ -332,24 +394,23 @@ void be_peephole_opt(be_irg_t *birg) lv = be_get_birg_liveness(birg); n_classes = arch_env_get_n_reg_class(arch_env); - register_values = alloca(sizeof(register_values[0]) * n_classes); - for(i = 0; i < n_classes; ++i) { + register_values = XMALLOCN(ir_node**, n_classes); + for (i = 0; i < n_classes; ++i) { const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i); unsigned n_regs = arch_register_class_n_regs(cls); - register_values[i] = alloca(sizeof(ir_node*) * n_regs); + register_values[i] = XMALLOCN(ir_node*, n_regs); } irg_block_walk_graph(irg, process_block, NULL, NULL); -} -void be_peephole_init(void) -{ - clear_irp_opcodes_generic_func(); + for (i = 0; i < n_classes; ++i) { + xfree(register_values[i]); + } + xfree(register_values); } +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_peephole); void be_init_peephole(void) { FIRM_DBG_REGISTER(dbg, "firm.be.peephole"); } - -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_spillbelady);