#include "irprog.h"
#include "irloop_t.h"
#include "iredges_t.h"
-#include "phiclass.h"
#include "irbitset.h"
#include "irphase_t.h"
#include "irprintf_t.h"
#include "bemodule.h"
-#include "bearch_t.h"
-#include "benode_t.h"
+#include "bearch.h"
+#include "benode.h"
#include "beutil.h"
#include "beifg_t.h"
#include "beintlive_t.h"
#include "becopystat.h"
#include "belive_t.h"
#include "beinsn_t.h"
-#include "besched_t.h"
+#include "besched.h"
#include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
#include "error.h"
#include "lc_opts.h"
static unsigned style_flags = 0;
static unsigned do_stats = 0;
static cost_fct_t cost_func = co_get_costs_exec_freq;
-static unsigned algo = CO_ALGO_HEUR4;
static int improve = 1;
static const lc_opt_enum_mask_items_t dump_items[] = {
{ NULL, 0 }
};
-static const lc_opt_enum_mask_items_t algo_items[] = {
- { "none", CO_ALGO_NONE },
- { "heur", CO_ALGO_HEUR },
- { "heur2", CO_ALGO_HEUR2 },
- { "heur3", CO_ALGO_HEUR3 },
- { "heur4", CO_ALGO_HEUR4 },
- { "ilp", CO_ALGO_ILP },
- { NULL, 0 }
-};
-
typedef int (*opt_funcptr)(void);
static const lc_opt_enum_func_ptr_items_t cost_func_items[] = {
&style_flags, style_items
};
-static lc_opt_enum_mask_var_t algo_var = {
- &algo, algo_items
-};
-
static lc_opt_enum_func_ptr_var_t cost_func_var = {
(opt_funcptr*) &cost_func, cost_func_items
};
static const lc_opt_table_entry_t options[] = {
- LC_OPT_ENT_ENUM_INT ("algo", "select copy optimization algo", &algo_var),
LC_OPT_ENT_ENUM_FUNC_PTR ("cost", "select a cost function", &cost_func_var),
LC_OPT_ENT_ENUM_MASK ("dump", "dump ifg before or after copy optimization", &dump_var),
LC_OPT_ENT_ENUM_MASK ("style", "dump style for ifg dumping", &style_var),
LC_OPT_ENT_BOOL ("stats", "dump statistics after each optimization", &do_stats),
- LC_OPT_ENT_BOOL ("improve", "run heur3 before if algo can exploit start solutions", &improve),
+ LC_OPT_ENT_BOOL ("improve", "run heur1 before if algo can exploit start solutions", &improve),
LC_OPT_LAST
};
-/* Insert additional options registration functions here. */
-extern void be_co_ilp_register_options(lc_opt_entry_t *grp);
-extern void be_co2_register_options(lc_opt_entry_t *grp);
-extern void be_co3_register_options(lc_opt_entry_t *grp);
+static be_module_list_entry_t *copyopts = NULL;
+static const co_algo_info *selected_copyopt = NULL;
-void be_init_copycoal(void)
+void be_register_copyopt(const char *name, co_algo_info *copyopt)
+{
+ if (selected_copyopt == NULL)
+ selected_copyopt = copyopt;
+ be_add_module_to_list(©opts, name, copyopt);
+}
+
+void be_init_copyopt(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");
lc_opt_entry_t *co_grp = lc_opt_get_grp(chordal_grp, "co");
lc_opt_add_table(co_grp, options);
+ be_add_module_list_opt(co_grp, "algo", "select copy optimization algo",
+ ©opts, (void**) &selected_copyopt);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyopt);
+
+static int void_algo(copy_opt_t *co)
+{
+ (void) co;
+ return 0;
}
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copycoal);
+void be_init_copynone(void)
+{
+ static co_algo_info copyheur = {
+ void_algo, 0
+ };
+
+ be_register_copyopt("none", ©heur);
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copynone);
#undef QUICK_AND_DIRTY_HACK
if (env->ifg)
return be_ifg_connected(env->ifg, a, b);
else
- return values_interfere(env->birg, a, b);
+ return be_values_interfere(env->birg->lv, a, b);
}
co->cls = chordal_env->cls;
co->get_costs = get_costs;
- s1 = get_irp_prog_name();
+ s1 = get_irp_name();
s2 = get_entity_name(get_irg_entity(co->irg));
s3 = chordal_env->cls->name;
len = strlen(s1) + strlen(s2) + strlen(s3) + 5;
static int co_is_optimizable_root(ir_node *irn)
{
const arch_register_req_t *req;
- const arch_register_t *reg;
+ const arch_register_t *reg;
- if (arch_irn_is(irn, ignore))
+ if (arch_irn_is_ignore(irn))
return 0;
reg = arch_get_irn_register(irn);
/* Else insert the argument of the phi to the members of this ou */
DBG((dbg, LEVEL_1, "\t Member: %+F\n", arg));
- if (!arch_irn_is(arg, ignore)) {
- /* Check if arg has occurred at a prior position in the arg/list */
- arg_pos = 0;
- for (o=1; o<unit->node_count; ++o) {
- if (unit->nodes[o] == arg) {
- arg_pos = o;
- break;
- }
- }
+ if (arch_irn_is_ignore(arg))
+ continue;
- if (!arg_pos) { /* a new argument */
- /* insert node, set costs */
- unit->nodes[unit->node_count] = arg;
- unit->costs[unit->node_count] = co->get_costs(co, irn, arg, i);
- unit->node_count++;
- } else { /* arg has occurred before in same phi */
- /* increase costs for existing arg */
- unit->costs[arg_pos] += co->get_costs(co, irn, arg, i);
+ /* Check if arg has occurred at a prior position in the arg/list */
+ arg_pos = 0;
+ for (o=1; o<unit->node_count; ++o) {
+ if (unit->nodes[o] == arg) {
+ arg_pos = o;
+ break;
}
}
+
+ if (!arg_pos) { /* a new argument */
+ /* insert node, set costs */
+ unit->nodes[unit->node_count] = arg;
+ unit->costs[unit->node_count] = co->get_costs(co, irn, arg, i);
+ unit->node_count++;
+ } else { /* arg has occurred before in same phi */
+ /* increase costs for existing arg */
+ unit->costs[arg_pos] += co->get_costs(co, irn, arg, i);
+ }
}
unit->nodes = XREALLOC(unit->nodes, ir_node*, unit->node_count);
unit->costs = XREALLOC(unit->costs, int, unit->node_count);
for (i = 0; (1U << i) <= other; ++i) {
if (other & (1U << i)) {
ir_node *o = get_irn_n(skip_Proj(irn), i);
- if (!arch_irn_is(o, ignore) &&
- !nodes_interfere(co->cenv, irn, o)) {
- ++count;
- }
+ if (arch_irn_is_ignore(o))
+ continue;
+ if (nodes_interfere(co->cenv, irn, o))
+ continue;
+ ++count;
}
}
for (i = 0; 1U << i <= other; ++i) {
if (other & (1U << i)) {
ir_node *o = get_irn_n(skip_Proj(irn), i);
- if (!arch_irn_is(o, ignore) &&
+ if (!arch_irn_is_ignore(o) &&
!nodes_interfere(co->cenv, irn, o)) {
unit->nodes[k] = o;
unit->costs[k] = co->get_costs(co, irn, o, -1);
/* if we did not find n2 in n1's neighbourhood insert it */
if (allocnew) {
- nbr = obstack_alloc(&co->obst, sizeof(*nbr));
+ nbr = OALLOC(&co->obst, neighb_t);
nbr->irn = n2;
nbr->costs = 0;
nbr->next = node->neighbours;
int pos, max;
const arch_register_t *reg;
- if (req->cls != co->cls || arch_irn_is(irn, ignore))
+ if (req->cls != co->cls || arch_irn_is_ignore(irn))
return;
reg = arch_get_irn_register(irn);
for (i = 0; 1U << i <= other; ++i) {
if (other & (1U << i)) {
ir_node *other = get_irn_n(skip_Proj(irn), i);
- if (!arch_irn_is(other, ignore))
+ if (!arch_irn_is_ignore(other))
add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
}
}
n = n_regs;
be_ifg_foreach_node(ifg, it, irn) {
- if (!arch_irn_is(irn, ignore))
- node_map[get_irn_idx(irn)] = n++;
+ if (arch_irn_is_ignore(irn))
+ continue;
+ node_map[get_irn_idx(irn)] = n++;
}
fprintf(f, "%d %d\n", n, n_regs);
be_ifg_foreach_node(ifg, it, irn) {
- if (!arch_irn_is(irn, ignore)) {
+ if (!arch_irn_is_ignore(irn)) {
int idx = node_map[get_irn_idx(irn)];
affinity_node_t *a = get_affinity_info(co, irn);
const arch_register_req_t *req = arch_get_register_req_out(irn);
}
be_ifg_foreach_neighbour(ifg, nit, irn, adj) {
- if (!arch_irn_is(adj, ignore) &&
+ if (!arch_irn_is_ignore(adj) &&
!co_dump_appel_disjoint_constraints(co, irn, adj)) {
int adj_idx = node_map[get_irn_idx(adj)];
if(idx < adj_idx)
neighb_t *n;
co_gs_foreach_neighb(a, n) {
- if (!arch_irn_is(n->irn, ignore)) {
+ if (!arch_irn_is_ignore(n->irn)) {
int n_idx = node_map[get_irn_idx(n->irn)];
if(idx < n_idx)
fprintf(f, "%d %d %d\n", idx, n_idx, (int) n->costs);
static int ifg_is_dump_node(void *self, ir_node *irn)
{
(void)self;
- return !arch_irn_is(irn, ignore);
+ return !arch_irn_is_ignore(irn);
}
static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)
(void) opt;
}
-static int void_algo(copy_opt_t *co)
-{
- (void) co;
- return 0;
-}
-
-/*
- _ _ _ _ _
- / \ | | __ _ ___ _ __(_) |_| |__ _ __ ___ ___
- / _ \ | |/ _` |/ _ \| '__| | __| '_ \| '_ ` _ \/ __|
- / ___ \| | (_| | (_) | | | | |_| | | | | | | | \__ \
- /_/ \_\_|\__, |\___/|_| |_|\__|_| |_|_| |_| |_|___/
- |___/
-*/
-
-typedef struct {
- co_algo_t *algo;
- const char *name;
- int can_improve_existing;
-} co_algo_info_t;
-
-static co_algo_info_t algos[] = {
- { void_algo, "none", 0 },
- { co_solve_heuristic, "heur1", 0 },
- { co_solve_heuristic_new, "heur2", 0 },
-#ifdef WITH_JVM
- { co_solve_heuristic_java, "heur3", 0 },
-#else
- { NULL, "heur3", 0 },
-#endif
- { co_solve_heuristic_mst, "heur4", 0 },
-#ifdef WITH_ILP
- { co_solve_ilp2, "ilp", 1 },
-#else
- { NULL, "ilp", 1 },
-#endif
- { NULL, "", 0 }
-};
-
/*
__ __ _ ____ _
| \/ | __ _(_)_ __ | _ \ _ __(_)_ _____ _ __
void co_driver(be_chordal_env_t *cenv)
{
- ir_timer_t *timer = ir_timer_register("firm.be.copyopt", "runtime");
+ ir_timer_t *timer = ir_timer_new();
co_complete_stats_t before, after;
copy_opt_t *co;
- co_algo_t *algo_func;
int was_optimal = 0;
- if (algo >= CO_ALGO_LAST)
+ assert(selected_copyopt);
+
+ /* skip copymin if algo is 'none' */
+ if(selected_copyopt->copyopt == void_algo)
return;
be_liveness_assure_chk(be_get_birg_liveness(cenv->birg));
fclose(f);
}
- /* if the algo can improve results, provide an initial solution with heur3 */
- if (improve && algos[algo].can_improve_existing) {
+ /* if the algo can improve results, provide an initial solution with heur1 */
+ if (improve && selected_copyopt->can_improve_existing) {
co_complete_stats_t stats;
/* produce a heuristic solution */
-#ifdef WITH_JVM
- co_solve_heuristic_java(co);
-#else
co_solve_heuristic(co);
-#endif /* WITH_JVM */
/* do the stats and provide the current costs */
co_complete_stats(co, &stats);
be_stat_ev_ull("co_prepare_costs", stats.costs);
}
-#ifdef WITH_JVM
- /* start the JVM here so that it does not tamper the timing. */
- if (algo == CO_ALGO_HEUR3)
- be_java_coal_start_jvm();
-#endif /* WITH_JVM */
-
- algo_func = algos[algo].algo;
-
/* perform actual copy minimization */
ir_timer_reset_and_start(timer);
- was_optimal = algo_func(co);
+ was_optimal = selected_copyopt->copyopt(co);
ir_timer_stop(timer);
be_stat_ev("co_time", ir_timer_elapsed_msec(timer));
be_stat_ev_ull("co_optimal", was_optimal);
+ ir_timer_free(timer);
if (dump_flags & DUMP_AFTER) {
FILE *f = my_open(cenv, "", "-after.dot");
projects / libfirm / blobdiff