#include <malloc.h>
#endif
+#include "debug.h"
#include "xmalloc.h"
-#include "becopyopt.h"
+#include "becopyopt_t.h"
#include "becopystat.h"
#include "bitset.h"
-#include "bearch.h"
static firm_dbg_module_t *dbg = NULL;
#define SEARCH_FREE_COLORS
-#define SLOTS_PINNED_GLOBAL 256
+#define SLOTS_PINNED_GLOBAL 64
#define SLOTS_CONFLICTS 8
#define SLOTS_CHANGED_NODES 32
-#define MIN(a,b) ((a<b)?(a):(b))
#define list_entry_queue(lh) list_entry(lh, qnode_t, queue)
#define HASH_CONFLICT(c) (HASH_PTR(c.n1) ^ HASH_PTR(c.n2))
static INLINE int qnode_are_conflicting(const qnode_t *qn, const ir_node *n1, const ir_node *n2) {
conflict_t c;
/* search for live range interference */
- if (n1!=n2 && nodes_interfere(qn->ou->co->chordal_env, n1, n2))
+ if (n1!=n2 && nodes_interfere(qn->ou->co->cenv, n1, n2))
return 1;
/* search for recoloring conflicts */
if ((int)n1 < (int)n2) {
*
*/
static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const ir_node *trigger) {
- const be_chordal_env_t *chordal_env = qn->ou->co->chordal_env;
- const arch_register_class_t *cls = chordal_env->cls;
- const arch_env_t *arch_env = chordal_env->main_env->arch_env;
+ copy_opt_t *co = qn->ou->co;
+ const be_chordal_env_t *chordal_env = co->cenv;
+ const arch_register_class_t *cls = co->cls;
+ const arch_env_t *arch_env = co->aenv;
int irn_col = qnode_get_new_color(qn, irn);
ir_node *sub_res, *curr;
be_ifg_t *ifg = chordal_env->ifg;
qnode_t *qn = xmalloc(sizeof(*qn));
qn->ou = ou;
qn->color = color;
- qn->mis = malloc(ou->node_count * sizeof(*qn->mis));
+ qn->mis = xmalloc(ou->node_count * sizeof(*qn->mis));
qn->conflicts = new_set(set_cmp_conflict_t, SLOTS_CONFLICTS);
qn->changed_nodes = new_set(set_cmp_node_stat_t, SLOTS_CHANGED_NODES);
return qn;
static void ou_optimize(unit_t *ou) {
int i;
qnode_t *curr = NULL, *tmp;
- arch_env_t *aenv = get_arch_env(ou->co);
- const arch_register_class_t *cls = ou->co->chordal_env->cls;
+ 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);
arch_put_non_ignore_regs(aenv, cls, ign_regs);
bitset_and(pos_regs, ign_regs);
+ assert(bitset_popcnt(pos_regs) != 0 && "No register is allowed for this node !!?");
+
/* create new qnode */
bitset_foreach(pos_regs, i)
ou_insert_qnode(ou, new_qnode(ou, i));
free_qnode(curr);
}
-void co_heur_opt(copy_opt_t *co) {
+int co_solve_heuristic(copy_opt_t *co) {
unit_t *curr;
dbg = firm_dbg_register("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)
if (curr->node_count > 1)
ou_optimize(curr);
del_pset(pinned_global);
+
+ return 0;
}