X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeloopana.c;h=aae7fae74493d53e763c6fa5e57c0d0490db7382;hb=0ac0b440ce2d239c5e7e7db56b8273559d9a7741;hp=713ce40327b9b5d5af8bf1e13c7ec8b0df27a39a;hpb=ab182d4b9ed44239ab3ff1d08b2f8e14a3699ccf;p=libfirm diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c index 713ce4032..aae7fae74 100644 --- a/ir/be/beloopana.c +++ b/ir/be/beloopana.c @@ -1,20 +1,6 @@ /* - * 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. - * - * 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. */ /** @@ -22,27 +8,27 @@ * @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 { ir_loop *loop; @@ -57,8 +43,8 @@ struct be_loopana_t { 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); @@ -75,10 +61,9 @@ 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(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)); @@ -88,7 +73,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg, max_live = ir_nodeset_size(&live_nodes); sched_foreach_reverse(block, irn) { - int cnt; + size_t cnt; if (is_Phi(irn)) break; @@ -98,14 +83,14 @@ static unsigned be_compute_block_pressure(const ir_graph *irg, 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. @@ -114,11 +99,11 @@ static unsigned be_compute_block_pressure(const ir_graph *irg, 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; @@ -136,13 +121,13 @@ 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; @@ -166,10 +151,7 @@ be_loopana_t *be_new_loop_pressure_cls(ir_graph *irg, 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); @@ -192,16 +174,13 @@ be_loopana_t *be_new_loop_pressure(ir_graph *irg, loop_ana->data = new_set(cmp_loop_info, 16); 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 +204,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 +223,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");