* algorithm optimized for the 1-register case.
* @author Matthias Braun
* @date 26.03.2007
- * @version $Id$
*/
#include "config.h"
#include "ircons_t.h"
#include "irgmod.h"
#include "irnodeset.h"
-#include "irnodemap.h"
-#include "adt/cpset.h"
+#include "irnodehashmap.h"
+#include "cpset.h"
#include "bearch.h"
+#include "beirg.h"
#include "beuses.h"
#include "besched.h"
#include "belive_t.h"
create_reload_func create_reload;
create_spill_func create_spill;
spill_info_t *spills;
- ir_nodemap_t spill_infos;
+ ir_nodehashmap_t spill_infos;
be_uses_t *uses; /**< env for the next-use magic */
} minibelady_env_t;
spill_info->value = state;
spill_info->reloads = NEW_ARR_F(ir_node*, 0);
- ir_nodemap_insert(&env->spill_infos, state, spill_info);
+ ir_nodehashmap_insert(&env->spill_infos, state, spill_info);
//ir_fprintf(stderr, "Insert %+F -> %p\n", state, spill_info);
spill_info->next = env->spills;
static inline spill_info_t *get_spill_info(minibelady_env_t *env, const ir_node *node)
{
- spill_info_t *spill_info
- = (spill_info_t*) ir_nodemap_get(&env->spill_infos, node);
+ spill_info_t *spill_info = ir_nodehashmap_get(spill_info_t, &env->spill_infos, node);
//ir_fprintf(stderr, "Get %+F -> %p\n", node, spill_info);
return spill_info;
}
do {
after = next;
next = sched_next(after);
- } while (is_Proj(next) || is_Phi(next) || be_is_Keep(next)
- || (arch_irn_get_flags(next) & arch_irn_flags_prolog));
+ } while (is_Proj(next) || is_Phi(next) || be_is_Keep(next));
} else {
after = state;
}
ir_graph *irg = get_irn_irg(phi);
ir_node *block = get_nodes_block(phi);
int arity = get_irn_arity(phi);
- ir_node **in = ALLOCAN(ir_node*, arity);
+ ir_node **phi_in = ALLOCAN(ir_node*, arity);
ir_node *dummy = new_r_Dummy(irg, mode_M);
ir_node *spill_to_kill = NULL;
spill_info_t *spill_info;
/* create a new phi-M with bad preds */
for (i = 0; i < arity; ++i) {
- in[i] = dummy;
+ phi_in[i] = dummy;
}
DBG((dbg, LEVEL_2, "\tcreate Phi-M for %+F\n", phi));
/* create a Phi-M */
- spill_info->spill = be_new_Phi(block, arity, in, mode_M, NULL);
+ spill_info->spill = be_new_Phi(block, arity, phi_in, mode_M,
+ arch_no_register_req);
sched_add_after(block, spill_info->spill);
if (spill_to_kill != NULL) {
be_next_use_t next_use;
ir_loop *loop;
ir_node *best_starter, *first;
- ir_node *node;
int n_cfgpreds;
unsigned best_time;
int outer_loop_allowed;
- int i;
/* Create the block info for this block. */
block_info = new_block_info(&env->obst, block);
}
/* check all Live-Ins */
- be_lv_foreach(env->lv, block, be_lv_state_in, i) {
- node = be_lv_get_irn(env->lv, block, i);
-
+ be_lv_foreach(env->lv, block, be_lv_state_in, node) {
if (!mode_is_data(get_irn_mode(node)))
continue;
return block_info;
}
-static ir_node *get_reload_point(ir_node *before)
-{
- while (true) {
- ir_node *prev = sched_prev(before);
- if (! (arch_irn_get_flags(prev) & arch_irn_flags_epilog))
- break;
- before = prev;
- }
- return before;
-}
-
/**
* For the given block @p block, decide for each values
* whether it is used from a register or is reloaded
static void belady(minibelady_env_t *env, ir_node *block)
{
ir_node *current_state;
- ir_node *node;
block_info_t *block_info;
/* Don't do a block twice */
}
/* create a reload to match state if necessary */
if (need_val != NULL && need_val != current_state) {
- ir_node *before = get_reload_point(node);
+ ir_node *before = node;
DBG((dbg, LEVEL_3, "\t... reloading %+F\n", need_val));
create_reload(env, need_val, before, current_state);
current_state = need_val;
/* record state changes by the node */
if (get_irn_mode(node) == mode_T) {
- const ir_edge_t *edge;
-
foreach_out_edge(node, edge) {
const arch_register_t *reg;
ir_node *proj = get_edge_src_irn(edge);
{
minibelady_env_t env;
spill_info_t *info;
- be_lv_t *lv = be_assure_liveness(irg);
+ be_lv_t *lv = be_get_irg_liveness(irg);
- be_liveness_assure_sets(lv);
- /* construct control flow loop tree */
- if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
- construct_cf_backedges(irg);
- }
+ be_assure_live_sets(irg);
+ assure_loopinfo(irg);
obstack_init(&env.obst);
env.reg = reg;
env.lv = be_get_irg_liveness(irg);
env.uses = be_begin_uses(irg, env.lv);
env.spills = NULL;
- ir_nodemap_init(&env.spill_infos);
+ ir_nodehashmap_init(&env.spill_infos);
assure_doms(irg);
ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED | IR_RESOURCE_IRN_LINK);
/* some nodes might be dead now. */
be_remove_dead_nodes_from_schedule(irg);
- ir_nodemap_destroy(&env.spill_infos);
+ ir_nodehashmap_destroy(&env.spill_infos);
be_end_uses(env.uses);
obstack_free(&env.obst, NULL);
}
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_state);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_state)
void be_init_state(void)
{
FIRM_DBG_REGISTER(dbg, "firm.be.state");