#include "bespillbelady.h"
#include "bespillilp.h"
-#include "beconstrperm.h"
#include "belower.h"
-#include "becopyoptmain.h"
+#include "becopyopt.h"
#include "bessadestr.h"
#include "becopystat.h"
void be_ra_chordal_check(be_chordal_env_t *chordal_env) {
firm_dbg_module_t *dbg = chordal_env->dbg;
- const arch_env_t *arch_env = chordal_env->main_env->arch_env;
+ const arch_env_t *arch_env = chordal_env->birg->main_env->arch_env;
struct obstack ob;
pmap_entry *pme;
ir_node **nodes, *n1, *n2;
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);
static be_ra_chordal_opts_t options = {
- BE_CH_DUMP_ALL,
+ BE_CH_DUMP_NONE,
BE_CH_SPILL_BELADY,
BE_CH_COPYMIN_HEUR,
BE_CH_IFG_STD,
{ NULL, 0 }
};
+static const lc_opt_enum_int_items_t dump_items[] = {
+ { "spill", BE_CH_DUMP_SPILL },
+ { "live", BE_CH_DUMP_LIVE },
+ { "color", BE_CH_DUMP_COLOR },
+ { "copymin", BE_CH_DUMP_COPYMIN },
+ { "ssadestr", BE_CH_DUMP_SSADESTR },
+ { "tree", BE_CH_DUMP_TREE_INTV },
+ { "constr", BE_CH_DUMP_CONSTR },
+ { "lower", BE_CH_DUMP_LOWER },
+ { NULL, 0 }
+};
+
static lc_opt_enum_int_var_t spill_var = {
&options.spill_method, spill_items
};
&options.lower_perm_method, lower_perm_items
};
+static lc_opt_enum_int_var_t dump_var = {
+ &options.dump_flags, dump_items
+};
+
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
-static void dump(int mask, ir_graph *irg,
+static void dump(unsigned mask, ir_graph *irg,
const arch_register_class_t *cls,
const char *suffix,
void (*dump_func)(ir_graph *, const char *))
}
}
-static void be_ra_chordal_main(const be_main_env_t *main_env, ir_graph *irg)
+static void be_ra_chordal_main(const be_irg_t *bi)
{
int j, m;
be_chordal_env_t chordal_env;
+ ir_graph *irg = bi->irg;
+ const be_main_env_t *main_env = bi->main_env;
const arch_isa_t *isa = arch_env_get_isa(main_env->arch_env);
compute_doms(irg);
+ chordal_env.opts = &options;
chordal_env.irg = irg;
chordal_env.dbg = firm_dbg_register("firm.be.chordal");
- chordal_env.main_env = main_env;
+ chordal_env.birg = bi;
chordal_env.dom_front = be_compute_dominance_frontiers(irg);
obstack_init(&chordal_env.obst);
/* 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);
be_liveness(irg);
+ dump(BE_CH_DUMP_LIVE, irg, chordal_env.cls, "-live", dump_ir_block_graph_sched);
/* spilling */
switch(options.spill_method) {
be_liveness(irg);
be_check_pressure(&chordal_env);
- /* 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);
-
be_liveness(irg);
- be_numbering(irg);
be_check_pressure(&chordal_env);
/* Color the graph. */
be_ra_chordal_color(&chordal_env);
+ dump(BE_CH_DUMP_CONSTR, irg, chordal_env.cls, "-color", dump_ir_block_graph_sched);
/* Build the interference graph. */
chordal_env.ifg = be_ifg_std_new(&chordal_env);
/* copy minimization */
copystat_collect_cls(&chordal_env);
- be_copy_opt(&chordal_env);
+ co_compare_solvers(&chordal_env);
dump(BE_CH_DUMP_COPYMIN, irg, chordal_env.cls, "-copymin", dump_ir_block_graph_sched);
be_ra_chordal_check(&chordal_env);
copystat_dump(irg);
be_ifg_free(chordal_env.ifg);
- be_numbering_done(irg);
pmap_destroy(chordal_env.border_heads);
}
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);
+ be_free_dominance_frontiers(chordal_env.dom_front);
}
const be_ra_t be_ra_chordal_allocator = {