projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
committing ilp based spilling
[libfirm]
/
ir
/
be
/
becopyilp2.c
diff --git
a/ir/be/becopyilp2.c
b/ir/be/becopyilp2.c
index
946322d
..
ee02479
100644
(file)
--- a/
ir/be/becopyilp2.c
+++ b/
ir/be/becopyilp2.c
@@
-30,6
+30,8
@@
#include "config.h"
#endif /* HAVE_CONFIG_H */
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#ifdef WITH_ILP
+
#include <bitset.h>
#include "pdeq.h"
#include <bitset.h>
#include "pdeq.h"
@@
-42,10
+44,10
@@
#define DEBUG_LVL 1
typedef struct _local_env_t {
#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;
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) {
} local_env_t;
static void build_coloring_cstr(ilp_env_t *ienv) {
@@
-72,8
+74,10
@@
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);
/* 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);
/* add the coloring constraint */
cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_equal, 1.0);
@@
-377,7
+381,7
@@
static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) {
/* check for forbidden interferences */
len = pdeq_len(path);
curr_path = alloca(len * sizeof(*curr_path));
/* 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]))
for (i=1; i<len; ++i)
if (be_ifg_connected(ifg, irn, curr_path[i]))
@@
-511,8
+515,7
@@
int co_solve_ilp2(copy_opt_t *co, double time_limit) {
my.first_x_var = -1;
my.last_x_var = -1;
my.nr_2_irn = pmap_create();
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);
ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);
@@
-523,3
+526,10
@@
int co_solve_ilp2(copy_opt_t *co, double time_limit) {
return sol_state == lpp_optimal;
}
return sol_state == lpp_optimal;
}
+
+#else /* WITH_ILP */
+
+static void only_that_you_can_compile_without_WITH_ILP_defined(void) {
+}
+
+#endif /* WITH_ILP */