/*
- * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
* Heuristic for minimizing copies using a queue which holds 'qnodes' not yet
* examined. A qnode has a 'target color', nodes out of the opt unit and
* a 'conflict graph'. 'Conflict graph' = "Interference graph' + 'conflict edges'
- * A 'max indep set' is determined form these. We try to color this mis using a
+ * A 'max indep set' is determined from these. We try to color this mis using a
* color-exchanging mechanism. Occuring conflicts are modeled with 'conflict edges'
* and the qnode is reinserted in the queue. The first qnode colored without
* conflicts is the best one.
#include "becopyopt_t.h"
#include "becopystat.h"
-#include "benodesets.h"
#include "beintlive_t.h"
#include "beirg_t.h"
#define SLOTS_CHANGED_NODES 32
#define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
-#define HASH_CONFLICT(c) (nodeset_hash(c.n1) ^ nodeset_hash(c.n2))
+#define HASH_CONFLICT(c) (hash_irn(c.n1) ^ hash_irn(c.n2))
/**
* Modeling additional conflicts between nodes. NOT live range interference
*/
typedef struct _qnode_t {
struct list_head queue; /**< chaining of unit_t->queue */
- const unit_t *ou; /**< the opt unit this qnode belongs to */
+ const unit_t *ou; /**< the opt unit this node belongs to */
int color; /**< target color */
set *conflicts; /**< contains conflict_t's. All internal conflicts */
int mis_costs; /**< costs of nodes/copies in the mis. */
const conflict_t *yy = y;
(void) size;
- return ! (xx->n1 == yy->n1 && xx->n2 == yy->n2);
+ return xx->n1 != yy->n1 || xx->n2 != yy->n2;
}
/**
conflict_t c;
DBG((dbg, LEVEL_4, "\t %+F -- %+F\n", n1, n2));
- if ((int)n1 < (int)n2) {
+ if (get_irn_idx(n1) < get_irn_idx(n2)) {
c.n1 = n1;
c.n2 = n2;
} else {
if (n1!=n2 && nodes_interfere(qn->ou->co->cenv, n1, n2))
return 1;
/* search for recoloring conflicts */
- if ((int)n1 < (int)n2) {
+ if (get_irn_idx(n1) < get_irn_idx(n2)) {
c.n1 = n1;
c.n2 = n2;
} else {
c.n1 = n2;
c.n2 = n1;
}
- return (int) set_find(qn->conflicts, &c, sizeof(c), HASH_CONFLICT(c));
+ return set_find(qn->conflicts, &c, sizeof(c), HASH_CONFLICT(c)) != 0;
}
static int set_cmp_node_stat_t(const void *x, const void *y, size_t size) {
(void) size;
- return ((node_stat_t *)x)->irn != ((node_stat_t *)y)->irn;
+ return ((const node_stat_t*)x)->irn != ((const node_stat_t*)y)->irn;
}
/**
* Finds a node status entry of a node if existent. Otherwise return NULL
*/
-static INLINE node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn) {
+static INLINE const 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), nodeset_hash(irn));
+ return set_find(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
}
/**
find.irn = irn;
find.new_color = NO_COLOR;
find.pinned_local = 0;
- return set_insert(qn->changed_nodes, &find, sizeof(find), nodeset_hash(irn));
+ return set_insert(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
}
/**
* Returns the virtual color of a node if set before, else returns the real color.
*/
static INLINE int qnode_get_new_color(const qnode_t *qn, ir_node *irn) {
- node_stat_t *found = qnode_find_node(qn, irn);
+ const node_stat_t *found = qnode_find_node(qn, irn);
if (found)
return found->new_color;
else
* processed node.
*/
static INLINE int qnode_is_pinned_local(const qnode_t *qn, ir_node *irn) {
- node_stat_t *found = qnode_find_node(qn, irn);
+ const node_stat_t *found = qnode_find_node(qn, irn);
if (found)
return found->pinned_local;
else
*/
#define CHANGE_SAVE NULL
#define CHANGE_IMPOSSIBLE (ir_node *)1
-#define is_conflicting_node(n) (((int)n) > 1)
/**
* Performs virtual re-coloring of node @p n to color @p col. Virtual colors of
} else if (confl_node == CHANGE_IMPOSSIBLE) {
DBG((dbg, LEVEL_3, "\t Impossible --> remove from qnode\n"));
qnode_add_conflict(qn, test_node, test_node);
+ return 0;
} else {
if (qnode_is_pinned_local(qn, confl_node)) {
/* changing test_node would change back a node of current ou */
DBG((dbg, LEVEL_3, "\t Conflicting global --> remove from qnode\n"));
qnode_add_conflict(qn, test_node, test_node);
}
- }
-
- if (confl_node != CHANGE_SAVE)
return 0;
+ }
}
return 1;
}
arch_get_allocatable_regs(aenv, ou->nodes[0], -1, pos_regs);
- /* exclude ingore colors */
+ /* exclude ignore colors */
bitset_andnot(pos_regs, ou->co->cenv->ignore_colors);
assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
ou_insert_qnode(ou, new_qnode(ou, idx));
/* search best */
- while (!list_empty(&ou->queue)) {
+ for (;;) {
+ assert(!list_empty(&ou->queue));
/* get head of queue */
curr = list_entry_queue(ou->queue.next);
list_del(&curr->queue);
projects / libfirm / blobdiff