X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=c44fbe2a103467bdc79c3972be43ac5188455332;hb=a801e68c8aa279117fe7845fb2d4220750131553;hp=4d0070aaed63a248ea1ed96c9d725cdbf1d7fffb;hpb=1779f8a4e0ee93544e4e89bbe91f22c7be4bb568;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index 4d0070aae..c44fbe2a1 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -47,13 +47,9 @@ #include "beconstrperm.h" #include "belower.h" -#define DO_SSADESTR - -#ifdef DO_SSADESTR +#include "becopyoptmain.h" #include "bessadestr.h" #include "becopystat.h" -#include "becopyoptmain.h" -#endif /* DO_SSADESTR */ void be_ra_chordal_check(be_chordal_env_t *chordal_env) { @@ -83,7 +79,7 @@ void be_ra_chordal_check(be_chordal_env_t *chordal_env) { n1_reg = arch_get_irn_register(arch_env, n1); if (!arch_reg_is_allocatable(arch_env, n1, -1, n1_reg)) { - DBG((dbg, 0, "Register assigned to %+F is not allowed\n", n1)); + DBG((dbg, 0, "Register %s assigned to %+F is not allowed\n", n1_reg->name, n1)); // assert(0 && "Register constraint does not hold"); } for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) { @@ -257,6 +253,8 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) be_spill_belady(&chordal_env); } dump(BE_CH_DUMP_SPILL, irg, "-spill", dump_ir_block_graph_sched); + be_liveness(irg); + be_check_pressure(&chordal_env); /* Insert perms before reg-constrained instructions */ be_insert_constr_perms(&chordal_env); @@ -271,21 +269,21 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) /* Build the interference graph. */ chordal_env.ifg = be_ifg_std_new(&chordal_env); + be_ifg_check(chordal_env.ifg); -#ifdef DO_SSADESTR /* copy minimization */ copystat_collect_cls(&chordal_env); be_copy_opt(&chordal_env); dump(BE_CH_DUMP_COPYMIN, irg, "-copymin", dump_ir_block_graph_sched); + be_ra_chordal_check(&chordal_env); /* ssa destruction */ be_ssa_destruction(&chordal_env); + dump(BE_CH_DUMP_SSADESTR, irg, "-ssadestr", dump_ir_block_graph_sched); be_ssa_destruction_check(&chordal_env); be_ra_chordal_check(&chordal_env); - dump(BE_CH_DUMP_SSADESTR, irg, "-ssadestr", dump_ir_block_graph_sched); copystat_dump(irg); -#endif /* DO_SSADESTR */ be_ifg_free(chordal_env.ifg); be_numbering_done(irg); @@ -293,9 +291,7 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) pmap_destroy(chordal_env.border_heads); } -#ifdef DO_SSADESTR lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0); -#endif /* DO_SSADESTR */ be_free_dominance_frontiers(chordal_env.dom_front); obstack_free(&chordal_env.obst, NULL);