added option to select between schedulers (list or ilp)

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index a02ab76..9ef100e 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -8,6 +8,8 @@
  *
  */
 
+#include "bestatevent.h"
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -19,6 +21,7 @@
 
 static int time_limit = 60;
 static int solve_net  = 1;
+static int solve_log  = 0;
 static int dump_flags = 0;
 
 #ifdef WITH_LIBCORE
@@ -35,9 +38,10 @@ static lc_opt_enum_mask_var_t dump_var = {
 };
 
 static const lc_opt_table_entry_t options[] = {
-       LC_OPT_ENT_INT      ("limit", "time limit for solving in seconds (0 for unlimited, default 60)", &time_limit),
-       LC_OPT_ENT_BOOL     ("net",   "solve over the net (default: yes)", &solve_net),
-       LC_OPT_ENT_ENUM_MASK("dump",  "dump flags (ilp, sol)",             &dump_var),
+       LC_OPT_ENT_INT      ("limit", "time limit for solving in seconds (0 for unlimited)", &time_limit),
+       LC_OPT_ENT_BOOL     ("net",   "solve over the net", &solve_net),
+       LC_OPT_ENT_BOOL     ("log",   "show ilp solving log",              &solve_log),
+       LC_OPT_ENT_ENUM_MASK("dump",  "dump flags",             &dump_var),
        { NULL }
 };
 
@@ -200,6 +204,9 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
        ienv->build(ienv);
        lpp_set_time_limit(ienv->lp, time_limit);
 
+       if(solve_log)
+               lpp_set_log(ienv->lp, stdout);
+
        if(solve_net)
                lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
        else {
@@ -210,6 +217,11 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
 #endif
        }
 
+       be_stat_ev_dbl("co_ilp_objval",     ienv->lp->objval);
+       be_stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound);
+       be_stat_ev    ("co_ilp_iter",       ienv->lp->iterations);
+       be_stat_ev_dbl("co_ilp_sol_time",   ienv->lp->sol_time);
+
        if(dump_flags & DUMP_ILP) {
                FILE *f = be_chordal_open(ienv->co->cenv, "", "-co.ilp");
                lpp_dump_plain(ienv->lp, f);