projects
/
libfirm
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2b16763
)
Fix the way simplifiable node are colored when alignment is in the game
author
Quentin Colombet
<quentin.colombet@ens-lyon.fr>
Mon, 12 Dec 2011 11:29:43 +0000
(12:29 +0100)
committer
Matthias Braun
<matthias.braun@kit.edu>
Thu, 1 Mar 2012 15:02:00 +0000
(16:02 +0100)
ir/be/becopyilp.c
patch
|
blob
|
history
diff --git
a/ir/be/becopyilp.c
b/ir/be/becopyilp.c
index
69684b4
..
3e34848
100644
(file)
--- a/
ir/be/becopyilp.c
+++ b/
ir/be/becopyilp.c
@@
-187,14
+187,29
@@
void sr_reinsert(size_red_t *sr)
/* get free color by inspecting all neighbors */
be_ifg_foreach_neighbour(ifg, &iter, irn, other) {
/* get free color by inspecting all neighbors */
be_ifg_foreach_neighbour(ifg, &iter, irn, other) {
+ const arch_register_req_t *cur_req;
+ unsigned cur_col;
+
/* only inspect nodes which are in graph right now */
if (sr_is_removed(sr, other))
continue;
/* only inspect nodes which are in graph right now */
if (sr_is_removed(sr, other))
continue;
- rbitset_clear(possible_cols, get_irn_col(other));
+
+ cur_req = arch_get_irn_register_req(other);
+ cur_col = get_irn_col(other);
+
+ /* Invalidate all single size register when it is a large one */
+ do {
+ rbitset_clear(possible_cols, cur_col);
+ ++cur_col;
+ } while ((cur_col % cur_req->width) != 0);
}
/* now all bits not set are possible colors */
}
/* now all bits not set are possible colors */
- free_col = (unsigned)rbitset_next(possible_cols, 0, true);
+ /* take one that matches the alignment constraint */
+ do {
+ free_col = (unsigned)rbitset_next(possible_cols, 0, true);
+ } while ((free_col % arch_get_irn_register_req(irn)->width) != 0
+ && free_col != n_regs - 1);
assert(!rbitset_is_empty(possible_cols, n_regs) && "No free color found. This can not be.");
set_irn_col(sr->co->cls, irn, free_col);
pset_remove_ptr(sr->all_removed, irn); /* irn is back in graph again */
assert(!rbitset_is_empty(possible_cols, n_regs) && "No free color found. This can not be.");
set_irn_col(sr->co->cls, irn, free_col);
pset_remove_ptr(sr->all_removed, irn); /* irn is back in graph again */