#include "belive_t.h"
#include "benode.h"
#include "besched.h"
-#include "bestatevent.h"
+#include "statev_t.h"
#include "beirg.h"
#include "beintlive_t.h"
return !(p->arg == q->arg);
}
-typedef struct insert_all_perms_env_t {
- be_chordal_env_t *chordal_env;
- pmap *perm_map;
-} insert_all_perms_env_t;
-
/**
* Insert Perms in all predecessors of a block containing a phi
*/
static void insert_all_perms_walker(ir_node *bl, void *data)
{
- insert_all_perms_env_t *env = (insert_all_perms_env_t*)data;
- be_chordal_env_t *chordal_env = env->chordal_env;
- pmap *perm_map = env->perm_map;
+ be_chordal_env_t *const chordal_env = (be_chordal_env_t*)data;
be_lv_t *lv = be_get_irg_liveness(chordal_env->irg);
int i, n;
/* Look at all predecessors of the phi block */
for (i = 0, n = get_irn_arity(bl); i < n; ++i) {
ir_node *phi, *perm, *insert_after, **in;
- perm_proj_t *pp;
set *arg_set = new_set(cmp_perm_proj, chordal_env->cls->n_regs);
ir_node *pred_bl = get_Block_cfgpred_block(bl, i);
int n_projs = 0;
- assert(!pmap_contains(perm_map, pred_bl) && "Already permed that block");
-
/*
* Note that all phis in the list are in the same
* register class by construction.
hash = hash_irn(arg);
templ.arg = arg;
- pp = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash);
+ perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
/*
* If a proj_perm_t entry has not been made in the argument set,
*/
if (!pp && !be_is_live_in(lv, bl, arg)) {
templ.pos = n_projs++;
- set_insert(arg_set, &templ, sizeof(templ), hash);
+ (void)set_insert(perm_proj_t, arg_set, &templ, sizeof(templ), hash);
}
}
* above in the arg_set and insert it into the schedule.
*/
in = XMALLOCN(ir_node*, n_projs);
- foreach_set(arg_set, perm_proj_t*, pp) {
+ foreach_set(arg_set, perm_proj_t, pp) {
in[pp->pos] = pp->arg;
}
perm = be_new_Perm(chordal_env->cls, pred_bl, n_projs, in);
- be_stat_ev("phi_perm", n_projs);
+ stat_ev_int("phi_perm", n_projs);
insert_after = pred_bl;
do {
* Register allocation is copied from the former phi
* arguments to the projs (new phi arguments).
*/
- insert_after = perm;
- foreach_set(arg_set, perm_proj_t*, pp) {
+ foreach_set(arg_set, perm_proj_t, pp) {
ir_node *proj = new_r_Proj(perm, get_irn_mode(pp->arg), pp->pos);
pp->proj = proj;
assert(arch_get_irn_register(pp->arg));
arch_set_irn_register(proj, arch_get_irn_register(pp->arg));
- insert_after = proj;
DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", arch_get_irn_register(pp->arg)->name, pp->arg, pp->proj));
}
perm_proj_t templ;
templ.arg = get_irn_n(phi, i);
- pp = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
+ perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
/* If not found, it was an interfering argument */
if (pp) {
be_liveness_update(lv, in[i]);
}
free(in);
-
- /* register in perm map */
- pmap_insert(perm_map, pred_bl, perm);
}
del_set(arg_set);
void be_ssa_destruction(be_chordal_env_t *chordal_env)
{
- insert_all_perms_env_t insert_perms_env;
- pmap *perm_map = pmap_create();
- ir_graph *irg = chordal_env->irg;
+ ir_graph *irg = chordal_env->irg;
FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
DBG((dbg, LEVEL_1, "Placing perms...\n"));
- insert_perms_env.chordal_env = chordal_env;
- insert_perms_env.perm_map = perm_map;
- irg_block_walk_graph(irg, insert_all_perms_walker, NULL, &insert_perms_env);
+ irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env);
if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
dump_ir_graph(irg, "ssa_destr_perms_placed");
if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
dump_ir_graph(irg, "ssa_destr_regs_set");
-
- pmap_destroy(perm_map);
}
static void ssa_destruction_check_walker(ir_node *bl, void *data)