fix

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index b91550a..3a804e9 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -7,11 +7,16 @@
  * Common stuff used by all ILP fomulations.
  *
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "irtools.h"
+
+#include "bestatevent.h"
+#include "beirg_t.h"
+#include "bemodule.h"
+
 #ifdef WITH_ILP
 
 #define DUMP_ILP 1
@@ -19,6 +24,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,18 +41,26 @@ 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 }
 };
 
-void be_co_ilp_register_options(lc_opt_entry_t *grp)
+void be_init_copyilp(void)
 {
-       lc_opt_entry_t *ilp_grp = lc_opt_get_grp(grp, "ilp");
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+       lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra");
+       lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal");
+       lc_opt_entry_t *co_grp = lc_opt_get_grp(chordal_grp, "co");
+       lc_opt_entry_t *ilp_grp = lc_opt_get_grp(co_grp, "ilp");
+
        lc_opt_add_table(ilp_grp, options);
 }
-#endif
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp);
+#endif /* WITH_LIBCORE */
 
 
 #include "becopyilp_t.h"
@@ -200,6 +214,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 +227,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);
@@ -231,7 +253,7 @@ void free_ilp_env(ilp_env_t *ienv) {
 
 #else /* WITH_ILP */
 
-static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
 }
 
 #endif /* WITH_ILP */