X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=4052b769e5eea5d789a68acac546797458c11305;hb=7dc49aa9500a289e802d4a23cc25bf6228ad911b;hp=278b5c282a0785fbc8847f4649d59726be39e9f1;hpb=39f3a8dbd0f00f90b7b12a849d1bf7b9c1329479;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index 278b5c282..4052b769e 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.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,9 +24,7 @@ * @date 29.11.2005 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include @@ -36,11 +34,9 @@ #include "list.h" #include "bitset.h" #include "iterator.h" -#include "firm_config.h" -#include -#include -#include +#include "lc_opts.h" +#include "lc_opts_enum.h" #include "ircons_t.h" #include "irmode_t.h" @@ -55,49 +51,44 @@ #include "irnode.h" #include "ircons.h" #include "debug.h" -#include "xmalloc.h" #include "execfreq.h" #include "iredges_t.h" #include "bechordal_t.h" #include "beabi.h" -#include "bejavacoal.h" #include "beutil.h" #include "besched.h" -#include "besched_t.h" +#include "besched.h" #include "belive_t.h" -#include "bearch_t.h" +#include "bearch.h" #include "beifg_t.h" #include "beifg_impl.h" -#include "benode_t.h" +#include "benode.h" #include "bestatevent.h" #include "bestat.h" #include "bemodule.h" #include "be_t.h" #include "bera.h" -#include "beirg_t.h" +#include "beirg.h" -#include "bespillbelady.h" -#include "bespillmorgan.h" #include "bespillslots.h" -#include "bespilloptions.h" +#include "bespill.h" #include "belower.h" -#ifdef WITH_ILP -#include "bespillremat.h" -#endif /* WITH_ILP */ - -#include "bejavacoal.h" #include "becopystat.h" #include "becopyopt.h" #include "bessadestr.h" #include "beverify.h" -#include "benode_t.h" +#include "benode.h" + +#include "bepbqpcoloring.h" static be_ra_chordal_opts_t options = { BE_CH_DUMP_NONE, BE_CH_LOWER_PERM_SWAP, BE_CH_VRFY_WARN, + "", + "" }; typedef struct _post_spill_env_t { @@ -107,20 +98,6 @@ typedef struct _post_spill_env_t { 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 const lc_opt_enum_int_items_t lower_perm_items[] = { { "copy", BE_CH_LOWER_PERM_COPY }, { "swap", BE_CH_LOWER_PERM_SWAP }, @@ -169,10 +146,30 @@ static lc_opt_enum_int_var_t be_ch_vrfy_var = { 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), - { NULL } + LC_OPT_ENT_ENUM_PTR ("verify", "verify options", &be_ch_vrfy_var), + LC_OPT_LAST }; +static be_module_list_entry_t *colorings = NULL; +static const be_ra_chordal_coloring_t *selected_coloring = NULL; + +void be_register_chordal_coloring(const char *name, be_ra_chordal_coloring_t *coloring) +{ + if (selected_coloring == NULL) + selected_coloring = coloring; + + be_add_module_to_list(&colorings, name, coloring); +} + +void be_ra_chordal_coloring(be_chordal_env_t *env) +{ + assert(selected_coloring != NULL); + if(selected_coloring != NULL) { + selected_coloring->allocate(env); + } +} + + static void dump(unsigned mask, ir_graph *irg, const arch_register_class_t *cls, const char *suffix, @@ -190,15 +187,16 @@ static void dump(unsigned mask, ir_graph *irg, } /** - * Checks for every reload if it's user can perform the load on itself. + * Checks for every reload if its user can perform the load on itself. */ -static void memory_operand_walker(ir_node *irn, void *env) { - be_chordal_env_t *cenv = env; - const arch_env_t *aenv = cenv->birg->main_env->arch_env; +static void memory_operand_walker(ir_node *irn, void *env) +{ const ir_edge_t *edge, *ne; ir_node *block; ir_node *spill; + (void)env; + if (! be_is_Reload(irn)) return; @@ -215,8 +213,8 @@ 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)) { - arch_perform_memory_operand(aenv, src, spill, pos); + if (get_nodes_block(src) == block && arch_possible_memory_operand(src, pos)) { + arch_perform_memory_operand(src, spill, pos); } } @@ -231,198 +229,41 @@ static void memory_operand_walker(ir_node *irn, void *env) { /** * Starts a walk for memory operands if supported by the backend. */ -static INLINE void check_for_memory_operands(be_chordal_env_t *chordal_env) { - irg_walk_graph(chordal_env->irg, NULL, memory_operand_walker, chordal_env); -} - -/** - * Sorry for doing stats again... - */ -typedef struct _node_stat_t { - unsigned int n_phis; /**< Phis of the current register class. */ - unsigned int n_mem_phis; /**< Memory Phis (Phis with spill operands). */ - unsigned int n_copies; /**< Copies */ - unsigned int n_perms; /**< Perms */ - unsigned int n_spills; /**< Spill nodes */ - unsigned int n_reloads; /**< Reloads */ -} node_stat_t; - -struct node_stat_walker { - 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) +void check_for_memory_operands(ir_graph *irg) { - struct node_stat_walker *env = data; - const arch_env_t *aenv = env->arch_env; - - 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; - } - - /* 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) { - int i; - - for(i = get_irn_arity(irn) - 1; i >= 0; --i) { - ir_node *op = get_irn_n(irn, i); - - if((is_Phi(op) && bitset_contains_irn(env->mem_phis, op)) || (arch_irn_classify(aenv, op) & arch_irn_class_spill)) { - bitset_add_irn(env->mem_phis, irn); - env->stat->n_mem_phis++; - break; - } - } - } -} - -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.arch_env = birg->main_env->arch_env; - env.mem_phis = bitset_irg_malloc(birg->irg); - env.stat = stat; - env.cls = cls; - irg_walk_graph(birg->irg, NULL, node_stat_walker, &env); - bitset_free(env.mem_phis); -} - -static void insn_count_walker(ir_node *irn, void *data) -{ - int *cnt = data; - - switch(get_irn_opcode(irn)) { - case iro_Proj: - case iro_Phi: - case iro_Start: - case iro_End: - break; - default: - (*cnt)++; - } -} - -static unsigned int count_insns(ir_graph *irg) -{ - int cnt = 0; - irg_walk_graph(irg, insn_count_walker, NULL, &cnt); - return cnt; + irg_walk_graph(irg, NULL, memory_operand_walker, NULL); } -/** - * 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); - - global_ra_timer = &ra_timer; - } -} -#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; \ - } +static be_node_stats_t last_node_stats; /** * 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; - be_irg_t *birg = pse->birg; - 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); - pse->cls = arch_isa_get_reg_class(isa, cls_idx); - chordal_env->cls = pse->cls; + 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] = pse->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(birg, pse->cls, &node_stat); - be_stat_ev("phis_before_spill", node_stat.n_phis); - } -#endif /* FIRM_STATISTICS */ + stat_ev_do(pse->pre_spill_cost = be_estimate_irg_costs(irg, birg->exec_freq)); /* put all ignore registers into the ignore register set. */ be_put_ignore_regs(birg, pse->cls, chordal_env->ignore_colors); - be_pre_spill_prepare_constr(chordal_env); - dump(BE_CH_DUMP_CONSTR, birg->irg, pse->cls, "-constr-pre", dump_ir_block_graph_sched); + BE_TIMER_PUSH(t_ra_constr); + be_pre_spill_prepare_constr(chordal_env->birg, chordal_env->cls); + BE_TIMER_POP(t_ra_constr); -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - pse->pre_spill_cost = be_estimate_irg_costs(birg->irg, - birg->main_env->arch_env, birg->exec_freq); - be_stat_ev_pop(); - } -#endif /* FIRM_STATISTICS */ + dump(BE_CH_DUMP_CONSTR, birg->irg, pse->cls, "-constr-pre", dump_ir_block_graph_sched); } /** @@ -432,113 +273,86 @@ static void post_spill(post_spill_env_t *pse, int iteration) { be_chordal_env_t *chordal_env = &pse->cenv; 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; - node_stat_t node_stat; - int colors_n = arch_register_class_n_regs(chordal_env->cls); + 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) { - -#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_tags[STAT_TAG_CLS] = pse->cls->name; - be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file); - - be_stat_ev_l("spillcosts", (long) spillcosts); - - node_stats(birg, pse->cls, &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 */ + stat_ev_dbl("bechordal_spillcosts", be_estimate_irg_costs(irg, 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_apply); + check_for_memory_operands(irg); if (iteration == 0) { - check_for_memory_operands(chordal_env); be_abi_fix_stack_nodes(birg->abi); } + BE_TIMER_POP(t_ra_spill_apply); - BE_TIMER_PUSH(ra_timer.t_verify); /* verify schedule and register pressure */ + BE_TIMER_PUSH(t_verify); 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) { + } 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(ra_timer.t_verify); + BE_TIMER_POP(t_verify); /* Color the graph. */ - BE_TIMER_PUSH(ra_timer.t_color); - be_ra_chordal_color(chordal_env); - BE_TIMER_POP(ra_timer.t_color); + BE_TIMER_PUSH(t_ra_color); + be_ra_chordal_coloring(chordal_env); + BE_TIMER_POP(t_ra_color); dump(BE_CH_DUMP_CONSTR, irg, pse->cls, "-color", dump_ir_block_graph_sched); /* Create the ifg with the selected flavor */ - BE_TIMER_PUSH(ra_timer.t_ifg); + BE_TIMER_PUSH(t_ra_ifg); chordal_env->ifg = be_create_ifg(chordal_env); - BE_TIMER_POP(ra_timer.t_ifg); + BE_TIMER_POP(t_ra_ifg); -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - be_ifg_stat_t stat; + stat_ev_if { + be_ifg_stat_t stat; + be_node_stats_t node_stats; be_ifg_stat(birg, chordal_env->ifg, &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); + stat_ev_dbl("bechordal_ifg_nodes", stat.n_nodes); + stat_ev_dbl("bechordal_ifg_edges", stat.n_edges); + stat_ev_dbl("bechordal_ifg_comps", stat.n_comps); + + be_collect_node_stats(&node_stats, birg); + be_subtract_node_stats(&node_stats, &last_node_stats); - node_stats(birg, pse->cls, &node_stat); - be_stat_ev("perms_before_coal", node_stat.n_perms); - be_stat_ev("copies_before_coal", node_stat.n_copies); + stat_ev_dbl("bechordal_perms_before_coal", + node_stats[BE_STAT_PERMS]); + stat_ev_dbl("bechordal_copies_before_coal", + node_stats[BE_STAT_COPIES]); } -#endif /* FIRM_STATISTICS */ - /* copy minimization */ - BE_TIMER_PUSH(ra_timer.t_copymin); + BE_TIMER_PUSH(t_ra_copymin); co_driver(chordal_env); - BE_TIMER_POP(ra_timer.t_copymin); + BE_TIMER_POP(t_ra_copymin); dump(BE_CH_DUMP_COPYMIN, irg, pse->cls, "-copymin", dump_ir_block_graph_sched); - BE_TIMER_PUSH(ra_timer.t_ssa); - /* ssa destruction */ + BE_TIMER_PUSH(t_ra_ssa); be_ssa_destruction(chordal_env); - - BE_TIMER_POP(ra_timer.t_ssa); + BE_TIMER_POP(t_ra_ssa); dump(BE_CH_DUMP_SSADESTR, irg, pse->cls, "-ssadestr", dump_ir_block_graph_sched); - BE_TIMER_PUSH(ra_timer.t_verify); 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); } - BE_TIMER_POP(ra_timer.t_verify); - -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - node_stats(birg, pse->cls, &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 */ /* the ifg exists only if there are allocatable regs */ be_ifg_free(chordal_env->ifg); @@ -557,19 +371,17 @@ static void post_spill(post_spill_env_t *pse, int iteration) { */ 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; - 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); - - be_assure_dom_front(birg); + const arch_env_t *arch_env = birg->main_env->arch_env; + ir_graph *irg = birg->irg; + int j; + int m; + be_chordal_env_t chordal_env; + struct obstack obst; + + BE_TIMER_PUSH(t_ra_other); + + BE_TIMER_PUSH(t_ra_prolog); + be_assure_liveness(birg); chordal_env.obst = &obst; @@ -582,46 +394,72 @@ static void be_ra_chordal_main(be_irg_t *birg) 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_collect_node_stats(&last_node_stats, birg); + } 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; + + + stat_ev_ctx_push_str("bechordal_cls", cls->name); + + stat_ev_if { + be_do_stat_reg_pressure(birg, cls); + } memcpy(&pse.cenv, &chordal_env, sizeof(chordal_env)); pse.birg = birg; - pre_spill(isa, j, &pse); + pre_spill(&pse, cls); - BE_TIMER_PUSH(ra_timer.t_spill); - be_do_spill(birg, pse.cls); - 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.cls, "-spill", dump_ir_block_graph_sched); + dump(BE_CH_DUMP_SPILL, irg, pse.cls, "-spill", + dump_ir_block_graph_sched); post_spill(&pse, 0); + + stat_ev_if { + be_node_stats_t node_stats; + + be_collect_node_stats(&node_stats, birg); + be_subtract_node_stats(&node_stats, &last_node_stats); + be_emit_node_stats(&node_stats, "bechordal_"); + + be_copy_node_stats(&last_node_stats, &node_stats); + stat_ev_ctx_pop("bechordal_cls"); + } } } else { post_spill_env_t *pse; - /* the backend has it's own spiller */ - m = arch_isa_get_n_reg_class(isa); + /* the backend has its own spiller */ + m = arch_env_get_n_reg_class(arch_env); - pse = alloca(m * sizeof(pse[0])); + pse = ALLOCAN(post_spill_env_t, m); for (j = 0; j < m; ++j) { memcpy(&pse[j].cenv, &chordal_env, sizeof(chordal_env)); pse[j].birg = birg; - pre_spill(isa, j, &pse[j]); + pre_spill(&pse[j], pse[j].cls); } - BE_TIMER_PUSH(ra_timer.t_spill); + BE_TIMER_PUSH(t_ra_spill); arch_code_generator_spill(birg->cg, birg); - BE_TIMER_POP(ra_timer.t_spill); + 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) { @@ -629,34 +467,40 @@ static void be_ra_chordal_main(be_irg_t *birg) } } - BE_TIMER_PUSH(ra_timer.t_epilog); + BE_TIMER_PUSH(t_verify); + if (chordal_env.opts->vrfy_option == BE_CH_VRFY_WARN) { + be_verify_register_allocation(birg); + } else if(chordal_env.opts->vrfy_option == BE_CH_VRFY_ASSERT) { + assert(be_verify_register_allocation(birg) + && "Register allocation invalid"); + } + BE_TIMER_POP(t_verify); + + 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(&obst, NULL); - be_invalidate_liveness(birg); - BE_TIMER_POP(ra_timer.t_epilog); + be_liveness_invalidate(be_get_birg_liveness(birg)); + BE_TIMER_POP(t_ra_epilog); - BE_TIMER_POP(ra_timer.t_other); - - be_stat_ev("insns_after", count_insns(irg)); - - return; + BE_TIMER_POP(t_ra_other); } -static be_ra_t be_ra_chordal_allocator = { - be_ra_chordal_main, -}; - void be_init_chordal_main(void) { + static be_ra_t be_ra_chordal_allocator = { + be_ra_chordal_main, + }; + + be_register_allocator("chordal", &be_ra_chordal_allocator); + 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"); lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal"); lc_opt_add_table(chordal_grp, be_chordal_options); - - be_register_allocator("chordal", &be_ra_chordal_allocator); + be_add_module_list_opt(chordal_grp, "coloring", "select coloring methode", &colorings, (void**) &selected_coloring); } BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal_main);