/* ilp values */
I_HEUR_TIME, /* solving time in milli seconds */
I_ILP_TIME, /* solving time in milli seconds */
- I_ILP_VARS,
- I_ILP_CSTR,
+ I_ILP_VARS,
+ I_ILP_CSTR,
I_ILP_ITER, /* number of simplex iterations */
/* copy instructions */
arch_env_t *arch_env = env;
curr_vals[I_ALL_NODES]++; /* count all nodes */
- if (is_Block(node)) /* count all blocks */
- curr_vals[I_BLOCKS]++;
+ if (is_Block(node)) /* count all blocks */
+ curr_vals[I_BLOCKS]++;
- if (is_Reg_Phi(node)) /* collect phis */
- pset_insert_ptr(all_phi_nodes, node);
+ if (is_Reg_Phi(node)) /* collect phis */
+ pset_insert_ptr(all_phi_nodes, node);
- if (is_Perm_Proj(arch_env, node))
- pset_insert_ptr(all_copy_nodes, node);
+ if (is_Perm_Proj(arch_env, node))
+ pset_insert_ptr(all_copy_nodes, node);
/* TODO: Add 2-Addr-Code nodes */
}
if (get_irn_arity(bl_at_pos) != 1)
return 0;
- /* Does the pred of the pred have several sucsecessors */
+ /* Does the pred of the pred have several successors */
bl_before = get_irn_n(bl_at_pos, 0);
edge = get_block_succ_first(bl_before);
return get_block_succ_next(bl_before, edge) ? 1 : 0;
FILE *out;
snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
+ buf[sizeof(buf) - 1] = '\0';
out = ffopen(buf, "stat", "wt");
fprintf(out, "%d\n", ASIZE);
fprintf(out, "%i\n", curr_vals[i]);
}
- fclose(out);
+ fclose(out);
}
void copystat_dump_pretty(ir_graph *irg) {
FILE *out;
snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
+ buf[sizeof(buf) - 1] = '\0';
out = ffopen(buf, "pstat", "wt");
fprintf(out, "Nodes %4d\n", curr_vals[I_ALL_NODES]);
copystat_add_init_costs(costs_init);
copystat_add_max_costs(co_get_max_copy_costs(co));
-
/* heuristic 1 (Daniel Grund) */
timer = lc_timer_register("heur1", NULL);
lc_timer_reset_and_start(timer);
- co_solve_heuristic_new(co);
+ co_solve_heuristic(co);
lc_timer_stop(timer);
copystat_add_heur_costs(costs_solved);
assert(lower_bound <= costs_solved);
+ /* Park & Moon register coalescing (Kimon Hoffmann) */
+ timer = lc_timer_register("park", NULL);
+ lc_timer_reset_and_start(timer);
+
+ co_solve_park_moon(co);
+
+ lc_timer_stop(timer);
+
+ be_ra_chordal_check(co->cenv);
+ costs_solved = co_get_copy_costs(co);
+ DBG((dbg, LEVEL_1, "Park/Moon costs: %3d\n", costs_solved));
+ copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+ copystat_add_heur_costs(costs_solved);
+ assert(lower_bound <= costs_solved);
+
#ifdef WITH_ILP
/* ILP 2 */
load_colors(&saver);
- co_solve_ilp2(co, 60.0);
+ co_solve_ilp2(co);
be_ra_chordal_check(co->cenv);
costs_solved = co_get_copy_costs(co);