#include "bespillslots.h"
#include "bechordal_t.h"
#include "bejavacoal.h"
-
+#include "benodesets.h"
+#include "bestatevent.h"
+#include "bespilloptions.h"
#define DBG_COALESCING 1
#define DBG_INTERFERENCES 2
typedef struct _ss_env_t {
struct obstack obst;
+ const arch_env_t *arch_env;
const be_chordal_env_t *chordal_env;
set *spills;
ir_node **reloads;
/** Compare 2 affinity edges (used in quicksort) */
static int cmp_affinity(const void *d1, const void *d2) {
- const affinity_edge_t *e1 = d1;
- const affinity_edge_t *e2 = d2;
+ const affinity_edge_t * const *e1 = d1;
+ const affinity_edge_t * const *e2 = d2;
- return e1->affinity < e2->affinity ? -1 : 1;
+ // sort in descending order
+ return (*e1)->affinity < (*e2)->affinity ? 1 : -1;
}
static int cmp_spill(const void* d1, const void* d2, size_t size) {
static spill_t *get_spill(ss_env_t *env, ir_node *node) {
spill_t spill, *res;
- int hash = HASH_PTR(node);
+ int hash = nodeset_hash(node);
spill.spill = node;
res = set_find(env->spills, &spill, sizeof(spill), hash);
* |_|
*/
-static spill_t *collect_spill(ss_env_t *env, ir_node *node, const arch_register_class_t *cls) {
+static ir_node *get_memory_edge(const ir_node *node) {
+ int i, arity;
+
+ arity = get_irn_arity(node);
+ for(i = arity - 1; i >= 0; --i) {
+ ir_node *arg = get_irn_n(node, i);
+ if(get_irn_mode(arg) == mode_M)
+ return arg;
+ }
+
+ return NULL;
+}
+
+static spill_t *collect_spill(ss_env_t *env, ir_node *node) {
+ const arch_env_t *arch_env = env->arch_env;
+ const arch_register_class_t *cls;
spill_t spill, *res;
- int hash = HASH_PTR(node);
+ int hash = nodeset_hash(node);
- assert(be_is_Spill(node));
+ assert(arch_irn_class_is(arch_env, node, spill));
+
+ if(be_is_Spill(node)) {
+ cls = arch_get_irn_reg_class(arch_env, node, be_pos_Spill_val);
+ } else {
+ // TODO add a way to detect the type of the spilled value
+ assert(0);
+ }
spill.spill = node;
res = set_find(env->spills, &spill, sizeof(spill), hash);
spill.spillslot = set_count(env->spills);
spill.cls = cls;
res = set_insert(env->spills, &spill, sizeof(spill), hash);
- } else {
- assert(cls == res->cls);
}
return res;
}
-static spill_t *collect_memphi(ss_env_t *env, ir_node *node, const arch_register_class_t *cls) {
+static spill_t *collect_memphi(ss_env_t *env, ir_node *node) {
int i, arity;
spill_t spill, *res;
- int hash = HASH_PTR(node);
+ int hash = nodeset_hash(node);
+ ir_exec_freq *exec_freq = env->chordal_env->birg->exec_freq;
assert(is_Phi(node));
}
spill.spillslot = set_count(env->spills);
- spill.cls = cls;
+ spill.cls = NULL;
res = set_insert(env->spills, &spill, sizeof(spill), hash);
// is 1 of the arguments a spill?
spill_t* arg_spill;
if(be_is_Spill(arg)) {
- arg_spill = collect_spill(env, arg, cls);
+ arg_spill = collect_spill(env, arg);
} else {
// if it wasn't a spill then it must be a Mem-Phi
assert(is_Phi(arg));
- arg_spill = collect_memphi(env, arg, cls);
+ arg_spill = collect_memphi(env, arg);
+ }
+
+ if(res->cls == NULL) {
+ res->cls = arg_spill->cls;
+ } else {
+ assert(arg_spill->cls == NULL || res->cls == arg_spill->cls);
}
// add an affinity edge
affinty_edge = obstack_alloc(&env->obst, sizeof(affinty_edge[0]));
- affinty_edge->affinity = get_block_execfreq(env->chordal_env->exec_freq, get_nodes_block(arg));
+ affinty_edge->affinity = get_block_execfreq(exec_freq, get_nodes_block(arg));
affinty_edge->slot1 = res->spillslot;
affinty_edge->slot2 = arg_spill->spillslot;
ARR_APP1(affinity_edge_t*, env->affinity_edges, affinty_edge);
* and memphis attached to them.
*/
static void collect_spills_walker(ir_node *node, void *data) {
- ss_env_t *env = data;
+ ss_env_t *env = data;
+ const arch_env_t *arch_env = env->arch_env;
- if(be_is_Reload(node)) {
- ir_node *spill = get_irn_n(node, be_pos_Reload_mem);
- const arch_env_t *arch_env = env->chordal_env->birg->main_env->arch_env;
- const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, node, -1);
+ /* classify returns classification of the irn the proj is attached to */
+ if (is_Proj(node))
+ return;
- if(is_Phi(spill)) {
- collect_memphi(env, spill, cls);
- } else {
- collect_spill(env, spill, cls);
+ if (arch_irn_class_is(arch_env, node, reload)) {
+ ir_node *spillnode = get_memory_edge(node);
+ spill_t *spill;
+
+ assert(spillnode != NULL);
+
+ if (is_Phi(spillnode)) {
+ spill = collect_memphi(env, spillnode);
}
- ARR_APP1(ir_node*, env->reloads, node);
+ else {
+ spill = collect_spill(env, spillnode);
+ }
+
+ ARR_APP1(ir_node *, env->reloads, node);
}
}
int affinity_edge_count;
bitset_t **interferences;
int* spillslot_unionfind;
+ be_lv_t *lv = env->chordal_env->birg->lv;
spillcount = set_count(env->spills);
if(spillcount == 0)
// construct interferences
for(i = 0; i < spillcount; ++i) {
for(i2 = i+1; i2 < spillcount; ++i2) {
- if(values_interfere(env->chordal_env->lv, spilllist[i]->spill, spilllist[i2]->spill)) {
+ if(values_interfere(lv, spilllist[i]->spill, spilllist[i2]->spill)) {
DBG((dbg, DBG_INTERFERENCES, "Slot %d and %d interfere\n", i, i2));
bitset_set(interferences[i], i2);
bitset_set(interferences[i2], i);
}
}
- // assign spillslots
+ // assign spillslots to spills
for(i = 0; i < spillcount; ++i) {
spill_t *spill = spilllist[i];
int hash;
entry.block = block;
- hash = HASH_PTR(block);
+ hash = nodeset_hash(block);
res = set_find(env->memperms, &entry, sizeof(entry), hash);
ir_type* frame = get_irg_frame_type(env->chordal_env->irg);
entity* res = frame_alloc_area(frame, slot->size, slot->align, 0);
+ // adjust size of the entity type...
+ ir_type *enttype = get_entity_type(res);
+ set_type_size_bytes(enttype, slot->size);
+
slot->entity = res;
return res;
* reload nodes.
*/
static void assign_spillslots(ss_env_t *env) {
+ const arch_env_t *arch_env = env->arch_env;
int i;
int spillcount;
spill_t *spill;
create_stack_entity(env, slot);
}
- if(be_is_Spill(node)) {
- be_set_frame_entity(node, slot->entity);
- } else {
+ if(is_Phi(node)) {
int i, arity;
+ ir_node *block = get_nodes_block(node);
// should be a PhiM
assert(is_Phi(node));
for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
ir_node *arg = get_irn_n(node, i);
+ ir_node *predblock = get_Block_cfgpred_block(block, i);
spill_t *argspill;
int argslotid;
create_stack_entity(env, argslot);
}
- memperm = get_memperm(env, get_nodes_block(arg));
+ memperm = get_memperm(env, predblock);
entry = obstack_alloc(&env->obst, sizeof(entry[0]));
entry->node = node;
memperm->entries = entry;
}
}
+ } else {
+ assert(arch_irn_class_is(arch_env, node, spill));
+ arch_set_frame_entity(arch_env, node, slot->entity);
}
}
for(i = 0; i < ARR_LEN(env->reloads); ++i) {
- const ir_node* reload = env->reloads[i];
- ir_node* spillnode = get_irn_n(reload, be_pos_Reload_mem);
+ ir_node* reload = env->reloads[i];
+ ir_node* spillnode = get_memory_edge(reload);
spill_t *spill = get_spill(env, spillnode);
const spill_slot_t *slot = & spillslots[spill->spillslot];
assert(slot->entity != NULL);
- be_set_frame_entity(reload, slot->entity);
+ arch_set_frame_entity(arch_env, reload, slot->entity);
}
}
// insert node into schedule
blockend = get_end_of_block_insertion_point(memperm->block);
sched_add_before(blockend, mempermnode);
+ be_stat_ev("mem_perm", memperm->entrycount);
for(entry = memperm->entries, i = 0; entry != NULL; entry = entry->next, ++i) {
ir_node *proj;
}
}
+static int count_spillslots(const ss_env_t *env) {
+ const spill_t *spill;
+ int spillcount = set_count(env->spills);
+ bitset_t *counted = bitset_alloca(spillcount);
+ int slotcount;
+
+ slotcount = 0;
+ for(spill = set_first(env->spills); spill != NULL;
+ spill = set_next(env->spills)) {
+ int spillslot = spill->spillslot;
+ if(!bitset_is_set(counted, spillslot)) {
+ slotcount++;
+ bitset_set(counted, spillslot);
+ }
+ }
+
+ return slotcount;
+}
+
void be_coalesce_spillslots(const be_chordal_env_t *chordal_env) {
ss_env_t env;
obstack_init(&env.obst);
+ env.arch_env = chordal_env->birg->main_env->arch_env;
env.chordal_env = chordal_env;
env.spills = new_set(cmp_spill, 10);
env.reloads = NEW_ARR_F(ir_node*, 0);
/* Get initial spill slots */
irg_walk_graph(chordal_env->irg, NULL, collect_spills_walker, &env);
- do_greedy_coalescing(&env);
+ be_stat_ev("spillslots", set_count(env.spills));
+
+ if(be_coalesce_spill_slots) {
+ do_greedy_coalescing(&env);
+ if(be_stat_ev_is_active()) {
+ be_stat_ev("spillslots_after_coalescing", count_spillslots(&env));
+ }
+ }
assign_spillslots(&env);
projects / libfirm / blobdiff