X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillmorgan.c;h=815dd09a6fc50b7c74f93da8ef1b38aa642a35a9;hb=b9d45e08e23bcf058fa8f2d9e18dd78e8cccd044;hp=8902191282a25ac8bb9df3b2906881b2eb3e11a5;hpb=1d488e74cf7b5bf1ae976201e3cffab3ad010ed0;p=libfirm diff --git a/ir/be/bespillmorgan.c b/ir/be/bespillmorgan.c index 890219128..815dd09a6 100644 --- a/ir/be/bespillmorgan.c +++ b/ir/be/bespillmorgan.c @@ -14,6 +14,7 @@ #include "bechordal_t.h" #include "bespill.h" #include "belive_t.h" +#include "beabi.h" #include "irgwalk.h" #include "besched.h" #include "beutil.h" @@ -24,10 +25,12 @@ #include "bespillbelady.h" #include "beverify.h" +#include "benodesets.h" #define DBG_LIVE 1 #define DBG_LOOPANA 2 #define DBG_PRESSURE 4 +#define DBG_SPILLS 8 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) typedef struct morgan_env { @@ -88,15 +91,19 @@ static int block_attr_cmp(const void *e1, const void *e2, size_t s) { } static INLINE int loop_attr_hash(const loop_attr_t *a) { +#ifdef DEBUG_libfirm + return a->loop->loop_nr; +#else return HASH_PTR(a->loop); +#endif } static INLINE int block_attr_hash(const block_attr_t *b) { - return HASH_PTR(b->block); + return nodeset_hash(b->block); } static INLINE int loop_edge_hash(const loop_edge_t *e) { - return HASH_PTR(e->block) ^ (e->pos * 31); + return nodeset_hash(e->block) ^ (e->pos * 31); } static INLINE loop_attr_t *get_loop_attr(morgan_env_t *env, const ir_loop *loop) { @@ -147,68 +154,60 @@ static INLINE int consider_for_spilling(const arch_env_t *env, const arch_regist * Determine edges going out of a loop (= edges that go to a block that is not inside * the loop or one of its subloops) */ -static INLINE void construct_loop_edges(ir_node* block, void* e) { - morgan_env_t *env = (morgan_env_t*) e; +static INLINE void construct_loop_edges(ir_node* block, void* data) { + morgan_env_t *env = data; int n_cfgpreds = get_Block_n_cfgpreds(block); int i; ir_loop* loop = get_irn_loop(block); - loop_attr_t *loop_attr = get_loop_attr(env, loop); DBG((dbg, DBG_LOOPANA, "Loop for %+F: %d (depth %d)\n", block, loop->loop_nr, loop->depth)); for(i = 0; i < n_cfgpreds; ++i) { + loop_edge_t edge; + int hash; ir_node* cfgpred = get_Block_cfgpred(block, i); ir_node* cfgpred_block = get_nodes_block(cfgpred); ir_loop* cfgpred_loop = get_irn_loop(cfgpred_block); - loop_attr_t *outedges = get_loop_attr(env, cfgpred_loop); if(cfgpred_loop == loop) continue; - // is it an edge into the loop? - if(get_loop_depth(loop) > get_loop_depth(cfgpred_loop)) { - loop_edge_t edge; - edge.block = block; - edge.pos = i; - DBG((dbg, DBG_LOOPANA, "Loop in edge from %+F (loop %d) to %+F (loop %d)\n", cfgpred_block, get_loop_loop_nr(cfgpred_loop), block, get_loop_loop_nr(loop))); - set_insert(loop_attr->in_edges, &edge, sizeof(edge), loop_edge_hash(&edge)); - } else { - ir_loop *p_loop = cfgpred_loop; - while(get_loop_depth(p_loop) > get_loop_depth(loop)) { - p_loop = get_loop_outer_loop(p_loop); - } - if(p_loop != loop) { - loop_edge_t edge; - edge.block = block; - edge.pos = i; - DBG((dbg, DBG_LOOPANA, "Loop in edge from %+F (loop %d) to %+F (loop %d)\n", cfgpred_block, get_loop_loop_nr(cfgpred_loop), block, get_loop_loop_nr(loop))); - set_insert(loop_attr->in_edges, &edge, sizeof(edge), loop_edge_hash(&edge)); - } - } + assert(get_loop_depth(cfgpred_loop) != get_loop_depth(loop)); - // an edge out of the loop? - if(get_loop_depth(cfgpred_loop) >= get_loop_depth(loop)) { - loop_edge_t edge; - edge.block = block; - edge.pos = i; - DBG((dbg, DBG_LOOPANA, "Loop out edge from %+F (loop %d) to %+F\n", cfgpred_block, cfgpred_loop->loop_nr, block)); - set_insert(outedges->out_edges, &edge, sizeof(edge), loop_edge_hash(&edge)); + edge.block = block; + edge.pos = i; + hash = loop_edge_hash(&edge); + + // edge out of a loop? + if(get_loop_depth(cfgpred_loop) > get_loop_depth(loop)) { + ir_loop *l; + + DBG((dbg, DBG_LOOPANA, "Loop out edge from %+F (loop %d) to %+F (loop %d)\n", block, get_loop_loop_nr(loop), + cfgpred_block, get_loop_loop_nr(cfgpred_loop))); + + /* this might be a jump out of multiple loops, so add this to all + * needed outedge sets */ + l = cfgpred_loop; + do { + loop_attr_t *l_attr = get_loop_attr(env, l); + set_insert(l_attr->out_edges, &edge, sizeof(edge), hash); + + l = get_loop_outer_loop(l); + assert(l != NULL); + } while(l != loop); } else { - ir_loop *o_loop = loop; + ir_loop *l; - // we might jump in the middle of another inner loop which is not inside - // our loop (happens for irreducible graphs). This would be a - // real out edge then. - while(get_loop_depth(o_loop) > get_loop_depth(cfgpred_loop)) { - o_loop = get_loop_outer_loop(o_loop); - } + // edge into a loop + DBG((dbg, DBG_LOOPANA, "Loop in edge from %+F (loop %d) to %+F (loop %d)\n", block, get_loop_loop_nr(loop), + cfgpred_block, get_loop_loop_nr(cfgpred_loop))); - if(cfgpred_loop != o_loop) { - loop_edge_t edge; - edge.block = block; - edge.pos = i; - DBG((dbg, DBG_LOOPANA, "Loop out edge from %+F (loop %d) to %+F (into jump)\n", cfgpred_block, cfgpred_loop->loop_nr, block)); - set_insert(outedges->out_edges, &edge, sizeof(edge), loop_edge_hash(&edge)); - } + l = loop; + do { + loop_attr_t *l_attr = get_loop_attr(env, l); + set_insert(l_attr->in_edges, &edge, sizeof(edge), hash); + + l = get_loop_outer_loop(l); + } while(l != cfgpred_loop); } } } @@ -222,6 +221,7 @@ static void free_loop_edges(morgan_env_t *env) { } } +#if 0 /** * Debugging help, shows all nodes in a (node-)bitset */ @@ -230,9 +230,11 @@ static void show_nodebitset(ir_graph* irg, const bitset_t* bitset) { bitset_foreach(bitset, i) { ir_node* node = get_idx_irn(irg, i); - DBG((dbg, DBG_LIVE, "\t%+F\n", node)); + ir_fprintf(stderr, " %+F", node); } + fprintf(stderr, "\n"); } +#endif /** * Construct the livethrough unused set for a block @@ -248,10 +250,6 @@ static bitset_t *construct_block_livethrough_unused(morgan_env_t* env, const ir_ ir_node *irn = be_lv_get_irn(env->cenv->lv, block, i); int node_idx; - /* - if(!live_is_in(li) || !live_is_out(li)) - continue; - */ if(!consider_for_spilling(env->arch, env->cls, irn)) continue; @@ -272,7 +270,6 @@ static bitset_t *construct_block_livethrough_unused(morgan_env_t* env, const ir_ } } - show_nodebitset(env->irg, block_attr->livethrough_unused); return block_attr->livethrough_unused; } @@ -326,13 +323,11 @@ static bitset_t *construct_loop_livethrough_unused(morgan_env_t *env, const ir_l bitset_andnot(son_attr->livethrough_unused, loop_attr->livethrough_unused); DBG((dbg, DBG_LIVE, "Livethroughs for loop %d:\n", loop->loop_nr)); - show_nodebitset(env->irg, son_attr->livethrough_unused); } else if(*elem.kind == k_ir_node) { block_attr_t *block_attr = get_block_attr(env, elem.node); bitset_andnot(block_attr->livethrough_unused, loop_attr->livethrough_unused); DBG((dbg, DBG_LIVE, "Livethroughs for block %+F\n", elem.node)); - show_nodebitset(env->irg, block_attr->livethrough_unused); } else { assert(0); } @@ -344,90 +339,42 @@ static bitset_t *construct_loop_livethrough_unused(morgan_env_t *env, const ir_l /*---------------------------------------------------------------------------*/ static int reduce_register_pressure_in_block(morgan_env_t *env, const ir_node* block, int loop_unused_spills_possible) { - int pressure; - ir_node *irn; - int max_pressure = 0; - int spills_needed; + ir_node *node; + int max_pressure; int loop_unused_spills_needed; - block_attr_t *block_attr = get_block_attr(env, block); - int block_unused_spills_possible = bitset_popcnt(block_attr->livethrough_unused); - int unused_spills_possible = loop_unused_spills_possible + block_unused_spills_possible; pset *live_nodes = pset_new_ptr_default(); be_liveness_end_of_block(env->cenv->lv, env->arch, env->cls, block, live_nodes); - pressure = pset_count(live_nodes); + max_pressure = pset_count(live_nodes); DBG((dbg, DBG_LIVE, "Reduce pressure to %d In Block %+F:\n", env->registers_available, block)); /** - * Walk over all irns in the schedule and check register pressure for each of them + * Determine register pressure in block */ - sched_foreach_reverse(block, irn) { - // do we need more spills than possible with unused libethroughs? - int spills_needed = pressure - env->registers_available - unused_spills_possible; - if(spills_needed > 0) { - DBG((dbg, DBG_PRESSURE, "\tWARNING %d more spills needed at %+F\n", spills_needed, irn)); - // TODO further spills needed - //assert(0); - } - if(pressure > max_pressure) { - max_pressure = pressure; - } + sched_foreach_reverse(block, node) { + int pressure; - /* Register pressure is only important until we reach the first phi (the rest of the block - * will only be phis.) - */ - if(is_Phi(irn)) + if(is_Phi(node)) break; - // update pressure - be_liveness_transfer(env->arch, env->cls, irn, live_nodes); + be_liveness_transfer(env->arch, env->cls, node, live_nodes); pressure = pset_count(live_nodes); + if(pressure > max_pressure) + max_pressure = pressure; } + del_pset(live_nodes); DBG((dbg, DBG_PRESSURE, "\tMax Pressure in %+F: %d\n", block, max_pressure)); - /* - * Calculate number of spills from loop_unused_spills_possible that we want to use, - * and spill unused livethroughs from the block if we still don't have enough registers - */ - spills_needed = max_pressure - env->registers_available; - if(spills_needed < 0) { - loop_unused_spills_needed = 0; - } else if(spills_needed > loop_unused_spills_possible) { - int i, spills; - int block_unused_spills_needed; + loop_unused_spills_needed = max_pressure - env->registers_available; + if(loop_unused_spills_needed < 0) { + loop_unused_spills_needed = 0; + } else if(loop_unused_spills_needed > loop_unused_spills_possible) { loop_unused_spills_needed = loop_unused_spills_possible; - block_unused_spills_needed = spills_needed - loop_unused_spills_possible; - if(block_unused_spills_needed > block_unused_spills_possible) { - block_unused_spills_needed = block_unused_spills_possible; - } - - spills = 0; - /* - * Spill/Reload unused livethroughs from the block - */ - bitset_foreach(block_attr->livethrough_unused, i) { - ir_node *to_spill; - const ir_edge_t *edge; - - if(spills >= block_unused_spills_needed) - break; - - to_spill = get_idx_irn(env->irg, i); - foreach_block_succ(block, edge) { - DBG((dbg, DBG_PRESSURE, "Spilling node %+F around block %+F\n", to_spill, block)); - be_add_reload_on_edge(env->senv, to_spill, edge->src, edge->pos); - } - spills++; - } - } else { - loop_unused_spills_needed = spills_needed; } - del_pset(live_nodes); - DBG((dbg, DBG_PRESSURE, "Unused spills for Block %+F needed: %d\n", block, loop_unused_spills_needed)); return loop_unused_spills_needed; } @@ -453,6 +400,7 @@ static int reduce_register_pressure_in_loop(morgan_env_t *env, const ir_loop *lo int needed; assert(is_Block(elem.node)); needed = reduce_register_pressure_in_block(env, elem.node, spills_possible); + assert(needed >= 0); assert(needed <= spills_possible); if(needed > spills_needed) spills_needed = needed; @@ -460,6 +408,7 @@ static int reduce_register_pressure_in_loop(morgan_env_t *env, const ir_loop *lo } case k_ir_loop: { int needed = reduce_register_pressure_in_loop(env, elem.son, spills_possible); + assert(needed >= 0); assert(needed <= spills_possible); if(needed > spills_needed) spills_needed = needed; @@ -481,12 +430,16 @@ static int reduce_register_pressure_in_loop(morgan_env_t *env, const ir_loop *lo spills_to_place = spills_needed; + DBG((dbg, DBG_SPILLS, "%d values unused in loop %d, spilling %d\n", + spills_possible - outer_spills_possible, loop->loop_nr, spills_to_place)); + bitset_foreach(loop_attr->livethrough_unused, i) { loop_edge_t *edge; ir_node *to_spill = get_idx_irn(env->irg, i); + DBG((dbg, DBG_SPILLS, "Spilling node %+F around loop %d\n", to_spill, loop->loop_nr)); + for(edge = set_first(loop_attr->out_edges); edge != NULL; edge = set_next(loop_attr->out_edges)) { - DBG((dbg, DBG_PRESSURE, "Spilling node %+F around loop %d\n", to_spill, loop->loop_nr)); be_add_reload_on_edge(env->senv, to_spill, edge->block, edge->pos); } @@ -506,7 +459,7 @@ void be_spill_morgan(be_chordal_env_t *chordal_env) { morgan_env_t env; FIRM_DBG_REGISTER(dbg, "ir.be.spillmorgan"); - //firm_dbg_set_mask(dbg, DBG_LOOPANA | DBG_PRESSURE); + //firm_dbg_set_mask(dbg, DBG_SPILLS | DBG_LOOPANA); env.cenv = chordal_env; env.arch = chordal_env->birg->main_env->arch_env; @@ -517,7 +470,7 @@ void be_spill_morgan(be_chordal_env_t *chordal_env) { obstack_init(&env.obst); - env.registers_available = arch_count_non_ignore_regs(env.arch, env.cls); + env.registers_available = env.cls->n_regs - be_put_ignore_regs(chordal_env->birg, env.cls, NULL); env.loop_attr_set = new_set(loop_attr_cmp, 5); env.block_attr_set = new_set(block_attr_cmp, 20); @@ -558,11 +511,6 @@ void be_spill_morgan(be_chordal_env_t *chordal_env) { del_set(env.block_attr_set); /* fix the remaining places with too high register pressure with beladies algorithm */ - - /* we have to remove dead nodes from schedule to not confuse liveness calculation */ - be_remove_dead_nodes_from_schedule(env.irg); - be_liveness_recompute(chordal_env->lv); - be_spill_belady_spill_env(chordal_env, env.senv); be_delete_spill_env(env.senv);