#include "bechordal_t.h"
-#define BIGM 100000.0
-
-#define DUMP_SOLUTION
-#define DUMP_ILP
+//#define DUMP_SOLUTION
+//#define DUMP_ILP
//#define KEEPALIVE /* keep alive all inserted remats and dump graph with remats */
-#define COLLECT_REMATS /* enable rematerialization */
-#define COLLECT_INVERSE_REMATS /* enable placement of inverse remats */
+//#define COLLECT_REMATS /* enable rematerialization */
+//#define COLLECT_INVERSE_REMATS /* enable placement of inverse remats */
+//#define ONLY_BRIGGS_REMATS /* only remats without parameters (or only with ignored params) */
#define REMAT_WHILE_LIVE /* only remat values that are live */
//#define NO_ENLARGE_L1V3N355 /* do not remat after the death of some operand */
//#define EXECFREQ_LOOPDEPH /* compute execution frequency from loop depth only */
typedef struct _remat_t {
const ir_node *op; /**< for copy_irn */
const ir_node *value; /**< the value which is being recomputed by this remat */
- ir_node *proj; /**< not NULL if the above op produces a tuple */
+ const ir_node *proj; /**< not NULL if the above op produces a tuple */
int cost; /**< cost of this remat */
int inverse; /**< nonzero if this is an inverse remat */
} remat_t;
union {
struct {
ilp_var_t ilp;
- remat_t *remat; /** the remat this op belongs to */
+ const remat_t *remat; /** the remat this op belongs to */
int pre; /** 1, if this is a pressure-increasing remat */
} remat;
struct {
} op_t;
typedef struct _defs_t {
- ir_node *value;
- ir_node *spills; /**< points to the first spill for this value (linked by link field) */
- ir_node *remats; /**< points to the first definition for this value (linked by link field) */
+ const ir_node *value;
+ ir_node *spills; /**< points to the first spill for this value (linked by link field) */
+ ir_node *remats; /**< points to the first definition for this value (linked by link field) */
} defs_t;
typedef struct _remat_info_t {
} keyval_t;
typedef struct _spill_t {
- ir_node *irn;
- ilp_var_t reg_in;
- ilp_var_t mem_in;
- ilp_var_t reg_out;
- ilp_var_t mem_out;
- ilp_var_t spill;
+ ir_node *irn;
+ ilp_var_t reg_in;
+ ilp_var_t mem_in;
+ ilp_var_t reg_out;
+ ilp_var_t mem_out;
+ ilp_var_t spill;
} spill_t;
#ifdef WITH_MEMOPERANDS
typedef struct _memoperand_t {
- const ir_node *irn; /**< the irn */
+ ir_node *irn; /**< the irn */
unsigned int pos; /**< the position of the argument */
ilp_var_t ilp; /**< the ilp var for this memory operand */
} memoperand_t;
#endif
static keyval_t *
-set_find_keyval(set * set, void * key)
+set_find_keyval(set * set, const void * key)
{
keyval_t query;
}
static defs_t *
-set_find_def(set * set, ir_node * value)
+set_find_def(set * set, const ir_node * value)
{
defs_t query;
}
static defs_t *
-set_insert_def(set * set, ir_node * value)
+set_insert_def(set * set, const ir_node * value)
{
defs_t query;
}
static memoperand_t *
-set_find_memoperand(set * set, ir_node * irn, unsigned int pos)
+set_find_memoperand(set * set, const ir_node * irn, unsigned int pos)
{
memoperand_t query;
- query.irn = irn;
+ query.irn = (ir_node*)irn;
query.pos = pos;
return set_find(set, &query, sizeof(query), HASH_PTR(irn)+pos);
}
static spill_t *
-set_find_spill(set * set, ir_node * value)
+set_find_spill(set * set, const ir_node * value)
{
spill_t query;
- query.irn = value;
+ query.irn = (ir_node*)value;
return set_find(set, &query, sizeof(query), HASH_PTR(value));
}
}
}
+#ifdef NO_SINGLE_USE_REMATS
static int
get_irn_n_nonremat_edges(const spill_ilp_t * si, const ir_node * irn)
{
return i;
}
+#endif
+
+#ifdef ONLY_BRIGGS_REMATS
+static int
+get_irn_n_nonignore_args(const spill_ilp_t * si, const ir_node * irn)
+{
+ int n;
+ unsigned int ret = 0;
+
+ for(n=get_irn_arity(irn)-1; n>=0; --n) {
+ if(has_reg_class(si, irn)) ++ret;
+ }
+
+ return ret;
+}
+#endif
static INLINE void
get_remats_from_op(spill_ilp_t * si, const ir_node * op)
int n;
remat_t *remat;
+ if( has_reg_class(si, op)
#ifdef NO_SINGLE_USE_REMATS
- if(has_reg_class(si, op) && (get_irn_n_nonremat_edges(si, op) > 1)) {
-#else
- if(has_reg_class(si, op)) {
+ && (get_irn_n_nonremat_edges(si, op) > 1)
#endif
+#ifdef ONLY_BRIGGS_REMATS
+ && (get_irn_n_nonignore_args(si, op) == 0)
+#endif
+ ) {
remat = get_remat_from_op(si, op, op);
if(remat) {
add_remat(si, remat);
}
}
-#ifdef COLLECT_INVERSE_REMATS
+#if defined(COLLECT_INVERSE_REMATS) && !defined(ONLY_BRIGGS_REMATS)
/* repeat the whole stuff for each remat retrieved by get_remat_from_op(op, arg)
for each arg */
for (n = get_irn_arity(op)-1; n>=0; --n) {
}
static ir_node *
-insert_remat_after(spill_ilp_t * si, const remat_t * remat, const ir_node * pos, const pset * live)
+insert_remat_after(spill_ilp_t * si, const remat_t * remat, ir_node * pos, const pset * live)
{
char buf[256];
op->is_remat = 1;
op->attr.remat.remat = remat;
op->attr.remat.pre = 0;
- op->attr.remat.ilp = lpp_add_var(si->lpp, buf, lpp_binary, remat->cost*execution_frequency(si, pos));
+ op->attr.remat.ilp = lpp_add_var_default(si->lpp, buf, lpp_binary, remat->cost*execution_frequency(si, pos), 0.0);
set_irn_link(copy, op);
pset_insert_ptr(si->all_possible_remats, copy);
}
static ir_node *
-insert_remat_before(spill_ilp_t * si, const remat_t * remat, const ir_node * pos, const pset * live)
+insert_remat_before(spill_ilp_t * si, const remat_t * remat, ir_node * pos, const pset * live)
{
char buf[256];
op->is_remat = 1;
op->attr.remat.remat = remat;
op->attr.remat.pre = 1;
- op->attr.remat.ilp = lpp_add_var(si->lpp, buf, lpp_binary, remat->cost*execution_frequency(si, pos));
+ op->attr.remat.ilp = lpp_add_var_default(si->lpp, buf, lpp_binary, remat->cost*execution_frequency(si, pos), 0.0);
set_irn_link(copy, op);
pset_insert_ptr(si->all_possible_remats, copy);
spill_cost = is_Unknown(irn)?0.0001:COST_STORE*execution_frequency(si, bb);
ir_snprintf(buf, sizeof(buf), "reg_out_%N_%N", irn, bb);
- spill->reg_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->reg_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
lpp_set_factor_fast(si->lpp, cst, spill->reg_out, 1.0);
ir_snprintf(buf, sizeof(buf), "mem_out_%N_%N", irn, bb);
- spill->mem_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->mem_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
ir_snprintf(buf, sizeof(buf), "spill_%N_%N", irn, bb);
- spill->spill = lpp_add_var(si->lpp, buf, lpp_binary, spill_cost);
+ /* by default spill value right after definition */
+ be_is_live_in(si->lv, bb, irn) {
+ spill->spill = lpp_add_var_default(si->lpp, buf, lpp_binary, spill_cost, 0.0);
+ } else {
+ spill->spill = lpp_add_var_default(si->lpp, buf, lpp_binary, spill_cost, 1.0);
+ }
if(is_merge_edge(bb)) {
ilp_var_t reload;
ilp_cst_t rel_cst;
ir_snprintf(buf, sizeof(buf), "reload_%N_%N", bb, irn);
- reload = lpp_add_var(si->lpp, buf, lpp_binary, COST_LOAD*execution_frequency(si, bb));
+ reload = lpp_add_var_default(si->lpp, buf, lpp_binary, COST_LOAD*execution_frequency(si, bb), 0.0);
set_insert_keyval(spill_bb->reloads, irn, INT_TO_PTR(reload));
/* reload <= mem_out */
spill_cost = is_Unknown(irn)?0.0001:COST_STORE*execution_frequency(si, bb);
ir_snprintf(buf, sizeof(buf), "reg_out_%N_%N", irn, bb);
- spill->reg_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->reg_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
/* if irn is used at the end of the block, then it is live anyway */
//lpp_set_factor_fast(si->lpp, cst, spill->reg_out, 1.0);
ir_snprintf(buf, sizeof(buf), "mem_out_%N_%N", irn, bb);
- spill->mem_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->mem_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
ir_snprintf(buf, sizeof(buf), "spill_%N_%N", irn, bb);
- spill->spill = lpp_add_var(si->lpp, buf, lpp_binary, spill_cost);
+ be_is_live_in(si->lv, bb, irn) {
+ spill->spill = lpp_add_var_default(si->lpp, buf, lpp_binary, spill_cost, 0.0);
+ } else {
+ spill->spill = lpp_add_var_default(si->lpp, buf, lpp_binary, spill_cost, 1.0);
+ }
+ /* reload for use be control flow op */
ir_snprintf(buf, sizeof(buf), "reload_%N_%N", bb, irn);
- reload = lpp_add_var(si->lpp, buf, lpp_binary, COST_LOAD*execution_frequency(si, bb));
+ reload = lpp_add_var_default(si->lpp, buf, lpp_binary, COST_LOAD*execution_frequency(si, bb), 1.0);
set_insert_keyval(spill_bb->reloads, irn, INT_TO_PTR(reload));
/* reload <= mem_out */
next_post_remat(const ir_node * irn)
{
op_t *op;
+ ir_node *next;
if(is_Block(irn)) {
- irn = sched_block_first_nonphi(irn);
+ next = sched_block_first_nonphi(irn);
} else {
- irn = sched_next_op(irn);
+ next = sched_next_op(irn);
}
- if(sched_is_end(irn))
+ if(sched_is_end(next))
return NULL;
- op = (op_t*)get_irn_link(irn);
+ op = get_irn_link(next);
if(op->is_remat && !op->attr.remat.pre) {
- return irn;
+ return next;
}
return NULL;
spill->mem_in = ILP_UNDEF;
ir_snprintf(buf, sizeof(buf), "mem_out_%N_%N", irn, bb);
- spill->mem_out = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->mem_out = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
ir_snprintf(buf, sizeof(buf), "spill_%N_%N", irn, bb);
- spill->spill = lpp_add_var(si->lpp, buf, lpp_binary, spill_cost);
+ be_is_live_in(si->lv, bb, irn) {
+ spill->spill = lpp_add_var_default(si->lpp, buf, lpp_binary, spill_cost, 0.0);
+ } else {
+ spill->spill = lpp_add_var_default(si->lpp, buf, lpp_binary, spill_cost, 1.0);
+ }
}
return spill;
if(edge) return;
ir_snprintf(buf, sizeof(buf), "copyreg_%N", block);
- copyreg = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ copyreg = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
ir_snprintf(buf, sizeof(buf), "check_copyreg_%N", block);
cst = lpp_add_cst_uniq(si->lpp, buf, lpp_less, si->n_regs);
assert(!op->is_remat);
ir_snprintf(buf, sizeof(buf), "lr_%N_%N", irn, bb);
- op->attr.live_range.ilp = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ op->attr.live_range.ilp = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
op->attr.live_range.op = bb;
ir_snprintf(buf, sizeof(buf), "reg_out_%N_%N", bb, irn);
/* if value is becoming live through use by remat */
if(!pset_find_ptr(live, remat_arg)) {
ir_snprintf(buf, sizeof(buf), "lr_%N_end%N", remat_arg, bb);
- prev_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ prev_lr = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
arg_op->attr.live_range.ilp = prev_lr;
arg_op->attr.live_range.op = bb;
cst = lpp_add_cst_uniq(si->lpp, buf, lpp_less, 0.0);
ir_snprintf(buf, sizeof(buf), "lr_%N_%N", value, irn);
- prev_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ prev_lr = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
lpp_set_factor_fast(si->lpp, cst, value_op->attr.live_range.ilp, 1.0);
lpp_set_factor_fast(si->lpp, cst, prev_lr, -1.0);
ilp_var_t lr;
ir_snprintf(buf, sizeof(buf), "lr_%N_%N", remat_arg, irn);
- lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ lr = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
arg_op->attr.live_range.ilp = lr;
arg_op->attr.live_range.op = irn;
/* new live range for each used value */
ir_snprintf(buf, sizeof(buf), "lr_%N_%N", arg, irn);
- prev_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ prev_lr = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
/* the epilog stuff - including post_use, check_post, check_post_remat */
ir_snprintf(buf, sizeof(buf), "post_use_%N_%N", arg, irn);
- post_use = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ post_use = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 0.0);
lpp_set_factor_fast(si->lpp, check_post, post_use, 1.0);
ilp_var_t memoperand;
ir_snprintf(buf, sizeof(buf), "memoperand_%N_%d", irn, n);
- memoperand = lpp_add_var(si->lpp, buf, lpp_binary, COST_MEMOPERAND*execution_frequency(si, bb));
+ memoperand = lpp_add_var_default(si->lpp, buf, lpp_binary, COST_MEMOPERAND*execution_frequency(si, bb), 0.0);
set_insert_memoperand(si->memoperands, irn, n, memoperand);
ir_snprintf(buf, sizeof(buf), "nolivepost_%N_%d", irn, n);
set_foreach(args, keyval) {
spill_t *spill;
- ir_node *arg = keyval->key;
+ const ir_node *arg = keyval->key;
int i = PTR_TO_INT(keyval->val);
op_t *arg_op = get_irn_link(arg);
ilp_cst_t requirements;
assert(spill);
ir_snprintf(buf, sizeof(buf), "reload_%N_%N", arg, irn);
- op->attr.live_range.args.reloads[i] = lpp_add_var(si->lpp, buf, lpp_binary, COST_LOAD*execution_frequency(si, bb));
+ op->attr.live_range.args.reloads[i] = lpp_add_var_default(si->lpp, buf, lpp_binary, COST_LOAD*execution_frequency(si, bb), 1.0);
/* reload <= mem_out */
ir_snprintf(buf, sizeof(buf), "req_reload_%N_%N", arg, irn);
for (n=get_irn_arity(tmp)-1; n>=0; --n) {
ir_node *remat_arg = get_irn_n(tmp, n);
op_t *arg_op = get_irn_link(remat_arg);
- ilp_var_t prev_lr;
if(!has_reg_class(si, remat_arg)) continue;
DBG((si->dbg, LEVEL_5, "\t %+F live at beginning of block %+F\n", spill->irn, bb));
ir_snprintf(buf, sizeof(buf), "mem_in_%N_%N", spill->irn, bb);
- spill->mem_in = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->mem_in = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
lpp_set_factor_fast(si->lpp, cst, spill->mem_in, -1.0);
if(is_Phi(spill->irn) && get_nodes_block(spill->irn) == bb) {
/* copies are not for free */
ir_snprintf(buf, sizeof(buf), "copy_%N_%N", arg, spill->irn);
- var = lpp_add_var(si->lpp, buf, lpp_binary, COST_STORE * freq);
+ var = lpp_add_var_default(si->lpp, buf, lpp_binary, COST_STORE * freq, 1.0);
for(m=n; m>=0; --m) {
const ir_node *arg2 = get_irn_n(spill->irn, m);
assert(spill);
ir_snprintf(buf, sizeof(buf), "reg_in_%N_%N", irn, bb);
- spill->reg_in = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ spill->reg_in = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
lpp_set_factor_fast(si->lpp, cst, spill->reg_in, 1.0);
assert(!is_Proj(tmp));
if(op->is_remat) {
- ir_node *value = op->attr.remat.remat->value;
+ const ir_node *value = op->attr.remat.remat->value;
if(value == irn) {
/* only collect remats up to the first real use of a value */
}
}
}
-next_live:
+next_live: ;
}
del_pset(live);
}
static int
-values_interfere_in_block(const spill_ilp_t * si, ir_node * bb, ir_node * a, ir_node * b)
+values_interfere_in_block(const spill_ilp_t * si, const ir_node * bb, const ir_node * a, const ir_node * b)
{
const ir_edge_t *edge;
ir_node *a = be_lv_get_irn(si->lv, bb, l1);
op_t *a_op = get_irn_link(a);
- if(a_op->is_remat) continue;
/* a is only interesting if it is in my register class and if it is inside a phi class */
if (has_reg_class(si, a) && get_phi_class(a)) {
+ if(a_op->is_remat)
+ continue;
+
for(l2=_be_lv_next_irn(si->lv, bb, 0xff, l1+1); l2>=0; l2=_be_lv_next_irn(si->lv, bb, 0xff, l2+1)) {
ir_node *b = be_lv_get_irn(si->lv, bb, l2);
op_t *b_op = get_irn_link(b);
- if(b_op->is_remat) continue;
/* a and b are only interesting if they are in the same phi class */
if(has_reg_class(si, b) && get_phi_class(a) == get_phi_class(b)) {
+ if(b_op->is_remat)
+ continue;
+
if(values_interfere_in_block(si, bb, a, b)) {
DBG((si->dbg, LEVEL_4, "\tvalues interfere in %+F: %+F, %+F\n", bb, a, b));
set_insert_interference(si, si->interferences, a, b, bb);
* @parameter visited contains a set of nodes already visited on this path
*/
static int
-find_copy_path(spill_ilp_t * si, ir_node * irn, ir_node * target, ilp_var_t any_interfere, pset * copies, pset * visited)
+find_copy_path(spill_ilp_t * si, const ir_node * irn, const ir_node * target, ilp_var_t any_interfere, pset * copies, pset * visited)
{
- ir_edge_t *edge;
- op_t *op = get_irn_link(irn);
- pset *visited_users = pset_new_ptr_default();
- int paths = 0;
+ const ir_edge_t *edge;
+ op_t *op = get_irn_link(irn);
+ pset *visited_users = pset_new_ptr_default();
+ int paths = 0;
- if(op->is_remat) return;
+ if(op->is_remat) return 0;
pset_insert_ptr(visited, irn);
}
static void
-gen_copy_constraints(spill_ilp_t * si, ir_node * a, ir_node * b, ilp_var_t any_interfere)
+gen_copy_constraints(spill_ilp_t * si, const ir_node * a, const ir_node * b, ilp_var_t any_interfere)
{
pset * copies = pset_new_ptr_default();
pset * visited = pset_new_ptr_default();
/* any_interf <= \sum interf */
ir_snprintf(buf, sizeof(buf), "interfere_%N_%N", a, b);
any_interfere_cst = lpp_add_cst_uniq(si->lpp, buf, lpp_less, 0);
- any_interfere = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ any_interfere = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
lpp_set_factor_fast(si->lpp, any_interfere_cst, any_interfere, 1.0);
const ir_node *bb = irnlist->irn;
spill_bb_t *spill_bb = get_irn_link(bb);
spill_t *spilla,
- *spillb,
- query;
+ *spillb;
char buf[256];
- query.irn = a;
spilla = set_find_spill(spill_bb->ilp, a);
assert(spilla);
- query.irn = b;
spillb = set_find_spill(spill_bb->ilp, b);
assert(spillb);
/* 2: - mem_in_a - spill_a + interfere <= 0 */
/* 3: - mem_in_b - spill_b + interfere <= 0 */
ir_snprintf(buf, sizeof(buf), "interfere_%N_%N_%N", bb, a, b);
- interfere = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
+ interfere = lpp_add_var_default(si->lpp, buf, lpp_binary, 0.0, 1.0);
ir_snprintf(buf, sizeof(buf), "interfere_%N_%N_%N-1", bb, a, b);
cst = lpp_add_cst_uniq(si->lpp, buf, lpp_less, 1);
}
/** insert a spill at an arbitrary position */
-ir_node *be_spill2(const arch_env_t *arch_env, ir_node *irn, ir_node *insert, ir_node *ctx)
+ir_node *be_spill2(const arch_env_t *arch_env, ir_node *irn, ir_node *insert)
{
ir_node *bl = is_Block(insert)?insert:get_nodes_block(insert);
ir_graph *irg = get_irn_irg(bl);
const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, irn, -1);
const arch_register_class_t *cls_frame = arch_get_irn_reg_class(arch_env, frame, -1);
- spill = be_new_Spill(cls, cls_frame, irg, bl, frame, irn, ctx);
+ spill = be_new_Spill(cls, cls_frame, irg, bl, frame, irn);
/*
* search the right insertion point. a spill of a phi cannot be put
pset_foreach(remat_info->remats, remat)
{
if(remat->proj && get_irn_n_edges(remat->proj) == 0) {
- set_irn_n(remat->proj, -1, bad);
- set_irn_n(remat->proj, 0, bad);
+ set_irn_n((ir_node*)remat->proj, -1, bad);
+ set_irn_n((ir_node*)remat->proj, 0, bad);
}
if(get_irn_n_edges(remat->op) == 0) {
for (n=get_irn_arity(remat->op)-1; n>=-1; --n) {
- set_irn_n(remat->op, n, bad);
+ set_irn_n((ir_node*)remat->op, n, bad);
}
}
}
}
static pset *
-get_spills_for_value(spill_ilp_t * si, ir_node * value)
+get_spills_for_value(spill_ilp_t * si, const ir_node * value)
{
pset *spills = pset_new_ptr_default();
- ir_node *next;
- defs_t *defs;
+ const ir_node *next;
+ defs_t *defs;
defs = set_find_def(si->values, value);
return spills;
}
-static pset *
-get_remats_for_value(spill_ilp_t * si, ir_node * value)
-{
- pset *remats = pset_new_ptr_default();
-
- ir_node *next;
- defs_t *defs;
-
- pset_insert_ptr(remats, value);
- defs = set_find_def(si->values, value);
-
- if(defs && defs->remats) {
- for(next = defs->remats; next; next = get_irn_link(next)) {
- pset_insert_ptr(remats, next);
- }
- }
-
- return remats;
-}
-
-
/**
* @param before The node after which the spill will be placed in the schedule
*/
/* TODO set context properly */
static ir_node *
-insert_spill(spill_ilp_t * si, ir_node * irn, ir_node * value, ir_node * before)
+insert_spill(spill_ilp_t * si, ir_node * irn, const ir_node * value, ir_node * before)
{
defs_t *defs;
ir_node *spill;
DBG((si->dbg, LEVEL_3, "\t inserting spill for value %+F after %+F\n", irn, before));
- spill = be_spill2(arch_env, irn, before, irn);
+ spill = be_spill2(arch_env, irn, before);
defs = set_insert_def(si->values, value);
assert(defs);
* @param before The Phi node which has to be spilled
*/
static ir_node *
-insert_mem_phi(spill_ilp_t * si, const ir_node * phi)
+insert_mem_phi(spill_ilp_t * si, ir_node * phi)
{
ir_node *mem_phi;
ir_node **ins;
defs_t *defs;
int n;
- op_t *op = get_irn_link(phi);
NEW_ARR_A(ir_node*, ins, get_irn_arity(phi));
* Add reload before operation and add to list of defs
*/
static ir_node *
-insert_reload(spill_ilp_t * si, const ir_node * value, const ir_node * after)
+insert_reload(spill_ilp_t * si, const ir_node * value, ir_node * after)
{
defs_t *defs;
ir_node *reload,
}
static ir_node *
-insert_mem_copy(spill_ilp_t * si, const ir_node * bb, const ir_node * value)
+insert_mem_copy(spill_ilp_t * si, ir_node * bb, ir_node * value)
{
ir_node *insert_pos = bb;
ir_node *spill;
DBG((si->dbg, LEVEL_2, "\t inserting mem copy for value %+F after %+F\n", value, insert_pos));
- spill = be_spill2(arch_env, is_Block(insert_pos)?value:insert_pos, insert_pos, value);
+ spill = be_spill2(arch_env, is_Block(insert_pos)?value:insert_pos, insert_pos);
return spill;
}
if(!phi_m) continue;
for(n=get_irn_arity(phi)-1; n>=0; --n) {
- const ir_node *value = get_irn_n(phi, n);
+ ir_node *value = get_irn_n(phi, n);
defs_t *val_defs = set_find_def(si->values, value);
- ir_node *arg = get_irn_n(phi_m, n);
/* a spill of this value */
ir_node *spill;
spill_ilp_t *si = (spill_ilp_t*)data;
ir_node *irn;
spill_bb_t *spill_bb = get_irn_link(bb);
- int i;
/* reloads at end of block */
if(spill_bb->reloads) {
walker_kill_unused(ir_node * bb, void * data)
{
struct kill_helper *kh = data;
- const ir_node *bad = get_irg_bad(get_irn_irg(bb));
+ ir_node *bad = get_irg_bad(get_irn_irg(bb));
ir_node *irn;
lc_bitset_free(kh.used);
}
-static void
+void
print_irn_pset(pset * p)
{
ir_node *irn;
}
}
-static void
+void
dump_phi_class(spill_ilp_t * si, pset * phiclass, const char * file)
{
FILE *f = fopen(file, "w");
/* then fix uses of spills */
set_foreach(si->values, defs) {
- pset *reloads;
- pset *spills;
- ir_node *next = defs->remats;
+ pset *reloads;
+ pset *spills;
+ const ir_node *next = defs->remats;
int remats = 0;
reloads = pset_new_ptr_default();
/* first fix uses of remats and reloads */
set_foreach(si->values, defs) {
- pset *nodes;
- ir_node *next = defs->remats;
+ pset *nodes;
+ const ir_node *next = defs->remats;
if(next) {
nodes = pset_new_ptr_default();
if( sched_is_end(irn) ||
(be_is_Reload(irn) && has_reg_class(si, irn)) ||
/* do not move reload before its spill */
- (irn == be_get_Reload_mem(reload)) ) break;
+ (irn == be_get_Reload_mem(reload)) ||
+ /* do not move before phi */
+ is_Phi(irn)) break;
set_irn_link(irn, INT_TO_PTR(pressure+1));
DBG((si->dbg, LEVEL_5, "new regpressure before %+F: %d\n", irn, pressure+1));
static void
walker_spillslotassigner(ir_node * irn, void * data)
{
- spill_ilp_t *si = (spill_ilp_t*)data;
void *cls;
if(!be_is_Spill(irn)) return;
/* set spill context to phi class if it has one ;) */
-
+ (void) cls;
+#if 0
+ // Matze: not needed anymore
cls = get_phi_class(irn);
if(cls)
be_set_Spill_context(irn, cls);
else
be_set_Spill_context(irn, irn);
+#endif
}
#endif
#ifdef SOLVE
- DBG((si.dbg, LEVEL_1, "\tSolving %F\n", chordal_env->irg));
+ DBG((si.dbg, LEVEL_1, "\tSolving %s (%d variables, %d constraints)\n", problem_name, si.lpp->var_next, si.lpp->cst_next));
#ifdef ILP_TIMEOUT
lpp_set_time_limit(si.lpp, ILP_TIMEOUT);
#endif
+ lpp_set_log(si.lpp, stdout);
+
#ifdef SOLVE_LOCAL
lpp_solve_cplex(si.lpp);
#else
projects / libfirm / blobdiff