ir_node *instr; /**< current instruction */
unsigned instr_nr; /**< current instruction number (relative to block start) */
pset *used; /**< holds the values used (so far) in the current BB */
+ pset *copies; /**< holds all copies placed due to phi-spilling */
spill_env_t *senv; /* see bespill.h */
pset *reloads; /**< all reload nodes placed */
struct _workset_t {
belady_env_t *bel;
- int i; /**< used for iteration TODO remove this form the struct */
int len; /**< current length */
loc_t vals[1]; /**< inlined array of the values/distances in this working set */
};
return 0;
}
-#define workset_foreach(ws, v) for(ws->i=0; \
- v=(ws->i < ws->len) ? ws->vals[ws->i].irn : NULL, ws->i < ws->len; \
- ws->i++)
+/**
+ * Iterates over all values in the working set.
+ * @p ws The workset to iterate
+ * @p v A variable to put the current value in
+ * @p i An integer for internal use
+ */
+#define workset_foreach(ws, v, i) for(i=0; \
+ v=(i < ws->len) ? ws->vals[i].irn : NULL, i < ws->len; \
+ ++i)
#define workset_set_time(ws, i, t) (ws)->vals[i].time=t
#define workset_set_length(ws, length) (ws)->len = length
return !workset_contains(sws, irn);
}
+/**
+ * @return The distance to the next use
+ * Or 0 if irn is an ignore node
+ */
+#define get_distance(bel, from, from_step, def, skip_from_uses) \
+ ((arch_irn_is_ignore(bel->arch, def) ) ? 0 : be_get_next_use(bel->uses, from, from_step, def, skip_from_uses))
+
+
/**
* Collects all values live-in at block @p blk and all phi results in this block.
* Then it adds the best values (at most n_regs) to the blocks start_workset.
sched_foreach(blk, irn)
if (is_Phi(irn) && arch_get_irn_reg_class(bel->arch, irn, -1) == bel->cls) {
loc.irn = irn;
- loc.time = be_get_next_use(bel->uses, first, 0, irn, 0);
+ loc.time = get_distance(bel, first, 0, irn, 0);
obstack_grow(&ob, &loc, sizeof(loc));
DBG((dbg, DBG_START, " %+F:\n", irn));
count++;
live_foreach(blk, li)
if (live_is_in(li) && arch_get_irn_reg_class(bel->arch, li->irn, -1) == bel->cls) {
loc.irn = (ir_node *)li->irn;
- loc.time = be_get_next_use(bel->uses, first, 0, li->irn, 0);
+ loc.time = get_distance(bel, first, 0, li->irn, 0);
obstack_grow(&ob, &loc, sizeof(loc));
DBG((dbg, DBG_START, " %+F:\n", irn));
count++;
ir_node *arg = get_irn_n(irn, o);
ir_node *pred_block = get_Block_cfgpred_block(get_nodes_block(irn), o);
ir_node *cpy = be_new_Copy(bel->cls, irg, pred_block, arg);
+ pset_insert_ptr(bel->copies, cpy);
DBG((dbg, DBG_START, " place a %+F of %+F in %+F\n", cpy, arg, pred_block));
sched_add_before(pred_block, cpy);
set_irn_n(irn, o, cpy);
*/
static void displace(belady_env_t *bel, workset_t *new_vals, int is_usage) {
ir_node *val;
- int i, len, max_allowed, demand;
+ int i, len, max_allowed, demand, iter;
workset_t *ws = bel->ws;
ir_node **to_insert = alloca(bel->n_regs * sizeof(*to_insert));
* 1. Identify the number of needed slots and the values to reload
*/
demand = 0;
- workset_foreach(new_vals, val) {
+ workset_foreach(new_vals, val, iter) {
/* mark value as used */
if (is_usage)
pset_insert_ptr(bel->used, val);
if (len > max_allowed) {
/* get current next-use distance */
for (i=0; i<ws->len; ++i)
- workset_set_time(ws, i, be_get_next_use(bel->uses, bel->instr, bel->instr_nr, workset_get_val(ws, i), !is_usage));
+ workset_set_time(ws, i, get_distance(bel, bel->instr, bel->instr_nr, workset_get_val(ws, i), !is_usage));
/* sort entries by increasing nextuse-distance*/
workset_sort(ws);
belady_env_t *bel = env;
workset_t *new_vals;
ir_node *irn;
+ int iter;
+
#ifdef SINGLE_START_PROJS
ir_node *start_blk = get_irg_start_block(get_irn_irg(blk));
#endif
workset_copy(bel->ws, blk_info->ws_start);
DBG((dbg, DBG_WSETS, "Initial start workset for %+F:\n", blk));
- workset_foreach(bel->ws, irn)
+ workset_foreach(bel->ws, irn, iter)
DBG((dbg, DBG_WSETS, " %+F\n", irn));
/* process the block from start to end */
/* Remember end-workset for this block */
blk_info->ws_end = workset_clone(&bel->ob, bel->ws);
DBG((dbg, DBG_WSETS, "Start workset for %+F:\n", blk));
- workset_foreach(blk_info->ws_start, irn)
+ workset_foreach(blk_info->ws_start, irn, iter)
DBG((dbg, DBG_WSETS, " %+F\n", irn));
DBG((dbg, DBG_WSETS, "End workset for %+F:\n", blk));
- workset_foreach(blk_info->ws_end, irn)
+ workset_foreach(blk_info->ws_end, irn, iter)
DBG((dbg, DBG_WSETS, " %+F\n", irn));
}
static void fix_block_borders(ir_node *blk, void *env) {
workset_t *wsb;
belady_env_t *bel = env;
- int i, max;
+ int i, max, iter, iter2;
DBG((dbg, DBG_FIX, "\n"));
DBG((dbg, DBG_FIX, "Fixing %+F\n", blk));
DBG((dbg, DBG_FIX, " Pred %+F\n", pred));
- workset_foreach(wsb, irnb) {
+ 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) && blk == get_nodes_block(irnb))
continue;
/* check if irnb is in a register at end of pred */
- workset_foreach(wsp, irnp)
+ workset_foreach(wsp, irnp, iter2)
if (irnb == irnp)
goto next_value;
* Removes all used reloads from bel->reloads.
* The remaining nodes in bel->reloads will be removed from the graph.
*/
-static void rescue_used_reloads_and_remove_copies(ir_node *irn, void *env) {
+static void rescue_used_reloads(ir_node *irn, void *env) {
pset *rlds = (pset *)env;
if (pset_find_ptr(rlds, irn))
pset_remove_ptr(rlds, irn);
+}
+/**
+ * Removes all copies introduced for phi-spills
+ */
+static void remove_copies(belady_env_t *bel) {
+ ir_node *irn;
- /* remove copies introduced for phi-spills */
- if (be_is_Copy(irn)) {
+ for (irn = pset_first(bel->copies); irn; irn = pset_next(bel->copies)) {
ir_node *src, *spill;
+
+ assert(be_is_Copy(irn));
assert(get_irn_n_edges(irn) == 1 && "This is not a copy introduced in 'compute_block_start_info()'. Who created it?");
spill = get_irn_edge(get_irn_irg(irn), irn, 0)->src;
* Finds all unused reloads and remove them from the schedule
* Also removes spills if they are not used anymore after removing reloads
*/
-static void remove_copies_and_unused_reloads(ir_graph *irg, belady_env_t *bel) {
+static void remove_unused_reloads(ir_graph *irg, belady_env_t *bel) {
ir_node *irn;
- irg_walk_graph(irg, rescue_used_reloads_and_remove_copies, NULL, bel->reloads);
+ irg_walk_graph(irg, rescue_used_reloads, NULL, bel->reloads);
for(irn = pset_first(bel->reloads); irn; irn = pset_next(bel->reloads)) {
ir_node *spill;
DBG((dbg, DBG_SPILL, "Removing %+F before %+F in %+F\n", irn, sched_next(irn), get_nodes_block(irn)));
belady_env_t bel;
dbg = firm_dbg_register("ir.be.spillbelady");
- firm_dbg_set_mask(dbg, DEBUG_LVL);
/* init belady env */
obstack_init(&bel.ob);
bel.uses = be_begin_uses(chordal_env->irg, chordal_env->main_env->arch_env, bel.cls);
bel.senv = be_new_spill_env(dbg, chordal_env, is_mem_phi, NULL);
bel.reloads = pset_new_ptr_default();
+ bel.copies = pset_new_ptr_default();
+
+ DBG((dbg, LEVEL_1, "running on register class: %s\n", bel.cls->name));
/* do the work */
irg_block_walk_graph(chordal_env->irg, compute_block_start_info, NULL, &bel);
irg_block_walk_graph(chordal_env->irg, belady, NULL, &bel);
irg_block_walk_graph(chordal_env->irg, fix_block_borders, NULL, &bel);
be_insert_spills_reloads(bel.senv, bel.reloads);
- remove_copies_and_unused_reloads(chordal_env->irg, &bel);
+ remove_unused_reloads(chordal_env->irg, &bel);
+ remove_copies(&bel);
+
/* clean up */