#ifdef WITH_ILP
-#include <bitset.h>
+#include "bitset.h"
+#include "raw_bitset.h"
#include "pdeq.h"
#include "irtools.h"
#include "becopyilp_t.h"
#include "beifg_t.h"
#include "besched_t.h"
+#include "benodesets.h"
#define DEBUG_LVL 1
typedef struct _local_env_t {
- firm_dbg_module_t *dbg;
double time_limit;
int first_x_var, last_x_var;
pmap *nr_2_irn;
+ DEBUG_ONLY(firm_dbg_module_t *dbg;)
} local_env_t;
static void build_coloring_cstr(ilp_env_t *ienv) {
be_ifg_foreach_node(ifg, iter, irn)
if (!sr_is_removed(ienv->sr, irn)) {
int col, cst_idx;
- arch_register_req_t req;
+ const arch_register_req_t *req;
int curr_node_color = get_irn_col(ienv->co, irn);
int node_nr = (int)get_irn_node_nr(irn);
local_env_t *lenv = ienv->env;
pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
- arch_get_register_req(ienv->co->aenv, &req, irn, -1);
+ req = arch_get_register_req(ienv->co->aenv, irn, -1);
/* get assignable colors */
- if (arch_register_req_is(&req, limited))
- req.limited(req.limited_env, colors);
- else
- arch_put_non_ignore_regs(ienv->co->aenv, req.cls, colors);
+ if (arch_register_req_is(req, limited)) {
+ rbitset_copy_to_bitset(req->limited, colors);
+ } else {
+ arch_register_class_put(req->cls, colors);
+ // bitset_andnot(colors, ienv->co->cenv->ignore_colors);
+ }
/* add the coloring constraint */
cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_equal, 1.0);
return ! (e1->n1 == e2->n1 && e1->n2 == e2->n2);
}
-#define HASH_EDGE(e) (HASH_PTR((e)->n1) ^ HASH_PTR((e)->n2))
+#define HASH_EDGE(e) (nodeset_hash((e)->n1) ^ nodeset_hash((e)->n2))
static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
edge_t new_edge;
for (e=set_first(edges); !e->n1; e=set_next(edges))
/*nothing*/ ;
+ /* we could be stepped out of the loop before the set iterated to the end */
+ set_break(edges);
+
pset_insert_ptr(clique, e->n1);
pset_insert_ptr(clique, e->n2);
remove_edge(edges, e->n1, e->n2, &n_edges);
#endif
}
-int co_solve_ilp2(copy_opt_t *co, double time_limit) {
+int co_solve_ilp2(copy_opt_t *co) {
lpp_sol_state_t sol_state;
ilp_env_t *ienv;
local_env_t my;
ASSERT_OU_AVAIL(co); //See build_clique_st
ASSERT_GS_AVAIL(co);
- my.time_limit = time_limit;
+ my.time_limit = 0;
my.first_x_var = -1;
my.last_x_var = -1;
my.nr_2_irn = pmap_create();
- FIRM_DBG_REGISTER(my.dbg, "ir.be.coilp2");
- firm_dbg_set_mask(my.dbg, DEBUG_LVL);
+ FIRM_DBG_REGISTER(my.dbg, "firm.be.coilp2");
ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);
#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 */