#include "bechordal_t.h"
#include "bejavacoal.h"
#include "benodesets.h"
+#include "bespilloptions.h"
+#include "bestatevent.h"
// only rematerialise when costs are less than REMAT_COST_LIMIT
// TODO determine a good value here...
spill_info_t *info;
reloader_t *rel;
- assert(sched_is_scheduled(before));
assert(arch_irn_consider_in_reg_alloc(env->arch_env, env->cls, to_spill));
info = get_spillinfo(env, to_spill);
ir_node *arg = get_irn_n(to_spill, i);
get_spillinfo(env, arg);
}
+
+#if 1
+ // hackery... sometimes the morgan algo spilled the value of a phi,
+ // the belady algo decides later to spill the whole phi, then sees the
+ // spill node and adds a reload for that spill node, problem is the
+ // reload gets attach to that same spill (and is totally unnecessary)
+ if(info->old_spill != NULL &&
+ (before == info->old_spill || value_dominates(before, info->old_spill))) {
+ printf("spilledphi hack was needed...\n");
+ before = sched_next(info->old_spill);
+ }
+#endif
}
rel = obstack_alloc(&env->obst, sizeof(rel[0]));
last = sched_prev(last);
assert(!sched_is_end(last));
}
- assert(is_cfop(last));
+
+ if(!is_cfop(last)) {
+ ir_graph *irg = get_irn_irg(block);
+ ir_node *startblock = get_irg_start_block(irg);
+
+ last = sched_next(last);
+ // last node must be a cfop, only exception is the start block
+ assert(last == startblock);
+ }
// add the reload before the (cond-)jump
return last;
// if we had a spill for the phi value before, then remove this spill from
// schedule, as we will remove it in the insert spill/reload phase
if(spill->spill != NULL && !is_Phi(spill->spill)) {
+ assert(spill->old_spill == NULL);
spill->old_spill = spill->spill;
spill->spill = NULL;
}
// rewire reloads from old_spill to phi
if(spillinfo->old_spill != NULL) {
const ir_edge_t *edge, *next;
- foreach_out_edge_safe(spillinfo->old_spill, edge, next) {
+ ir_node *old_spill = spillinfo->old_spill;
+
+ foreach_out_edge_safe(old_spill, edge, next) {
ir_node* reload = get_edge_src_irn(edge);
assert(be_is_Reload(reload) || is_Phi(reload));
set_irn_n(reload, get_edge_src_pos(edge), spillinfo->spill);
}
+ set_irn_n(old_spill, be_pos_Spill_frame, new_Bad());
+ set_irn_n(old_spill, be_pos_Spill_val, new_Bad());
+ //sched_remove(old_spill);
spillinfo->old_spill = NULL;
}
}
if(arg == get_irg_frame(env->chordal_env->irg))
return 1;
+ // hack for now (happens when command should be inserted at end of block)
+ if(is_Block(reloader)) {
+ return 0;
+ }
+
/* the following test does not work while spilling,
* because the liveness info is not adapted yet to the effects of the
* additional spills/reloads.
static ir_node *do_remat(spill_env_t *env, ir_node *spilled, ir_node *reloader) {
int i, arity;
ir_node *res;
- ir_node *bl = get_nodes_block(reloader);
+ ir_node *bl;
ir_node **ins;
+ if(is_Block(reloader)) {
+ bl = reloader;
+ } else {
+ bl = get_nodes_block(reloader);
+ }
+
ins = alloca(get_irn_arity(spilled) * sizeof(ins[0]));
for(i = 0, arity = get_irn_arity(spilled); i < arity; ++i) {
ir_node *arg = get_irn_n(spilled, i);
DBG((env->dbg, LEVEL_1, "Insert remat %+F before reloader %+F\n", res, reloader));
/* insert in schedule */
- assert(!is_Block(reloader));
sched_add_before(reloader, res);
return res;
int be_get_reload_costs(spill_env_t *env, ir_node *to_spill, ir_node *before) {
spill_info_t *spill_info;
- // is the node rematerializable?
- int costs = check_remat_conditions_costs(env, to_spill, before, 0);
- if(costs < REMAT_COST_LIMIT)
- return costs;
+ if(be_do_remats) {
+ // is the node rematerializable?
+ int costs = check_remat_conditions_costs(env, to_spill, before, 0);
+ if(costs < REMAT_COST_LIMIT)
+ return costs;
+ }
// do we already have a spill?
spill_info = find_spillinfo(env, to_spill);
void be_insert_spills_reloads(spill_env_t *env) {
const arch_env_t *arch_env = env->arch_env;
spill_info_t *si;
+ int remats = 0;
+ int reloads = 0;
+ int spills = 0;
/* process each spilled node */
for(si = set_first(env->spills); si; si = set_next(env->spills)) {
for(rld = si->reloaders; rld; rld = rld->next) {
ir_node *new_val;
- if (check_remat_conditions(env, si->spilled_node, rld->reloader)) {
+ if (be_do_remats && check_remat_conditions(env, si->spilled_node, rld->reloader)) {
new_val = do_remat(env, si->spilled_node, rld->reloader);
+ remats++;
} else {
/* make sure we have a spill */
- spill_node(env, si);
+ if(si->spill == NULL) {
+ spill_node(env, si);
+ spills++;
+ }
- /* do a reload */
+ /* create a reload */
new_val = be_reload(arch_env, env->cls, rld->reloader, mode, si->spill);
+ reloads++;
}
DBG((env->dbg, LEVEL_1, " %+F of %+F before %+F\n", new_val, si->spilled_node, rld->reloader));
si->reloaders = NULL;
}
+ if(be_stat_ev_is_active()) {
+ be_stat_ev("spill_spills", spills);
+ be_stat_ev("spill_reloads", reloads);
+ be_stat_ev("spill_remats", remats);
+ }
+
be_remove_dead_nodes_from_schedule(env->chordal_env->irg);
be_liveness_recompute(env->chordal_env->lv);
}
projects / libfirm / blobdiff