return res;
}
-static be_insn_t *chordal_scan_insn(be_chordal_alloc_env_t *env, ir_node *irn)
+static be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn)
{
be_insn_env_t ie;
- ie.ignore_colors = env->chordal_env->ignore_colors;
- ie.aenv = env->chordal_env->birg->main_env->arch_env;
- ie.obst = &env->chordal_env->obst;
- ie.cls = env->chordal_env->cls;
+ ie.ignore_colors = env->ignore_colors;
+ ie.aenv = env->birg->main_env->arch_env;
+ ie.obst = &env->obst;
+ ie.cls = env->cls;
return be_scan_insn(&ie, irn);
}
+static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn)
+{
+ be_insn_t *insn = chordal_scan_insn(env, irn);
+ int n_uses = be_insn_n_uses(insn);
+ int n_defs = be_insn_n_defs(insn);
+ int i;
+
+ if(!insn->has_constraints)
+ goto end;
+
+ for(i = insn->use_start; i < insn->n_ops; ++i) {
+ be_operand_t *op = &insn->ops[i];
+ if(op->has_constraints && values_interfere(env->lv, insn->irn, op->carrier)) {
+ ir_node *bl = get_nodes_block(insn->irn);
+ ir_node *copy = be_new_Copy(env->cls, env->irg, bl, op->carrier);
+
+ sched_add_before(insn->irn, copy);
+ set_irn_n(insn->irn, op->pos, copy);
+ DBG((env->dbg, LEVEL_3, "inserting constr copy %+F for %+F pos %d\n", copy, insn->irn, op->pos));
+ be_liveness_update(env->lv, op->carrier);
+ }
+ }
+
+end:
+ obstack_free(&env->obst, insn);
+ return insn->next_insn;
+}
+
+static void pre_spill_prepare_constr_walker(ir_node *bl, void *data)
+{
+ be_chordal_env_t *env = data;
+ ir_node *irn;
+ for(irn = sched_first(bl); !sched_is_end(irn);) {
+ irn = prepare_constr_insn(env, irn);
+ }
+}
+
+void be_pre_spill_prepare_constr(be_chordal_env_t *cenv) {
+ irg_block_walk_graph(cenv->irg, pre_spill_prepare_constr_walker, NULL, (void *) cenv);
+}
+
static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t *insn)
{
const be_chordal_env_t *env = alloc_env->chordal_env;
of one are a subset of the other's. We record the operand whose constraints
count in the decisive array.
*/
- if(!values_interfere(op->irn, op->carrier)) {
+ if(!values_interfere(env->lv, op->irn, op->carrier)) {
if(get_decisive_partner_regs(bs, out_op, op))
bipartite_add(bp, j, i - insn->use_start);
}
Now, figure out which input operand must be copied since it has input
constraints which are also output constraints.
*/
+#if 0
for(i = insn->use_start; i < insn->n_ops; ++i) {
be_operand_t *op = &insn->ops[i];
- if(op->has_constraints && (values_interfere(op->carrier, insn->irn) || arch_irn_is(aenv, op->carrier, ignore))) {
+ if(op->has_constraints && (values_interfere(env->lv, op->carrier, insn->irn) || arch_irn_is(aenv, op->carrier, ignore))) {
bitset_copy(bs, op->regs);
bitset_and(bs, out_constr);
}
}
}
+#endif
/*
Make the Perm, recompute liveness and re-scan the insn since the
in operands are now the Projs of the Perm.
*/
- perm = insert_Perm_after(aenv, env->cls, env->dom_front, sched_prev(insn->irn));
+ perm = insert_Perm_after(aenv, env->lv, env->cls, env->dom_front, sched_prev(insn->irn));
/* Registers are propagated by insert_Perm_after(). Clean them here! */
if(perm) {
the Perm. Recomputing liveness is also a good idea if a Perm is inserted, since
the live sets may change.
*/
- be_liveness(env->irg);
+ // be_liveness_recompute(env->lv);
obstack_free(&env->obst, insn);
- *the_insn = insn = chordal_scan_insn(alloc_env, insn->irn);
+ *the_insn = insn = chordal_scan_insn(env, insn->irn);
/*
Copy the input constraints of the insn to the Perm as output
{
be_chordal_env_t *env = alloc_env->chordal_env;
void *base = obstack_base(&env->obst);
- be_insn_t *insn = chordal_scan_insn(alloc_env, irn);
+ be_insn_t *insn = chordal_scan_insn(env, irn);
ir_node *res = insn->next_insn;
int be_silent = *silent;
assert(is_Proj(proj));
- if(values_interfere(proj, irn) && !pmap_contains(partners, proj)) {
+ if(values_interfere(env->lv, proj, irn) && !pmap_contains(partners, proj)) {
assert(n_alloc < n_regs);
alloc_nodes[n_alloc] = proj;
pmap_insert(partners, proj, NULL);
unsigned step = 0;
unsigned pressure = 0;
struct list_head *head;
- pset *live_in = put_live_in(block, pset_new_ptr_default());
- pset *live_end = put_live_end(block, pset_new_ptr_default());
+ pset *live_in = be_lv_pset_put_in(env->lv, block, pset_new_ptr_default());
+ pset *live_end = be_lv_pset_put_end(env->lv, block, pset_new_ptr_default());
DBG((dbg, LEVEL_1, "Computing pressure in block %+F\n", block));
bitset_clear_all(live);
bitset_t *in_colors = alloc_env->in_colors;
const arch_env_t *arch_env = env->birg->main_env->arch_env;
struct list_head *head = get_block_border_head(env, block);
- pset *live_in = put_live_in(block, pset_new_ptr_default());
+ pset *live_in = be_lv_pset_put_in(env->lv, block, pset_new_ptr_default());
const ir_node *irn;
border_t *b;
* Assign a color, if it is a local def. Global defs already have a
* color.
*/
- if(b->is_def && !is_live_in(block, irn)) {
+ if(b->is_def && !be_is_live_in(env->lv, block, irn)) {
const arch_register_t *reg;
int col = NO_COLOR;
projects / libfirm / blobdiff