X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=c1190da0b3e5f0b7877483abccc09bef91398df4;hb=0ada12ba1e11d8ff2e39e3183eb43c4783df2d91;hp=6b7ee74eec75d08b327ab97a703caf6279339b2b;hpb=69849fc8fe452350bfbd2ad67f1898147fc906b4;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 6b7ee74ee..c1190da0b 100644
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -22,43 +22,43 @@
  * @brief       Compute register pressure in loops.
  * @author      Christian Wuerdig
  * @date        19.02.2007
- * @version     $Id$
  */
 #include "config.h"
 
 #include "set.h"
 #include "pset.h"
 #include "irnode.h"
-#include "irtools.h"
+#include "util.h"
 #include "irloop_t.h"
 #include "error.h"
 #include "debug.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belive.h"
 #include "besched.h"
 #include "beloopana.h"
 #include "bemodule.h"
 
-DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL);
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-#define HASH_LOOP_INFO(info) (HASH_PTR((info)->loop) ^ HASH_PTR((info)->cls))
+#define HASH_LOOP_INFO(info) (hash_ptr((info)->loop) ^ hash_ptr((info)->cls))
 
-typedef struct _be_loop_info_t {
+typedef struct be_loop_info_t {
 	ir_loop                     *loop;
 	const arch_register_class_t *cls;
 	unsigned                    max_pressure;
 } be_loop_info_t;
 
-struct _be_loopana_t {
+struct be_loopana_t {
 	set      *data;
-	be_irg_t *birg;
+	ir_graph *irg;
 };
 
 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;
+	const be_loop_info_t *i1 = (const be_loop_info_t*)a;
+	const be_loop_info_t *i2 = (const be_loop_info_t*)b;
 	(void) size;
 
 	return ! (i1->loop == i2->loop && i1->cls == i2->cls);
@@ -66,18 +66,18 @@ static int cmp_loop_info(const void *a, const void *b, size_t size)
 
 /**
  * Compute the highest register pressure in a block.
- * @param birg      The graph.
+ * @param irg       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(const be_irg_t *birg,
-		ir_node *block, const arch_register_class_t *cls)
+static unsigned be_compute_block_pressure(const ir_graph *irg,
+                                          ir_node *block,
+                                          const arch_register_class_t *cls)
 {
-	be_lv_t      *lv = be_get_irg_liveness(birg->irg);
-	ir_nodeset_t  live_nodes;
-	ir_node      *irn;
-	int          max_live;
+	be_lv_t     *lv = be_get_irg_liveness(irg);
+	ir_nodeset_t live_nodes;
+	size_t       max_live;
 
 	DBG((dbg, LEVEL_1, "Processing Block %+F\n", block));
 
@@ -87,7 +87,7 @@ static unsigned be_compute_block_pressure(const be_irg_t *birg,
 	max_live   = ir_nodeset_size(&live_nodes);
 
 	sched_foreach_reverse(block, irn) {
-		int cnt;
+		size_t cnt;
 
 		if (is_Phi(irn))
 			break;
@@ -97,26 +97,27 @@ static unsigned be_compute_block_pressure(const be_irg_t *birg,
 		max_live = MAX(cnt, max_live);
 	}
 
-	DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %u)\n", block, cls->name, max_live));
+	DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %zu)\n", block, cls->name, max_live));
 
 	ir_nodeset_destroy(&live_nodes);
 	return max_live;
 }
 
 /**
- * Compute the highest register pressure in a loop and it's sub-loops.
+ * Compute the highest register pressure in a loop and its sub-loops.
  * @param loop_ana  The loop ana object.
  * @param loop      The loop to compute pressure for.
  * @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;
+	size_t         i, max;
 	unsigned       pressure;
 	be_loop_info_t *entry, key;
 
-	DBG((dbg, LEVEL_1, "\nProcessing Loop %d\n", loop->loop_nr));
+	DBG((dbg, LEVEL_1, "\nProcessing Loop %ld\n", loop->loop_nr));
 	assert(get_loop_n_elements(loop) > 0);
 	pressure = 0;
 
@@ -126,7 +127,7 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
 		loop_element elem = get_loop_element(loop, i);
 
 		if (*elem.kind == k_ir_node)
-			son_pressure = be_compute_block_pressure(loop_ana->birg, elem.node, cls);
+			son_pressure = be_compute_block_pressure(loop_ana->irg, elem.node, cls);
 		else {
 			assert(*elem.kind == k_ir_loop);
 			son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls);
@@ -134,41 +135,37 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
 
 		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));
+	DBG((dbg, LEVEL_1, "Done with loop %ld, pressure %u for class %s\n", loop->loop_nr, pressure, cls->name));
 
 	/* update info in set */
 	key.loop            = loop;
 	key.cls             = cls;
 	key.max_pressure    = 0;
-	entry               = set_insert(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
+	entry               = set_insert(be_loop_info_t, loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
 	entry->max_pressure = MAX(entry->max_pressure, pressure);
 
 	return pressure;
 }
 
 /**
- * Compute the register pressure for a class of all loops in the birg.
- * @param birg  The backend irg object
+ * Compute the register pressure for a class of all loops in a graph
+ * @param irg   The graph
  * @param cls   The register class to compute the pressure for
  * @return The loop analysis object.
  */
-be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
+be_loopana_t *be_new_loop_pressure_cls(ir_graph *irg,
                                        const arch_register_class_t *cls)
 {
-	ir_graph     *irg      = be_get_birg_irg(birg);
 	be_loopana_t *loop_ana = XMALLOC(be_loopana_t);
 
 	loop_ana->data = new_set(cmp_loop_info, 16);
-	loop_ana->birg = birg;
+	loop_ana->irg  = irg;
 
 	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);
-	}
+	assure_loopinfo(irg);
 
 	be_compute_loop_pressure(loop_ana, get_irg_loop(irg), cls);
 
@@ -176,32 +173,28 @@ be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg,
 }
 
 /**
- * Compute the register pressure for all classes of all loops in the birg.
- * @param birg  The backend irg object
+ * Compute the register pressure for all classes of all loops in the irg.
+ * @param irg  The graph
  * @return The loop analysis object.
  */
-be_loopana_t *be_new_loop_pressure(be_irg_t *birg,
+be_loopana_t *be_new_loop_pressure(ir_graph *irg,
                                    const arch_register_class_t *cls)
 {
-	ir_graph         *irg      = be_get_birg_irg(birg);
 	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_irg_arch_env(irg);
 	int               i;
 
 	loop_ana->data = new_set(cmp_loop_info, 16);
-	loop_ana->birg = birg;
+	loop_ana->irg  = irg;
 
-	/* construct control flow loop tree */
-	if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
-		construct_cf_backedges(irg);
-	}
+	assure_loopinfo(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);
+		for (i = arch_env->n_register_classes - 1; i >= 0; --i) {
+			const arch_register_class_t *cls = &arch_env->register_classes[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));
@@ -225,7 +218,7 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
 
 	key.loop = loop;
 	key.cls  = cls;
-	entry    = set_find(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
+	entry    = set_find(be_loop_info_t, loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
 
 	if (entry)
 		pressure = entry->max_pressure;
@@ -244,7 +237,7 @@ void be_free_loop_pressure(be_loopana_t *loop_ana)
 	xfree(loop_ana);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana)
 void be_init_loopana(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.loopana");