beifg: Factorise code to count interference components.

[libfirm] / ir / be / becopyilp_t.h

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index bf016d6..362c5db 100644 (file)
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -1,33 +1,18 @@
-/**
- * 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.
- *
+/*
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
-#ifndef _BECOPYILP_T_H
-#define _BECOPYILP_T_H
-
-#include "firm_config.h"
-
-#ifndef _WIN32
- #ifndef HAVE_ALLOCA_H
-  #define HAVE_ALLOCA_H 1
- #endif /* HAVE_ALLOC_H */
-#endif /* _WIN32 */
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
+/**
+ * @file
+ * @brief       Common stuff used by all ILP formulations.
+ * @author      Daniel Grund
+ * @date        28.02.2006
+ */
+#ifndef FIRM_BE_BECOPYILP_T_H
+#define FIRM_BE_BECOPYILP_T_H
 
-#include "irnode_t.h"
+#include "firm_types.h"
 #include "pset.h"
 #include "becopyopt_t.h"
 
@@ -41,18 +26,18 @@
 
  *****************************************************************************/
 
-typedef struct _coloring_suffix_t coloring_suffix_t;
+typedef struct coloring_suffix_t coloring_suffix_t;
 
-struct _coloring_suffix_t {
+struct coloring_suffix_t {
        coloring_suffix_t *next;
-       ir_node *irn;
+       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;
+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;
 
 /**
@@ -63,7 +48,7 @@ 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)
+#define sr_is_removed(sr, irn)   pset_find_ptr((sr)->all_removed, irn)
 
 /**
  * Virtually remove all nodes not related to the problem
@@ -86,15 +71,14 @@ void free_size_red(size_red_t *sr);
  *       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) {
+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)
+                       for (i = 1; i < curr->node_count; ++i)
                                if (curr->nodes[i] == arg)
                                        return curr->costs[i];
 
@@ -115,45 +99,28 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
  *****************************************************************************/
 
-#include <lpp/lpp.h>
-
-#undef LPP_SOLVE_NET
-
-#ifdef LPP_SOLVE_NET
-#  include <lpp/lpp_net.h>
-#  define LPP_HOST "i44pc52"
-#  define LPP_SOLVER "cplex"
-#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 {
-       firm_dbg_module_t *dbg;
-       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 {
+       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;
 };
 
-ilp_env_t *new_ilp_env(copy_opt_t *co, firm_dbg_module_t *dbg, ilp_callback build, ilp_callback apply, void *env);
+ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, void *env);
 
-lpp_sol_state_t ilp_go(ilp_env_t *ienv, double time_limit);
+lpp_sol_state_t ilp_go(ilp_env_t *ienv);
 
 void free_ilp_env(ilp_env_t *ienv);
 
-
-/******************************************************************************
-
-
- *****************************************************************************/
-
-#endif /* _BECOPYILP_T_H */
+#endif