projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use default error handler if none is specified
[libfirm]
/
ir
/
be
/
becopyilp2.c
diff --git
a/ir/be/becopyilp2.c
b/ir/be/becopyilp2.c
index
35ec959
..
06cb43e
100644
(file)
--- a/
ir/be/becopyilp2.c
+++ b/
ir/be/becopyilp2.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-44,11
+44,7
@@
*
* x_nc, y_ij \in N, w_ij \in R^+
*/
*
* x_nc, y_ij \in N, w_ij \in R^+
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#include "firm_config.h"
#ifdef WITH_ILP
#ifdef WITH_ILP
@@
-87,13
+83,13
@@
static void build_coloring_cstr(ilp_env_t *ienv) {
bitset_pos_t col;
int cst_idx;
const 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(i
env->co, i
rn);
+ int curr_node_color = get_irn_col(irn);
int node_nr = (int)get_irn_idx(irn);
local_env_t *lenv = ienv->env;
pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
int node_nr = (int)get_irn_idx(irn);
local_env_t *lenv = ienv->env;
pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
- req = arch_get_register_req(i
env->co->aenv, i
rn, -1);
+ req = arch_get_register_req(irn, -1);
bitset_clear_all(colors);
bitset_clear_all(colors);
@@
-190,12
+186,12
@@
static void build_affinity_cstr(ilp_env_t *ienv) {
root = curr->nodes[0];
root_nr = (int) get_irn_idx(root);
root = curr->nodes[0];
root_nr = (int) get_irn_idx(root);
- root_col = get_irn_col(
ienv->co,
root);
+ root_col = get_irn_col(root);
for (i = 1; i < curr->node_count; ++i) {
arg = curr->nodes[i];
arg_nr = (int) get_irn_idx(arg);
for (i = 1; i < curr->node_count; ++i) {
arg = curr->nodes[i];
arg_nr = (int) get_irn_idx(arg);
- arg_col = get_irn_col(
ienv->co,
arg);
+ arg_col = get_irn_col(arg);
/* add a new affinity variable */
y_idx = lpp_add_var(ienv->lp, name_cdd_sorted(buf, 'y', root_nr, arg_nr), lpp_binary, curr->costs[i]);
/* add a new affinity variable */
y_idx = lpp_add_var(ienv->lp, name_cdd_sorted(buf, 'y', root_nr, arg_nr), lpp_binary, curr->costs[i]);
@@
-296,7
+292,7
@@
static void build_clique_star_cstr(ilp_env_t *ienv) {
set *edges;
int i, o, n_nodes, n_edges;
set *edges;
int i, o, n_nodes, n_edges;
- if (arch_irn_is(
ienv->co->aenv,
aff->irn, ignore))
+ if (arch_irn_is(aff->irn, ignore))
continue;
obstack_init(&ob);
continue;
obstack_init(&ob);
@@
-305,7
+301,7
@@
static void build_clique_star_cstr(ilp_env_t *ienv) {
/* get all affinity neighbours */
n_nodes = 0;
co_gs_foreach_neighb(aff, nbr) {
/* get all affinity neighbours */
n_nodes = 0;
co_gs_foreach_neighb(aff, nbr) {
- if (!arch_irn_is(
ienv->co->aenv,
nbr->irn, ignore)) {
+ if (!arch_irn_is(nbr->irn, ignore)) {
obstack_ptr_grow(&ob, nbr->irn);
++n_nodes;
}
obstack_ptr_grow(&ob, nbr->irn);
++n_nodes;
}
@@
-409,7
+405,7
@@
static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) {
if (pdeq_contains(path, irn))
return;
if (pdeq_contains(path, irn))
return;
- if (arch_irn_is(i
env->co->aenv, i
rn, ignore))
+ if (arch_irn_is(irn, ignore))
return;
/* insert the new irn */
return;
/* insert the new irn */
@@
-500,16
+496,14
@@
static void ilp2_build(ilp_env_t *ienv) {
static void ilp2_apply(ilp_env_t *ienv) {
local_env_t *lenv = ienv->env;
static void ilp2_apply(ilp_env_t *ienv) {
local_env_t *lenv = ienv->env;
- double *sol;
- lpp_sol_state_t state;
- int i, count;
+ int i;
/* first check if there was sth. to optimize */
if (lenv->first_x_var >= 0) {
/* first check if there was sth. to optimize */
if (lenv->first_x_var >= 0) {
+ int count = lenv->last_x_var - lenv->first_x_var + 1;
+ double *sol = XMALLOCN(double, count);
+ lpp_sol_state_t state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
- count = lenv->last_x_var - lenv->first_x_var + 1;
- sol = xmalloc(count * sizeof(sol[0]));
- state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
if (state != lpp_optimal) {
printf("WARNING %s: Solution state is not 'optimal': %d\n", ienv->co->name, state);
assert(state >= lpp_feasible && "The solution should at least be feasible!");
if (state != lpp_optimal) {
printf("WARNING %s: Solution state is not 'optimal': %d\n", ienv->co->name, state);
assert(state >= lpp_feasible && "The solution should at least be feasible!");
@@
-531,6
+525,8
@@
static void ilp2_apply(ilp_env_t *ienv) {
assert(0 && "This should be a x-var");
}
}
assert(0 && "This should be a x-var");
}
}
+
+ xfree(sol);
}
#ifdef COPYOPT_STAT
}
#ifdef COPYOPT_STAT
@@
-558,7
+554,7
@@
int co_solve_ilp2(copy_opt_t *co) {
my.normal_colors = bitset_alloca(arch_register_class_n_regs(co->cls));
bitset_clear_all(my.normal_colors);
my.normal_colors = bitset_alloca(arch_register_class_n_regs(co->cls));
bitset_clear_all(my.normal_colors);
- arch_put_non_ignore_regs(co->
aenv, co->
cls, my.normal_colors);
+ arch_put_non_ignore_regs(co->cls, my.normal_colors);
my.n_colors = bitset_popcnt(my.normal_colors);
ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);
my.n_colors = bitset_popcnt(my.normal_colors);
ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);