X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=73c87c0295a2fc70003daa046e8740045a1ad7a7;hb=7f0a53a0ab98e5c4123bb7937170e89df5d61eb8;hp=98951cb4c8f700850352968e91a7dd8b84dd2133;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 98951cb4c..73c87c029 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.
  *
@@ -24,9 +24,7 @@
  * @date        19.02.2007
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "set.h"
 #include "pset.h"
@@ -36,7 +34,7 @@
 #include "error.h"
 #include "debug.h"
 
-#include "bearch_t.h"
+#include "bearch.h"
 #include "belive.h"
 #include "besched.h"
 #include "beloopana.h"
@@ -57,33 +55,36 @@ struct _be_loopana_t {
 	be_irg_t *birg;
 };
 
-static int cmp_loop_info(const void *a, const void *b, size_t sz) {
+static int cmp_loop_info(const void *a, const void *b, size_t size)
+{
 	const be_loop_info_t *i1 = a;
 	const be_loop_info_t *i2 = b;
+	(void) size;
 
 	return ! (i1->loop == i2->loop && i1->cls == i2->cls);
 }
 
 /**
  * Compute the highest register pressure in a block.
- * @param loop_ana  The loop ana object.
+ * @param birg      The graph.
  * @param block     The block to compute pressure for.
  * @param cls       The register class to compute pressure for.
  * @return The highest register pressure in the given block.
  */
-static unsigned be_compute_block_pressure(be_loopana_t *loop_ana, ir_node *block, const arch_register_class_t *cls) {
-	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_node          *irn;
-	int              max_live;
+static unsigned be_compute_block_pressure(const be_irg_t *birg,
+		ir_node *block, const arch_register_class_t *cls)
+{
+	be_lv_t      *lv = be_get_birg_liveness(birg);
+	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, cls, block, &live_nodes);
+	max_live   = ir_nodeset_size(&live_nodes);
 
 	sched_foreach_reverse(block, irn) {
 		int cnt;
@@ -91,14 +92,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);
-		max_live   = MAX(cnt, max_live);
+		be_liveness_transfer(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;
 }
 
@@ -109,7 +110,8 @@ static unsigned be_compute_block_pressure(be_loopana_t *loop_ana, ir_node *block
  * @param cls       The register class to compute pressure for.
  * @return The highest register pressure in the given loop.
  */
-static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, const arch_register_class_t *cls) {
+static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop, const arch_register_class_t *cls)
+{
 	int            i, max;
 	unsigned       pressure;
 	be_loop_info_t *entry, key;
@@ -123,20 +125,15 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
 		unsigned     son_pressure;
 		loop_element elem = get_loop_element(loop, i);
 
-		switch (*elem.kind) {
-			case k_ir_node:
-				son_pressure = be_compute_block_pressure(loop_ana, elem.node, cls);
-				break;
-			case k_ir_loop:
-				son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls);
-				break;
-			default:
-				panic("Unknown element found in loop");
-				break;
+		if (*elem.kind == k_ir_node)
+			son_pressure = be_compute_block_pressure(loop_ana->birg, elem.node, cls);
+		else {
+			assert(*elem.kind == k_ir_loop);
+			son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls);
 		}
 
 		pressure = MAX(pressure, son_pressure);
-   	}
+	}
 	DBG((dbg, LEVEL_1, "Done with loop %d, pressure %u for class %s\n", loop->loop_nr, pressure, cls->name));
 
 	/* update info in set */
@@ -156,9 +153,10 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
  * @return The loop analysis object.
  */
 be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
-                                       const arch_register_class_t *cls) {
+                                       const arch_register_class_t *cls)
+{
 	ir_graph     *irg      = be_get_birg_irg(birg);
-	be_loopana_t *loop_ana = xmalloc(sizeof(*loop_ana));
+	be_loopana_t *loop_ana = XMALLOC(be_loopana_t);
 
 	loop_ana->data = new_set(cmp_loop_info, 16);
 	loop_ana->birg = birg;
@@ -167,6 +165,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;
@@ -177,23 +180,33 @@ be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
  * @param birg  The backend irg object
  * @return The loop analysis object.
  */
-be_loopana_t *be_new_loop_pressure(be_irg_t *birg) {
+be_loopana_t *be_new_loop_pressure(be_irg_t *birg,
+                                   const arch_register_class_t *cls)
+{
 	ir_graph         *irg      = be_get_birg_irg(birg);
-	be_loopana_t     *loop_ana = xmalloc(sizeof(*loop_ana));
+	be_loopana_t     *loop_ana = XMALLOC(be_loopana_t);
 	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);
-		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));
+	/* construct control flow loop tree */
+	if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
+		construct_cf_backedges(irg);
+	}
+
+	if (cls != NULL) {
 		be_compute_loop_pressure(loop_ana, irg_loop, cls);
+	} else {
+		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));
+			be_compute_loop_pressure(loop_ana, irg_loop, cls);
+		}
 	}
 
 	return loop_ana;
@@ -203,7 +216,8 @@ be_loopana_t *be_new_loop_pressure(be_irg_t *birg) {
  * Returns the computed register pressure for the given class and loop.
  * @return The pressure or INT_MAX if not found
  */
-unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_t *cls, ir_loop *loop) {
+unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_t *cls, ir_loop *loop)
+{
 	unsigned pressure = INT_MAX;
 	be_loop_info_t *entry, key;
 
@@ -216,7 +230,7 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
 	if (entry)
 		pressure = entry->max_pressure;
 	else
-		assert(0 && "Pressure not computed for given class and loop object.");
+		panic("Pressure not computed for given class and loop object.");
 
 	return pressure;
 }
@@ -224,7 +238,8 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
 /**
  * Frees the loop analysis object.
  */
-void be_free_loop_pressure(be_loopana_t *loop_ana) {
+void be_free_loop_pressure(be_loopana_t *loop_ana)
+{
 	del_set(loop_ana->data);
 	xfree(loop_ana);
 }