#include "belive_t.h"
#include "beinsn_t.h"
#include "besched_t.h"
+#include "benodesets.h"
+#include "bestatevent.h"
#define DUMP_BEFORE 1
#define DUMP_AFTER 2
};
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 },
be_co2_register_options(co_grp);
be_co3_register_options(co_grp);
+#ifdef WITH_ILP
be_co_ilp_register_options(co_grp);
+#endif
}
#endif
int d = get_loop_depth(loop);
cost = d*d;
}
- return cost+1;
+ return 1+cost;
}
int co_get_costs_exec_freq(const copy_opt_t *co, ir_node *root, ir_node* arg, int pos) {
+ int res;
ir_node *root_bl = get_nodes_block(root);
ir_node *copy_bl = is_Phi(root) ? get_Block_cfgpred_block(root_bl, pos) : root_bl;
- unsigned long freq = get_block_execfreq_ulong(co->cenv->exec_freq, copy_bl);
- return freq > 0 ? (int) freq : 1;
+ res = get_block_execfreq_ulong(co->cenv->exec_freq, copy_bl);
+
+ /* don't allow values smaller than one. */
+ return res < 1 ? 1 : res;
}
-int co_get_costs_all_one(const copy_opt_t *co, ir_node *root, ir_node* arg, int pos) {
+int co_get_costs_all_one(const copy_opt_t *co, ir_node *root, ir_node *arg, int pos) {
return 1;
}
return res;
}
+void co_complete_stats(const copy_opt_t *co, co_complete_stats_t *stat)
+{
+ bitset_t *seen = bitset_irg_malloc(co->irg);
+ affinity_node_t *an;
+
+ memset(stat, 0, sizeof(stat[0]));
+
+ /* count affinity edges. */
+ co_gs_foreach_aff_node(co, an) {
+ neighb_t *neigh;
+ stat->aff_nodes += 1;
+ bitset_add_irn(seen, an->irn);
+ co_gs_foreach_neighb(an, neigh) {
+ if(!bitset_contains_irn(seen, neigh->irn)) {
+ stat->aff_edges += 1;
+ stat->max_costs += neigh->costs;
+
+ if(get_irn_col(co, an->irn) != get_irn_col(co, neigh->irn)) {
+ stat->costs += neigh->costs;
+ stat->unsatisfied_edges += 1;
+ }
+
+ if(nodes_interfere(co->cenv, an->irn, neigh->irn)) {
+ stat->aff_int += 1;
+ stat->inevit_costs += neigh->costs;
+ }
+
+ }
+ }
+ }
+
+ bitset_free(seen);
+}
+
/******************************************************************************
_____ _ _____ _
/ ____| | | / ____| |
new_node.irn = n1;
new_node.degree = 0;
new_node.neighbours = NULL;
- node = set_insert(co->nodes, &new_node, sizeof(new_node), HASH_PTR(new_node.irn));
+ node = set_insert(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
allocnew = 1;
for (nbr = node->neighbours; nbr; nbr = nbr->next)
ASSERT_GS_AVAIL(co);
new_node.irn = irn;
- n = set_find(co->nodes, &new_node, sizeof(new_node), HASH_PTR(new_node.irn));
+ n = set_find(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
if (n) {
return (n->degree > 0);
} else
if(!arch_irn_is(co->aenv, n->irn, ignore)) {
int n_idx = PTR_TO_INT(get_irn_link(n->irn));
if(idx < n_idx)
- fprintf(f, "%d %d %d\n", idx, n_idx, n->costs);
+ fprintf(f, "%d %d %d\n", idx, n_idx, (int) n->costs);
}
}
}
for(j = 0, n = get_Block_n_cfgpreds(bl); j < n; ++j) {
ir_node *pred = get_Block_cfgpred_block(bl, j);
- appel_block_info_t *pred_bli = phase_get_irn_data(&env->ph, pred);
int nr = appel_get_live_end_nr(env, pred, irn);
assert(nr >= 0);
for(j = 0, n = get_Block_n_cfgpreds(bl); j < n; ++j) {
ir_node *pred = get_Block_cfgpred_block(bl, j);
- appel_block_info_t *pred_bli = phase_get_irn_data(&env->ph, pred);
ir_node *op = get_irn_n(irn, j);
int nr = appel_get_live_end_nr(env, pred, op);
}
else
- fprintf(f, "label=\"\"" );
+ fprintf(f, "label=\"\" shape=point " );
if(env->flags & CO_IFG_DUMP_SHAPE)
fprintf(f, "shape=%s ", limited ? "diamond" : "ellipse");
co_gs_foreach_neighb(a, n) {
const arch_register_t *nr = arch_get_irn_register(env->co->aenv, n->irn);
- int nidx = get_irn_idx(n->irn);
+ unsigned nidx = get_irn_idx(n->irn);
if(aidx < nidx) {
const char *color = nr == ar ? "blue" : "red";
if(env->flags & CO_IFG_DUMP_COLORS)
fprintf(file, "color=%s ", color);
else
- fprintf(file, "style=dashed");
+ fprintf(file, "style=dotted");
fprintf(file, "];\n");
}
}
}
-static void void_algo(copy_opt_t *co)
+static int void_algo(copy_opt_t *co)
{
+ return 0;
}
/*
co_solve_heuristic,
co_solve_heuristic_new,
co_solve_heuristic_java,
+#ifdef WITH_ILP
co_solve_ilp2
+#endif
};
/*
void co_driver(be_chordal_env_t *cenv)
{
+ co_complete_stats_t before, after;
copy_opt_t *co;
co_algo_t *algo_func;
co = new_copy_opt(cenv, cost_func);
co_build_ou_structure(co);
co_build_graph_structure(co);
- if(do_stats) {
- ir_printf("%30F %10s %7d%7d%7d%7d", cenv->irg, cenv->cls->name,
- co_get_max_copy_costs(co), co_get_copy_costs(co),
- co_get_inevit_copy_costs(co), co_get_lower_bound(co));
- }
+
+ co_complete_stats(co, &before);
+
+ be_stat_ev("co_aff_nodes", before.aff_nodes);
+ be_stat_ev("co_aff_edges", before.aff_edges);
+ be_stat_ev("co_max_costs", before.max_costs);
+ be_stat_ev("co_inevit_costs", before.inevit_costs);
+ be_stat_ev("co_aff_int", before.aff_int);
+
+ be_stat_ev("co_init_costs", before.costs);
+ be_stat_ev("co_init_unsat", before.unsatisfied_edges);
/* Dump the interference graph in Appel's format. */
if(dump_flags & DUMP_APPEL) {
fclose(f);
}
+ co_complete_stats(co, &after);
+
if(do_stats) {
- int optimizable_costs = co_get_max_copy_costs(co) - co_get_lower_bound(co);
- int remaining = co_get_copy_costs(co);
- int evitable = remaining - co_get_lower_bound(co);
+ int optimizable_costs = after.max_costs - after.inevit_costs;
+ int evitable = after.costs - after.inevit_costs;
+
+ ir_printf("%30F %10s %10d%10d%10d", cenv->irg, cenv->cls->name, after.max_costs, before.costs, after.inevit_costs);
if(optimizable_costs > 0)
- printf("%5d %5.2f\n", remaining, (evitable * 100.0) / optimizable_costs);
+ printf("%10d %5.2f\n", after.costs, (evitable * 100.0) / optimizable_costs);
else
- printf("%5d %5s\n", remaining, "-");
+ printf("%10d %5s\n", after.costs, "-");
}
+ be_stat_ev("co_after_costs", after.costs);
+ be_stat_ev("co_after_unsat", after.unsatisfied_edges);
+
co_free_graph_structure(co);
co_free_ou_structure(co);
free_copy_opt(co);
projects / libfirm / blobdiff