X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbecopyilp_t.h;h=3be6ab742d03810d123d48c6bc6bd0cf1fbae0dc;hb=46b1210ed70f149727d212d7bae741ac0ed96028;hp=56377fc921f5c79e86dd342bc207337930dbd580;hpb=c0461ca4cf5f3c74a1f7e32aca1e07cce6835984;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 56377fc92..3be6ab742 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -1,102 +1,19 @@
-/**
- * Author:      Daniel Grund
- * Date:		28.02.2006
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
- *
- * Common stuff used by all ILP fomulations.
- *
- */
-
-#ifndef _BECOPYILP_T_H
-#define _BECOPYILP_T_H
-
-#include "firm_config.h"
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#include "irnode_t.h"
-#include "pset.h"
-#include "becopyopt_t.h"
-
-/******************************************************************************
-    _____ _                        _            _   _
-   / ____(_)                      | |          | | (_)
-  | (___  _ _______   _ __ ___  __| |_   _  ___| |_ _  ___  _ __
-   \___ \| |_  / _ \ | '__/ _ \/ _` | | | |/ __| __| |/ _ \| '_ \
-   ____) | |/ /  __/ | | |  __/ (_| | |_| | (__| |_| | (_) | | | |
-  |_____/|_/___\___| |_|  \___|\__,_|\__,_|\___|\__|_|\___/|_| |_|
-
- *****************************************************************************/
-
-typedef struct _coloring_suffix_t coloring_suffix_t;
-
-struct _coloring_suffix_t {
-	coloring_suffix_t *next;
-	ir_node *irn;
-};
-
-typedef struct _size_red_t {
-	copy_opt_t *co;
-	pset *all_removed;				/**< All nodes removed during problem size reduction */
-	coloring_suffix_t *col_suff;	/**< Coloring suffix. Reverse would be a PEO prefix */
-	struct obstack ob;
-} size_red_t;
-
-/**
- * Just prepare. Do nothing yet.
- */
-size_red_t *new_size_red(copy_opt_t *co);
-
-/**
- * Checks if a node has already been removed
+/*
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
-#define sr_is_removed(sr, irn)		pset_find_ptr((sr)->all_removed, irn)
 
 /**
- * Virtually remove all nodes not related to the problem
- * (simplicial AND not adjacent to a equal-color-edge)
+ * @file
+ * @brief       Common stuff used by all ILP formulations.
+ * @author      Daniel Grund
+ * @date        28.02.2006
  */
-void sr_remove(size_red_t *sr);
+#ifndef FIRM_BE_BECOPYILP_T_H
+#define FIRM_BE_BECOPYILP_T_H
 
-/**
- * Virtually reinsert the nodes removed before and color them
- */
-void sr_reinsert(size_red_t *sr);
-
-/**
- * Free all space...
- */
-void free_size_red(size_red_t *sr);
-
-/**
- * TODO: This search is necessary because during the construction of the
- *       units (ou's) args could be merged and weights are accumulated.
- *       Is this necessary?
- */
-static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
-	int i;
-	unit_t *curr;
-
-	/* search optimization unit for phi */
-	list_for_each_entry(unit_t, curr, &co->units, units)
-		if (curr->nodes[0] == root) {
-
-			for (i=1; i<curr->node_count; ++i)
-				if (curr->nodes[i] == arg)
-					return curr->costs[i];
-
-				assert(0 && "irn must occur in this ou");
-		}
-
-	assert(0 && "phi must be found in a ou");
-	return 0;
-}
+#include "firm_types.h"
+#include "becopyopt_t.h"
 
 /******************************************************************************
     _____                      _        _____ _      _____
@@ -108,30 +25,23 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
  *****************************************************************************/
 
-#ifdef WITH_ILP
-#include <lpp/lpp.h>
-
-#define LPP_SOLVE_NET
-
-#ifdef LPP_SOLVE_NET
-#  include <lpp/lpp_net.h>
-#else
-#  include <lpp/lpp_cplex.h>
-#endif
+#include "lpp.h"
+#include "lpp_net.h"
 
 #define EPSILON 0.00001
 
-typedef struct _ilp_env_t ilp_env_t;
+typedef struct ilp_env_t ilp_env_t;
 
 typedef void(*ilp_callback)(ilp_env_t*);
 
-struct _ilp_env_t {
-	const copy_opt_t *co;			/**< the copy opt problem */
-	size_red_t *sr;					/**< problem size reduction. removes simple nodes */
-	lpp_t *lp;						/**< the linear programming problem */
-	void *env;
-	ilp_callback build;
-	ilp_callback apply;
+struct ilp_env_t {
+	copy_opt_t const *co;          /**< the copy opt problem */
+	ir_node         **col_suff;    /**< Coloring suffix for size reduction. A PEO prefix. */
+	ir_nodeset_t      all_removed; /**< All nodes removed during problem size reduction */
+	lpp_t            *lp;          /**< the linear programming problem */
+	void             *env;
+	ilp_callback     build;
+	ilp_callback     apply;
 };
 
 ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env);
@@ -140,13 +50,12 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv);
 
 void free_ilp_env(ilp_env_t *ienv);
 
-
-#define name_cdd(buf, char1, int1, int2) \
-			(snprintf(buf, sizeof(buf), "%c_%d_%d", char1, int1, int2), buf)
-
-#define name_cdd_sorted(buf, char1, int1, int2) \
-			name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
-
-#endif // WITH_ILP
+/**
+ * Checks if a node has already been removed
+ */
+static inline bool sr_is_removed(ilp_env_t const *const ienv, ir_node const *const irn)
+{
+	return ir_nodeset_contains(&ienv->all_removed, irn);
+}
 
 #endif