DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
-typedef struct _spill_t {
- ir_node *spill;
- const ir_mode *mode; /**< mode of the spilled value */
- int alignment; /**< alignment for the spilled value */
- int spillslot; /**< index into spillslot_unionfind structure */
+typedef struct spill_t {
+ ir_node *spill;
+ const ir_mode *mode; /**< mode of the spilled value */
+ int alignment; /**< alignment for the spilled value */
+ int spillslot; /**< index into spillslot_unionfind structure */
} spill_t;
-typedef struct _affinity_edge_t {
+typedef struct affinity_edge_t {
double affinity;
- int slot1, slot2;
+ int slot1;
+ int slot2;
} affinity_edge_t;
-struct _be_fec_env_t {
- struct obstack obst;
- const arch_env_t *arch_env;
- be_irg_t *birg;
- set *spills;
- ir_node **reloads;
- affinity_edge_t **affinity_edges;
- set *memperms;
+struct be_fec_env_t {
+ struct obstack obst;
+ ir_graph *irg;
+ set *spills;
+ ir_node **reloads;
+ affinity_edge_t **affinity_edges;
+ set *memperms;
+ set_frame_entity_func set_frame_entity;
};
/** Compare 2 affinity edges (used in quicksort) */
int i, arity;
spill_t spill, *res;
int hash = hash_irn(node);
- const ir_exec_freq *exec_freq = be_get_birg_exec_freq(env->birg);
+ const ir_exec_freq *exec_freq = be_get_irg_exec_freq(env->irg);
assert(is_Phi(node));
return res;
}
-static int my_values_interfere2(be_irg_t *birg, const ir_node *a,
+static int my_values_interfere2(ir_graph *irg, const ir_node *a,
const ir_node *b)
{
- be_lv_t *lv = be_get_birg_liveness(birg);
+ be_lv_t *lv = be_get_irg_liveness(irg);
int a2b = _value_dominates(a, b);
int b2a = _value_dominates(b, a);
/**
* same as values_interfere but with special handling for Syncs
*/
-static int my_values_interfere(be_irg_t *birg, ir_node *a, ir_node *b)
+static int my_values_interfere(ir_graph *irg, ir_node *a, ir_node *b)
{
if (is_Sync(a)) {
int i, arity = get_irn_arity(a);
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(a, i);
- if (my_values_interfere(birg, in, b))
+ if (my_values_interfere(irg, in, b))
return 1;
}
return 0;
for (i = 0; i < arity; ++i) {
ir_node *in = get_irn_n(b, i);
/* a is not a sync, so no need for my_values_interfere */
- if (my_values_interfere2(birg, a, in))
+ if (my_values_interfere2(irg, a, in))
return 1;
}
return 0;
}
- return my_values_interfere2(birg, a, b);
+ return my_values_interfere2(irg, a, b);
}
/**
int affinity_edge_count;
bitset_t **interferences;
int* spillslot_unionfind;
+ struct obstack data;
spillcount = set_count(env->spills);
if (spillcount == 0)
return;
+ obstack_init(&data);
+
DB((dbg, DBG_COALESCING, "Coalescing %d spillslots\n", spillcount));
- interferences = ALLOCAN(bitset_t*, spillcount);
- spillslot_unionfind = ALLOCAN(int, spillcount);
- spilllist = ALLOCAN(spill_t*, spillcount);
+ interferences = OALLOCN(&data, bitset_t*, spillcount);
+ spillslot_unionfind = OALLOCN(&data, int, spillcount);
+ spilllist = OALLOCN(&data, spill_t*, spillcount);
uf_init(spillslot_unionfind, spillcount);
}
for (i = 0; i < spillcount; ++i) {
- interferences[i] = bitset_alloca(spillcount);
+ interferences[i] = bitset_obstack_alloc(&data, spillcount);
}
/* construct interferences */
if (is_NoMem(spill2))
continue;
- if (my_values_interfere(env->birg, spill1, spill2)) {
+ if (my_values_interfere(env->irg, spill1, spill2)) {
DB((dbg, DBG_INTERFERENCES,
"Slot %d and %d interfere\n", i, i2));
}
/*dump_interference_graph(env, interferences, "after");*/
+ obstack_free(&data, 0);
}
-typedef struct _spill_slot_t {
+typedef struct spill_slot_t {
int size;
int align;
ir_entity *entity;
} spill_slot_t;
-typedef struct _memperm_entry_t {
+typedef struct memperm_entry_t {
ir_node* node;
int pos;
ir_entity *in;
ir_entity *out;
- struct _memperm_entry_t *next;
+ struct memperm_entry_t *next;
} memperm_entry_t;
-typedef struct _memperm_t {
+typedef struct memperm_t {
ir_node *block;
int entrycount;
memperm_entry_t *entries;
static ir_entity* create_stack_entity(be_fec_env_t *env, spill_slot_t *slot)
{
- ir_graph *irg = be_get_birg_irg(env->birg);
+ ir_graph *irg = env->irg;
ir_type *frame = get_irg_frame_type(irg);
/* TODO: backend should be able to specify wether we want spill slots
* at begin or end of frame */
}
}
-
-static void assign_spill_entity(ir_node *node, ir_entity *entity)
+static void assign_spill_entity(be_fec_env_t *env,
+ ir_node *node, ir_entity *entity)
{
if (is_NoMem(node))
return;
ir_node *in = get_irn_n(node, i);
assert(!is_Phi(in));
- assign_spill_entity(in, entity);
+ assign_spill_entity(env, in, entity);
}
return;
}
instance */
node = skip_Proj(node);
assert(arch_get_frame_entity(node) == NULL);
- arch_set_frame_entity(node, entity);
+ env->set_frame_entity(node, entity);
}
/**
}
}
} else {
- assign_spill_entity(node, slot->entity);
+ assign_spill_entity(env, node, slot->entity);
}
}
assert(slot->entity != NULL);
- arch_set_frame_entity(reload, slot->entity);
+ env->set_frame_entity(reload, slot->entity);
}
}
static void create_memperms(be_fec_env_t *env)
{
- const arch_env_t *arch_env = env->arch_env;
- ir_graph *irg = be_get_birg_irg(env->birg);
- memperm_t *memperm;
+ ir_graph *irg = env->irg;
+ memperm_t *memperm;
for (memperm = set_first(env->memperms); memperm != NULL; memperm = set_next(env->memperms)) {
ir_node **nodes = ALLOCAN(ir_node*, memperm->entrycount);
nodes[i] = arg;
}
- mempermnode = be_new_MemPerm(arch_env, memperm->block,
- memperm->entrycount, nodes);
+ mempermnode = be_new_MemPerm(memperm->block, memperm->entrycount,
+ nodes);
/* insert node into schedule */
blockend = get_end_of_block_insertion_point(memperm->block);
return slotcount;
}
-be_fec_env_t *be_new_frame_entity_coalescer(be_irg_t *birg)
+be_fec_env_t *be_new_frame_entity_coalescer(ir_graph *irg)
{
- const arch_env_t *arch_env = birg->main_env->arch_env;
- be_fec_env_t *env = XMALLOC(be_fec_env_t);
+ be_fec_env_t *env = XMALLOCZ(be_fec_env_t);
- be_liveness_assure_chk(be_assure_liveness(birg));
+ be_liveness_assure_chk(be_assure_liveness(irg));
obstack_init(&env->obst);
- env->arch_env = arch_env;
- env->birg = birg;
+ env->irg = irg;
env->spills = new_set(cmp_spill, 10);
env->reloads = NEW_ARR_F(ir_node*, 0);
env->affinity_edges = NEW_ARR_F(affinity_edge_t*, 0);
free(env);
}
-void be_assign_entities(be_fec_env_t *env)
+void be_assign_entities(be_fec_env_t *env,
+ set_frame_entity_func set_frame_entity)
{
+ env->set_frame_entity = set_frame_entity;
+
stat_ev_dbl("spillslots", set_count(env->spills));
if (be_coalesce_spill_slots) {
*/
static void collect_spills_walker(ir_node *node, void *data)
{
- be_fec_env_t *env = data;
- const ir_mode *mode;
+ be_fec_env_t *env = data;
+ const ir_mode *mode;
const arch_register_class_t *cls;
- int align;
-
- /* classify returns classification of the irn the proj is attached to */
- if (is_Proj(node))
- return;
+ int align;
+ ir_graph *irg;
+ const arch_env_t *arch_env;
- if (!arch_irn_class_is(node, reload))
+ if (! (arch_irn_classify(node) & arch_irn_class_reload))
return;
- mode = get_irn_mode(node);
- cls = arch_get_irn_reg_class_out(node);
- align = arch_env_get_reg_class_alignment(env->arch_env, cls);
+ mode = get_irn_mode(node);
+ cls = arch_get_irn_reg_class_out(node);
+ irg = get_irn_irg(node);
+ arch_env = be_get_irg_arch_env(irg);
+ align = arch_env_get_reg_class_alignment(arch_env, cls);
be_node_needs_frame_entity(env, node, mode, align);
}
-void be_coalesce_spillslots(be_irg_t *birg)
+void be_coalesce_spillslots(ir_graph *irg)
{
- be_fec_env_t *env = be_new_frame_entity_coalescer(birg);
+ be_fec_env_t *env = be_new_frame_entity_coalescer(irg);
/* collect reloads */
- irg_walk_graph(birg->irg, NULL, collect_spills_walker, env);
+ irg_walk_graph(irg, NULL, collect_spills_walker, env);
- be_assign_entities(env);
+ be_assign_entities(env, be_node_set_frame_entity);
be_free_frame_entity_coalescer(env);
}
projects / libfirm / blobdiff