/**
* Searchs the schedule backwards until we reach the first use or def of a
* value or a phi.
- * Returns the node before this node (so that you can do sched_add_before)
+ * Returns the node after this node (so that you can do sched_add_before)
*/
static ir_node *find_last_use_def(spill_env_t *env, ir_node *block, ir_node *value) {
ir_node *node, *last;
for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
ir_node *arg = get_irn_n(node, i);
if(arg == value) {
- return skip_projs(node);
+ return skip_projs(last);
}
}
last = node;
return res;
}
-static place_copies_for_phi(spill_env_t *env, ir_node* node) {
+static void place_copies_for_phi(spill_env_t *env, ir_node* node) {
int i, arity;
assert(is_Phi(node));
}
void be_spill_phi(spill_env_t *env, ir_node *node) {
+ spill_ctx_t *spill_ctx;
+
assert(is_Phi(node));
pset_insert_ptr(env->mem_phis, node);
+
+ // remove spill context for this phi (if there was one)
+ spill_ctx = be_get_spill_ctx(env->spill_ctxs, node, node);
+ if(spill_ctx != NULL) {
+ spill_ctx->spill = NULL;
+ }
}
void be_insert_spills_reloads(spill_env_t *env) {
/* introduce copies, rewire the uses */
assert(pset_count(values) > 0 && "???");
pset_insert_ptr(values, si->spilled_node);
- be_ssa_constr_set_ignore(env->chordal_env->dom_front, values, env->mem_phis);
+ be_ssa_constr_set_ignore(env->chordal_env->dom_front, env->chordal_env->lv, values, env->mem_phis);
del_pset(values);
}
rel->reloader = before;
rel->next = res->reloaders;
res->reloaders = rel;
+
+ be_liveness_add_missing(env->chordal_env->lv);
}
void be_add_reload_on_edge(spill_env_t *env, ir_node *to_spill, ir_node *block, int pos) {
* Walker: compute the spill slots
*/
static void compute_spill_slots_walker(ir_node *spill, void *env) {
- ss_env_t *ssenv = env;
- ir_node *ctx;
- pmap_entry *entry;
+ ss_env_t *ssenv = env;
+ arch_env_t *arch_env = ssenv->cenv->birg->main_env->arch_env;
+ ir_node *ctx;
+ pmap_entry *entry;
spill_slot_t *ss;
+ const arch_register_class_t *cls;
+
+ if (! be_is_Spill(spill))
+ return;
+
+ cls = arch_get_irn_reg_class(arch_env, spill, be_pos_Spill_val);
- if (!be_is_Spill(spill))
+ if (cls != ssenv->cenv->cls)
return;
/* check, if this spill is for a context already known */
- ctx = be_get_Spill_context(spill);
+ ctx = be_get_Spill_context(spill);
entry = pmap_find(ssenv->slots, ctx);
- if (!entry) {
- struct _arch_env_t *arch_env = ssenv->cenv->birg->main_env->arch_env;
- const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, spill, be_pos_Spill_val);
+ if (! entry) {
ir_mode *largest_mode = arch_register_class_mode(cls);
/* this is a new spill context */
for (irn = pset_first(ss->members); irn; irn = pset_next(ss->members)) {
/* use values_interfere here, because it uses the dominance check,
which does work for values in memory */
- assert(!values_interfere(spill, irn) && "Spills for the same spill slot must not interfere!");
+ assert(!values_interfere(ssenv->cenv->lv, spill, irn) && "Spills for the same spill slot must not interfere!");
}
}
#endif /* NDEBUG */
ir_node *n2;
for(n1 = pset_first(ass[i]->members); n1; n1 = pset_next(ass[i]->members))
for(n2 = pset_first(ass[o]->members); n2; n2 = pset_next(ass[o]->members))
- if(values_interfere(n1, n2)) {
+ if(values_interfere(ssenv->cenv->lv, n1, n2)) {
pset_break(ass[i]->members);
pset_break(ass[o]->members);
DBG((ssenv->dbg, LEVEL_1, " Interf %+F -- %+F\n", n1, n2));
ssenv.cenv = cenv;
ssenv.slots = pmap_create();
ssenv.types = pmap_create();
- FIRM_DBG_REGISTER(ssenv.dbg, "ir.be.spillslots");
+ FIRM_DBG_REGISTER(ssenv.dbg, "firm.be.spillslots");
/* Get initial spill slots */
irg_walk_graph(cenv->irg, NULL, compute_spill_slots_walker, &ssenv);