X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal_main.c;h=38bd67885b039092d7ef3d471603117accca8544;hb=d6b7eed0bb726ee331416c677aa10a80861bfe19;hp=c18835c8a3d696d02c2ef0a608af71a76987a8bb;hpb=7507003420c69d2a84403d07daf26a305c631b43;p=libfirm diff --git a/ir/be/bechordal_main.c b/ir/be/bechordal_main.c index c18835c8a..38bd67885 100644 --- a/ir/be/bechordal_main.c +++ b/ir/be/bechordal_main.c @@ -44,7 +44,6 @@ #include "bespillbelady.h" #include "bespillilp.h" -#include "beconstrperm.h" #include "belower.h" #include "becopyoptmain.h" @@ -80,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 %s assigned to %+F is not allowed\n", n1_reg->name, n1)); -// assert(0 && "Register constraint does not hold"); + assert(0 && "Register constraint does not hold"); } for (o = i+1, n2 = nodes[o]; n2; n2 = nodes[++o]) { n2_reg = arch_get_irn_register(arch_env, n2); @@ -205,9 +204,7 @@ static lc_opt_enum_int_var_t lower_perm_var = { static void be_ra_chordal_register_options(lc_opt_entry_t *grp) { - lc_opt_entry_t *dump; grp = lc_opt_get_grp(grp, "chordal"); - } #endif @@ -237,7 +234,7 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) compute_doms(irg); chordal_env.irg = irg; - chordal_env.dbg = firm_dbg_register("be.chordal"); + chordal_env.dbg = firm_dbg_register("firm.be.chordal"); chordal_env.main_env = main_env; chordal_env.dom_front = be_compute_dominance_frontiers(irg); @@ -245,10 +242,12 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) /* Perform the following for each register class. */ for(j = 0, m = arch_isa_get_n_reg_class(isa); j < m; ++j) { + chordal_env.cls = arch_isa_get_reg_class(isa, j); chordal_env.border_heads = pmap_create(); - chordal_env.cls = arch_isa_get_reg_class(isa, j); + chordal_env.constr_irn = pset_new_ptr(32); be_liveness(irg); + dump(BE_CH_DUMP_LIVE, irg, chordal_env.cls, "-live", dump_ir_block_graph_sched); /* spilling */ switch(options.spill_method) { @@ -266,12 +265,13 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) be_liveness(irg); be_check_pressure(&chordal_env); +#if 0 /* Insert perms before reg-constrained instructions */ be_insert_constr_perms(&chordal_env); dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-constr", dump_ir_block_graph_sched); +#endif be_liveness(irg); - be_numbering(irg); be_check_pressure(&chordal_env); /* Color the graph. */ @@ -297,17 +297,17 @@ static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg) copystat_dump(irg); be_ifg_free(chordal_env.ifg); - be_numbering_done(irg); pmap_destroy(chordal_env.border_heads); + del_pset(chordal_env.constr_irn); } be_compute_spill_offsets(&chordal_env); dump(BE_CH_DUMP_LOWER, irg, NULL, "-spilloff", dump_ir_block_graph_sched); - lower_perms(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0); - dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower", dump_ir_block_graph_sched); + lower_nodes_after_ra(&chordal_env, options.lower_perm_method == BE_CH_LOWER_PERM_COPY ? 1 : 0); + dump(BE_CH_DUMP_LOWER, irg, NULL, "-belower-after-ra", dump_ir_block_graph_sched); be_free_dominance_frontiers(chordal_env.dom_front); obstack_free(&chordal_env.obst, NULL);