summaryrefslogtreecommitdiffhomepage
path: root/ir/be/beblocksched.c
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2011-06-16 13:50:54 +0200
committerMatthias Braun <matze@braunis.de>2011-06-16 13:50:54 +0200
commit32bb9cd68eb4e4a550475b5ab516fd1b8de22456 (patch)
tree20f52f71210ada8b67b4b9d9d78658ab3cf1aaa5 /ir/be/beblocksched.c
parent9d9b55603b6dc481b3551143a61eda3db59d9090 (diff)
remove remaining WITH_ILP uses, fix bug introduced when adapting lpp
Diffstat (limited to 'ir/be/beblocksched.c')
-rw-r--r--ir/be/beblocksched.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index 54c5bf2..cbc96a8 100644
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -61,10 +61,8 @@
#include "lc_opts.h"
#include "lc_opts_enum.h"
-#ifdef WITH_ILP
-#include <lpp/lpp.h>
-#include <lpp/lpp_net.h>
-#endif /* WITH_ILP */
+#include "lpp.h"
+#include "lpp_net.h"
DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -77,9 +75,7 @@ static int algo = BLOCKSCHED_GREEDY;
static const lc_opt_enum_int_items_t blockschedalgo_items[] = {
{ "naiv", BLOCKSCHED_NAIV },
{ "greedy", BLOCKSCHED_GREEDY },
-#ifdef WITH_ILP
{ "ilp", BLOCKSCHED_ILP },
-#endif /* WITH_ILP */
{ NULL, 0 }
};
@@ -534,7 +530,6 @@ static ir_node **create_block_schedule_greedy(ir_graph *irg, ir_exec_freq *execf
*
*/
-#ifdef WITH_ILP
typedef struct ilp_edge_t {
ir_node *block; /**< source block */
int pos; /**< number of cfg predecessor (target) */
@@ -712,7 +707,6 @@ static ir_node **create_block_schedule_ilp(ir_graph *irg, ir_exec_freq *execfreq
return block_list;
}
-#endif /* WITH_ILP */
/*
* __ __ _
@@ -740,10 +734,8 @@ ir_node **be_create_block_schedule(ir_graph *irg)
case BLOCKSCHED_GREEDY:
case BLOCKSCHED_NAIV:
return create_block_schedule_greedy(irg, execfreqs);
-#ifdef WITH_ILP
case BLOCKSCHED_ILP:
return create_block_schedule_ilp(irg, execfreqs);
-#endif /* WITH_ILP */
}
panic("unknown blocksched algo");