#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) {
/* 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);
+ 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);
}
}
+
+/**
+ * TODO: Remove the dependency of the opt-units data structure
+ * by walking over all affinity edges. Graph structure
+ * does not provide this walker, yet.
+ */
static void build_affinity_cstr(ilp_env_t *ienv) {
unit_t *curr;
int n_colors = arch_register_class_n_regs(ienv->co->cls);
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;
* At most 1 node of the clique can be colored equally with the external node.
*/
static void build_clique_star_cstr(ilp_env_t *ienv) {
- affinity_t *aff;
+ affinity_node_t *aff;
/* for each node with affinity edges */
co_gs_foreach_aff_node(ienv->co, aff) {
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);
be_ifg_t *ifg = ienv->co->cenv->ifg;
int i, len;
ir_node **curr_path;
- affinity_t *aff;
+ affinity_node_t *aff;
neighb_t *nbr;
/* do not walk backwards or in circles */
/* check for forbidden interferences */
len = pdeq_len(path);
curr_path = alloca(len * sizeof(*curr_path));
- pdeq_copyl(path, curr_path);
+ pdeq_copyl(path, (const void **)curr_path);
for (i=1; i<len; ++i)
if (be_ifg_connected(ifg, irn, curr_path[i]))
* Then at least one of these affinity edges must break.
*/
static void build_path_cstr(ilp_env_t *ienv) {
- affinity_t *aff_info;
+ affinity_node_t *aff_info;
/* for each node with affinity edges */
co_gs_foreach_aff_node(ienv->co, aff_info) {
#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;
- my.time_limit = time_limit;
+ ASSERT_OU_AVAIL(co); //See build_clique_st
+ ASSERT_GS_AVAIL(co);
+
+ my.time_limit = 0;
my.first_x_var = -1;
my.last_x_var = -1;
my.nr_2_irn = pmap_create();
- my.dbg = firm_dbg_register("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 */