X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbepeephole.c;h=484a5acab715901240e702e859a8345a01a75266;hb=bed05ed2d3b2ae84849fd2e75603e8834153cd5b;hp=cc726c92fbfbcacef1ba05bc6d5ac947d7351497;hpb=ea75e9d38674b468f602a0699fb64b9c01254797;p=libfirm diff --git a/ir/be/bepeephole.c b/ir/be/bepeephole.c index cc726c92f..484a5acab 100644 --- a/ir/be/bepeephole.c +++ b/ir/be/bepeephole.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -25,6 +25,7 @@ */ #include "config.h" +#include "array_t.h" #include "bepeephole.h" #include "iredges_t.h" @@ -62,14 +63,14 @@ static void clear_reg_value(ir_node *node) if (reg == NULL) { panic("No register assigned at %+F", node); } - if (arch_register_type_is(reg, virtual)) + if (reg->type & arch_register_type_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; } @@ -87,13 +88,13 @@ static void set_reg_value(ir_node *node) if (reg == NULL) { panic("No register assigned at %+F", node); } - if (arch_register_type_is(reg, virtual)) + if (reg->type & arch_register_type_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; } @@ -131,9 +132,9 @@ void be_peephole_new_node(ir_node * 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. + * so bepeephole can update its internal state. * - * Note: killing a node and rewiring os only allowed if new_node produces + * Note: killing a node and rewiring is only allowed if new_node produces * the same registers as old_node. */ static void be_peephole_before_exchange(const ir_node *old_node, @@ -144,7 +145,7 @@ static void be_peephole_before_exchange(const ir_node *old_node, unsigned reg_idx; unsigned cls_idx; - DBG((dbg, LEVEL_1, "About to exchange and kill %+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 (current_node == old_node) { /* next node to be processed will be killed. Its scheduling predecessor @@ -193,20 +194,20 @@ static void process_block(ir_node *block, void *data) (void) data; /* construct initial register assignment */ - n_classes = arch_env_get_n_reg_class(arch_env); + n_classes = arch_env->n_register_classes; for (i = 0; i < n_classes; ++i) { - const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i); + const arch_register_class_t *cls = &arch_env->register_classes[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); @@ -227,107 +228,34 @@ static void process_block(ir_node *block, void *data) if (peephole_node == NULL) continue; + 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) -{ - ir_node *irn; - - sched_foreach_reverse(ret_blk, irn) { - 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) -{ - ir_node *end_blk = get_irg_end_block(irg); - ir_node *start_blk; - int i; - - /* skip the barrier on all return blocks */ - for (i = get_Block_n_cfgpreds(end_blk) - 1; i >= 0; --i) { - ir_node *be_ret = get_Block_cfgpred(end_blk, i); - ir_node *ret_blk = get_nodes_block(be_ret); - - skip_barrier(ret_blk, irg); - } - - /* skip the barrier on the start block */ - start_blk = get_irg_start_block(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) +bool be_has_only_one_user(ir_node *node) { int n = get_irn_n_edges(node); + int n_users; const ir_edge_t *edge; if (n <= 1) return 1; - if (n > 2) - return 0; - + n_users = 0; foreach_out_edge(node, edge) { ir_node *src = get_edge_src_irn(edge); - if (is_Anchor(src)) - return 1; + /* ignore anchor and keep-alive edges */ + if (is_Anchor(src) || is_End(src)) + continue; + n_users++; } - return 0; + return n_users == 1; } /* @@ -344,7 +272,7 @@ ir_node *be_peephole_IncSP_IncSP(ir_node *node) if (!be_is_IncSP(pred)) return node; - if (!has_only_one_user(pred)) + if (!be_has_only_one_user(pred)) return node; pred_offs = be_get_IncSP_offset(pred); @@ -374,33 +302,33 @@ ir_node *be_peephole_IncSP_IncSP(ir_node *node) return pred; } -void be_peephole_opt(be_irg_t *birg) +void be_peephole_opt(ir_graph *irg) { - ir_graph *irg = be_get_birg_irg(birg); - unsigned n_classes; - unsigned i; - - /* barrier nodes are used for register allocations. They hinders - * peephole optimizations, so remove them here. */ - kill_barriers(irg); + unsigned n_classes; + unsigned i; /* we sometimes find BadE nodes in float apps like optest_float.c or * kahansum.c for example... */ - be_liveness_invalidate(birg->lv); - be_liveness_assure_sets(be_assure_liveness(birg)); + be_liveness_invalidate(be_get_irg_liveness(irg)); + be_liveness_assure_sets(be_assure_liveness(irg)); - arch_env = be_get_birg_arch_env(birg); - lv = be_get_birg_liveness(birg); + arch_env = be_get_irg_arch_env(irg); + lv = be_get_irg_liveness(irg); - n_classes = arch_env_get_n_reg_class(arch_env); - register_values = ALLOCAN(ir_node**, n_classes); + n_classes = arch_env->n_register_classes; + 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); + const arch_register_class_t *cls = &arch_env->register_classes[i]; unsigned n_regs = arch_register_class_n_regs(cls); - register_values[i] = ALLOCAN(ir_node*, n_regs); + register_values[i] = XMALLOCN(ir_node*, n_regs); } irg_block_walk_graph(irg, process_block, NULL, NULL); + + for (i = 0; i < n_classes; ++i) { + xfree(register_values[i]); + } + xfree(register_values); } BE_REGISTER_MODULE_CONSTRUCTOR(be_init_peephole);