#include "belive_t.h"
#include "benode.h"
#include "bechordal_t.h"
-#include "bestatevent.h"
+#include "statev_t.h"
#include "bessaconstr.h"
#include "beirg.h"
#include "beirgmod.h"
typedef struct reloader_t reloader_t;
struct reloader_t {
reloader_t *next;
- ir_node *can_spill_after;
ir_node *reloader;
ir_node *rematted_node;
int remat_cost_delta; /** costs needed for rematerialization,
double spill_costs; /**< costs needed for spilling the value */
const arch_register_class_t *reload_cls; /** the register class in which the
reload should be placed */
+ bool spilled_phi; /* true when the whole Phi has been spilled and
+ will be replaced with a PhiM. false if only the
+ value of the Phi gets spilled */
};
struct spill_env_t {
int reload_cost; /**< the cost of a reload node */
set *spills; /**< all spill_info_t's, which must be
placed */
- ir_nodeset_t mem_phis; /**< set of all spilled phis. */
- ir_exec_freq *exec_freq;
+ spill_info_t **mem_phis; /**< set of all spilled phis. */
unsigned spill_count;
unsigned reload_count;
int hash = hash_irn(value);
info.to_spill = value;
- res = (spill_info_t*)set_find(env->spills, &info, sizeof(info), hash);
+ res = set_find(spill_info_t, env->spills, &info, sizeof(info), hash);
if (res == NULL) {
info.reloaders = NULL;
info.spills = NULL;
info.spill_costs = -1;
info.reload_cls = NULL;
- res = (spill_info_t*)set_insert(env->spills, &info, sizeof(info), hash);
+ info.spilled_phi = false;
+ res = set_insert(spill_info_t, env->spills, &info, sizeof(info), hash);
}
return res;
env->spills = new_set(cmp_spillinfo, 1024);
env->irg = irg;
env->arch_env = arch_env;
- ir_nodeset_init(&env->mem_phis);
+ env->mem_phis = NEW_ARR_F(spill_info_t*, 0);
env->spill_cost = arch_env->spill_cost;
env->reload_cost = arch_env->reload_cost;
- env->exec_freq = be_get_irg_exec_freq(irg);
obstack_init(&env->obst);
env->spill_count = 0;
void be_delete_spill_env(spill_env_t *env)
{
del_set(env->spills);
- ir_nodeset_destroy(&env->mem_phis);
+ DEL_ARR_F(env->mem_phis);
obstack_free(&env->obst, NULL);
free(env);
}
spill_info->spills = spill;
}
-void be_add_reload2(spill_env_t *env, ir_node *to_spill, ir_node *before,
- ir_node *can_spill_after, const arch_register_class_t *reload_cls,
- int allow_remat)
+void be_add_reload(spill_env_t *env, ir_node *to_spill, ir_node *before, const arch_register_class_t *reload_cls, int allow_remat)
{
spill_info_t *info;
reloader_t *rel;
}
}
- assert(!is_Proj(before) && !be_is_Keep(before));
+ assert(!be_is_Keep(before));
/* put reload into list */
rel = OALLOC(&env->obst, reloader_t);
rel->next = info->reloaders;
rel->reloader = before;
rel->rematted_node = NULL;
- rel->can_spill_after = can_spill_after;
rel->remat_cost_delta = allow_remat ? 0 : REMAT_COST_INFINITE;
info->reloaders = rel;
to_spill, before, allow_remat ? "" : " not"));
}
-void be_add_reload(spill_env_t *senv, ir_node *to_spill, ir_node *before,
- const arch_register_class_t *reload_cls, int allow_remat)
-{
- be_add_reload2(senv, to_spill, before, to_spill, reload_cls, allow_remat);
-
-}
-
ir_node *be_get_end_of_block_insertion_point(const ir_node *block)
{
ir_node *last = sched_last(block);
return be_get_end_of_block_insertion_point(predblock);
}
-void be_add_reload_at_end(spill_env_t *env, ir_node *to_spill,
- const ir_node *block,
- const arch_register_class_t *reload_cls,
- int allow_remat)
-{
- ir_node *before = be_get_end_of_block_insertion_point(block);
- be_add_reload(env, to_spill, before, reload_cls, allow_remat);
-}
-
void be_add_reload_on_edge(spill_env_t *env, ir_node *to_spill, ir_node *block,
int pos, const arch_register_class_t *reload_cls,
int allow_remat)
{
ir_node *block;
int i, arity;
+ spill_info_t *info;
assert(is_Phi(node));
- ir_nodeset_insert(&env->mem_phis, node);
+ info = get_spillinfo(env, node);
+ info->spilled_phi = true;
+ ARR_APP1(spill_info_t*, env->mem_phis, info);
/* create spills for the phi arguments */
block = get_nodes_block(node);
/* override or replace spills list... */
spill = OALLOC(&env->obst, spill_t);
spill->after = determine_spill_point(phi);
- spill->spill = be_new_Phi(block, arity, ins, mode_M, NULL);
+ spill->spill = be_new_Phi(block, arity, ins, mode_M, arch_no_register_req);
spill->next = NULL;
sched_add_after(block, spill->spill);
*/
static void spill_node(spill_env_t *env, spill_info_t *spillinfo)
{
- ir_node *to_spill;
-
/* node is already spilled */
if (spillinfo->spills != NULL && spillinfo->spills->spill != NULL)
return;
- to_spill = spillinfo->to_spill;
-
- if (is_Phi(to_spill) && ir_nodeset_contains(&env->mem_phis, to_spill)) {
+ if (spillinfo->spilled_phi) {
spill_phi(env, spillinfo);
} else {
spill_irn(env, spillinfo);
{
int i, arity;
ir_node *res;
- ir_node *bl;
ir_node **ins;
- if (is_Block(reloader)) {
- bl = reloader;
- } else {
- bl = get_nodes_block(reloader);
- }
-
ins = ALLOCAN(ir_node*, get_irn_arity(spilled));
for (i = 0, arity = get_irn_arity(spilled); i < arity; ++i) {
ir_node *arg = get_irn_n(spilled, i);
}
/* create a copy of the node */
+ ir_node *const bl = get_nodes_block(reloader);
res = new_ir_node(get_irn_dbg_info(spilled), env->irg, bl,
get_irn_op(spilled), get_irn_mode(spilled),
get_irn_arity(spilled), ins);
double be_get_spill_costs(spill_env_t *env, ir_node *to_spill, ir_node *before)
{
ir_node *block = get_nodes_block(before);
- double freq = get_block_execfreq(env->exec_freq, block);
+ double freq = get_block_execfreq(block);
(void) to_spill;
return env->spill_cost * freq;
double be_get_reload_costs(spill_env_t *env, ir_node *to_spill, ir_node *before)
{
- ir_node *block = get_nodes_block(before);
- double freq = get_block_execfreq(env->exec_freq, block);
+ ir_node *block = get_nodes_block(before);
+ double freq = get_block_execfreq(block);
if (be_do_remats) {
/* is the node rematerializable? */
}
spill_block = get_nodes_block(insn);
- spill_execfreq = get_block_execfreq(env->exec_freq, spill_block);
+ spill_execfreq = get_block_execfreq(spill_block);
- if (is_Phi(to_spill) && ir_nodeset_contains(&env->mem_phis, to_spill)) {
+ if (spillinfo->spilled_phi) {
/* TODO calculate correct costs...
* (though we can't remat this node anyway so no big problem) */
spillinfo->spill_costs = env->spill_cost * spill_execfreq;
s = spillinfo->spills;
for ( ; s != NULL; s = s->next) {
ir_node *spill_block = get_block(s->after);
- double freq = get_block_execfreq(env->exec_freq, spill_block);
+ double freq = get_block_execfreq(spill_block);
spills_execfreq += freq;
}
void be_insert_spills_reloads(spill_env_t *env)
{
- const ir_exec_freq *exec_freq = env->exec_freq;
- spill_info_t *si;
- ir_nodeset_iterator_t iter;
- ir_node *node;
+ size_t n_mem_phis = ARR_LEN(env->mem_phis);
+ size_t i;
be_timer_push(T_RA_SPILL_APPLY);
/* create all phi-ms first, this is needed so, that phis, hanging on
spilled phis work correctly */
- foreach_ir_nodeset(&env->mem_phis, node, iter) {
- spill_info_t *info = get_spillinfo(env, node);
+ for (i = 0; i < n_mem_phis; ++i) {
+ spill_info_t *info = env->mem_phis[i];
spill_node(env, info);
}
/* process each spilled node */
- foreach_set(env->spills, spill_info_t*, si) {
+ foreach_set(env->spills, spill_info_t, si) {
ir_node *to_spill = si->to_spill;
ir_node **copies = NEW_ARR_F(ir_node*, 0);
double all_remat_costs = 0; /** costs when we would remat all nodes */
remat_cost_delta = remat_cost - env->reload_cost;
rld->remat_cost_delta = remat_cost_delta;
block = is_Block(reloader) ? reloader : get_nodes_block(reloader);
- freq = get_block_execfreq(exec_freq, block);
+ freq = get_block_execfreq(block);
all_remat_costs += remat_cost_delta * freq;
DBG((dbg, LEVEL_2, "\tremat costs delta before %+F: "
"%d (rel %f)\n", reloader, remat_cost_delta,
/* Matze: In theory be_ssa_construction should take care of the liveness...
* try to disable this again in the future */
- be_liveness_invalidate(be_get_irg_liveness(env->irg));
+ be_invalidate_live_sets(env->irg);
be_remove_dead_nodes_from_schedule(env->irg);
projects / libfirm / blobdiff