X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeirgmod.c;h=4fbbc06ecdcda69d93d44f55711546277c4944e1;hb=e243eb2e9e8a9f5e57e166950a1a0a8ab25e92a9;hp=45db09588778c9ca846d004779799b1680d60a1c;hpb=6b1817ea1a4820e0d11c2bea70180ccdb7b659e0;p=libfirm

diff --git a/ir/be/beirgmod.c b/ir/be/beirgmod.c
index 45db09588..4fbbc06ec 100644
--- a/ir/be/beirgmod.c
+++ b/ir/be/beirgmod.c
@@ -56,9 +56,12 @@
 
 */
 
-
-struct _dom_front_info_t {
-  pmap *df_map;
+/**
+ * The dominance frontier for a graph.
+ */
+struct _be_dom_front_info_t {
+	pmap *df_map;         /**< A map, mapping every block to a list of its dominance frontier blocks. */
+	struct obstack obst;  /**< An obstack holding all the frontier data. */
 };
 
 /**
@@ -71,101 +74,115 @@ struct _dom_front_info_t {
  */
 static INLINE ir_node *get_idom(ir_node *bl)
 {
-  ir_node *idom = get_Block_idom(bl);
-  return idom == NULL ? bl : idom;
+	ir_node *idom = get_Block_idom(bl);
+	return idom == NULL ? bl : idom;
 }
 
-static void compute_df(ir_node *n, pmap *df_map)
+/**
+ * Compute the dominance frontier for a given block.
+ *
+ * @param blk   the block where the calculation starts
+ *
+ * @return the list of all blocks in the dominance frontier of blk
+ */
+static ir_node **compute_df(ir_node *blk, be_dom_front_info_t *info)
 {
-  ir_node *c;
-  const ir_edge_t *edge;
-  pset *df = pset_new_ptr_default();
-
-  /* Add local dominance frontiers */
-  foreach_block_succ(n, edge) {
-    ir_node *y = edge->src;
-
-    if(get_idom(y) != n)
-      pset_insert_ptr(df, y);
-  }
-
-  /*
-   * Go recursively down the dominance tree and add all blocks
-   * int the dominance frontiers of the children, which are not
-   * dominated by the given block.
-   */
-  for(c = get_Block_dominated_first(n); c; c = get_Block_dominated_next(c)) {
-    pset *df_c;
-    ir_node *w;
-
-    compute_df(c, df_map);
-    df_c = pmap_get(df_map, c);
-
-    for(w = pset_first(df_c); w; w = pset_next(df_c)) {
-      if(get_idom(w) != n)
-        pset_insert_ptr(df, w);
-    }
-  }
-
-  pmap_insert(df_map, n, df);
+	ir_node *c;
+	const ir_edge_t *edge;
+	ir_node **df_list = NEW_ARR_F(ir_node *, 0);
+	ir_node **df;
+	int len;
+
+	/* Add local dominance frontiers */
+	foreach_block_succ(blk, edge) {
+		ir_node *y = edge->src;
+
+		if (get_idom(y) != blk) {
+			ARR_APP1(ir_node *, df_list, y);
+		}
+	}
+
+	/*
+	 * Go recursively down the dominance tree and add all blocks
+	 * into the dominance frontiers of the children, which are not
+	 * dominated by the given block.
+	 */
+	for (c = get_Block_dominated_first(blk); c; c = get_Block_dominated_next(c)) {
+		int i;
+		ir_node **df_c_list = compute_df(c, info);
+
+		for (i = ARR_LEN(df_c_list) - 1; i >= 0; --i) {
+			ir_node *w = df_c_list[i];
+			if (get_idom(w) != blk)
+				ARR_APP1(ir_node *, df_list, w);
+		}
+	}
 
+	/* now copy the flexible array to the obstack */
+	len = ARR_LEN(df_list);
+	df = NEW_ARR_D(ir_node *, &info->obst, len);
+	memcpy(df, df_list, len * sizeof(df[0]));
+	DEL_ARR_F(df_list);
+
+	pmap_insert(info->df_map, blk, df);
+	return df;
 }
 
-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();
-  compute_doms(irg);
-  compute_df(get_irg_start_block(irg), info->df_map);
+	edges_assure(irg);
+	obstack_init(&info->obst);
+	info->df_map = pmap_create();
+	assure_doms(irg);
+	(void)compute_df(get_irg_start_block(irg), info);
 
-  return info;
+	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;
-
-  for(ent = pmap_first(info->df_map); ent; ent = pmap_next(info->df_map))
-    del_pset(ent->value);
-
-  pmap_destroy(info->df_map);
-  free(info);
+	obstack_free(&info->obst, NULL);
+	pmap_destroy(info->df_map);
+	free(info);
 }
 
