X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=28dce51a3a7c8f7e3f5601b07aaa80d7b4b4f5e0;hb=5cb14f12bacb0c7d1c646112b4660d57e14236a2;hp=a23db97be9dd8997527ded9a3b345b290d35ca44;hpb=38ec686ad6d9f036566225c0ceb7d8d0c8a25cd1;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index a23db97be..28dce51a3 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -1,18 +1,34 @@ -/** - * @file bechordal_main.c - * @date 29.11.2005 - * @author Sebastian Hack - * @cvs-id $Id$ +/* + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. * - * Copyright (C) 2005-2006 Universitaet Karlsruhe - * Released under the GPL + * 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. * - * Driver for the chordal register allocator. + * 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 Driver for the chordal register allocator. + * @author Sebastian Hack + * @date 29.11.2005 + * @version $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include #include #include "obst.h" @@ -22,11 +38,8 @@ #include "iterator.h" #include "firm_config.h" -#ifdef WITH_LIBCORE -#include -#include -#include -#endif /* WITH_LIBCORE */ +#include "lc_opts.h" +#include "lc_opts_enum.h" #include "ircons_t.h" #include "irmode_t.h" @@ -43,6 +56,7 @@ #include "debug.h" #include "xmalloc.h" #include "execfreq.h" +#include "iredges_t.h" #include "bechordal_t.h" #include "beabi.h" @@ -51,16 +65,17 @@ #include "besched.h" #include "besched_t.h" #include "belive_t.h" -#include "bearch.h" +#include "bearch_t.h" #include "beifg_t.h" #include "beifg_impl.h" #include "benode_t.h" #include "bestatevent.h" #include "bestat.h" #include "bemodule.h" +#include "be_t.h" +#include "bera.h" +#include "beirg_t.h" -#include "bespillbelady.h" -#include "bespillmorgan.h" #include "bespillslots.h" #include "bespilloptions.h" #include "belower.h" @@ -80,29 +95,18 @@ static be_ra_chordal_opts_t options = { BE_CH_DUMP_NONE, BE_CH_LOWER_PERM_SWAP, BE_CH_VRFY_WARN, + "", + "" }; -/** Enable extreme live range splitting. */ -static int be_elr_split = 0; - typedef struct _post_spill_env_t { - be_chordal_env_t cenv; - double pre_spill_cost; + be_chordal_env_t cenv; + be_irg_t *birg; + const arch_register_class_t *cls; + double pre_spill_cost; } post_spill_env_t; -static be_ra_timer_t ra_timer = { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; +static be_options_t *main_opts; static const lc_opt_enum_int_items_t lower_perm_items[] = { { "copy", BE_CH_LOWER_PERM_COPY }, @@ -115,6 +119,7 @@ static const lc_opt_enum_int_items_t lower_perm_stat_items[] = { }; static const lc_opt_enum_int_items_t dump_items[] = { + { "none", BE_CH_DUMP_NONE }, { "spill", BE_CH_DUMP_SPILL }, { "live", BE_CH_DUMP_LIVE }, { "color", BE_CH_DUMP_COLOR }, @@ -152,8 +157,7 @@ static const lc_opt_table_entry_t be_chordal_options[] = { LC_OPT_ENT_ENUM_PTR ("perm", "perm lowering options", &lower_perm_var), LC_OPT_ENT_ENUM_MASK("dump", "select dump phases", &dump_var), LC_OPT_ENT_ENUM_PTR ("vrfy", "verify options", &be_ch_vrfy_var), - LC_OPT_ENT_BOOL ("elrsplit", "enable extreme live range splitting", &be_elr_split), - { NULL } + LC_OPT_LAST }; static void dump(unsigned mask, ir_graph *irg, @@ -199,7 +203,6 @@ static void memory_operand_walker(ir_node *irn, void *env) { assert(src && "outedges broken!"); if (get_nodes_block(src) == block && arch_possible_memory_operand(aenv, src, pos)) { - DBG((cenv->dbg, LEVEL_3, "performing memory operand %+F at %+F\n", irn, src)); arch_perform_memory_operand(aenv, src, spill, pos); } } @@ -208,6 +211,7 @@ static void memory_operand_walker(ir_node *irn, void *env) { if (get_irn_n_edges(irn) == 0) { sched_remove(irn); set_irn_n(irn, be_pos_Reload_mem, new_Bad()); + set_irn_n(irn, be_pos_Reload_frame, new_Bad()); } } @@ -231,37 +235,39 @@ typedef struct _node_stat_t { } node_stat_t; struct node_stat_walker { - node_stat_t *stat; - const be_chordal_env_t *cenv; - bitset_t *mem_phis; + node_stat_t *stat; + const arch_env_t *arch_env; + bitset_t *mem_phis; + const arch_register_class_t *cls; }; static void node_stat_walker(ir_node *irn, void *data) { - struct node_stat_walker *env = data; - const arch_env_t *aenv = env->cenv->birg->main_env->arch_env; + struct node_stat_walker *env = data; + const arch_env_t *aenv = env->arch_env; - if(arch_irn_consider_in_reg_alloc(aenv, env->cenv->cls, irn)) { + if (arch_irn_consider_in_reg_alloc(aenv, env->cls, irn)) { /* if the node is a normal phi */ if(is_Phi(irn)) env->stat->n_phis++; - else if(arch_irn_classify(aenv, irn) & arch_irn_class_spill) - ++env->stat->n_spills; - - else if(arch_irn_classify(aenv, irn) & arch_irn_class_reload) - ++env->stat->n_reloads; - - else if(arch_irn_classify(aenv, irn) & arch_irn_class_copy) - ++env->stat->n_copies; - - else if(arch_irn_classify(aenv, irn) & arch_irn_class_perm) - ++env->stat->n_perms; + else { + arch_irn_class_t classify = arch_irn_classify(aenv, irn); + + if(classify & arch_irn_class_spill) + ++env->stat->n_spills; + if(classify & arch_irn_class_reload) + ++env->stat->n_reloads; + if(classify & arch_irn_class_copy) + ++env->stat->n_copies; + if(classify & arch_irn_class_perm) + ++env->stat->n_perms; + } } /* a mem phi is a PhiM with a mem phi operand or a Spill operand */ - else if(is_Phi(irn) && get_irn_mode(irn) == mode_M) { + /*else*/ if(is_Phi(irn) && get_irn_mode(irn) == mode_M) { int i; for(i = get_irn_arity(irn) - 1; i >= 0; --i) { @@ -276,15 +282,16 @@ static void node_stat_walker(ir_node *irn, void *data) } } -static void node_stats(const be_chordal_env_t *cenv, node_stat_t *stat) +static void node_stats(be_irg_t *birg, const arch_register_class_t *cls, node_stat_t *stat) { struct node_stat_walker env; memset(stat, 0, sizeof(stat[0])); - env.cenv = cenv; - env.mem_phis = bitset_irg_malloc(cenv->irg); + env.arch_env = birg->main_env->arch_env; + env.mem_phis = bitset_irg_malloc(birg->irg); env.stat = stat; - irg_walk_graph(cenv->irg, NULL, node_stat_walker, &env); + env.cls = cls; + irg_walk_graph(birg->irg, NULL, node_stat_walker, &env); bitset_free(env.mem_phis); } @@ -310,214 +317,150 @@ static unsigned int count_insns(ir_graph *irg) return cnt; } -#ifdef WITH_LIBCORE -/** - * Initialize all timers. - */ -static void be_init_timer(be_options_t *main_opts) -{ - if (main_opts->timing == BE_TIME_ON) { - ra_timer.t_prolog = lc_timer_register("ra_prolog", "regalloc prolog"); - ra_timer.t_epilog = lc_timer_register("ra_epilog", "regalloc epilog"); - ra_timer.t_live = lc_timer_register("ra_liveness", "be liveness"); - ra_timer.t_spill = lc_timer_register("ra_spill", "spiller"); - ra_timer.t_spillslots = lc_timer_register("ra_spillslots", "spillslots"); - ra_timer.t_color = lc_timer_register("ra_color", "graph coloring"); - ra_timer.t_ifg = lc_timer_register("ra_ifg", "interference graph"); - ra_timer.t_copymin = lc_timer_register("ra_copymin", "copy minimization"); - ra_timer.t_ssa = lc_timer_register("ra_ssadestr", "ssa destruction"); - ra_timer.t_verify = lc_timer_register("ra_verify", "graph verification"); - ra_timer.t_other = lc_timer_register("ra_other", "other time"); - - LC_STOP_AND_RESET_TIMER(ra_timer.t_prolog); - LC_STOP_AND_RESET_TIMER(ra_timer.t_epilog); - LC_STOP_AND_RESET_TIMER(ra_timer.t_live); - LC_STOP_AND_RESET_TIMER(ra_timer.t_spill); - LC_STOP_AND_RESET_TIMER(ra_timer.t_spillslots); - LC_STOP_AND_RESET_TIMER(ra_timer.t_color); - LC_STOP_AND_RESET_TIMER(ra_timer.t_ifg); - LC_STOP_AND_RESET_TIMER(ra_timer.t_copymin); - LC_STOP_AND_RESET_TIMER(ra_timer.t_ssa); - LC_STOP_AND_RESET_TIMER(ra_timer.t_verify); - LC_STOP_AND_RESET_TIMER(ra_timer.t_other); - } -} - -#define BE_TIMER_INIT(main_opts) be_init_timer(main_opts) - -#define BE_TIMER_PUSH(timer) \ - if (main_opts->timing == BE_TIME_ON) { \ - if (! lc_timer_push(timer)) { \ - if (options.vrfy_option == BE_CH_VRFY_ASSERT) \ - assert(!"Timer already on stack, cannot be pushed twice."); \ - else if (options.vrfy_option == BE_CH_VRFY_WARN) \ - fprintf(stderr, "Timer %s already on stack, cannot be pushed twice.\n", \ - lc_timer_get_name(timer)); \ - } \ - } -#define BE_TIMER_POP(timer) \ - if (main_opts->timing == BE_TIME_ON) { \ - lc_timer_t *tmp = lc_timer_pop(); \ - if (options.vrfy_option == BE_CH_VRFY_ASSERT) \ - assert(tmp == timer && "Attempt to pop wrong timer."); \ - else if (options.vrfy_option == BE_CH_VRFY_WARN && tmp != timer) \ - fprintf(stderr, "Attempt to pop wrong timer. %s is on stack, trying to pop %s.\n", \ - lc_timer_get_name(tmp), lc_timer_get_name(timer)); \ - timer = tmp; \ - } -#else - -#define BE_TIMER_INIT(main_opts) -#define BE_TIMER_PUSH(timer) -#define BE_TIMER_POP(timer) - -#endif /* WITH_LIBCORE */ - /** * Perform things which need to be done per register class before spilling. */ -static void pre_spill(const arch_isa_t *isa, int cls_idx, post_spill_env_t *pse) { - be_chordal_env_t *chordal_env = &pse->cenv; - node_stat_t node_stat; +static void pre_spill(post_spill_env_t *pse, const arch_register_class_t *cls) +{ + be_chordal_env_t *chordal_env = &pse->cenv; + be_irg_t *birg = pse->birg; + ir_graph *irg = be_get_birg_irg(birg); + const be_main_env_t *main_env = birg->main_env; + node_stat_t node_stat; - chordal_env->cls = arch_isa_get_reg_class(isa, cls_idx); + pse->cls = cls; + chordal_env->cls = cls; chordal_env->border_heads = pmap_create(); chordal_env->ignore_colors = bitset_malloc(chordal_env->cls->n_regs); -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - be_stat_tags[STAT_TAG_CLS] = chordal_env->cls->name; - be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file); + be_assure_liveness(birg); + be_liveness_assure_chk(be_get_birg_liveness(birg)); - /* perform some node statistics. */ - node_stats(chordal_env, &node_stat); - be_stat_ev("phis_before_spill", node_stat.n_phis); - } -#endif /* FIRM_STATISTICS */ + stat_ev_ctx_push_str("bechordal_cls", pse->cls->name); + stat_ev_do(node_stats(birg, pse->cls, &node_stat)); + stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq)); + stat_ev_dbl("phis_before_spill", node_stat.n_phis); /* put all ignore registers into the ignore register set. */ - be_put_ignore_regs(chordal_env->birg, chordal_env->cls, chordal_env->ignore_colors); + be_put_ignore_regs(birg, pse->cls, chordal_env->ignore_colors); + BE_TIMER_PUSH(t_ra_constr); be_pre_spill_prepare_constr(chordal_env); - dump(BE_CH_DUMP_CONSTR, chordal_env->irg, chordal_env->cls, "-constr-pre", dump_ir_block_graph_sched); + BE_TIMER_POP(t_ra_constr); -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - pse->pre_spill_cost = be_estimate_irg_costs(chordal_env->irg, - chordal_env->birg->main_env->arch_env, chordal_env->birg->exec_freq); - } -#endif /* FIRM_STATISTICS */ + dump(BE_CH_DUMP_CONSTR, birg->irg, pse->cls, "-constr-pre", dump_ir_block_graph_sched); + + stat_ev_ctx_pop("bechordal_cls"); } /** * Perform things which need to be done per register class after spilling. */ -static void post_spill(post_spill_env_t *pse) { +static void post_spill(post_spill_env_t *pse, int iteration) { be_chordal_env_t *chordal_env = &pse->cenv; - ir_graph *irg = chordal_env->irg; - be_irg_t *birg = chordal_env->birg; + be_irg_t *birg = pse->birg; + ir_graph *irg = birg->irg; const be_main_env_t *main_env = birg->main_env; - be_options_t *main_opts = main_env->options; - static int splitted = 0; - node_stat_t node_stat; - -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - double spillcosts = be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq) - pse->pre_spill_cost; - - be_stat_ev_l("spillcosts", (long) spillcosts); + node_stat_t node_stat; + int colors_n = arch_register_class_n_regs(chordal_env->cls); + int allocatable_regs = colors_n - be_put_ignore_regs(birg, chordal_env->cls, NULL); + + /* some special classes contain only ignore regs, no work to be done */ + if (allocatable_regs > 0) { + + stat_ev_ctx_push_str("bechordal_cls", pse->cls->name); + stat_ev_do(node_stats(birg, pse->cls, &node_stat)); + stat_ev_dbl("phis_after_spill", node_stat.n_phis); + stat_ev_dbl("mem_phis", node_stat.n_mem_phis); + stat_ev_dbl("reloads", node_stat.n_reloads); + stat_ev_dbl("spills", node_stat.n_spills); + stat_ev_dbl("spillcosts", be_estimate_irg_costs(irg, main_env->arch_env, birg->exec_freq) - pse->pre_spill_cost); + + /* + If we have a backend provided spiller, post spill is + called in a loop after spilling for each register class. + But we only need to fix stack nodes once in this case. + */ + BE_TIMER_PUSH(t_ra_spill); + check_for_memory_operands(chordal_env); + if (iteration == 0) { + be_abi_fix_stack_nodes(birg->abi); + } + BE_TIMER_POP(t_ra_spill); + + BE_TIMER_PUSH(t_verify); + + /* verify schedule and register pressure */ + if (chordal_env->opts->vrfy_option == BE_CH_VRFY_WARN) { + be_verify_schedule(birg); + be_verify_register_pressure(birg, pse->cls, irg); + } else if (chordal_env->opts->vrfy_option == BE_CH_VRFY_ASSERT) { + assert(be_verify_schedule(birg) && "Schedule verification failed"); + assert(be_verify_register_pressure(birg, pse->cls, irg) + && "Register pressure verification failed"); + } + BE_TIMER_POP(t_verify); - node_stats(chordal_env, &node_stat); - be_stat_ev("phis_after_spill", node_stat.n_phis); - be_stat_ev("mem_phis", node_stat.n_mem_phis); - be_stat_ev("reloads", node_stat.n_reloads); - be_stat_ev("spills", node_stat.n_spills); - } -#endif /* FIRM_STATISTICS */ + /* Color the graph. */ + BE_TIMER_PUSH(t_ra_color); + be_ra_chordal_color(chordal_env); + BE_TIMER_POP(t_ra_color); - check_for_memory_operands(chordal_env); + dump(BE_CH_DUMP_CONSTR, irg, pse->cls, "-color", dump_ir_block_graph_sched); - be_abi_fix_stack_nodes(birg->abi, birg->lv); + /* Create the ifg with the selected flavor */ + BE_TIMER_PUSH(t_ra_ifg); + chordal_env->ifg = be_create_ifg(chordal_env); + BE_TIMER_POP(t_ra_ifg); - BE_TIMER_PUSH(ra_timer.t_verify); + { + be_ifg_stat_t stat; - /* verify schedule and register pressure */ - if (chordal_env->opts->vrfy_option == BE_CH_VRFY_WARN) { - be_verify_schedule(irg); - be_verify_register_pressure(chordal_env->birg, chordal_env->cls, irg); - } - else if (chordal_env->opts->vrfy_option == BE_CH_VRFY_ASSERT) { - assert(be_verify_schedule(irg) && "Schedule verification failed"); - assert(be_verify_register_pressure(chordal_env->birg, chordal_env->cls, irg) - && "Register pressure verification failed"); - } - BE_TIMER_POP(ra_timer.t_verify); + stat_ev_do(be_ifg_stat(birg, chordal_env->ifg, &stat)); + stat_ev_dbl("ifg_nodes", stat.n_nodes); + stat_ev_dbl("ifg_edges", stat.n_edges); + stat_ev_dbl("ifg_comps", stat.n_comps); - if (be_elr_split && ! splitted) { - extreme_liverange_splitting(chordal_env); - splitted = 1; - } + stat_ev_do(node_stats(birg, pse->cls, &node_stat)); + stat_ev_dbl("perms_before_coal", node_stat.n_perms); + stat_ev_dbl("copies_before_coal", node_stat.n_copies); + } - /* Color the graph. */ - BE_TIMER_PUSH(ra_timer.t_color); - be_ra_chordal_color(chordal_env); - BE_TIMER_POP(ra_timer.t_color); - - dump(BE_CH_DUMP_CONSTR, irg, chordal_env->cls, "-color", dump_ir_block_graph_sched); - - /* Create the ifg with the selected flavor */ - BE_TIMER_PUSH(ra_timer.t_ifg); - chordal_env->ifg = be_create_ifg(chordal_env); - BE_TIMER_POP(ra_timer.t_ifg); - -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - be_ifg_stat_t stat; - be_ifg_stat(chordal_env, &stat); - be_stat_ev("ifg_nodes", stat.n_nodes); - be_stat_ev("ifg_edges", stat.n_edges); - be_stat_ev("ifg_comps", stat.n_comps); - - node_stats(chordal_env, &node_stat); - be_stat_ev("perms_before_coal", node_stat.n_perms); - be_stat_ev("copies_before_coal", node_stat.n_copies); - } -#endif /* FIRM_STATISTICS */ + /* copy minimization */ + BE_TIMER_PUSH(t_ra_copymin); + co_driver(chordal_env); + BE_TIMER_POP(t_ra_copymin); - /* copy minimization */ - BE_TIMER_PUSH(ra_timer.t_copymin); - co_driver(chordal_env); - BE_TIMER_POP(ra_timer.t_copymin); + dump(BE_CH_DUMP_COPYMIN, irg, pse->cls, "-copymin", dump_ir_block_graph_sched); - dump(BE_CH_DUMP_COPYMIN, irg, chordal_env->cls, "-copymin", dump_ir_block_graph_sched); - BE_TIMER_PUSH(ra_timer.t_ssa); + /* ssa destruction */ + BE_TIMER_PUSH(t_ra_ssa); + stat_ev_ctx_push_str("berachordal_phase", "ssadestr"); + be_ssa_destruction(chordal_env); + stat_ev_ctx_pop("berachordal_phase"); + BE_TIMER_POP(t_ra_ssa); - /* ssa destruction */ - be_ssa_destruction(chordal_env); + dump(BE_CH_DUMP_SSADESTR, irg, pse->cls, "-ssadestr", dump_ir_block_graph_sched); - BE_TIMER_POP(ra_timer.t_ssa); + if (chordal_env->opts->vrfy_option != BE_CH_VRFY_OFF) { + BE_TIMER_PUSH(t_verify); + be_ssa_destruction_check(chordal_env); + BE_TIMER_POP(t_verify); + } - dump(BE_CH_DUMP_SSADESTR, irg, chordal_env->cls, "-ssadestr", dump_ir_block_graph_sched); + stat_ev_do(node_stats(birg, pse->cls, &node_stat)); + stat_ev_dbl("perms_after_coal", node_stat.n_perms); + stat_ev_dbl("copies_after_coal", node_stat.n_copies); + stat_ev_ctx_pop("bechordal_cls"); - BE_TIMER_PUSH(ra_timer.t_verify); - if (chordal_env->opts->vrfy_option != BE_CH_VRFY_OFF) { - be_ssa_destruction_check(chordal_env); + /* the ifg exists only if there are allocatable regs */ + be_ifg_free(chordal_env->ifg); } - BE_TIMER_POP(ra_timer.t_verify); - be_ifg_free(chordal_env->ifg); + /* free some always allocated data structures */ pmap_destroy(chordal_env->border_heads); bitset_free(chordal_env->ignore_colors); - -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - node_stats(chordal_env, &node_stat); - be_stat_ev("perms_after_coal", node_stat.n_perms); - be_stat_ev("copies_after_coal", node_stat.n_copies); - be_stat_ev_pop(); - } -#endif /* FIRM_STATISTICS */ } /** @@ -528,111 +471,112 @@ static void post_spill(post_spill_env_t *pse) { */ static void be_ra_chordal_main(be_irg_t *birg) { - const be_main_env_t *main_env = birg->main_env; - const arch_isa_t *isa = arch_env_get_isa(main_env->arch_env); - ir_graph *irg = birg->irg; - be_options_t *main_opts = main_env->options; + const be_main_env_t *main_env = birg->main_env; + const arch_env_t *arch_env = main_env->arch_env; + ir_graph *irg = birg->irg; int j, m; be_chordal_env_t chordal_env; + struct obstack obst; - BE_TIMER_INIT(main_opts); - BE_TIMER_PUSH(ra_timer.t_other); - BE_TIMER_PUSH(ra_timer.t_prolog); + main_opts = main_env->options; + + BE_TIMER_PUSH(t_ra_other); + + BE_TIMER_PUSH(t_ra_prolog); be_assure_dom_front(birg); be_assure_liveness(birg); - chordal_env.opts = &options; - chordal_env.irg = irg; - chordal_env.birg = birg; - FIRM_DBG_REGISTER(chordal_env.dbg, "firm.be.chordal"); + chordal_env.obst = &obst; + chordal_env.opts = &options; + chordal_env.irg = irg; + chordal_env.birg = birg; + chordal_env.border_heads = NULL; + chordal_env.ifg = NULL; + chordal_env.ignore_colors = NULL; - obstack_init(&chordal_env.obst); + obstack_init(&obst); - BE_TIMER_POP(ra_timer.t_prolog); + BE_TIMER_POP(t_ra_prolog); - be_stat_ev("insns_before", count_insns(irg)); + stat_ev_if { + be_stat_ev("insns_before", count_insns(irg)); + } if (! arch_code_generator_has_spiller(birg->cg)) { /* use one of the generic spiller */ /* Perform the following for each register class. */ - for (j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) { + for (j = 0, m = arch_env_get_n_reg_class(arch_env); j < m; ++j) { post_spill_env_t pse; + const arch_register_class_t *cls + = arch_env_get_reg_class(arch_env, j); + + if(arch_register_class_flags(cls) & arch_register_class_flag_manual_ra) + continue; + memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env)); - pre_spill(isa, j, &pse); + pse.birg = birg; + pre_spill(&pse, cls); - BE_TIMER_PUSH(ra_timer.t_spill); - be_do_spill(&pse.cenv); - BE_TIMER_POP(ra_timer.t_spill); + BE_TIMER_PUSH(t_ra_spill); + be_do_spill(birg, cls); + BE_TIMER_POP(t_ra_spill); - dump(BE_CH_DUMP_SPILL, irg, pse.cenv.cls, "-spill", dump_ir_block_graph_sched); + dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill", + dump_ir_block_graph_sched); - post_spill(&pse); + post_spill(&pse, 0); } - } - else { + } else { post_spill_env_t *pse; /* the backend has it's own spiller */ - m = arch_isa_get_n_reg_class(isa); + m = arch_env_get_n_reg_class(arch_env); pse = alloca(m * sizeof(pse[0])); for (j = 0; j < m; ++j) { memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env)); - pre_spill(isa, j, &pse[j]); + pse[j].birg = birg; + pre_spill(&pse[j], pse[j].cls); } - BE_TIMER_PUSH(ra_timer.t_spill); - arch_code_generator_spill(birg->cg, &chordal_env); - BE_TIMER_POP(ra_timer.t_spill); + BE_TIMER_PUSH(t_ra_spill); + arch_code_generator_spill(birg->cg, birg); + BE_TIMER_POP(t_ra_spill); dump(BE_CH_DUMP_SPILL, irg, NULL, "-spill", dump_ir_block_graph_sched); for (j = 0; j < m; ++j) { - post_spill(&pse[j]); + post_spill(&pse[j], j); } } - BE_TIMER_PUSH(ra_timer.t_spillslots); - - be_coalesce_spillslots(&chordal_env); - dump(BE_CH_DUMP_SPILLSLOTS, irg, NULL, "-spillslots", dump_ir_block_graph_sched); - - BE_TIMER_POP(ra_timer.t_spillslots); - - BE_TIMER_PUSH(ra_timer.t_verify); - /* verify spillslots */ - if (options.vrfy_option == BE_CH_VRFY_WARN) { - be_verify_spillslots(main_env->arch_env, irg); - } - else if (options.vrfy_option == BE_CH_VRFY_ASSERT) { - assert(be_verify_spillslots(main_env->arch_env, irg) && "Spillslot verification failed"); - } - BE_TIMER_POP(ra_timer.t_verify); - - BE_TIMER_PUSH(ra_timer.t_epilog); - dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched); + BE_TIMER_PUSH(t_verify); + be_verify_register_allocation(birg); + BE_TIMER_POP(t_verify); - lower_nodes_after_ra(&chordal_env, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0); + BE_TIMER_PUSH(t_ra_epilog); + lower_nodes_after_ra(birg, options.lower_perm_opt & BE_CH_LOWER_PERM_COPY ? 1 : 0); dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched); - obstack_free(&chordal_env.obst, NULL); - BE_TIMER_POP(ra_timer.t_epilog); - - BE_TIMER_POP(ra_timer.t_other); + obstack_free(&obst, NULL); + be_liveness_invalidate(be_get_birg_liveness(birg)); + BE_TIMER_POP(t_ra_epilog); - be_stat_ev("insns_after", count_insns(irg)); + BE_TIMER_POP(t_ra_other); - return; + stat_ev_if { + be_stat_ev("insns_after", count_insns(irg)); + } } static be_ra_t be_ra_chordal_allocator = { be_ra_chordal_main, }; -void be_init_chordal(void) +void be_init_chordal_main(void) { lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra"); @@ -643,4 +587,4 @@ void be_init_chordal(void) be_register_allocator("chordal", &be_ra_chordal_allocator); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);