X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.c;h=fd020cebfdb6290aac9a2e96b688f4bd9f380cc7;hb=75e3b5fe17402ca27fc671dd404ff958664506b1;hp=c3224c68dd31440ced6f58ed36dfef79de459b8e;hpb=aa89f2a8eee2c5a5b84b6b5377ddc5d57b3aa2e0;p=libfirm diff --git a/ir/be/beifg.c b/ir/be/beifg.c index c3224c68d..fd020cebf 100644 --- a/ir/be/beifg.c +++ b/ir/be/beifg.c @@ -1,10 +1,28 @@ -/** - * @file beifg.c - * @date 18.11.2005 - * @author Sebastian Hack +/* + * Copyright (C) 1995-2007 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. * - * Copyright (C) 2005 Universitaet Karlsruhe - * Released under the GPL + * 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. + */ + +/** + * @file + * @brief Interface for interference graphs. + * @author Sebastian Hack + * @date 18.11.2005 + * @version $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -12,26 +30,11 @@ #include -#ifdef HAVE_MALLOC_H -#include -#endif - -#ifdef __linux__ -#include -#endif /* __linux__ */ - -#ifdef HAVE_ALLOCA_H -#include -#endif - -#ifdef WITH_LIBCORE #include #include #include -#endif /* WITH_LIBCORE */ #include "bitset.h" - #include "irgwalk.h" #include "irnode_t.h" #include "irprintf.h" @@ -39,14 +42,14 @@ #include "irbitset.h" #include "beifg_t.h" #include "beifg_impl.h" -#include "irphase.h" #include "irphase_t.h" -#include "bechordal.h" #include "error.h" +#include "xmalloc.h" #include "becopystat.h" #include "becopyopt.h" #include "beirg_t.h" +#include "bemodule.h" /** Defines values for the ifg performance test */ #define BE_CH_PERFORMANCETEST_MIN_NODES (50) @@ -55,9 +58,9 @@ typedef struct _coloring_t coloring_t; struct _coloring_t { - phase_t ph; + ir_phase ph; const arch_env_t *arch_env; - ir_graph *irg; + ir_graph *irg; }; size_t (be_ifg_nodes_iter_size)(const be_ifg_t *ifg) @@ -75,15 +78,17 @@ size_t (be_ifg_cliques_iter_size)(const be_ifg_t *ifg) return ifg->impl->cliques_iter_size; } -static void *regs_irn_data_init(phase_t *ph, ir_node *irn, void *data) +static void *regs_irn_data_init(ir_phase *ph, ir_node *irn, void *data) { coloring_t *coloring = (coloring_t *) ph; + (void) data; + return (void *) arch_get_irn_register(coloring->arch_env, irn); } coloring_t *coloring_init(coloring_t *c, ir_graph *irg, const arch_env_t *aenv) { - phase_init(&c->ph, "regs_map", irg, PHASE_DEFAULT_GROWTH, regs_irn_data_init); + phase_init(&c->ph, "regs_map", irg, PHASE_DEFAULT_GROWTH, regs_irn_data_init, NULL); c->arch_env = aenv; c->irg = irg; return c; @@ -380,7 +385,6 @@ void be_ifg_check_sorted_to_file(const be_ifg_t *ifg, FILE *f) void be_ifg_check_performance(be_chordal_env_t *chordal_env) { -#ifdef WITH_LIBCORE int tests = BE_CH_PERFORMANCETEST_COUNT; coloring_t coloring; @@ -585,7 +589,6 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env) } chordal_env->ifg = old_if; -#endif /* WITH_LIBCORE */ } void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump_dot_cb_t *cb, void *self) @@ -637,33 +640,33 @@ void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump bitset_free(nodes); } -static void int_comp_rec(const be_chordal_env_t *cenv, ir_node *n, bitset_t *seen) +static void int_comp_rec(be_irg_t *birg, be_ifg_t *ifg, ir_node *n, bitset_t *seen) { - void *neigh_it = be_ifg_neighbours_iter_alloca(cenv->ifg); + void *neigh_it = be_ifg_neighbours_iter_alloca(ifg); ir_node *m; - be_ifg_foreach_neighbour(cenv->ifg, neigh_it, n, m) { - if(!bitset_contains_irn(seen, m) && !arch_irn_is(cenv->birg->main_env->arch_env, m, ignore)) { + be_ifg_foreach_neighbour(ifg, neigh_it, n, m) { + if(!bitset_contains_irn(seen, m) && !arch_irn_is(birg->main_env->arch_env, m, ignore)) { bitset_add_irn(seen, m); - int_comp_rec(cenv, m, seen); + int_comp_rec(birg, ifg, m, seen); } } } -static int int_component_stat(const be_chordal_env_t *cenv) +static int int_component_stat(be_irg_t *birg, be_ifg_t *ifg) { - int n_comp = 0; - void *nodes_it = be_ifg_nodes_iter_alloca(cenv->ifg); - bitset_t *seen = bitset_irg_malloc(cenv->irg); + int n_comp = 0; + void *nodes_it = be_ifg_nodes_iter_alloca(ifg); + bitset_t *seen = bitset_irg_malloc(birg->irg); ir_node *n; - be_ifg_foreach_node(cenv->ifg, nodes_it, n) { - if(!bitset_contains_irn(seen, n) && !arch_irn_is(cenv->birg->main_env->arch_env, n, ignore)) { + be_ifg_foreach_node(ifg, nodes_it, n) { + if (! bitset_contains_irn(seen, n) && ! arch_irn_is(birg->main_env->arch_env, n, ignore)) { ++n_comp; bitset_add_irn(seen, n); - int_comp_rec(cenv, n, seen); + int_comp_rec(birg, ifg, n, seen); } } @@ -671,24 +674,24 @@ static int int_component_stat(const be_chordal_env_t *cenv) return n_comp; } -void be_ifg_stat(const be_chordal_env_t *cenv, be_ifg_stat_t *stat) +void be_ifg_stat(be_irg_t *birg, be_ifg_t *ifg, be_ifg_stat_t *stat) { - void *nodes_it = be_ifg_nodes_iter_alloca(cenv->ifg); - void *neigh_it = be_ifg_neighbours_iter_alloca(cenv->ifg); - bitset_t *nodes = bitset_irg_malloc(cenv->irg); - - ir_node *n, *m; + void *nodes_it = be_ifg_nodes_iter_alloca(ifg); + void *neigh_it = be_ifg_neighbours_iter_alloca(ifg); + bitset_t *nodes = bitset_irg_malloc(birg->irg); + ir_node *n, *m; memset(stat, 0, sizeof(stat[0])); - be_ifg_foreach_node(cenv->ifg, nodes_it, n) { + + be_ifg_foreach_node(ifg, nodes_it, n) { stat->n_nodes += 1; - be_ifg_foreach_neighbour(cenv->ifg, neigh_it, n, m) { + be_ifg_foreach_neighbour(ifg, neigh_it, n, m) { bitset_add_irn(nodes, n); stat->n_edges += !bitset_contains_irn(nodes, m); } } - stat->n_comps = int_component_stat(cenv); + stat->n_comps = int_component_stat(birg, ifg); bitset_free(nodes); } @@ -719,7 +722,7 @@ static lc_opt_enum_int_var_t ifg_flavor_var = { static const lc_opt_table_entry_t be_ifg_options[] = { LC_OPT_ENT_ENUM_PTR ("ifg", "interference graph flavour", &ifg_flavor_var), - { NULL } + LC_OPT_LAST }; void be_init_ifg(void)