-pset *be_get_dominance_frontier(dom_front_info_t *info, ir_node *block)
+/* Get the dominance frontier of a block. */
+ir_node **be_get_dominance_frontier(be_dom_front_info_t *info, ir_node *block)
 {
-  return pmap_get(info->df_map, 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();
+	waitq *worklist = new_waitq();
 	FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
 
 	/*
 	 * Fill the worklist queue and the rest of the orig blocks array.
 	 */
-	for(bl = pset_first(copy_blocks); bl; bl = pset_next(copy_blocks)) {
-		pdeq_putr(worklist, bl);
+	for (bl = pset_first(copy_blocks); bl; bl = pset_next(copy_blocks)) {
+		waitq_put(worklist, bl);
 	}
 
 	while (!pdeq_empty(worklist)) {
-		ir_node *bl = pdeq_getl(worklist);
-		pset *df    = be_get_dominance_frontier(df_info, bl);
+		ir_node *bl  = waitq_get(worklist);
+		ir_node **df = be_get_dominance_frontier(df_info, bl);
+		int i;
 
 		ir_node *y;
 
 		DBG((dbg, LEVEL_3, "dom front of %+F\n", bl));
 		DEBUG_ONLY(
-			for (y = pset_first(df); y; y = pset_next(df))
-				DBG((dbg, LEVEL_3, "\t%+F\n", y))
+			for (i = ARR_LEN(df) - 1; i >= 0; --i)
+				DBG((dbg, LEVEL_3, "\t%+F\n", df[i]))
 		);
 
-		for(y = pset_first(df); y; y = pset_next(df)) {
-			if(!pset_find_ptr(phi_blocks, y)) {
+		for (i = ARR_LEN(df) - 1; i >= 0; --i) {
+			y = df[i];
+			if (!pset_find_ptr(phi_blocks, y)) {
 				pset_insert_ptr(phi_blocks, y);
 
 				/*
@@ -176,12 +193,12 @@ static void determine_phi_blocks(pset *copies, pset *copy_blocks, pset *phi_bloc
 				set_irn_link(y, NULL);
 
 				if(!pset_find_ptr(copy_blocks, y))
-					pdeq_putr(worklist, y);
+					waitq_put(worklist, y);
 			}
 		}
 	}
 
-	del_pdeq(worklist);
+	del_waitq(worklist);
 }
 
 /*
@@ -243,10 +260,12 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 	 * 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;
@@ -258,6 +277,16 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 				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)) {
@@ -280,6 +309,16 @@ static ir_node *search_def(ir_node *usage, int pos, pset *copies, pset *copy_blo
 
 				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);
 				}
@@ -347,8 +386,15 @@ static void fix_usages(pset *copies, pset *copy_blocks, pset *phi_blocks, pset *
 		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);
@@ -394,7 +440,7 @@ static void remove_odd_phis(pset *copies, pset *unused_copies)
 }
 #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;
@@ -405,18 +451,18 @@ void be_ssa_constr_phis_ignore(dom_front_info_t *info, be_lv_t *lv, int n, ir_no
 	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);
@@ -482,18 +528,18 @@ void be_ssa_constr_set_phis_ignore(dom_front_info_t *df, be_lv_t *lv, pset *node
 
 }
 
-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);
@@ -511,7 +557,7 @@ void be_ssa_constr_set(dom_front_info_t *info, be_lv_t *lv, pset *nodes)
 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);
@@ -547,7 +593,7 @@ ir_node *insert_Perm_after(const arch_env_t *arch_env,
 	free(nodes);
 
 	curr = perm;
-	for(i = 0; i < n; ++i) {
+	for (i = 0; i < n; ++i) {
 		ir_node *copies[2];
 		ir_node *perm_op = get_irn_n(perm, i);
 		const arch_register_t *reg = arch_get_irn_register(arch_env, perm_op);
@@ -578,6 +624,8 @@ static void elr_split_walker(ir_node *bl, void *data)
 	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;
 
@@ -586,65 +634,75 @@ static void elr_split_walker(ir_node *bl, void *data)
 	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);
 }
 
+/**
+ * Post-block-walker: Find blocks containing only one jump and
+ * remove them.
+ */
 static void remove_empty_block(ir_node *block, void *data) {
-	ir_graph *irg;
 	const ir_edge_t *edge, *next;
 	ir_node *node;
+	int *changed = data;
 	ir_node *jump = NULL;
 
 	assert(is_Block(block));
 
-	if(get_Block_n_cfgpreds(block) != 1)
+	if (get_Block_n_cfgpreds(block) != 1)
 		return;
 
 	sched_foreach(block, node) {
-		if(!is_Jmp(node))
+		if (! is_Jmp(node))
 			return;
-		if(jump != NULL) {
-			// we should never have 2 jumps in a block
-			assert(0);
+		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)
+
+	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);
+		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);
+	*changed = 1;
 }
 
-/**
- * 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);
+/* removes basic blocks that just contain a jump instruction */
+int be_remove_empty_blocks(ir_graph *irg) {
+	int changed = 0;
+
+	irg_block_walk_graph(irg, remove_empty_block, NULL, &changed);
+	if (changed) {
+		/* invalidate analysis info */
+		set_irg_doms_inconsistent(irg);
+		set_irg_extblk_inconsistent(irg);
+		set_irg_outs_inconsistent(irg);
+	}
+	return changed;
 }