beloopana: Do not pass around the irg, simply fetch it locally.

[libfirm] / ir / be / beloopana.c

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index c1190da..33b8901 100644 (file)
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 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.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -51,8 +37,7 @@ typedef struct be_loop_info_t {
 } be_loop_info_t;
 
 struct be_loopana_t {
-       set      *data;
-       ir_graph *irg;
+       set *data;
 };
 
 static int cmp_loop_info(const void *a, const void *b, size_t size)
@@ -66,16 +51,12 @@ static int cmp_loop_info(const void *a, const void *b, size_t size)
 
 /**
  * Compute the highest register pressure in a block.
- * @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 ir_graph *irg,
-                                          ir_node *block,
-                                          const arch_register_class_t *cls)
+static unsigned be_compute_block_pressure(ir_node *const block, arch_register_class_t const *const cls)
 {
-       be_lv_t     *lv = be_get_irg_liveness(irg);
        ir_nodeset_t live_nodes;
        size_t       max_live;
 
@@ -83,6 +64,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
 
        /* determine largest pressure with this block */
        ir_nodeset_init(&live_nodes);
+       be_lv_t *const lv = be_get_irg_liveness(get_Block_irg(block));
        be_liveness_end_of_block(lv, cls, block, &live_nodes);
        max_live   = ir_nodeset_size(&live_nodes);
 
@@ -127,7 +109,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->irg, elem.node, cls);
+                       son_pressure = be_compute_block_pressure(elem.node, cls);
                else {
                        assert(*elem.kind == k_ir_loop);
                        son_pressure = be_compute_loop_pressure(loop_ana, elem.son, cls);
@@ -147,19 +129,11 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
        return pressure;
 }
 
-/**
- * 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(ir_graph *irg,
-                                       const arch_register_class_t *cls)
+be_loopana_t *be_new_loop_pressure(ir_graph *const irg, arch_register_class_t const *const cls)
 {
        be_loopana_t *loop_ana = XMALLOC(be_loopana_t);
 
        loop_ana->data = new_set(cmp_loop_info, 16);
-       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));
@@ -172,43 +146,6 @@ be_loopana_t *be_new_loop_pressure_cls(ir_graph *irg,
        return loop_ana;
 }
 
-/**
- * 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(ir_graph *irg,
-                                   const arch_register_class_t *cls)
-{
-       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->irg  = irg;
-
-       assure_loopinfo(irg);
-
-       if (cls != NULL) {
-               be_compute_loop_pressure(loop_ana, irg_loop, cls);
-       } else {
-               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));
-                       be_compute_loop_pressure(loop_ana, irg_loop, cls);
-               }
-       }
-
-       return loop_ana;
-}
-
-/**
- * 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 pressure = INT_MAX;
@@ -228,9 +165,6 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
        return pressure;
 }
 
-/**
- * Frees the loop analysis object.
- */
 void be_free_loop_pressure(be_loopana_t *loop_ana)
 {
        del_set(loop_ana->data);