X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeblocksched.c;h=97184dfe3b2beb79acadc3939b136799436682ab;hb=5474a1c188c9d59eea2c915515980cd9cbab58d8;hp=55a2b67f4361cbccf553ecfc4e15c877f65cef24;hpb=8ccfe04ca59ff56fc32b2323b80cee2a5194694d;p=libfirm

diff --git a/ir/be/beblocksched.c b/ir/be/beblocksched.c
index 55a2b67f4..97184dfe3 100644
--- a/ir/be/beblocksched.c
+++ b/ir/be/beblocksched.c
@@ -22,7 +22,6 @@
  * @brief       Block-scheduling strategies.
  * @author      Matthias Braun, Christoph Mallon
  * @date        27.09.2006
- * @version     $Id$
  *
  * The goals of the greedy (and ILP) algorithm here works by assuming that
  * we want to change as many jumps to fallthroughs as possible (executed jumps
@@ -52,6 +51,7 @@
 #include "execfreq.h"
 #include "irdump_t.h"
 #include "irtools.h"
+#include "util.h"
 #include "debug.h"
 #include "beirgmod.h"
 #include "bemodule.h"
@@ -498,10 +498,7 @@ static ir_node **create_block_schedule_greedy(ir_graph *irg, ir_exec_freq *execf
 	env.worklist   = NULL;
 	env.blockcount = 0;
 
-	/* make sure loopinfo is up-to-date */
-	if (! (get_irg_loopinfo_state(irg) & loopinfo_cf_consistent)) {
-		construct_cf_backedges(irg);
-	}
+	assure_loopinfo(irg);
 
 	// collect edge execution frequencies
 	irg_block_walk_graph(irg, collect_egde_frequency, NULL, &env);
@@ -584,7 +581,7 @@ static void collect_egde_frequency_ilp(ir_node *block, void *data)
 	entry->block   = block;
 	entry->next    = NULL;
 	entry->prev    = NULL;
-	entry->out_cst = lpp_add_cst_uniq(env->lpp, name, lpp_greater, out_count - 1);
+	entry->out_cst = lpp_add_cst_uniq(env->lpp, name, lpp_greater_equal, out_count - 1);
 	set_irn_link(block, entry);
 
 	if (block == startblock)
@@ -599,7 +596,7 @@ static void collect_egde_frequency_ilp(ir_node *block, void *data)
 		int i;
 
 		snprintf(name, sizeof(name), "block_in_constr_%ld", get_irn_node_nr(block));
-		cst = lpp_add_cst_uniq(env->lpp, name, lpp_greater, arity - 1);
+		cst = lpp_add_cst_uniq(env->lpp, name, lpp_greater_equal, arity - 1);
 
 		for (i = 0; i < arity; ++i) {
 			double     execfreq;
@@ -687,7 +684,7 @@ static ir_node **create_block_schedule_ilp(ir_graph *irg, ir_exec_freq *execfreq
 	env.env.blockcount = 0;
 	env.ilpedges       = NEW_ARR_F(ilp_edge_t, 0);
 
-	env.lpp = new_lpp("blockschedule", lpp_minimize);
+	env.lpp = lpp_new("blockschedule", lpp_minimize);
 	lpp_set_time_limit(env.lpp, 20);
 	lpp_set_log(env.lpp, stdout);
 
@@ -702,7 +699,7 @@ static ir_node **create_block_schedule_ilp(ir_graph *irg, ir_exec_freq *execfreq
 	                                      be_get_be_obst(irg));
 
 	DEL_ARR_F(env.ilpedges);
-	free_lpp(env.lpp);
+	lpp_free(env.lpp);
 	obstack_free(&obst, NULL);
 
 	return block_list;