* Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE.
*/
#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
+#include "config.h"
#endif
#include "execfreq.h"
#include "irprintf_t.h"
#include "bemodule.h"
-#include "bearch.h"
+#include "bearch_t.h"
#include "benode_t.h"
#include "beutil.h"
#include "beifg_t.h"
#define COST_FUNC_LOOP 2
#define COST_FUNC_ALL_ONE 3
-static unsigned dump_flags = 0;
-static unsigned style_flags = 0;
-static unsigned do_stats = 0;
+static unsigned dump_flags = 0;
+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_HEUR2;
-static int improve = 1;
+static unsigned algo = CO_ALGO_HEUR;
+static int improve = 1;
static const lc_opt_enum_mask_items_t dump_items[] = {
{ "before", DUMP_BEFORE },
#ifdef WITH_JVM
{ "heur3", CO_ALGO_HEUR3 },
#endif /* WITH_JVM */
+ { "heur4", CO_ALGO_HEUR4 },
#ifdef WITH_ILP
{ "ilp", CO_ALGO_ILP },
#endif /* WITH_ILP */
static int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b)
{
- if(env->ifg)
+ if (env->ifg)
return be_ifg_connected(env->ifg, a, b);
else
return values_interfere(env->birg->lv, a, b);
/* Else insert the argument of the phi to the members of this ou */
DBG((dbg, LEVEL_1, "\t Member: %+F\n", arg));
- /* Check if arg has occurred at a prior position in the arg/list */
- arg_pos = 0;
- for (o=0; o<unit->node_count; ++o)
- if (unit->nodes[o] == arg) {
- arg_pos = o;
- break;
+ if (! arch_irn_is(co->aenv, 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 (!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 occured before in same phi */
- /* increase costs for existing arg */
- unit->costs[arg_pos] += co->get_costs(co, irn, arg, i);
+ 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 occured 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, unit->node_count * sizeof(*unit->nodes));
/* Src == Tgt of a 2-addr-code instruction */
if (is_2addr_code(req)) {
ir_node *other = get_irn_n(irn, req->other_same);
- if (!nodes_interfere(co->cenv, irn, other)) {
+ if (!arch_irn_is(co->aenv, other, ignore) &&
+ !nodes_interfere(co->cenv, irn, other)) {
unit->nodes = xmalloc(2 * sizeof(*unit->nodes));
unit->costs = xmalloc(2 * sizeof(*unit->costs));
unit->node_count = 2;
arch_get_register_req(co->aenv, irn, -1);
if (is_2addr_code(req)) {
ir_node *other = get_irn_n(irn, req->other_same);
- add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
+ if(!arch_irn_is(co->aenv, other, ignore))
+ add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
}
}
}
}
typedef struct _appel_clique_walker_t {
- phase_t ph;
+ ir_phase ph;
const copy_opt_t *co;
int curr_nr;
int node_count;
#endif
}
-static void *appel_clique_walker_irn_init(phase_t *phase, ir_node *irn, void *old)
+static void *appel_clique_walker_irn_init(ir_phase *phase, ir_node *irn, void *old)
{
appel_block_info_t *res = NULL;
irn = insn->next_insn;
}
- DBG((env->co->cenv->dbg, LEVEL_2, "%+F\n", bl));
+ DBG((dbg, LEVEL_2, "%+F\n", bl));
be_liveness_end_of_block(lv, env->co->aenv, env->co->cls, bl, live);
/* Generate the bad and ugly. */
be_liveness_recompute(lv);
obstack_init(&env.obst);
- phase_init(&env.ph, "appel_clique_dumper", co->irg, PHASE_DEFAULT_GROWTH, appel_clique_walker_irn_init);
+ phase_init(&env.ph, "appel_clique_dumper", co->irg, PHASE_DEFAULT_GROWTH, appel_clique_walker_irn_init, NULL);
env.curr_nr = co->cls->n_regs;
env.co = co;
env.f = f;
*/
typedef struct {
- co_algo_t *algo;
+ co_algo_t *algo;
const char *name;
- int can_improve_existing;
+ 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 },
- { co_solve_heuristic_java, "heur3", 0 },
+ { void_algo, "none", 0 },
+ { co_solve_heuristic, "heur1", 0 },
+ { co_solve_heuristic_new, "heur2", 0 },
+ { co_solve_heuristic_java, "heur3", 0 },
+ { co_solve_heuristic_mst, "heur4", 0 },
#ifdef WITH_ILP
- { co_solve_ilp2, "ilp", 1 },
+ { co_solve_ilp2, "ilp", 1 },
#endif
- { NULL, "", 0 }
+ { NULL, "", 0 }
};
/*
void co_driver(be_chordal_env_t *cenv)
{
- lc_timer_t *timer = lc_timer_register("firm.be.copyopt", "runtime");
+ lc_timer_t *timer = lc_timer_register("firm.be.copyopt", "runtime");
co_complete_stats_t before, after;
- copy_opt_t *co;
- co_algo_t *algo_func;
- int was_optimal = 0;
+ copy_opt_t *co;
+ co_algo_t *algo_func;
+ int was_optimal = 0;
- if(algo < 0 || algo >= CO_ALGO_LAST)
+ if (algo < 0 || algo >= CO_ALGO_LAST)
return;
co = new_copy_opt(cenv, cost_func);
be_stat_ev_ull("co_init_unsat", before.unsatisfied_edges);
/* Dump the interference graph in Appel's format. */
- if(dump_flags & DUMP_APPEL) {
+ if (dump_flags & DUMP_APPEL) {
FILE *f = my_open(cenv, "", ".apl");
co_dump_appel_graph(co, f);
fclose(f);
}
- if(dump_flags & DUMP_BEFORE) {
+ if (dump_flags & DUMP_BEFORE) {
FILE *f = my_open(cenv, "", "-before.dot");
co_dump_ifg_dot(co, f, style_flags);
fclose(f);
}
/* if the algo can improve results, provide an initial solution with heur3 */
- if(improve && algos[algo].can_improve_existing) {
+ if (improve && algos[algo].can_improve_existing) {
co_complete_stats_t stats;
- /* produce a heuristical solution */
+ /* 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);
#ifdef WITH_JVM
/* start the JVM here so that it does not tamper the timing. */
- if(algo == CO_ALGO_HEUR3)
+ if (algo == CO_ALGO_HEUR3)
be_java_coal_start_jvm();
-#endif
+#endif /* WITH_JVM */
algo_func = algos[algo].algo;
+ /* perform actual copy minimization */
lc_timer_reset_and_start(timer);
-
was_optimal = algo_func(co);
-
lc_timer_stop(timer);
- be_stat_ev("co_time", lc_timer_elapsed_msec(timer));
+ be_stat_ev("co_time", lc_timer_elapsed_msec(timer));
be_stat_ev_ull("co_optimal", was_optimal);
- if(dump_flags & DUMP_AFTER) {
+ if (dump_flags & DUMP_AFTER) {
FILE *f = my_open(cenv, "", "-after.dot");
co_dump_ifg_dot(co, f, style_flags);
fclose(f);
co_complete_stats(co, &after);
- if(do_stats) {
+ if (do_stats) {
ulong64 optimizable_costs = after.max_costs - after.inevit_costs;
ulong64 evitable = after.costs - after.inevit_costs;