verifier to check that no out edges point to dead/removed nodes

[libfirm] / ir / be / becopyilp.c

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index 296f1a4..0fc169a 100644 (file)
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -8,6 +8,49 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#ifdef WITH_ILP
+
+#define DUMP_ILP 1
+#define DUMP_SOL 2
+
+static int time_limit = 60;
+static int solve_net  = 1;
+static int solve_log  = 0;
+static int dump_flags = 0;
+
+#ifdef WITH_LIBCORE
+#include <libcore/lc_opts.h>
+#include <libcore/lc_opts_enum.h>
+static const lc_opt_enum_mask_items_t dump_items[] = {
+       { "ilp",   DUMP_ILP },
+       { "sol",   DUMP_SOL },
+       { NULL,    0 }
+};
+
+static lc_opt_enum_mask_var_t dump_var = {
+       &dump_flags, dump_items
+};
+
+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_BOOL     ("log",   "show ilp solving log",              &solve_log),
+       LC_OPT_ENT_ENUM_MASK("dump",  "dump flags (ilp, sol)",             &dump_var),
+       { NULL }
+};
+
+void be_co_ilp_register_options(lc_opt_entry_t *grp)
+{
+       lc_opt_entry_t *ilp_grp = lc_opt_get_grp(grp, "ilp");
+       lc_opt_add_table(ilp_grp, options);
+}
+#endif
+
+
 #include "becopyilp_t.h"
 #include "beifg_t.h"
 
@@ -48,6 +91,7 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
        be_ifg_foreach_neighbour(ifg, iter, ifn, curr)
                if (!sr_is_removed(sr, curr))
                        all[size++] = curr;
+       be_ifg_neighbours_break(ifg, iter);
 
        /* check if these form a clique */
        for (i=0; i<size; ++i)
@@ -62,9 +106,8 @@ static INLINE int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) {
 void sr_remove(size_red_t *sr) {
        ir_node *irn;
        int redo = 1;
-       int n_nodes = 0;
        const be_ifg_t *ifg = sr->co->cenv->ifg;
-       void *iter = be_ifg_neighbours_iter_alloca(ifg);
+       void *iter = be_ifg_nodes_iter_alloca(ifg);
 
        while (redo) {
                redo = 0;
@@ -87,6 +130,7 @@ void sr_remove(size_red_t *sr) {
                        }
                        }
                }
+               be_ifg_nodes_break(ifg, iter);
        }
 }
 
@@ -109,6 +153,7 @@ void sr_reinsert(size_red_t *sr) {
                        if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */
                                bitset_set(used_cols, get_irn_col(sr->co, other));
                }
+               be_ifg_neighbours_break(ifg, iter);
 
                /* now all bits not set are possible colors */
                free_col = bitset_next_clear(used_cols, 0);
@@ -140,34 +185,41 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
        ilp_env_t *res = xmalloc(sizeof(*res));
        assert(res);
 
-       res->co = co;
-       res->build = build;
-       res->apply = apply;
-       res->env = env;
-       res->sr = new_size_red(co);
+       res->co         = co;
+       res->build      = build;
+       res->apply      = apply;
+       res->env        = env;
+       res->sr         = new_size_red(co);
 
        return res;
 }
 
 lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
-       FILE *f;
-       char buf[256];
        be_main_env_t *main_env = ienv->co->cenv->birg->main_env;
 
        sr_remove(ienv->sr);
 
        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 {
 #ifdef LPP_SOLVE_NET
-       lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
+               fprintf(stderr, "can only solve ilp over the net\n");
 #else
-       lpp_solve_cplex(ienv->lp);
+               lpp_solve_cplex(ienv->lp);
 #endif
+       }
 
-       snprintf(buf, sizeof(buf), "%s.ilp", ienv->co->name);
-       f = fopen(buf, "wt");
-       lpp_dump_plain(ienv->lp, f);
-       fclose(f);
+       if(dump_flags & DUMP_ILP) {
+               FILE *f = be_chordal_open(ienv->co->cenv, "", "-co.ilp");
+               lpp_dump_plain(ienv->lp, f);
+               fclose(f);
+       }
 
        ienv->apply(ienv);
 
@@ -181,3 +233,10 @@ void free_ilp_env(ilp_env_t *ienv) {
        free_lpp(ienv->lp);
        free(ienv);
 }
+
+#else /* WITH_ILP */
+
+static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */