X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopystat.c;h=d2f794c1046d2d18dee3b62a9333ff483bba7419;hb=9bb328756235509a74ffb9c3fcbfac86d9c409f1;hp=a8a74a63e7ddfd8a46e9f911b7686d13cfd80cec;hpb=9e56dbf066d3698df877e2a9f78caeca29ea5a03;p=libfirm diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c index a8a74a63e..d2f794c10 100644 --- a/ir/be/becopystat.c +++ b/ir/be/becopystat.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -24,14 +24,11 @@ * @date 19.04.2005 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include -#include -#include "xmalloc.h" +#include "timing.h" #include "irgraph.h" #include "irgwalk.h" #include "irprog.h" @@ -40,6 +37,7 @@ #include "irnodeset.h" #include "bechordal_t.h" +#include "benode_t.h" #include "beutil.h" #include "becopyopt_t.h" #include "becopystat.h" @@ -140,8 +138,10 @@ void copystat_reset(void) { /** * Collect general data */ -static void irg_stat_walker(ir_node *node, void *env) { - arch_env_t *arch_env = env; +static void irg_stat_walker(ir_node *node, void *env) +{ + (void)env; + curr_vals[I_ALL_NODES]++; /* count all nodes */ if (is_Block(node)) /* count all blocks */ @@ -150,14 +150,15 @@ static void irg_stat_walker(ir_node *node, void *env) { if (is_Reg_Phi(node)) /* collect phis */ ir_nodeset_insert(all_phi_nodes, node); - if (is_Perm_Proj(arch_env, node)) + if (is_Perm_Proj(node)) ir_nodeset_insert(all_copy_nodes, node); /* TODO: Add 2-Addr-Code nodes */ } -static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) { - irg_walk_graph(irg, irg_stat_walker, NULL, arch_env); +static void copystat_collect_irg(ir_graph *irg) +{ + irg_walk_graph(irg, irg_stat_walker, NULL, NULL); last_irg = irg; } @@ -165,7 +166,7 @@ static void copystat_collect_irg(ir_graph *irg, arch_env_t *arch_env) { * @return 1 if the block at pos @p pos removed a critical edge * 0 else */ -static INLINE int was_edge_critical(const ir_node *bl, int pos) { +static inline int was_edge_critical(const ir_node *bl, int pos) { const ir_edge_t *edge; const ir_node *bl_at_pos, *bl_before; assert(is_Block(bl)); @@ -290,32 +291,31 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) { static void copystat_collect_cls(be_chordal_env_t *cenv) { ir_graph *irg = cenv->irg; - arch_env_t *aenv = cenv->birg->main_env->arch_env; ir_node *n, **pc; phi_classes_t *pc_obj; pset *all_phi_classes; ir_nodeset_iterator_t iter; copystat_reset(); - copystat_collect_irg(irg, aenv); + copystat_collect_irg(irg); /* compute the Phi classes of the collected Phis */ pc_obj = phi_class_new_from_set(cenv->irg, all_phi_nodes, 0); all_phi_classes = get_all_phi_classes(pc_obj); foreach_ir_nodeset(all_phi_nodes, n, iter) { - if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls) + if (arch_get_irn_reg_class_out(n) == cenv->cls) stat_phi_node(cenv, n); } foreach_ir_nodeset(all_copy_nodes, n, iter) { - if (arch_get_irn_reg_class(aenv, n, -1) == cenv->cls) + if (arch_get_irn_reg_class_out(n) == cenv->cls) stat_copy_node(cenv, n); } foreach_pset(all_phi_classes, pc) { ir_node *member = pc[0]; - if (arch_get_irn_reg_class(aenv, member, -1) == cenv->cls) + if (arch_get_irn_reg_class_out(member) == cenv->cls) stat_phi_class(cenv, pc); } @@ -442,7 +442,6 @@ void copystat_dump_pretty(ir_graph *irg) { * Used to get dependable and comparable benchmark results. */ typedef struct color_saver { - arch_env_t *arch_env; be_chordal_env_t *chordal_env; pmap *saved_colors; int flag; /* 0 save, 1 load */ @@ -450,13 +449,13 @@ typedef struct color_saver { static void save_load(ir_node *irn, void *env) { color_save_t *saver = env; - if (saver->chordal_env->cls == arch_get_irn_reg_class(saver->arch_env, irn, -1)) { + if (saver->chordal_env->cls == arch_get_irn_reg_class_out(irn)) { if (saver->flag == 0) { /* save */ - const arch_register_t *reg = arch_get_irn_register(saver->arch_env, irn); + const arch_register_t *reg = arch_get_irn_register(irn); pmap_insert(saver->saved_colors, irn, (void *) reg); } else { /*load */ arch_register_t *reg = pmap_get(saver->saved_colors, irn); - arch_set_irn_register(saver->arch_env, irn, reg); + arch_set_irn_register(irn, reg); } } } @@ -478,7 +477,7 @@ static void load_colors(color_save_t *color_saver) { */ void co_compare_solvers(be_chordal_env_t *chordal_env) { copy_opt_t *co; - lc_timer_t *timer; + ir_timer_t *timer; color_save_t saver; int costs_inevit, costs_init, costs_solved, lower_bound; @@ -490,7 +489,6 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) { DBG((dbg, LEVEL_1, "----> CO: %s\n", co->name)); /* save colors */ - saver.arch_env = chordal_env->birg->main_env->arch_env; saver.chordal_env = chordal_env; saver.saved_colors = pmap_create(); save_colors(&saver); @@ -509,44 +507,44 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) { copystat_add_max_costs(co_get_max_copy_costs(co)); /* heuristic 1 (Daniel Grund) */ - timer = lc_timer_register("heur1", NULL); - lc_timer_reset_and_start(timer); + timer = ir_timer_register("heur1", NULL); + ir_timer_reset_and_start(timer); co_solve_heuristic(co); - lc_timer_stop(timer); + ir_timer_stop(timer); costs_solved = co_get_copy_costs(co); DBG((dbg, LEVEL_1, "HEUR1 costs: %3d\n", costs_solved)); - copystat_add_heur_time(lc_timer_elapsed_msec(timer)); + copystat_add_heur_time(ir_timer_elapsed_msec(timer)); copystat_add_heur_costs(costs_solved); assert(lower_bound <= costs_solved); /* heuristic 2 (Sebastian Hack) */ - timer = lc_timer_register("heur2", NULL); - lc_timer_reset_and_start(timer); + timer = ir_timer_register("heur2", NULL); + ir_timer_reset_and_start(timer); co_solve_heuristic_new(co); - lc_timer_stop(timer); + ir_timer_stop(timer); costs_solved = co_get_copy_costs(co); DBG((dbg, LEVEL_1, "HEUR2 costs: %3d\n", costs_solved)); - copystat_add_heur_time(lc_timer_elapsed_msec(timer)); + copystat_add_heur_time(ir_timer_elapsed_msec(timer)); copystat_add_heur_costs(costs_solved); assert(lower_bound <= costs_solved); /* Park & Moon register coalescing (Kimon Hoffmann) */ - timer = lc_timer_register("park", NULL); - lc_timer_reset_and_start(timer); + timer = ir_timer_register("park", NULL); + ir_timer_reset_and_start(timer); co_solve_park_moon(co); - lc_timer_stop(timer); + ir_timer_stop(timer); costs_solved = co_get_copy_costs(co); DBG((dbg, LEVEL_1, "Park/Moon costs: %3d\n", costs_solved)); - copystat_add_heur_time(lc_timer_elapsed_msec(timer)); + copystat_add_heur_time(ir_timer_elapsed_msec(timer)); copystat_add_heur_costs(costs_solved); assert(lower_bound <= costs_solved);