X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbespillbelady.c;h=59de03b4e4b5a57ed978d88ae9b3c461b70c14f4;hb=8938d107e5c4fd70e921a182360f01f8bbda26cc;hp=948bbe46d0048a120e6209b475ad1821830519ba;hpb=501a13c6429ecb1de1cbb274782e67fa0030b970;p=libfirm diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c index 948bbe46d..59de03b4e 100644 --- a/ir/be/bespillbelady.c +++ b/ir/be/bespillbelady.c @@ -83,7 +83,7 @@ typedef struct _belady_env_t { struct obstack ob; const arch_env_t *arch; const arch_register_class_t *cls; - const be_lv_t *lv; + be_lv_t *lv; be_loopana_t *loop_ana; int n_regs; /** number of regs in this reg-class */ @@ -329,7 +329,12 @@ static void displace(belady_env_t *env, workset_t *new_vals, int is_usage) { for (i = max_allowed; i < ws->len; ++i) { ir_node *irn = ws->vals[i].irn; - DBG((dbg, DBG_DECIDE, " disposing %+F (%u)\n", irn, workset_get_time(ws, i))); + DBG((dbg, DBG_DECIDE, " disposing %+F (%u)\n", irn, + workset_get_time(ws, i))); + + if(!USES_IS_INFINITE(ws->vals[i].time)) { + be_add_spill(env->senv, irn, env->instr); + } if (is_Phi(irn)) continue; @@ -372,6 +377,7 @@ static loc_t to_take_or_not_to_take(belady_env_t *env, ir_node* first, loc_t loc; loc.time = USES_INFINITY; loc.irn = node; + (void) block; if (!arch_irn_consider_in_reg_alloc(env->arch, env->cls, node)) { loc.time = USES_INFINITY; @@ -478,9 +484,9 @@ static void compute_live_ins(ir_node *block, void *data) { } /* spill all delayed phis which didn't make it into start workset */ - for (i = ARR_LEN(delayed) - 1; i >= 0; --i) { + for ( ; i < ARR_LEN(delayed); ++i) { ir_node *irn = delayed[i].irn; - if (irn && is_Phi(irn)) { + if (irn && is_Phi(irn) && get_nodes_block(irn) == block) { DBG((dbg, DBG_START, " spilling delayed phi %+F\n", irn)); be_spill_phi(env->senv, irn); } @@ -608,9 +614,12 @@ static void belady(ir_node *block, void *data) { /* allocate all values _defined_ by this instruction */ workset_clear(new_vals); if (get_irn_mode(irn) == mode_T) { /* special handling for tuples and projs */ - ir_node *proj; - for(proj=sched_next(irn); is_Proj(proj); proj=sched_next(proj)) + const ir_edge_t *edge; + + foreach_out_edge(irn, edge) { + ir_node *proj = get_edge_src_irn(edge); workset_insert(env, new_vals, proj); + } } else { workset_insert(env, new_vals, irn); } @@ -633,56 +642,78 @@ static void belady(ir_node *block, void *data) { * about the set of live-ins. Thus we must adapt the * live-outs to the live-ins at each block-border. */ -static void fix_block_borders(ir_node *block, void *data) { - belady_env_t *env = data; - workset_t *wsb; - ir_graph *irg = get_irn_irg(block); - ir_node *startblock = get_irg_start_block(irg); - int i, max, iter, iter2; - - if(block == startblock) - return; +static void fix_block_borders(ir_node *block, void *data) +{ + ir_graph *irg = get_irn_irg(block); + ir_node *startblock = get_irg_start_block(irg); + belady_env_t *env = data; + workset_t *start_workset; + int arity; + int i; + int iter; + + if(block == startblock) + return; DBG((dbg, DBG_FIX, "\n")); DBG((dbg, DBG_FIX, "Fixing %+F\n", block)); - wsb = get_block_info(block)->ws_start; + start_workset = get_block_info(block)->ws_start; /* process all pred blocks */ - for (i=0, max=get_irn_arity(block); iws_end; + arity = get_irn_arity(block); + for (i = 0; i < arity; ++i) { + ir_node *pred = get_Block_cfgpred_block(block, i); + workset_t *workset_pred_end = get_block_info(pred)->ws_end; + ir_node *node; DBG((dbg, DBG_FIX, " Pred %+F\n", pred)); - workset_foreach(wsb, irnb, iter) { - /* if irnb is a phi of the current block we reload - * the corresponding argument, else irnb itself */ - if(is_Phi(irnb) && block == get_nodes_block(irnb)) { - irnb = get_irn_n(irnb, i); + /* spill all values not used anymore */ + workset_foreach(workset_pred_end, node, iter) { + ir_node *n2; + int iter2; + int found = 0; + workset_foreach(start_workset, n2, iter2) { + if(n2 == node) { + found = 1; + break; + } + /* note that we do not look at phi inputs, becuase the values + * will be either live-end and need no spill or + * they have other users in which must be somewhere else in the + * workset */ + } - // we might have unknowns as argument for the phi - if(!arch_irn_consider_in_reg_alloc(env->arch, env->cls, irnb)) - continue; + if(!found && be_is_live_out(env->lv, pred, node)) { + ir_node *insert_point + = be_get_end_of_block_insertion_point(pred); + DBG((dbg, DBG_SPILL, "Spill %+F before %+F\n", node, + insert_point)); + be_add_spill(env->senv, node, insert_point); } + } - /* Unknowns are available everywhere */ - if(get_irn_opcode(irnb) == iro_Unknown) - continue; + /* reload missing values in predecessors */ + workset_foreach(start_workset, node, iter) { + /* if node is a phi of the current block we reload + * the corresponding argument, else node itself */ + if(is_Phi(node) && block == get_nodes_block(node)) { + node = get_irn_n(node, i); - /* check if irnb is in a register at end of pred */ - workset_foreach(wsp, irnp, iter2) { - if (irnb == irnp) - goto next_value; + /* we might have unknowns as argument for the phi */ + if(!arch_irn_consider_in_reg_alloc(env->arch, env->cls, node)) + continue; } - /* irnb is not in memory at the end of pred, so we have to reload it */ - DBG((dbg, DBG_FIX, " reload %+F\n", irnb)); - DBG((dbg, DBG_SPILL, "Reload %+F before %+F,%d\n", irnb, block, i)); - be_add_reload_on_edge(env->senv, irnb, block, i, env->cls, 1); + /* check if node is in a register at end of pred */ + if(workset_contains(workset_pred_end, node)) + continue; -next_value: - /*epsilon statement :)*/; + /* node is not in memory at the end of pred -> reload it */ + DBG((dbg, DBG_FIX, " reload %+F\n", node)); + DBG((dbg, DBG_SPILL, "Reload %+F before %+F,%d\n", node, block, i)); + be_add_reload_on_edge(env->senv, node, block, i, env->cls, 1); } } } @@ -704,13 +735,9 @@ void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls, ir_graph *irg = be_get_birg_irg(birg); int n_regs; - /* some special classes contain only ignore regs, nothing to do then */ n_regs = cls->n_regs - be_put_ignore_regs(birg, cls, NULL); - if(n_regs == 0) - return; + be_liveness_assure_sets(be_assure_liveness(birg)); - be_invalidate_liveness(birg); - be_assure_liveness(birg); /* construct control flow loop tree */ if(! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) { construct_cf_backedges(irg); @@ -739,15 +766,17 @@ void be_spill_belady_spill_env(be_irg_t *birg, const arch_register_class_t *cls, irg_block_walk_graph(irg, NULL, belady, &env); /* belady was block-local, fix the global flow by adding reloads on the edges */ irg_block_walk_graph(irg, fix_block_borders, NULL, &env); + + be_end_uses(env.uses); + be_free_loop_pressure(env.loop_ana); + obstack_free(&env.ob, NULL); + /* Insert spill/reload nodes into the graph and fix usages */ be_insert_spills_reloads(env.senv); /* clean up */ if(spill_env == NULL) be_delete_spill_env(env.senv); - be_end_uses(env.uses); - be_free_loop_pressure(env.loop_ana); - obstack_free(&env.ob, NULL); } void be_init_spillbelady(void)