*/
-struct _dom_front_info_t {
+struct _be_dom_front_info_t {
pmap *df_map;
};
}
-dom_front_info_t *be_compute_dominance_frontiers(ir_graph *irg)
+be_dom_front_info_t *be_compute_dominance_frontiers(ir_graph *irg)
{
- dom_front_info_t *info = xmalloc(sizeof(*info));
+ be_dom_front_info_t *info = xmalloc(sizeof(*info));
edges_assure(irg);
info->df_map = pmap_create();
return info;
}
-void be_free_dominance_frontiers(dom_front_info_t *info)
+void be_free_dominance_frontiers(be_dom_front_info_t *info)
{
pmap_entry *ent;
free(info);
}
-pset *be_get_dominance_frontier(dom_front_info_t *info, ir_node *block)
+pset *be_get_dominance_frontier(be_dom_front_info_t *info, ir_node *block)
{
return pmap_get(info->df_map, block);
}
-static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_blocks, dom_front_info_t *df_info)
+static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_blocks, be_dom_front_info_t *df_info)
{
ir_node *bl;
pdeq *worklist = new_pdeq();
* predecessor block of the usage.
*/
while(curr_bl != NULL) {
+ ir_node *phim;
/*
* If this block contains a copy, search the block
- * instruction by instruction.
+ * instruction by instruction. If nothing is found
+ * search for a not scheduled PhiM.
*/
if(pset_find_ptr(copy_blocks, curr_bl)) {
ir_node *irn;
if(pset_find_ptr(copies, irn))
return irn;
}
+
+ for(phim = pset_first(copies); phim; phim = pset_next(copies)) {
+ if(!is_Phi(phim) || !(get_irn_mode(phim) == mode_M))
+ continue;
+
+ if(get_nodes_block(phim) == curr_bl) {
+ pset_break(copies);
+ return phim;
+ }
+ }
}
if(pset_find_ptr(phi_blocks, curr_bl)) {
for(i = 0; i < n_preds; ++i) {
ir_node *arg = search_def(phi, i, copies, copy_blocks, phis, phi_blocks, mode);
+ if(arg == NULL) {
+ ir_node *irn;
+
+ ir_fprintf(stderr, "no definition found for %+F at position %d\nCopies: ", phi, i);
+ for(irn = pset_first(copies); irn; irn = pset_next(copies)) {
+ ir_fprintf(stderr, "%+F ", irn);
+ }
+ ir_fprintf(stderr, "\n\n");
+ assert(arg && "no definition found");
+ }
DBG((dbg, LEVEL_2, "\t\t%+F(%d) -> %+F\n", phi, i, arg));
set_irn_n(phi, i, arg);
}
def = search_def(irn, pos, copies, copy_blocks, phis, phi_blocks, mode);
DBG((dbg, LEVEL_2, "\t%+F(%d) -> %+F\n", irn, pos, def));
- if(def != NULL)
- set_irn_n(irn, pos, def);
+ if(def == NULL) {
+ ir_fprintf(stderr, "no definition found for %+F at position %d\nCopies: ", irn, pos);
+ for(irn = pset_first(copies); irn; irn = pset_next(copies)) {
+ ir_fprintf(stderr, "%+F ", irn);
+ }
+ ir_fprintf(stderr, "\n\n");
+ assert(def && "no definition found");
+ }
+ set_irn_n(irn, pos, def);
}
obstack_free(&obst, NULL);
}
#endif
-void be_ssa_constr_phis_ignore(dom_front_info_t *info, be_lv_t *lv, int n, ir_node *nodes[], pset *phis, pset *ignore_uses)
+void be_ssa_constr_phis_ignore(be_dom_front_info_t *info, be_lv_t *lv, int n, ir_node *nodes[], pset *phis, pset *ignore_uses)
{
pset *irns = pset_new_ptr(n);
int i;
del_pset(irns);
}
-void be_ssa_constr_ignore(dom_front_info_t *info, be_lv_t *lv, int n, ir_node *nodes[], pset *ignore_uses)
+void be_ssa_constr_ignore(be_dom_front_info_t *info, be_lv_t *lv, int n, ir_node *nodes[], pset *ignore_uses)
{
be_ssa_constr_phis_ignore(info, lv, n, nodes, NULL, ignore_uses);
}
-void be_ssa_constr(dom_front_info_t *info, be_lv_t *lv, int n, ir_node *nodes[])
+void be_ssa_constr(be_dom_front_info_t *info, be_lv_t *lv, int n, ir_node *nodes[])
{
pset *empty_set = be_empty_set();
be_ssa_constr_ignore(info, lv, n, nodes, empty_set);
}
-void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, be_lv_t *lv, pset *nodes, pset *phis, pset *ignore_uses)
+void be_ssa_constr_set_phis_ignore(be_dom_front_info_t *df, be_lv_t *lv, pset *nodes, pset *phis, pset *ignore_uses)
{
int n = pset_count(nodes);
pset *blocks = pset_new_ptr(n);
}
-void be_ssa_constr_set_phis(dom_front_info_t *df, be_lv_t *lv, pset *nodes, pset *phis)
+void be_ssa_constr_set_phis(be_dom_front_info_t *df, be_lv_t *lv, pset *nodes, pset *phis)
{
pset *empty_set = be_empty_set();
be_ssa_constr_set_phis_ignore(df, lv, nodes, phis, empty_set);
}
-void be_ssa_constr_set_ignore(dom_front_info_t *df, be_lv_t *lv, pset *nodes, pset *ignore_uses)
+void be_ssa_constr_set_ignore(be_dom_front_info_t *df, be_lv_t *lv, pset *nodes, pset *ignore_uses)
{
be_ssa_constr_set_phis_ignore(df, lv, nodes, NULL, ignore_uses);
}
-void be_ssa_constr_set(dom_front_info_t *info, be_lv_t *lv, pset *nodes)
+void be_ssa_constr_set(be_dom_front_info_t *info, be_lv_t *lv, pset *nodes)
{
pset *empty_set = be_empty_set();
be_ssa_constr_set_ignore(info, lv, nodes, empty_set);
ir_node *insert_Perm_after(const arch_env_t *arch_env,
be_lv_t *lv,
const arch_register_class_t *cls,
- dom_front_info_t *dom_front,
+ be_dom_front_info_t *dom_front,
ir_node *pos)
{
ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
struct _elr_closure_t *c = data;
const be_chordal_env_t *cenv = c->cenv;
const arch_env_t *aenv = cenv->birg->main_env->arch_env;
+ be_lv_t *lv = cenv->birg->lv;
+ be_dom_front_info_t *dom_front = cenv->birg->dom_front;
be_insn_t *insn;
be_insn_env_t ie;
for(insn = be_scan_insn(&ie, sched_first(bl)); !is_Block(insn->irn); insn = be_scan_insn(&ie, insn->next_insn)) {
ir_node *pred = sched_prev(insn->irn);
if(!is_Block(pred) && !is_Phi(insn->irn))
- insert_Perm_after(aenv, cenv->lv, cenv->cls, cenv->dom_front, insn->irn);
+ insert_Perm_after(aenv, lv, cenv->cls, dom_front, insn->irn);
}
}
void extreme_liverange_splitting(struct _be_chordal_env_t *cenv)
{
struct _elr_closure_t c;
+ be_lv_t *lv = cenv->birg->lv;
c.cenv = cenv;
obstack_init(&c.obst);
- be_liveness_recompute(cenv->lv);
+ be_liveness_recompute(lv);
irg_block_walk_graph(cenv->irg, elr_split_walker, NULL, &c);
- be_liveness_recompute(cenv->lv);
+ be_liveness_recompute(lv);
obstack_free(&c.obst, NULL);
}
+
+static void remove_empty_block(ir_node *block, void *data) {
+ ir_graph *irg;
+ const ir_edge_t *edge, *next;
+ ir_node *node;
+ ir_node *jump = NULL;
+
+ assert(is_Block(block));
+
+ if (get_Block_n_cfgpreds(block) != 1)
+ return;
+
+ sched_foreach(block, node) {
+ if (! is_Jmp(node))
+ return;
+ if (jump != NULL) {
+ /* we should never have 2 jumps in a block */
+ assert(0 && "We should never have 2 jumps in a block");
+ return;
+ }
+ jump = node;
+ }
+
+ if (jump == NULL)
+ return;
+
+ node = get_Block_cfgpred(block, 0);
+ foreach_out_edge_safe(jump, edge, next) {
+ ir_node *block = get_edge_src_irn(edge);
+ int pos = get_edge_src_pos(edge);
+
+ set_irn_n(block, pos, node);
+ }
+
+ set_Block_cfgpred(block, 0, new_Bad());
+ sched_remove(jump);
+
+ irg = get_irn_irg(block);
+ set_irg_doms_inconsistent(irg);
+ set_irg_extblk_inconsistent(irg);
+ set_irg_outs_inconsistent(irg);
+}
+
+/**
+ * removes basic blocks that just contain a jump instruction
+ */
+void be_remove_empty_blocks(ir_graph *irg) {
+ irg_block_walk_graph(irg, remove_empty_block, NULL, NULL);
+}