X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=d6d4b755ed896190cf39f931ac6003ef3e635783;hb=b0e09fe0aada2e5d9dc0299e969b3c93c1092d97;hp=773decd47a8df2cd7a3f877e516ea528873baf0b;hpb=ea64ddabccc512b21b425e4d89fda5e4ffe124a6;p=libfirm

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index 773decd47..d6d4b755e 100644
--- a/ir/be/becopyilp2.c
+++ b/ir/be/becopyilp2.c
@@ -1,9 +1,28 @@
-/**
- * Author:      Daniel Grund
- * Date:		28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
  *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
+/**
+ * @file
+ * @brief       ILP based copy minimization.
+ * @author      Daniel Grund
+ * @date        28.02.2006
+ * @version     $Id$
  *
  * ILP formalization using G=(V, E, Q):
  *  - 2 class of variables: coloring vars x_ic   and   equal color vars y_ij
@@ -25,14 +44,16 @@
  *
  *		x_nc, y_ij \in N,   w_ij \in R^+
  */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "firm_config.h"
+
 #ifdef WITH_ILP
 
-#include <bitset.h>
+#include "bitset.h"
+#include "raw_bitset.h"
 #include "pdeq.h"
 
 #include "irtools.h"
@@ -40,6 +61,7 @@
 #include "becopyilp_t.h"
 #include "beifg_t.h"
 #include "besched_t.h"
+#include "benodesets.h"
 
 #define DEBUG_LVL 1
 
@@ -61,28 +83,31 @@ static void build_coloring_cstr(ilp_env_t *ienv) {
 
 	be_ifg_foreach_node(ifg, iter, irn)
 		if (!sr_is_removed(ienv->sr, irn)) {
-			int col, cst_idx;
-			arch_register_req_t req;
+			bitset_pos_t col;
+			int cst_idx;
+			const arch_register_req_t *req;
 			int curr_node_color = get_irn_col(ienv->co, irn);
 			int node_nr = (int)get_irn_node_nr(irn);
 			local_env_t *lenv = ienv->env;
 
 			pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
 
-			arch_get_register_req(ienv->co->aenv, &req, irn, -1);
+			req = arch_get_register_req(ienv->co->aenv, irn, -1);
 
 			/* 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);
+			if (arch_register_req_is(req, limited)) {
+				rbitset_copy_to_bitset(req->limited, 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);
 
 			bitset_foreach(colors, col) {
 				int var_idx = lpp_add_var(ienv->lp, name_cdd(buf, 'x', node_nr, col), lpp_binary, 0.0);
-				lpp_set_start_value(ienv->lp, var_idx, (col == curr_node_color) ? 1.0 : 0.0);
+				lpp_set_start_value(ienv->lp, var_idx, (col == (unsigned) curr_node_color) ? 1.0 : 0.0);
 				lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1);
 
 				lenv->last_x_var = var_idx;
@@ -196,11 +221,12 @@ typedef struct _edge_t {
 static int compare_edge_t(const void *k1, const void *k2, size_t size) {
 	const edge_t *e1 = k1;
 	const edge_t *e2 = k2;
+	(void) size;
 
 	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;
@@ -294,6 +320,9 @@ static void build_clique_star_cstr(ilp_env_t *ienv) {
 			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);
@@ -501,7 +530,7 @@ static void ilp2_apply(ilp_env_t *ienv) {
 #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;
@@ -509,7 +538,7 @@ int co_solve_ilp2(copy_opt_t *co, double time_limit) {
 	ASSERT_OU_AVAIL(co); //See build_clique_st
 	ASSERT_GS_AVAIL(co);
 
-	my.time_limit  = time_limit;
+	my.time_limit  = 0;
 	my.first_x_var = -1;
 	my.last_x_var  = -1;
 	my.nr_2_irn    = pmap_create();
@@ -527,7 +556,7 @@ int co_solve_ilp2(copy_opt_t *co, double time_limit) {
 
 #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 */