Commit c0461ca4 authored by Matthias Braun's avatar Matthias Braun
Browse files

-fix compilation when WITH_ILP is not defined

parent bc9c8405
...@@ -108,6 +108,7 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) ...@@ -108,6 +108,7 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
*****************************************************************************/ *****************************************************************************/
#ifdef WITH_ILP
#include <lpp/lpp.h> #include <lpp/lpp.h>
#define LPP_SOLVE_NET #define LPP_SOLVE_NET
...@@ -146,4 +147,6 @@ void free_ilp_env(ilp_env_t *ienv); ...@@ -146,4 +147,6 @@ void free_ilp_env(ilp_env_t *ienv);
#define name_cdd_sorted(buf, char1, int1, int2) \ #define name_cdd_sorted(buf, char1, int1, int2) \
name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2)) name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
#endif // WITH_ILP
#endif #endif
...@@ -124,7 +124,9 @@ void co_register_options(lc_opt_entry_t *grp) ...@@ -124,7 +124,9 @@ void co_register_options(lc_opt_entry_t *grp)
be_co2_register_options(co_grp); be_co2_register_options(co_grp);
be_co3_register_options(co_grp); be_co3_register_options(co_grp);
#ifdef WITH_ILP
be_co_ilp_register_options(co_grp); be_co_ilp_register_options(co_grp);
#endif
} }
#endif #endif
...@@ -1249,7 +1251,7 @@ static void ifg_dump_at_end(FILE *file, void *self) ...@@ -1249,7 +1251,7 @@ static void ifg_dump_at_end(FILE *file, void *self)
co_gs_foreach_neighb(a, n) { co_gs_foreach_neighb(a, n) {
const arch_register_t *nr = arch_get_irn_register(env->co->aenv, n->irn); const arch_register_t *nr = arch_get_irn_register(env->co->aenv, n->irn);
int nidx = get_irn_idx(n->irn); unsigned nidx = get_irn_idx(n->irn);
if(aidx < nidx) { if(aidx < nidx) {
const char *color = nr == ar ? "blue" : "red"; const char *color = nr == ar ? "blue" : "red";
...@@ -1293,8 +1295,9 @@ void co_solve_park_moon(copy_opt_t *opt) ...@@ -1293,8 +1295,9 @@ void co_solve_park_moon(copy_opt_t *opt)
} }
static void void_algo(copy_opt_t *co) static int void_algo(copy_opt_t *co)
{ {
return 0;
} }
/* /*
...@@ -1311,7 +1314,9 @@ static co_algo_t *algos[] = { ...@@ -1311,7 +1314,9 @@ static co_algo_t *algos[] = {
co_solve_heuristic, co_solve_heuristic,
co_solve_heuristic_new, co_solve_heuristic_new,
co_solve_heuristic_java, co_solve_heuristic_java,
#ifdef WITH_ILP
co_solve_ilp2 co_solve_ilp2
#endif
}; };
/* /*
......
...@@ -32,10 +32,6 @@ ...@@ -32,10 +32,6 @@
#include "execfreq.h" #include "execfreq.h"
#include "irvrfy.h" #include "irvrfy.h"
#include <lpp/lpp.h>
#include <lpp/lpp_net.h>
#include <lpp/lpp_cplex.h>
//#include <lc_pset.h>
#include <libcore/lc_bitset.h> #include <libcore/lc_bitset.h>
#include "be_t.h" #include "be_t.h"
......
...@@ -199,3 +199,8 @@ int be_verify_schedule(ir_graph *irg) ...@@ -199,3 +199,8 @@ int be_verify_schedule(ir_graph *irg)
return ! env.problem_found; return ! env.problem_found;
} }
/* Ideas for further verifiers:
* - make sure that each use is dominated by its definition (except phi arguments)
* - make sure that all spills attached to phims spill into the same slot...
*/
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment