ia32: Fix calculation bug in ia32_get_op_estimated_cost() of the latency of CopyB_i.

[libfirm] / ir / be / becopyilp_t.h

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index a73d07e..3be6ab7 100644 (file)
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2008 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.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -22,89 +8,13 @@
  * @brief       Common stuff used by all ILP formulations.
  * @author      Daniel Grund
  * @date        28.02.2006
- * @version     $Id$
  */
 #ifndef FIRM_BE_BECOPYILP_T_H
 #define FIRM_BE_BECOPYILP_T_H
 
 #include "firm_types.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
- */
-#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)
- */
-void sr_remove(size_red_t *sr);
-
-/**
- * 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;
-}
-
 /******************************************************************************
     _____                      _        _____ _      _____
    / ____|                    (_)      |_   _| |    |  __ \
@@ -115,9 +25,8 @@ 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_net.h>
+#include "lpp.h"
+#include "lpp_net.h"
 
 #define EPSILON 0.00001
 
@@ -126,9 +35,10 @@ 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 */
+       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;
@@ -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
+/**
+ * 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