projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for SymConst(ofs_ent)
[libfirm]
/
ir
/
be
/
becopyheur.c
diff --git
a/ir/be/becopyheur.c
b/ir/be/becopyheur.c
index
941c05b
..
7f24bcc
100644
(file)
--- a/
ir/be/becopyheur.c
+++ b/
ir/be/becopyheur.c
@@
-27,9
+27,10
@@
#include "xmalloc.h"
#include "becopyopt_t.h"
#include "becopystat.h"
#include "xmalloc.h"
#include "becopyopt_t.h"
#include "becopystat.h"
+#include "benodesets.h"
#include "bitset.h"
#include "bitset.h"
-static firm_dbg_module_t *dbg = NULL;
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
#define SEARCH_FREE_COLORS
#define SEARCH_FREE_COLORS
@@
-38,7
+39,7
@@
static firm_dbg_module_t *dbg = NULL;
#define SLOTS_CHANGED_NODES 32
#define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
#define SLOTS_CHANGED_NODES 32
#define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
-#define HASH_CONFLICT(c) (
HASH_PTR(c.n1) ^ HASH_PTR
(c.n2))
+#define HASH_CONFLICT(c) (
nodeset_hash(c.n1) ^ nodeset_hash
(c.n2))
/**
* Modeling additional conflicts between nodes. NOT live range interference
/**
* Modeling additional conflicts between nodes. NOT live range interference
@@
-126,7
+127,7
@@
static int set_cmp_node_stat_t(const void *x, const void *y, size_t size) {
static INLINE node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn) {
node_stat_t find;
find.irn = irn;
static INLINE node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn) {
node_stat_t find;
find.irn = irn;
- return set_find(qn->changed_nodes, &find, sizeof(find),
HASH_PTR
(irn));
+ return set_find(qn->changed_nodes, &find, sizeof(find),
nodeset_hash
(irn));
}
/**
}
/**
@@
-138,7
+139,7
@@
static INLINE node_stat_t *qnode_find_or_insert_node(const qnode_t *qn, ir_node
find.irn = irn;
find.new_color = NO_COLOR;
find.pinned_local = 0;
find.irn = irn;
find.new_color = NO_COLOR;
find.pinned_local = 0;
- return set_insert(qn->changed_nodes, &find, sizeof(find),
HASH_PTR
(irn));
+ return set_insert(qn->changed_nodes, &find, sizeof(find),
nodeset_hash
(irn));
}
/**
}
/**
@@
-247,7
+248,8
@@
static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const
int free_col;
/* Get all possible colors */
int free_col;
/* Get all possible colors */
- arch_put_non_ignore_regs(arch_env, cls, free_cols);
+ bitset_copy(free_cols, co->cenv->ignore_colors);
+ bitset_flip_all(free_cols);
/* Exclude colors not assignable to the irn */
arch_get_register_req(arch_env, &req, irn, -1);
/* Exclude colors not assignable to the irn */
arch_get_register_req(arch_env, &req, irn, -1);
@@
-510,7
+512,6
@@
static void ou_optimize(unit_t *ou) {
const arch_env_t *aenv = ou->co->aenv;
const arch_register_class_t *cls = ou->co->cls;
bitset_t *pos_regs = bitset_alloca(cls->n_regs);
const arch_env_t *aenv = ou->co->aenv;
const arch_register_class_t *cls = ou->co->cls;
bitset_t *pos_regs = bitset_alloca(cls->n_regs);
- bitset_t *ign_regs = bitset_alloca(cls->n_regs);
DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
for (i=0; i<ou->node_count; ++i)
DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
for (i=0; i<ou->node_count; ++i)
@@
-522,8
+523,7
@@
static void ou_optimize(unit_t *ou) {
arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
/* exclude ingore colors */
arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
/* exclude ingore colors */
- arch_put_non_ignore_regs(aenv, cls, ign_regs);
- bitset_and(pos_regs, ign_regs);
+ bitset_andnot(pos_regs, ou->co->cenv->ignore_colors);
assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
@@
-580,7
+580,9
@@
static void ou_optimize(unit_t *ou) {
int co_solve_heuristic(copy_opt_t *co) {
unit_t *curr;
int co_solve_heuristic(copy_opt_t *co) {
unit_t *curr;
- dbg = firm_dbg_register("ir.be.copyoptheur");
+ FIRM_DBG_REGISTER(dbg, "ir.be.copyoptheur");
+
+ ASSERT_OU_AVAIL(co);
pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
list_for_each_entry(unit_t, curr, &co->units, units)
pinned_global = pset_new_ptr(SLOTS_PINNED_GLOBAL);
list_for_each_entry(unit_t, curr, &co->units, units)
@@
-588,6
+590,5
@@
int co_solve_heuristic(copy_opt_t *co) {
ou_optimize(curr);
del_pset(pinned_global);
ou_optimize(curr);
del_pset(pinned_global);
-
return 0;
}
return 0;
}