projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
becopyilp: Turn the colouring suffix linked list into an array.
[libfirm]
/
ir
/
be
/
becopyilp_t.h
diff --git
a/ir/be/becopyilp_t.h
b/ir/be/becopyilp_t.h
index
349593e
..
de8925e
100644
(file)
--- a/
ir/be/becopyilp_t.h
+++ b/
ir/be/becopyilp_t.h
@@
-1,28
+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
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#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 "pset.h"
+#include "firm_types.h"
#include "becopyopt_t.h"
/******************************************************************************
#include "becopyopt_t.h"
/******************************************************************************
@@
-35,60
+25,33
@@
*****************************************************************************/
*****************************************************************************/
-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;
+typedef struct size_red_t {
+ copy_opt_t *co;
+ ir_node **col_suff; /**< Coloring suffix. A PEO prefix. */
+ ir_nodeset_t all_removed; /**< All nodes removed during problem size reduction */
} size_red_t;
} 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
*/
/**
* 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);
+static inline bool sr_is_removed(size_red_t const *const sr, ir_node const *const irn)
+{
+ return ir_nodeset_contains(&sr->all_removed, irn);
+}
/**
* 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?
*/
/**
* 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) {
+static
inline
int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
int i;
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) {
/* 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];
if (curr->nodes[i] == arg)
return curr->costs[i];
@@
-109,32
+72,22
@@
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
#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*);
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 {
+ 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, 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);
@@
-143,11
+96,4
@@
lpp_sol_state_t ilp_go(ilp_env_t *ienv);
void free_ilp_env(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
#endif