X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=dc3ee7a030e793ea96401a8bb74939dbce004744;hb=2ba470dbd1cf5b505632290e2a75f6965deb6e97;hp=e8592814f81cc36b787b43f22918b4e1777ef17a;hpb=55437d814f031e648187e51ba6e952907f9a480c;p=libfirm diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c index e8592814f..dc3ee7a03 100644 --- a/ir/be/beirgmod.c +++ b/ir/be/beirgmod.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -53,6 +53,7 @@ #include "iredges_t.h" #include "irgraph_t.h" #include "irgopt.h" +#include "irgmod.h" #include "irprintf_t.h" #include "irgwalk.h" @@ -88,30 +89,33 @@ ir_node *insert_Perm_after(be_irg_t *birg, be_lv_t *lv = birg->lv; ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos); ir_graph *irg = get_irn_irg(bl); - pset *live = pset_new_ptr_default(); + ir_nodeset_t live; + ir_nodeset_iterator_t iter; ir_node *curr, *irn, *perm, **nodes; - int i, n; + size_t i, n; DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos)); - be_liveness_nodes_live_at(lv, arch_env, cls, pos, live); - - n = pset_count(live); + ir_nodeset_init(&live); + be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live); + n = ir_nodeset_size(&live); if(n == 0) { - del_pset(live); + ir_nodeset_destroy(&live); return NULL; } nodes = xmalloc(n * sizeof(nodes[0])); DBG((dbg, LEVEL_1, "live:\n")); - for(irn = pset_first(live), i = 0; irn; irn = pset_next(live), i++) { + i = 0; + foreach_ir_nodeset(&live, irn, iter) { DBG((dbg, LEVEL_1, "\t%+F\n", irn)); nodes[i] = irn; + i++; } - del_pset(live); + ir_nodeset_destroy(&live); perm = be_new_Perm(cls, irg, bl, n, nodes); sched_add_after(pos, perm); @@ -127,9 +131,6 @@ ir_node *insert_Perm_after(be_irg_t *birg, ir_node *proj = new_r_Proj(irg, bl, perm, mode, i); arch_set_irn_register(arch_env, proj, reg); -#ifdef SCHEDULE_PROJS - sched_add_after(curr, proj); -#endif curr = proj; be_ssa_construction_init(&senv, birg); @@ -145,59 +146,126 @@ ir_node *insert_Perm_after(be_irg_t *birg, return perm; } +static int blocks_removed; + /** * Post-block-walker: Find blocks containing only one jump and * remove them. */ -static void remove_empty_block(ir_node *block, void *data) { +static void remove_empty_block(ir_node *block) +{ const ir_edge_t *edge, *next; + int i, arity; ir_node *node; - int *changed = data; + ir_node *pred; + ir_node *succ_block; ir_node *jump = NULL; - assert(is_Block(block)); + if (irn_visited(block)) + return; + mark_irn_visited(block); if (get_Block_n_cfgpreds(block) != 1) - return; + goto check_preds; sched_foreach(block, node) { if (! is_Jmp(node)) - return; + goto check_preds; if (jump != NULL) { /* we should never have 2 jumps in a block */ - panic("We should never have 2 jumps in a block"); + panic("found 2 jumps in a block"); } jump = node; } if (jump == NULL) - return; + goto check_preds; - node = get_Block_cfgpred(block, 0); + pred = get_Block_cfgpred(block, 0); + succ_block = NULL; foreach_out_edge_safe(jump, edge, next) { - ir_node *block = get_edge_src_irn(edge); - int pos = get_edge_src_pos(edge); + int pos = get_edge_src_pos(edge); - set_irn_n(block, pos, node); + assert(succ_block == NULL); + succ_block = get_edge_src_irn(edge); + + set_irn_n(succ_block, pos, pred); + } + + /* there can be some non-scheduled Pin nodes left in the block, move them + * to the succ block (Pin) or pred block (Sync) */ + foreach_out_edge_safe(block, edge, next) { + node = get_edge_src_irn(edge); + + if(node == jump) + continue; + if (is_Block(node)) { + /* a Block->Block edge: This should be the MacroBlock + edge, ignore it. */ + assert(get_Block_MacroBlock(node) == block && "Wrong Block->Block edge"); + continue; + } + if (is_Pin(node)) { + set_nodes_block(node, succ_block); + continue; + } + if (is_Sync(node)) { + set_nodes_block(node, get_nodes_block(pred)); + continue; + } + if (is_End(node)) { /* End-keep, reroute it to the successor */ + int pos = get_edge_src_pos(edge); + set_irn_n(node, pos, succ_block); + continue; + } + panic("Unexpected node %+F in block %+F with empty schedule", node, block); } set_Block_cfgpred(block, 0, new_Bad()); - be_kill_node(jump); - *changed = 1; + kill_node(jump); + blocks_removed = 1; + + /* check predecessor */ + remove_empty_block(get_nodes_block(pred)); + return; + +check_preds: + arity = get_Block_n_cfgpreds(block); + for(i = 0; i < arity; ++i) { + ir_node *pred = get_Block_cfgpred_block(block, i); + remove_empty_block(pred); + } } /* removes basic blocks that just contain a jump instruction */ -int be_remove_empty_blocks(ir_graph *irg) { - int changed = 0; +int be_remove_empty_blocks(ir_graph *irg) +{ + ir_node *end; + int i, arity; + + blocks_removed = 0; + + ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED); + inc_irg_visited(irg); + remove_empty_block(get_irg_end_block(irg)); + end = get_irg_end(irg); + arity = get_irn_arity(end); + for(i = 0; i < arity; ++i) { + ir_node *pred = get_irn_n(end, i); + if(!is_Block(pred)) + continue; + remove_empty_block(pred); + } + ir_free_resources(irg, IR_RESOURCE_IRN_VISITED); - irg_block_walk_graph(irg, remove_empty_block, NULL, &changed); - if (changed) { + if (blocks_removed) { /* invalidate analysis info */ set_irg_doms_inconsistent(irg); set_irg_extblk_inconsistent(irg); set_irg_outs_inconsistent(irg); + set_irg_loopinfo_inconsistent(irg); } - return changed; + return blocks_removed; } void be_init_irgmod(void)