X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=c62e5eff0cd7592d4eec6b6e8e443285a2f53682;hb=1872920c09708b361d06c0dc9f4c1fd0a03544f5;hp=9acc15652f318f77775ada0a1a486cea23a9d5ff;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index 9acc15652..c62e5eff0 100644
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,11 +1,28 @@
-/**
- * Author:      Christian Wuerdig
- * Date:        2007/02/19
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- * CVS-Id:      $Id$
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
  *
- * Compute register pressure in loops
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       Compute register pressure in loops.
+ * @author      Christian Wuerdig
+ * @date        19.02.2007
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -17,8 +34,9 @@
 #include "irtools.h"
 #include "irloop_t.h"
 #include "error.h"
+#include "debug.h"
 
-#include "bearch.h"
+#include "bearch_t.h"
 #include "belive.h"
 #include "besched.h"
 #include "beloopana.h"
@@ -39,9 +57,10 @@ 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);
 }
@@ -54,16 +73,19 @@ static int cmp_loop_info(const void *a, const void *b, size_t sz) {
  * @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 arch_env_t *aenv       = loop_ana->birg->main_env->arch_env;
-	pset             *live_nodes = pset_new_ptr_default();
+	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);
+	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(loop_ana->birg->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;
@@ -71,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;
 }
 
@@ -116,7 +138,7 @@ 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));
 
 	/* update info in set */
@@ -135,7 +157,9 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
  * @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, const arch_register_class_t *cls) {
+be_loopana_t *be_new_loop_pressure_cls(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));
 
 	loop_ana->data = new_set(cmp_loop_info, 16);
@@ -145,7 +169,12 @@ be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg, const arch_register_class
 	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, get_irg_loop(birg->irg), cls);
+	/* 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;
 }
@@ -156,15 +185,22 @@ be_loopana_t *be_new_loop_pressure_cls(be_irg_t *birg, const arch_register_class
  * @return The loop analysis object.
  */
 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(birg->irg);
-	int          i;
+	ir_graph         *irg      = be_get_birg_irg(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);
+	int               i;
 
 	loop_ana->data = new_set(cmp_loop_info, 16);
 	loop_ana->birg = birg;
 
-	for (i = arch_isa_get_n_reg_class(birg->main_env->arch_env->isa) - 1; i >= 0; --i) {
-		const arch_register_class_t *cls = arch_isa_get_reg_class(birg->main_env->arch_env->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));