X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeilpsched.c;h=bf508a3754ab8dd6ba75f1a784b0328167c4742d;hb=2176caea24ef5a9786dc4ada2bd2eaf74ad88b4d;hp=f1b372b1608c96352e94b8442a3ba7705770d4f3;hpb=d6768d8d4427959eb045aafb1d15bd189beaa5dd;p=libfirm diff --git a/ir/be/beilpsched.c b/ir/be/beilpsched.c index f1b372b16..bf508a375 100644 --- a/ir/be/beilpsched.c +++ b/ir/be/beilpsched.c @@ -33,6 +33,8 @@ #include "config.h" #endif +#include "firm_config.h" + #ifdef WITH_ILP #include @@ -209,7 +211,7 @@ static const lc_opt_table_entry_t ilpsched_option_table[] = { LC_OPT_ENT_BOOL("regpress", "Use register pressure constraints", &ilp_opts.regpress), LC_OPT_ENT_INT("time_limit", "ILP time limit per block", &ilp_opts.time_limit), LC_OPT_ENT_STR("lpp_log", "LPP logfile (stderr and stdout are supported)", ilp_opts.log_file, sizeof(ilp_opts.log_file)), - { NULL } + LC_OPT_LAST }; /* @@ -376,7 +378,7 @@ static void collect_alap_root_nodes(ir_node *irn, void *walk_env) { unsigned n_consumer = 0; ir_edge_kind_t ekind[2] = { EDGE_KIND_NORMAL, EDGE_KIND_DEP }; ir_node **consumer; - int idx; + unsigned idx; if (! consider_for_sched(env->arch_env->isa, irn)) return; @@ -687,6 +689,7 @@ static void refine_asap_alap_times(ir_node *irn, void *walk_env) { static INLINE void check_for_keeps(waitq *keeps, ir_node *block, ir_node *irn) { const ir_edge_t *edge; + (void) block; foreach_out_edge(irn, edge) { ir_node *user = get_edge_src_irn(edge); @@ -1869,6 +1872,7 @@ static void create_ilp(ir_node *block, void *walk_env) { DBG((env->dbg, LEVEL_1, "Creating LPP with estimated numbers: %d vars, %d cst\n", estimated_n_var, estimated_n_cst)); + (void) estimated_n_var; /* set up the LPP object */ snprintf(name, sizeof(name), "ilp scheduling IRG %s", get_entity_ld_name(get_irg_entity(env->irg))); @@ -1901,7 +1905,7 @@ static void create_ilp(ir_node *block, void *walk_env) { DBG((env->dbg, LEVEL_1, "ILP to solve: %u variables, %u constraints\n", lpp->var_next, lpp->cst_next)); /* debug stuff, dump lpp when debugging is on */ - DEBUG_ONLY( + DEBUG_ONLY({ if (firm_dbg_get_mask(env->dbg) > 1) { char buf[1024]; FILE *f; @@ -1913,7 +1917,7 @@ static void create_ilp(ir_node *block, void *walk_env) { snprintf(buf, sizeof(buf), "lpp_block_%lu.mps", get_irn_node_nr(block)); lpp_dump(lpp, buf); } - ); + }) /* set solve time limit */ lpp_set_time_limit(lpp, env->opts->time_limit); @@ -1941,20 +1945,20 @@ static void create_ilp(ir_node *block, void *walk_env) { /* check for valid solution */ if (! lpp_is_sol_valid(lpp)) { - char buf[1024]; - FILE *f; - - DEBUG_ONLY( - if (firm_dbg_get_mask(env->dbg) >= 2) { - snprintf(buf, sizeof(buf), "lpp_block_%lu.infeasible.txt", get_irn_node_nr(block)); - f = fopen(buf, "w"); - lpp_dump_plain(lpp, f); - fclose(f); - snprintf(buf, sizeof(buf), "lpp_block_%lu.infeasible.mps", get_irn_node_nr(block)); - lpp_dump(lpp, buf); - dump_ir_block_graph(env->irg, "-infeasible"); - } - ) + DEBUG_ONLY({ + char buf[1024]; + FILE *f; + + if (firm_dbg_get_mask(env->dbg) >= 2) { + snprintf(buf, sizeof(buf), "lpp_block_%lu.infeasible.txt", get_irn_node_nr(block)); + f = fopen(buf, "w"); + lpp_dump_plain(lpp, f); + fclose(f); + snprintf(buf, sizeof(buf), "lpp_block_%lu.infeasible.mps", get_irn_node_nr(block)); + lpp_dump(lpp, buf); + dump_ir_block_graph(env->irg, "-infeasible"); + } + }) ir_fprintf(stderr, "ILP found no solution within time (%+F, %+F), falling back to heuristics.\n", block, env->irg); need_heur = 1; @@ -1973,36 +1977,24 @@ static void create_ilp(ir_node *block, void *walk_env) { } /* apply solution */ -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - be_stat_ev("nodes", ba->block_last_idx); - be_stat_ev("vars", lpp ? lpp->var_next : 0); - be_stat_ev("csts", lpp ? lpp->cst_next : 0); - } -#endif /* FIRM_STATISTICS */ + be_stat_ev("nodes", ba->block_last_idx); + be_stat_ev("vars", lpp ? lpp->var_next : 0); + be_stat_ev("csts", lpp ? lpp->cst_next : 0); if (need_heur) { -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { be_stat_ev("time", -1); be_stat_ev_dbl("opt", 0.0); - } -#endif /* FIRM_STATISTICS */ list_sched_single_block(env->birg, block, env->be_opts); } else { -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - if (lpp) { - double opt = lpp->sol_state == lpp_optimal ? 100.0 : 100.0 * lpp->best_bound / lpp->objval; - be_stat_ev_dbl("time", lpp->sol_time); - be_stat_ev_dbl("opt", opt); - } - else { - be_stat_ev_dbl("time", 0.0); - be_stat_ev_dbl("opt", 100.0); - } + if (lpp) { + double opt = lpp->sol_state == lpp_optimal ? 100.0 : 100.0 * lpp->best_bound / lpp->objval; + be_stat_ev_dbl("time", lpp->sol_time); + be_stat_ev_dbl("opt", opt); + } + else { + be_stat_ev_dbl("time", 0.0); + be_stat_ev_dbl("opt", 100.0); } -#endif /* FIRM_STATISTICS */ apply_solution(env, lpp, block); } @@ -2026,12 +2018,7 @@ void be_ilp_sched(const be_irg_t *birg, be_options_t *be_opts) { FIRM_DBG_REGISTER(env.dbg, "firm.be.sched.ilp"); -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - be_stat_tags[STAT_TAG_CLS] = "ilpsched"; - be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file); - } -#endif /* FIRM_STATISTICS */ + stat_ev_ctx_push("ilpsched"); // firm_dbg_set_mask(env.dbg, 1); @@ -2088,11 +2075,7 @@ void be_ilp_sched(const be_irg_t *birg, be_options_t *be_opts) { /* notify backend */ be_ilp_sched_finish_irg_ilp_schedule(sel, birg->irg, env.irg_env); -#ifdef FIRM_STATISTICS - if (be_stat_ev_is_active()) { - be_stat_ev_pop(); - } -#endif /* FIRM_STATISTICS */ + stat_ev_ctx_pop("ilpsched"); } /**