X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=f0e26ceda3fa252b907ee9728875c361ea80369b;hb=5cb14f12bacb0c7d1c646112b4660d57e14236a2;hp=69c73a8e5eb9202dfca3e64d8aaefc9c0c640105;hpb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 69c73a8e5..f0e26ceda 100644
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -76,15 +76,16 @@ static unsigned be_compute_block_pressure(be_loopana_t *loop_ana, ir_node *block
 	const be_irg_t   *birg       = loop_ana->birg;
 	const arch_env_t *aenv       = be_get_birg_arch_env(birg);
 	be_lv_t          *lv         = be_get_birg_liveness(birg);
-	pset             *live_nodes = pset_new_ptr_default();
+	ir_nodeset_t      live_nodes;
 	ir_node          *irn;
 	int              max_live;
 
 	DBG((dbg, LEVEL_1, "Processing Block %+F\n", block));
 
 	/* determine largest pressure with this block */
-	live_nodes = be_liveness_end_of_block(lv, aenv, cls, block, live_nodes);
-	max_live   = pset_count(live_nodes);
+	ir_nodeset_init(&live_nodes);
+	be_liveness_end_of_block(lv, aenv, cls, block, &live_nodes);
+	max_live   = ir_nodeset_size(&live_nodes);
 
 	sched_foreach_reverse(block, irn) {
 		int cnt;
@@ -92,14 +93,14 @@ static unsigned be_compute_block_pressure(be_loopana_t *loop_ana, ir_node *block
 		if (is_Phi(irn))
 			break;
 
-		live_nodes = be_liveness_transfer(aenv, cls, irn, live_nodes);
-		cnt        = pset_count(live_nodes);
+		be_liveness_transfer(aenv, cls, irn, &live_nodes);
+		cnt        = ir_nodeset_size(&live_nodes);
 		max_live   = MAX(cnt, max_live);
 	}
 
 	DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %u)\n", block, cls->name, max_live));
 
-	del_pset(live_nodes);
+	ir_nodeset_destroy(&live_nodes);
 	return max_live;
 }
 
@@ -168,6 +169,11 @@ be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
 	DBG((dbg, LEVEL_1, " Computing register pressure for class %s:\n", cls->name));
 	DBG((dbg, LEVEL_1, "=====================================================\n", cls->name));
 
+	/* construct control flow loop tree */
+	if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
+		construct_cf_backedges(irg);
+	}
+
 	be_compute_loop_pressure(loop_ana, get_irg_loop(irg), cls);
 
 	return loop_ana;
@@ -183,14 +189,18 @@ be_loopana_t *be_new_loop_pressure(be_irg_t *birg) {
 	be_loopana_t     *loop_ana = xmalloc(sizeof(*loop_ana));
 	ir_loop          *irg_loop = get_irg_loop(irg);
 	const arch_env_t *arch_env = be_get_birg_arch_env(birg);
-	const arch_isa_t *isa      = arch_env->isa;
 	int               i;
 
 	loop_ana->data = new_set(cmp_loop_info, 16);
 	loop_ana->birg = birg;
 
-	for (i = arch_isa_get_n_reg_class(isa) - 1; i >= 0; --i) {
-		const arch_register_class_t *cls = arch_isa_get_reg_class(isa, i);
+	/* construct control flow loop tree */
+	if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
+		construct_cf_backedges(irg);
+	}
+
+	for (i = arch_env_get_n_reg_class(arch_env) - 1; i >= 0; --i) {
+		const arch_register_class_t *cls = arch_env_get_reg_class(arch_env, i);
 		DBG((dbg, LEVEL_1, "\n=====================================================\n", cls->name));
 		DBG((dbg, LEVEL_1, " Computing register pressure for class %s:\n", cls->name));
 		DBG((dbg, LEVEL_1, "=====================================================\n", cls->name));