values may die at every use
[libfirm] / ir / be / bespillremat.c
index 8f8a7f1..bef74c8 100644 (file)
 #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 */
-//#define MAY_DIE_AT_PRE_REMAT /* allow values to die after a pre remat */
-#define CHECK_POST_REMAT /* check pressure after post remats (conservative but otherwise we can temporarily exceed the register pressure) */
+#define MAY_DIE_AT_REMAT /* allow values to die after a pre remat */
 #define NO_SINGLE_USE_REMATS /* do not repair schedule */
 //#define KEEPALIVE_SPILLS
 //#define KEEPALIVE_RELOADS
 #define GOODWIN_REDUCTION
-//#define NO_MEMCOPIES
+#define NO_MEMCOPIES
 
 #define  SOLVE
 //#define  SOLVE_LOCAL
@@ -326,8 +325,7 @@ get_cost(const spill_ilp_t * si, const ir_node * irn)
 static INLINE int
 is_rematerializable(const spill_ilp_t * si, const ir_node * irn)
 {
-       int             i,
-                       n;
+       int               n;
        const arch_env_t *arch_env = si->chordal_env->birg->main_env->arch_env;
        int               remat = (arch_irn_get_flags(arch_env, irn) & arch_irn_flags_rematerializable) != 0;
 
@@ -336,8 +334,8 @@ is_rematerializable(const spill_ilp_t * si, const ir_node * irn)
                ir_fprintf(stderr, "  Node %+F is not rematerializable\n", irn);
 #endif
 
-       for (i = 0, n = get_irn_arity(irn); i < n && remat; ++i) {
-               ir_node        *op = get_irn_n(irn, i);
+       for (n = get_irn_arity(irn)-1; n>=0 && remat; --n) {
+               ir_node        *op = get_irn_n(irn, n);
                remat &= has_reg_class(si, op) || arch_irn_get_flags(arch_env, op) & arch_irn_flags_ignore || (get_irn_op(op) == op_NoMem);
 
 //             if(!remat)
@@ -377,28 +375,27 @@ get_remat_from_op(spill_ilp_t * si, const ir_node * dest_value, const ir_node *
                remat->inverse = 0;
        } else {
                arch_inverse_t     inverse;
-               int                i,
-                                                  n;
+               int                n;
 
                /* get the index of the operand we want to retrieve by the inverse op */
-               for (i = 0, n = get_irn_arity(op); i < n; ++i) {
-                       ir_node        *arg = get_irn_n(op, i);
+               for (n = get_irn_arity(op)-1; n>=0; --n) {
+                       ir_node        *arg = get_irn_n(op, n);
 
                        if(arg == dest_value) break;
                }
-               if(i == n) return NULL;
+               if(n<0) return NULL;
 
-               DBG((si->dbg, LEVEL_5, "\t  requesting inverse op for argument %d of op %+F\n", i, op));
+               DBG((si->dbg, LEVEL_5, "\t  requesting inverse op for argument %d of op %+F\n", n, op));
 
                /* else ask the backend to give an inverse op */
-               if(arch_get_inverse(si->chordal_env->birg->main_env->arch_env, op, i, &inverse, si->obst)) {
+               if(arch_get_inverse(si->chordal_env->birg->main_env->arch_env, op, n, &inverse, si->obst)) {
                        int   i;
 
                        DBG((si->dbg, LEVEL_4, "\t  backend gave us an inverse op with %d nodes and cost %d\n", inverse.n, inverse.costs));
 
                        assert(inverse.n > 0 && "inverse op should have at least one node");
 
-                       for(i=0; i<inverse.n; ++i) {
+                       for(i=inverse.n-1; i>=0; --i) {
                                pset_insert_ptr(si->inverse_ops, inverse.nodes[i]);
                        }
 
@@ -433,8 +430,7 @@ add_remat(const spill_ilp_t * si, const remat_t * remat)
 {
        remat_info_t    *remat_info,
                      query;
-       int              i,
-                                        n;
+       int              n;
 
        assert(remat->op);
        assert(remat->value);
@@ -450,8 +446,8 @@ add_remat(const spill_ilp_t * si, const remat_t * remat)
        pset_insert(remat_info->remats, remat, HASH_PTR(remat->op));
 
        /* insert the remat into the remats_be_operand set of each argument of the remat op */
-       for (i = 0, n = get_irn_arity(remat->op); i < n; ++i) {
-               ir_node        *arg = get_irn_n(remat->op, i);
+       for (n = get_irn_arity(remat->op)-1; n>=0; --n) {
+               ir_node        *arg = get_irn_n(remat->op, n);
 
                query.irn = arg;
                query.remats = NULL;
@@ -484,8 +480,7 @@ get_irn_n_nonremat_edges(const spill_ilp_t * si, const ir_node * irn)
 static INLINE void
 get_remats_from_op(spill_ilp_t * si, const ir_node * op)
 {
-       int       i,
-                     n;
+       int      n;
        remat_t *remat;
 
 #ifdef NO_SINGLE_USE_REMATS
@@ -502,8 +497,8 @@ get_remats_from_op(spill_ilp_t * si, const ir_node * op)
 #ifdef COLLECT_INVERSE_REMATS
        /* repeat the whole stuff for each remat retrieved by get_remat_from_op(op, arg)
           for each arg */
-       for (i = 0, n = get_irn_arity(op); i < n; ++i) {
-               ir_node        *arg = get_irn_n(op, i);
+       for (n = get_irn_arity(op)-1; n>=0; --n) {
+               ir_node        *arg = get_irn_n(op, n);
 
                if(has_reg_class(si, arg)) {
                        /* try to get an inverse remat */
@@ -637,8 +632,7 @@ can_remat_before(const spill_ilp_t * si, const remat_t * remat, const ir_node *
 {
        const ir_node   *op = remat->op;
        const ir_node   *prev;
-       int        i,
-                          n,
+       int        n,
                           res = 1;
 
        if(is_Block(pos)) {
@@ -662,8 +656,8 @@ can_remat_before(const spill_ilp_t * si, const remat_t * remat, const ir_node *
        }
 #endif
 
-       for(i=0, n=get_irn_arity(op); i<n && res; ++i) {
-               const ir_node   *arg = get_irn_n(op, i);
+       for(n=get_irn_arity(op)-1; n>=0 && res; --n) {
+               const ir_node   *arg = get_irn_n(op, n);
 
 #ifdef NO_ENLARGE_L1V3N355
                if(has_reg_class(si, arg) && live) {
@@ -747,7 +741,7 @@ insert_copy_after(const spill_ilp_t * si, const ir_node * irn, ir_node * pos)
        return copy;
 }
 
-static void
+static ir_node *
 insert_remat_after(spill_ilp_t * si, const remat_t * remat, const ir_node * pos, const pset * live)
 {
        char     buf[256];
@@ -779,10 +773,14 @@ insert_remat_after(spill_ilp_t * si, const remat_t * remat, const ir_node * pos,
                } else {
                        proj_copy = NULL;
                }
+
+               return copy;
        }
+
+       return NULL;
 }
 
-static void
+static ir_node *
 insert_remat_before(spill_ilp_t * si, const remat_t * remat, const ir_node * pos, const pset * live)
 {
        char     buf[256];
@@ -814,7 +812,11 @@ insert_remat_before(spill_ilp_t * si, const remat_t * remat, const ir_node * pos
                } else {
                        proj_copy = NULL;
                }
+
+               return copy;
        }
+
+       return NULL;
 }
 
 static int
@@ -851,6 +853,37 @@ is_diverge_edge(const ir_node * bb)
 #endif
 }
 
+static void
+walker_regclass_copy_insertor(ir_node * irn, void * data)
+{
+       spill_ilp_t    *si = data;
+
+       if(is_Phi(irn) && has_reg_class(si, irn)) {
+               int n;
+
+               for(n=get_irn_arity(irn)-1; n>=0; --n) {
+                       ir_node  *phi_arg = get_irn_n(irn, n);
+                       ir_node  *bb = get_Block_cfgpred_block(get_nodes_block(irn), n);
+
+                       if(!has_reg_class(si, phi_arg)) {
+                               ir_node   *copy = be_new_Copy(si->cls, si->chordal_env->irg, bb, phi_arg);
+                               ir_node   *pos = sched_block_last_noncf(si, bb);
+                               op_t      *op = obstack_alloc(si->obst, sizeof(*op));
+
+                               DBG((si->dbg, LEVEL_2, "\t copy to my regclass for arg %+F of %+F\n", phi_arg, irn));
+                               sched_add_after(pos, copy);
+                               set_irn_n(irn, n, copy);
+
+                               op->is_remat = 0;
+                               op->attr.live_range.args.reloads = NULL;
+                               op->attr.live_range.ilp = ILP_UNDEF;
+                               set_irn_link(copy, op);
+                       }
+               }
+       }
+}
+
+
 /**
  * Insert (so far unused) remats into the irg to
  * recompute the potential liveness of all values
@@ -885,6 +918,7 @@ walker_remat_insertor(ir_node * bb, void * data)
                op_t      *op;
                pset      *args;
                ir_node   *arg;
+               pset      *remat_args;
 
                next = sched_prev(irn);
 
@@ -923,14 +957,16 @@ walker_remat_insertor(ir_node * bb, void * data)
                        pset_insert_ptr(args, arg);
                }
 
-               /* set args of op live in epilog */
+               /* set args of op already live in epilog */
                pset_foreach(args, arg) {
                        if(has_reg_class(si, arg)) {
                                pset_insert_ptr(live, arg);
                        }
                }
 
-               /* insert all possible remats after irn */
+               remat_args = pset_new_ptr_default();
+
+               /* insert all possible remats before irn */
                pset_foreach(args, arg) {
                        remat_info_t   *remat_info,
                                                    query;
@@ -950,39 +986,48 @@ walker_remat_insertor(ir_node * bb, void * data)
                                continue;
                        }
 
-                       /* do not place post remats after jumps */
-                       if(sched_skip_cf_predicator(irn, si->chordal_env->birg->main_env->arch_env)) continue;
+                       if(remat_info->remats) {
+                               pset_foreach(remat_info->remats, remat) {
+                                       ir_node  *remat_irn = NULL;
 
-                       if(remat_info->remats_by_operand) {
-                               pset_foreach(remat_info->remats_by_operand, remat) {
-                                       /* do not insert remats producing the same value as one of the operands */
-                                       if(!pset_find_ptr(args, remat->value)) {
-                                               DBG((si->dbg, LEVEL_4, "\t  considering remat %+F with arg %+F\n", remat->op, arg));
+                                       DBG((si->dbg, LEVEL_4, "\t  considering remat %+F for arg %+F\n", remat->op, arg));
 #ifdef REMAT_WHILE_LIVE
-                                               if(pset_find_ptr(live, remat->value)) {
-                                                       insert_remat_after(si, remat, irn, live);
-                                               }
+                                       if(pset_find_ptr(live, remat->value)) {
+                                               remat_irn = insert_remat_before(si, remat, irn, live);
+                                       }
 #else
-                                               insert_remat_after(si, remat, irn, live);
+                                       remat_irn = insert_remat_before(si, remat, irn, live);
 #endif
+                                       if(remat_irn) {
+                                               for(n=get_irn_arity(remat_irn)-1; n>=0; --n) {
+                                                       ir_node  *remat_arg = get_irn_n(remat_irn, n);
+
+                                                       if(!has_reg_class(si, remat_arg)) continue;
+
+                                                       pset_insert_ptr(remat_args, remat_arg);
+                                               }
                                        }
                                }
                        }
                }
 
-               /* delete defined value from live set */
-               if(has_reg_class(si, irn)) {
-                       pset_remove_ptr(live, irn);
+               /* now we add remat args to op's args because they could also die at this op */
+               pset_foreach(args,arg) {
+                       if(pset_find_ptr(remat_args, arg)) {
+                               pset_remove_ptr(remat_args, arg);
+                       }
+               }
+               pset_foreach(remat_args,arg) {
+                       pset_insert_ptr(args, arg);
                }
 
-               /* insert all possible remats before irn */
+               /* insert all possible remats after irn */
                pset_foreach(args, arg) {
                        remat_info_t   *remat_info,
                                                    query;
                        remat_t        *remat;
 
-                       /* continue if the operand has the wrong reg class
-                        */
+                       /* continue if the operand has the wrong reg class */
                        if(!has_reg_class(si, arg))
                                continue;
 
@@ -995,20 +1040,32 @@ walker_remat_insertor(ir_node * bb, void * data)
                                continue;
                        }
 
-                       if(remat_info->remats) {
-                               pset_foreach(remat_info->remats, remat) {
-                                       DBG((si->dbg, LEVEL_4, "\t  considering remat %+F for arg %+F\n", remat->op, arg));
+                       /* do not place post remats after jumps */
+                       if(sched_skip_cf_predicator(irn, si->chordal_env->birg->main_env->arch_env)) continue;
+
+                       if(remat_info->remats_by_operand) {
+                               pset_foreach(remat_info->remats_by_operand, remat) {
+                                       /* do not insert remats producing the same value as one of the operands */
+                                       if(!pset_find_ptr(args, remat->value)) {
+                                               DBG((si->dbg, LEVEL_4, "\t  considering remat %+F with arg %+F\n", remat->op, arg));
 #ifdef REMAT_WHILE_LIVE
-                                       if(pset_find_ptr(live, remat->value)) {
-                                               insert_remat_before(si, remat, irn, live);
-                                       }
+                                               if(pset_find_ptr(live, remat->value)) {
+                                                       insert_remat_after(si, remat, irn, live);
+                                               }
 #else
-                                       insert_remat_before(si, remat, irn, live);
+                                               insert_remat_after(si, remat, irn, live);
 #endif
+                                       }
                                }
                        }
                }
 
+               /* delete defined value from live set */
+               if(has_reg_class(si, irn)) {
+                       pset_remove_ptr(live, irn);
+               }
+
+               del_pset(remat_args);
                del_pset(args);
                irn = next;
        }
@@ -1097,13 +1154,13 @@ luke_endwalker(ir_node * bb, void * data)
        /* collect values used by cond jumps etc. at bb end (use_end) -> always live */
        /* their reg_out must always be set */
        sched_foreach_reverse(bb, irn) {
-               int   i,
-                         n;
+               int   n;
 
                if(!sched_skip_cf_predicator(irn, si->chordal_env->birg->main_env->arch_env)) break;
 
-               for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                       ir_node        *irn_arg = get_irn_n(irn, i);
+               for (n=get_irn_arity(irn)-1; n>=0; --n) {
+                       ir_node        *irn_arg = get_irn_n(irn, n);
+
                        if(has_reg_class(si, irn_arg)) {
                                pset_insert_ptr(use_end, irn_arg);
                        }
@@ -1111,9 +1168,19 @@ luke_endwalker(ir_node * bb, void * data)
        }
 
        ir_snprintf(buf, sizeof(buf), "check_end_%N", bb);
+       //cst = lpp_add_cst(si->lpp, buf, lpp_less, si->n_regs);
        cst = lpp_add_cst(si->lpp, buf, lpp_less, si->n_regs - pset_count(use_end));
 
-       spill_bb->ilp = new_set(cmp_spill, 16);
+       spill_bb->ilp = new_set(cmp_spill, pset_count(live)+pset_count(use_end));
+
+       /* if this is a merge edge we can reload at the end of this block */
+       if(is_merge_edge(bb)) {
+               spill_bb->reloads = new_set(cmp_keyval, pset_count(live)+pset_count(use_end));
+       } else if(pset_count(use_end)){
+               spill_bb->reloads = new_set(cmp_keyval, pset_count(use_end));
+       } else {
+               spill_bb->reloads = NULL;
+       }
 
        pset_foreach(live,irn) {
                spill_t     query,
@@ -1139,6 +1206,20 @@ luke_endwalker(ir_node * bb, void * data)
                ir_snprintf(buf, sizeof(buf), "spill_%N_%N", irn, bb);
                spill->spill = lpp_add_var(si->lpp, buf, lpp_binary, spill_cost);
 
+               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));
+                       set_insert_keyval(spill_bb->reloads, irn, INT_TO_PTR(reload));
+
+                       /* reload <= mem_out */
+                       rel_cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+                       lpp_set_factor_fast(si->lpp, rel_cst, reload, 1.0);
+                       lpp_set_factor_fast(si->lpp, rel_cst, spill->mem_out, -1.0);
+       }
+
                spill->reg_in = ILP_UNDEF;
                spill->mem_in = ILP_UNDEF;
        }
@@ -1147,7 +1228,9 @@ luke_endwalker(ir_node * bb, void * data)
                spill_t     query,
                                        *spill;
                double      spill_cost;
-               ilp_cst_t   end_use_req;
+               ilp_cst_t   end_use_req,
+                                       rel_cst;
+               ilp_var_t   reload;
 
                query.irn = irn;
                spill = set_insert(spill_bb->ilp, &query, sizeof(query), HASH_PTR(irn));
@@ -1165,6 +1248,15 @@ luke_endwalker(ir_node * bb, void * data)
                ir_snprintf(buf, sizeof(buf), "spill_%N_%N", irn, bb);
                spill->spill = lpp_add_var(si->lpp, buf, lpp_binary, spill_cost);
 
+               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));
+               set_insert_keyval(spill_bb->reloads, irn, INT_TO_PTR(reload));
+
+               /* reload <= mem_out */
+               rel_cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+               lpp_set_factor_fast(si->lpp, rel_cst, reload, 1.0);
+               lpp_set_factor_fast(si->lpp, rel_cst, spill->mem_out, -1.0);
+
                spill->reg_in = ILP_UNDEF;
                spill->mem_in = ILP_UNDEF;
 
@@ -1253,25 +1345,6 @@ find_post_remat(const ir_node * value, const ir_node * pos)
        return NULL;
 }
 
-/**
- * Find a remat of value @p value in the prolog of @p pos
- */
-static ir_node *
-find_pre_remat(const spill_ilp_t * si, const ir_node * value, const ir_node * pos)
-{
-       while((pos = next_pre_remat(si,pos)) != NULL) {
-               op_t   *op;
-
-               op = get_irn_link(pos);
-               assert(op->is_remat && op->attr.remat.pre);
-
-               if(op->attr.remat.remat->value == value)
-                       return (ir_node*)pos;
-       }
-
-       return NULL;
-}
-
 static spill_t *
 add_to_spill_bb(spill_ilp_t * si, ir_node * bb, ir_node * irn)
 {
@@ -1318,8 +1391,11 @@ get_live_end(spill_ilp_t * si, ir_node * bb, pset * live)
        irn = sched_last(bb);
 
        /* all values eaten by control flow operations are also live until the end of the block */
-       while(sched_skip_cf_predicator(irn, si->chordal_env->birg->main_env->arch_env)) {
+       sched_foreach_reverse(bb, irn) {
                int  i;
+
+               if(!sched_skip_cf_predicator(irn, si->chordal_env->birg->main_env->arch_env)) break;
+
                for(i=get_irn_arity(irn)-1; i>=0; --i) {
                        ir_node *arg = get_irn_n(irn,i);
 
@@ -1327,8 +1403,6 @@ get_live_end(spill_ilp_t * si, ir_node * bb, pset * live)
                                pset_insert_ptr(live, arg);
                        }
                }
-
-               irn = sched_prev(irn);
        }
 }
 
@@ -1344,42 +1418,34 @@ luke_blockwalker(ir_node * bb, void * data)
        char            buf[256];
        ilp_cst_t       cst;
        spill_bb_t     *spill_bb = get_irn_link(bb);
-       int             i;
        ir_node        *tmp;
        spill_t        *spill;
-       irn_live_t      *li;
+       pset           *defs = pset_new_ptr_default();
 
 
        live = pset_new_ptr_default();
 
-       /* do something at the end of the block */
+       /****************************************
+        *      B A S I C  B L O C K  E N D
+        ***************************************/
+
 
        /* init live values at end of block */
        get_live_end(si, bb, live);
 
-       if(is_merge_edge(bb)) {
-               spill_bb->reloads = new_set(cmp_keyval, pset_count(live));
-       } else {
-               spill_bb->reloads = NULL;
-       }
-
        pset_foreach(live, irn) {
                op_t           *op;
-               ilp_var_t       reload;
+               ilp_var_t       reload = ILP_UNDEF;
 
                spill = set_find_spill(spill_bb->ilp, irn);
                assert(spill);
 
                if(spill_bb->reloads) {
-                       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));
-
-                       set_insert_keyval(spill_bb->reloads, irn, INT_TO_PTR(reload));
+                       keyval_t *keyval = set_find_keyval(spill_bb->reloads, irn);
 
-                       /* reload <= mem_out */
-                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
-                       lpp_set_factor_fast(si->lpp, cst, reload, 1.0);
-                       lpp_set_factor_fast(si->lpp, cst, spill->mem_out, -1.0);
+                       if(keyval) {
+                               reload = PTR_TO_INT(keyval->val);
+                       }
                }
 
                op = get_irn_link(irn);
@@ -1394,7 +1460,7 @@ luke_blockwalker(ir_node * bb, void * data)
 
                /* reg_out - reload - remat - live_range <= 0 */
                lpp_set_factor_fast(si->lpp, cst, spill->reg_out, 1.0);
-               if(spill_bb->reloads) lpp_set_factor_fast(si->lpp, cst, reload, -1.0);
+               if(reload != ILP_UNDEF) lpp_set_factor_fast(si->lpp, cst, reload, -1.0);
                lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.ilp, -1.0);
                foreach_pre_remat(si, bb, tmp) {
                        op_t     *remat_op = get_irn_link(tmp);
@@ -1402,23 +1468,80 @@ luke_blockwalker(ir_node * bb, void * data)
                                lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, -1.0);
                        }
                }
+               /* maybe we should also assure that reg_out >= live_range etc. */
+       }
+
+       /*
+        * start new live ranges for values used by remats at end of block
+        * and assure the remat args are available
+        */
+       foreach_pre_remat(si, bb, tmp) {
+               op_t     *remat_op = get_irn_link(tmp);
+               int       n;
+
+               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;
+
+                       /* 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);
+
+                               arg_op->attr.live_range.ilp = prev_lr;
+                               arg_op->attr.live_range.op = bb;
+
+                               DBG((si->dbg, LEVEL_4, "  value %+F becoming live through use by remat at end of block %+F\n", remat_arg, tmp));
+
+                               pset_insert_ptr(live, remat_arg);
+                               add_to_spill_bb(si, bb, remat_arg);
+                       }
+
+                       /* remat <= live_rang(remat_arg) [ + reload(remat_arg) ] */
+                       ir_snprintf(buf, sizeof(buf), "req_remat_%N_arg_%N", tmp, remat_arg);
+                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+
+                       lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
+                       lpp_set_factor_fast(si->lpp, cst, arg_op->attr.live_range.ilp, -1.0);
+
+                       /* use reload placed for this argument */
+                       if(spill_bb->reloads) {
+                               keyval_t *keyval = set_find_keyval(spill_bb->reloads, remat_arg);
+
+                               if(keyval) {
+                                       ilp_var_t       reload = PTR_TO_INT(keyval->val);
+
+                                       lpp_set_factor_fast(si->lpp, cst, reload, -1.0);
+                               }
+                       }
+               }
        }
        DBG((si->dbg, LEVEL_4, "\t   %d values live at end of block %+F\n", pset_count(live), bb));
 
-       sched_foreach_reverse(bb, irn) {
+
+
+
+       /**************************************
+        *    B A S I C  B L O C K  B O D Y
+        **************************************/
+
+       sched_foreach_reverse_from(sched_block_last_noncf(si, bb), irn) {
                op_t       *op;
                op_t       *tmp_op;
                int         n,
-                                       k,
+                                       u = 0,
                                        d = 0;
                ilp_cst_t       check_pre,
                                        check_post;
-#ifdef CHECK_POST_REMAT
-               ilp_cst_t       check_post_remat;
-#endif
-               set        *args = new_set(cmp_keyval, get_irn_arity(irn));
+               set        *args;
+               pset       *used;
+               pset       *remat_defs;
                keyval_t   *keyval;
 
+               /* iterate only until first phi */
                if(is_Phi(irn))
                        break;
 
@@ -1427,197 +1550,208 @@ luke_blockwalker(ir_node * bb, void * data)
                if(op->is_remat) continue;
                DBG((si->dbg, LEVEL_4, "\t  at node %+F\n", irn));
 
+               /* collect defined values */
                if(has_reg_class(si, irn)) {
-                       assert(pset_find_ptr(live, irn));
-                       pset_remove_ptr(live, irn);
+                       pset_insert_ptr(defs, irn);
                }
 
+               /* skip projs */
                if(is_Proj(irn)) continue;
 
-               /* init set of irn's arguments */
+               /*
+                * init set of irn's arguments
+                * and all possibly used values around this op
+                * and values defined by post remats
+                */
+               args =       new_set(cmp_keyval, get_irn_arity(irn));
+               used =       pset_new_ptr(pset_count(live) + get_irn_arity(irn));
+               remat_defs = pset_new_ptr(pset_count(live));
+
                for (n=get_irn_arity(irn)-1; n>=0; --n) {
                        ir_node        *irn_arg = get_irn_n(irn, n);
                        if(has_reg_class(si, irn_arg)) {
                                set_insert_keyval(args, irn_arg, (void*)n);
+                               pset_insert_ptr(used, irn_arg);
                        }
                }
+               foreach_post_remat(irn, tmp) {
+                       op_t    *remat_op = get_irn_link(tmp);
 
-#ifdef CHECK_POST_REMAT
-               /* check the register pressure after the epilog */
-               ir_snprintf(buf, sizeof(buf), "check_post_remat_%N", irn);
-               check_post_remat = lpp_add_cst(si->lpp, buf, lpp_less, si->n_regs);
+                       pset_insert_ptr(remat_defs, remat_op->attr.remat.remat->value);
 
-               /* iterate over L\U */
-               pset_foreach(live, tmp) {
-                       if(!set_find_keyval(args, tmp)) {
-                               /* if a live value is not used by irn */
-                               tmp_op = get_irn_link(tmp);
-//                             assert(tmp_op->attr.live_range.op != irn);
-                               lpp_set_factor_fast(si->lpp, check_post_remat, tmp_op->attr.live_range.ilp, 1.0);
+                       for (n=get_irn_arity(tmp)-1; n>=0; --n) {
+                               ir_node        *remat_arg = get_irn_n(tmp, n);
+                               if(has_reg_class(si, remat_arg)) {
+                                       pset_insert_ptr(used, remat_arg);
+                               }
+                       }
+               }
+               foreach_pre_remat(si, irn, tmp) {
+                       for (n=get_irn_arity(tmp)-1; n>=0; --n) {
+                               ir_node        *remat_arg = get_irn_n(tmp, n);
+                               if(has_reg_class(si, remat_arg)) {
+                                       pset_insert_ptr(used, remat_arg);
+                               }
                        }
                }
-               /* iterate over following remats and remove possibly defined values again from check_post_remat */
-               foreach_post_remat(irn, tmp) {
-                       op_t           *remat_op = get_irn_link(tmp);
-                       const ir_node  *value = remat_op->attr.remat.remat->value;
-                       op_t           *val_op = get_irn_link(value);
 
-                       assert(remat_op->is_remat && !remat_op->attr.remat.pre);
+               /**********************************
+                *   I N  E P I L O G  O F  irn
+                **********************************/
 
-                       /* values that are defined by remat2s are not counted */
-#ifdef REMAT_WHILE_LIVE
-                       assert(val_op->attr.live_range.ilp);
-                       lpp_set_factor_fast(si->lpp, check_post_remat, val_op->attr.live_range.ilp, 0.0);
-#else
-                       if(val_op->attr.live_range.ilp != ILP_UNDEF) {
-                               lpp_set_factor_fast(si->lpp, check_post_remat, val_op->attr.live_range.ilp, 0.0);
+               /* ensure each dying value is used by only one post remat */
+               pset_foreach(live, tmp) {
+                       ir_node     *value = tmp;
+                       op_t        *value_op = get_irn_link(value);
+                       ir_node     *remat;
+                       int          n_remats = 0;
+
+                       cst = ILP_UNDEF;
+                       foreach_post_remat(irn, remat) {
+                               op_t  *remat_op = get_irn_link(remat);
+
+                               for(n=get_irn_arity(remat)-1; n>=0; --n) {
+                                       ir_node   *remat_arg = get_irn_n(remat, n);
+
+                                       /* if value is used by this remat add it to constraint */
+                                       if(remat_arg == value) {
+                                               if(n_remats == 0) {
+                                                       /* sum remat2s <= 1 + n_remats*live_range */
+                                                       ir_snprintf(buf, sizeof(buf), "dying_lr_%N_%N", value, irn);
+                                                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 1.0);
+                                               }
+
+                                               n_remats++;
+                                               lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
+                                               break;
+                                       }
+                               }
+                       }
+
+                       if(value_op->attr.live_range.ilp != ILP_UNDEF && cst != ILP_UNDEF) {
+                               lpp_set_factor_fast(si->lpp, cst, value_op->attr.live_range.ilp, -n_remats);
                        }
-#endif /* REMAT_WHILE_LIVE */
                }
-#endif /* CHECK_POST_REMAT */
 
 
-               /* new live ranges for values from L\U defined by remat2s or used by remats */
+
+               /* new live ranges for values from L\U defined by post remats */
                pset_foreach(live, tmp) {
-                       ir_node     *value = tmp;//remat_op->attr.remat.remat->value;
+                       ir_node     *value = tmp;
                        op_t        *value_op = get_irn_link(value);
 
-                       if(!set_find_keyval(args, value)) {
+                       if(!set_find_keyval(args, value) && !pset_find_ptr(defs, value)) {
                                ilp_var_t    prev_lr = ILP_UNDEF;
                                ir_node     *remat;
-                               cst = ILP_UNDEF;
-
-                               foreach_post_remat(irn, remat) {
-                                       op_t        *remat_op = get_irn_link(remat);
-
-                                       /* if value is being rematerialized by this remat */
-                                       if(value == remat_op->attr.remat.remat->value) {
-                                               if(cst == ILP_UNDEF) {
-                                                       /* next_live_range <= prev_live_range + sum remat2s */
-                                                       ir_snprintf(buf, sizeof(buf), "next_lr_%N_%N", value, irn);
-                                                       cst = lpp_add_cst(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);
-                                                       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);
-                                               }
 
-                                               lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, -1.0);
-                                       }
-                               }
+                               if(pset_find_ptr(remat_defs, value)) {
 
-#ifdef MAY_DIE_AT_PRE_REMAT
-                               if(cst == ILP_UNDEF) {
-                                       foreach_pre_remat(si, irn, remat) {
-                                               int       n;
-
-                                               for (n=get_irn_arity(remat)-1; n>=0; --n) {
-                                                       ir_node        *remat_arg = get_irn_n(remat, n);
-
-                                                       /* if value is being used by this remat */
-                                                       if(value == remat_arg) {
-                                                               /* next_live_range <= prev_live_range */
-                                                               ir_snprintf(buf, sizeof(buf), "lr_%N_%N", value, irn);
-                                                               prev_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
-
-                                                               ir_snprintf(buf, sizeof(buf), "next_lr_%N_%N", value, irn);
-                                                               cst = lpp_add_cst(si->lpp, buf, lpp_less, 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);
-                                                               goto fertig;
-                                                       }
-                                                       /* TODO check afterwards whether lr dies after a pre-remat (should not happen) */
+                                       /* next_live_range <= prev_live_range + sum remat2s */
+                                       ir_snprintf(buf, sizeof(buf), "next_lr_%N_%N", value, irn);
+                                       cst = lpp_add_cst(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);
+
+                                       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);
+
+                                       foreach_post_remat(irn, remat) {
+                                               op_t        *remat_op = get_irn_link(remat);
+
+                                               /* if value is being rematerialized by this remat */
+                                               if(value == remat_op->attr.remat.remat->value) {
+                                                       lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, -1.0);
                                                }
                                        }
-                               }
-fertig:
-#endif
 
-                               if(prev_lr != ILP_UNDEF) {
                                        value_op->attr.live_range.ilp = prev_lr;
                                        value_op->attr.live_range.op = irn;
                                }
                        }
                }
 
-               /* get count of values in my register class defined by irn */
-               /* also add defined values to check_post_remat; do this before iterating over args */
-               if(get_irn_mode(irn) == mode_T) {
-                       ir_node  *proj = sched_next(irn);
-                       op_t     *proj_op = get_irn_link(proj);
+               /* requirements for post remats and start live ranges from L/U' for values dying here */
+               foreach_post_remat(irn, tmp) {
+                       op_t        *remat_op = get_irn_link(tmp);
+                       int          n;
 
-                       while(is_Proj(proj)) {
-                               if(has_reg_class(si, proj)) {
-                                       ++d;
-#ifdef CHECK_POST_REMAT
-                                       lpp_set_factor_fast(si->lpp, check_post_remat, proj_op->attr.live_range.ilp, 1.0);
-#endif
+                       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);
+
+                               if(!has_reg_class(si, remat_arg)) continue;
+
+                               /* only for values in L\U (TODO and D?), the others are handled with post_use */
+                               if(!pset_find_ptr(used, remat_arg)) {
+                                       /* remat <= live_rang(remat_arg) */
+                                       ir_snprintf(buf, sizeof(buf), "req_remat2_%N_arg_%N", tmp, remat_arg);
+                                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+
+                                       /* if value is becoming live through use by remat2 */
+                                       if(!pset_find_ptr(live, remat_arg)) {
+                                               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);
+
+                                               arg_op->attr.live_range.ilp = lr;
+                                               arg_op->attr.live_range.op = irn;
+
+                                               DBG((si->dbg, LEVEL_3, "  value %+F becoming live through use by remat2 %+F\n", remat_arg, tmp));
+
+                                               pset_insert_ptr(live, remat_arg);
+                                               add_to_spill_bb(si, bb, remat_arg);
+                                       }
+
+                                       lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
+                                       lpp_set_factor_fast(si->lpp, cst, arg_op->attr.live_range.ilp, -1.0);
                                }
-                               proj = sched_next(proj);
-                               proj_op = get_irn_link(proj);
-                       }
-               } else {
-                       if(has_reg_class(si, irn)) {
-                                d = 1;
-#ifdef CHECK_POST_REMAT
-                                lpp_set_factor_fast(si->lpp, check_post_remat, op->attr.live_range.ilp, 1.0);
-#endif
                        }
                }
+
+               d = pset_count(defs);
                DBG((si->dbg, LEVEL_4, "\t   %+F produces %d values in my register class\n", irn, d));
 
                /* count how many regs irn needs for arguments */
-               k = set_count(args);
+               u = set_count(args);
 
-               /* check the register pressure in the prolog */
-               /* sum_{L\U} lr <= n - |U| */
-               ir_snprintf(buf, sizeof(buf), "check_pre_%N", irn);
-               check_pre = lpp_add_cst(si->lpp, buf, lpp_less, si->n_regs - k);
 
                /* check the register pressure in the epilog */
+               /* sum_{L\U'} lr + sum_{U'} post_use <= k - |D| */
                ir_snprintf(buf, sizeof(buf), "check_post_%N", irn);
                check_post = lpp_add_cst(si->lpp, buf, lpp_less, si->n_regs - d);
 
-               set_foreach(args, keyval) {
-                       ilp_var_t       next_lr;
-                       op_t           *arg_op;
+               /* add L\U' to check_post */
+               pset_foreach(live, tmp) {
+                       if(!pset_find_ptr(used, tmp) && !pset_find_ptr(defs, tmp)) {
+                               /* if a live value is not used by irn */
+                               tmp_op = get_irn_link(tmp);
+                               lpp_set_factor_fast(si->lpp, check_post, tmp_op->attr.live_range.ilp, 1.0);
+                       }
+               }
+
+               /***********************************************************
+                *  I T E R A T I O N  O V E R  U S E S  F O R  E P I L O G
+                **********************************************************/
+
+
+               pset_foreach(used, tmp) {
+                       ilp_var_t       prev_lr;
                        ilp_var_t       post_use;
                        int             p = 0;
                        spill_t        *spill;
-                       ir_node        *arg = keyval->key;
+                       ir_node        *arg = tmp;
+                       op_t           *arg_op = get_irn_link(arg);
+                       ir_node        *remat;
 
                        spill = add_to_spill_bb(si, bb, arg);
 
+                       /* new live range for each used value */
                        ir_snprintf(buf, sizeof(buf), "lr_%N_%N", arg, irn);
-                       next_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
-
-                       i = (int)keyval->val;
-
-                       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));
-
-                       /* reload <= mem_out */
-                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
-                       lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.args.reloads[i], 1.0);
-                       lpp_set_factor_fast(si->lpp, cst, spill->mem_out, -1.0);
-
-                       arg_op = get_irn_link(arg);
+                       prev_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
 
-                       /* requirement: arg must be in register for use */
-                       /* reload + remat + live_range == 1 */
-                       ir_snprintf(buf, sizeof(buf), "req_%N_%N", irn, arg);
-                       cst = lpp_add_cst(si->lpp, buf, lpp_equal, 1.0);
-
-                       lpp_set_factor_fast(si->lpp, cst, next_lr, 1.0);
-                       lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.args.reloads[i], 1.0);
-                       foreach_pre_remat(si, irn, tmp) {
-                               op_t     *remat_op = get_irn_link(tmp);
-                               if(remat_op->attr.remat.remat->value == arg) {
-                                       lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
-                               }
-                       }
-
-                       /* the epilog stuff - including post_use, post, post_remat */
+                       /* 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);
 
@@ -1627,23 +1761,42 @@ fertig:
                        if(pset_find_ptr(live, arg)) {
                                DBG((si->dbg, LEVEL_3, "\t  arg %+F is possibly live in epilog of %+F\n", arg, irn));
 
+                               /* post_use >= next_lr + remat */
                                ir_snprintf(buf, sizeof(buf), "post_use_%N_%N-%d", arg, irn, p++);
                                cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
                                lpp_set_factor_fast(si->lpp, cst, post_use, -1.0);
                                lpp_set_factor_fast(si->lpp, cst, arg_op->attr.live_range.ilp, 1.0);
 
-#ifdef CHECK_POST_REMAT
-                               lpp_set_factor_fast(si->lpp, check_post_remat, arg_op->attr.live_range.ilp, 1.0);
-#endif
                        }
 
-                       /*forall remat2 which use arg add a similar cst*/
-                       foreach_post_remat(irn, tmp) {
+                       /* if value is not an arg of op and not possibly defined by post remat
+                        * then it may only die and not become live
+                        */
+                       if(!set_find_keyval(args, arg)) {
+                               /* post_use <= prev_lr */
+                               ir_snprintf(buf, sizeof(buf), "req_post_use_%N_%N", arg, irn);
+                               cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+                               lpp_set_factor_fast(si->lpp, cst, post_use, 1.0);
+                               lpp_set_factor_fast(si->lpp, cst, prev_lr, -1.0);
+
+                               if(!pset_find_ptr(remat_defs, arg) && pset_find_ptr(live, arg)) {
+                                       /* next_lr <= prev_lr */
+                                       ir_snprintf(buf, sizeof(buf), "next_lr_%N_%N", arg, irn);
+                                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+                                       lpp_set_factor_fast(si->lpp, cst, arg_op->attr.live_range.ilp, 1.0);
+                                       lpp_set_factor_fast(si->lpp, cst, prev_lr, -1.0);
+                               }
+                       }
+
+
+
+                       /* forall post remat which use arg add a similar cst */
+                       foreach_post_remat(irn, remat) {
                                int      n;
 
-                               for (n=get_irn_arity(tmp)-1; n>=0; --n) {
-                                       ir_node    *remat_arg = get_irn_n(tmp, n);
-                                       op_t       *remat_op = get_irn_link(tmp);
+                               for (n=get_irn_arity(remat)-1; n>=0; --n) {
+                                       ir_node    *remat_arg = get_irn_n(remat, n);
+                                       op_t       *remat_op = get_irn_link(remat);
 
                                        if(remat_arg == arg) {
                                                DBG((si->dbg, LEVEL_3, "\t  found remat with arg %+F in epilog of %+F\n", arg, irn));
@@ -1656,39 +1809,73 @@ fertig:
                                }
                        }
 
-                       /* new live range begins for each argument */
-                       arg_op->attr.live_range.ilp = next_lr;
+                       /* new live range begins for each used value */
+                       arg_op->attr.live_range.ilp = prev_lr;
                        arg_op->attr.live_range.op = irn;
 
+                       /*if(!pset_find_ptr(live, arg)) {
+                               pset_insert_ptr(live, arg);
+                               add_to_spill_bb(si, bb, arg);
+                       }*/
                        pset_insert_ptr(live, arg);
+
                }
 
-               /* start new live ranges for values used by remats */
-               foreach_pre_remat(si, irn, tmp) {
-                       int       n;
+               /* just to be sure */
+               check_post = ILP_UNDEF;
 
-                       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;
 
-                               /* if value is becoming live through use by remat */
-                               if(!pset_find_ptr(live, remat_arg)) {
-                                       ir_snprintf(buf, sizeof(buf), "lr_%N_%N", remat_arg, irn);
-                                       prev_lr = lpp_add_var(si->lpp, buf, lpp_binary, 0.0);
 
-                                       arg_op->attr.live_range.ilp = prev_lr;
-                                       arg_op->attr.live_range.op = irn;
+               /******************
+                *   P R O L O G
+                ******************/
 
-                                       DBG((si->dbg, LEVEL_4, "  value %+F becoming live through use by remat %+F\n", remat_arg, tmp));
+               /* check the register pressure in the prolog */
+               /* sum_{L\U} lr <= k - |U| */
+               ir_snprintf(buf, sizeof(buf), "check_pre_%N", irn);
+               check_pre = lpp_add_cst(si->lpp, buf, lpp_less, si->n_regs - u);
+
+               /* for the prolog remove defined values from the live set */
+               pset_foreach(defs, tmp) {
+                       pset_remove_ptr(live, tmp);
+               }
 
-                                       /* TODO ist das hier die richtige Stelle???? */
-                                       pset_insert_ptr(live, remat_arg);
-                                       add_to_spill_bb(si, bb, remat_arg);
+               /***********************************************************
+                *  I T E R A T I O N  O V E R  A R G S  F O R  P R O L O G
+                **********************************************************/
+
+
+               set_foreach(args, keyval) {
+                       spill_t        *spill;
+                       ir_node        *arg = keyval->key;
+                       int             i = PTR_TO_INT(keyval->val);
+                       op_t           *arg_op = get_irn_link(arg);
+
+                       spill = set_find_spill(spill_bb->ilp, arg);
+                       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));
+
+                       /* reload <= mem_out */
+                       ir_snprintf(buf, sizeof(buf), "req_reload_%N_%N", arg, irn);
+                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
+                       lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.args.reloads[i], 1.0);
+                       lpp_set_factor_fast(si->lpp, cst, spill->mem_out, -1.0);
+
+                       /* requirement: arg must be in register for use */
+                       /* reload + remat + live_range == 1 */
+                       ir_snprintf(buf, sizeof(buf), "req_%N_%N", irn, arg);
+                       cst = lpp_add_cst(si->lpp, buf, lpp_equal, 1.0);
+
+                       lpp_set_factor_fast(si->lpp, cst, arg_op->attr.live_range.ilp, 1.0);
+                       lpp_set_factor_fast(si->lpp, cst, op->attr.live_range.args.reloads[i], 1.0);
+                       foreach_pre_remat(si, irn, tmp) {
+                               op_t     *remat_op = get_irn_link(tmp);
+                               if(remat_op->attr.remat.remat->value == arg) {
+                                       lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
                                }
-                               /* TODO check afterwards whether lr dies after a pre-remat (should not happen) */
                        }
                }
 
@@ -1697,13 +1884,13 @@ fertig:
                        if(!set_find_keyval(args, tmp)) {
                                /* if a live value is not used by irn */
                                tmp_op = get_irn_link(tmp);
-//                             assert(tmp_op->attr.live_range.op != irn);
                                lpp_set_factor_fast(si->lpp, check_pre, tmp_op->attr.live_range.ilp, 1.0);
-                               lpp_set_factor_fast(si->lpp, check_post, tmp_op->attr.live_range.ilp, 1.0);
                        }
                }
 
+
                /* requirements for remats */
+               /* start new live ranges for values used by remats */
                foreach_pre_remat(si, irn, tmp) {
                        op_t        *remat_op = get_irn_link(tmp);
                        int          n;
@@ -1711,6 +1898,7 @@ fertig:
                        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;
 
@@ -1730,62 +1918,12 @@ fertig:
                        }
                }
 
-               /* requirements for remats2
-                *
-                *  TODO unsure if this does the right thing.
-                *  should insert values into set if they do not become live through remat and
-                *  op
-                */
-               foreach_post_remat(irn, tmp) {
-                       op_t        *remat_op = get_irn_link(tmp);
-                       int          n;
-
-                       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);
 
-                               if(!has_reg_class(si, remat_arg)) continue;
-
-                               /* only for values in L\U, the others are handled with post_use */
-                               if(!set_find_keyval(args, remat_arg)) {
-                                       /* remat <= live_rang(remat_arg) */
-                                       ir_snprintf(buf, sizeof(buf), "req_remat2_%N_arg_%N", tmp, remat_arg);
-                                       cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
-
-                                       /* if value is becoming live through use by remat2 */
-                                       if(!pset_find_ptr(live, remat_arg)) {
-                                               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);
-
-                                               arg_op->attr.live_range.ilp = lr;
-                                               arg_op->attr.live_range.op = irn;
-
-                                               DBG((si->dbg, LEVEL_3, "  value %+F becoming live through use by remat2 %+F\n", remat_arg, tmp));
-
-                                               pset_insert_ptr(live, remat_arg);
-                                               add_to_spill_bb(si, bb, remat_arg);
-                                       }
-
-                                       lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
-                                       lpp_set_factor_fast(si->lpp, cst, arg_op->attr.live_range.ilp, -1.0);
-                               }
-                       }
-               }
-
-#ifdef CHECK_POST_REMAT
-               /* iterate over following remats and add them to check_post_remat */
-               foreach_post_remat(irn, tmp) {
-                       op_t           *remat_op = get_irn_link(tmp);
-
-                       assert(remat_op->is_remat && !remat_op->attr.remat.pre);
-
-                       lpp_set_factor_fast(si->lpp, check_post_remat, remat_op->attr.remat.ilp, 1.0);
-               }
-#endif
 
 
+               /*************************
+                *  D O N E  W I T H  O P
+                *************************/
 
                DBG((si->dbg, LEVEL_4, "\t   %d values live at %+F\n", pset_count(live), irn));
 
@@ -1799,12 +1937,19 @@ fertig:
                        assert(!find_post_remat(arg, irn) && "there should be no post remat for an argument of an op");
                }
 
+               del_pset(remat_defs);
+               del_pset(used);
                del_set(args);
+               del_pset(defs);
+               defs = pset_new_ptr_default();
        }
 
 
 
-       /* do something at the beginning of the block */
+       /***************************************
+        *   B E G I N N I N G  O F  B L O C K
+        ***************************************/
+
 
        /* we are now at the beginning of the basic block, there are only \Phis in front of us */
        DBG((si->dbg, LEVEL_3, "\t   %d values live at beginning of block %+F\n", pset_count(live), bb));
@@ -1899,11 +2044,11 @@ fertig:
 
                lpp_set_factor_fast(si->lpp, cst, spill->reg_in, 1.0);
 
-               /* spill + reg_in <= 1 */
+               /* spill + mem_in <= 1 */
                ir_snprintf(buf, sizeof(buf), "nospill_%N_%N", irn, bb);
                nospill = lpp_add_cst(si->lpp, buf, lpp_less, 1);
 
-               lpp_set_factor_fast(si->lpp, nospill, spill->reg_in, 1.0);
+               lpp_set_factor_fast(si->lpp, nospill, spill->mem_in, 1.0);
                lpp_set_factor_fast(si->lpp, nospill, spill->spill, 1.0);
 
        }
@@ -1916,7 +2061,7 @@ fertig:
                lpp_set_factor_fast(si->lpp, cst, remat_op->attr.remat.ilp, 1.0);
        }
 
-       /* forall remat2 add requirements */
+       /* forall post remats add requirements */
        foreach_post_remat(bb, tmp) {
                int         n;
 
@@ -1929,7 +2074,7 @@ fertig:
                        spill = set_find_spill(spill_bb->ilp, remat_arg);
                        assert(spill);
 
-                       /* TODO verify this is placed correctly */
+                       /* remat <= reg_in_argument */
                        ir_snprintf(buf, sizeof(buf), "req_remat2_%N_%N_arg_%N", tmp, bb, remat_arg);
                        cst = lpp_add_cst(si->lpp, buf, lpp_less, 0.0);
                        lpp_set_factor_fast(si->lpp, cst, spill->reg_in, -1.0);
@@ -2026,6 +2171,13 @@ fertig:
        /* this must only be done for values that are not defined in this block */
        /* TODO are these values at start of block? if yes, just check whether this is a diverge edge and skip the loop */
        pset_foreach(live, irn) {
+               /*
+                * if value is defined in this block we can anways place the spill directly after the def
+                *    -> no constraint necessary
+                */
+               if(!is_Phi(irn) && get_nodes_block(irn) == bb) continue;
+
+
                spill = set_find_spill(spill_bb->ilp, irn);
                assert(spill);
 
@@ -2035,48 +2187,38 @@ fertig:
                lpp_set_factor_fast(si->lpp, cst, spill->spill, 1.0);
                if(is_diverge_edge(bb)) lpp_set_factor_fast(si->lpp, cst, spill->reg_in, -1.0);
 
-               sched_foreach_op(bb, tmp) {
-                       op_t   *op = get_irn_link(tmp);
+               if(!is_Phi(irn)) {
+                       sched_foreach_op(bb, tmp) {
+                               op_t   *op = get_irn_link(tmp);
 
-                       if(is_Phi(tmp)) continue;
-                       assert(!is_Proj(tmp));
+                               if(is_Phi(tmp)) continue;
+                               assert(!is_Proj(tmp));
 
-                       if(op->is_remat) {
-                               ir_node   *value = op->attr.remat.remat->value;
+                               if(op->is_remat) {
+                                       ir_node   *value = op->attr.remat.remat->value;
 
-                               if(value == irn) {
-                                       /* only collect remats up to the first use of a value */
-                                       lpp_set_factor_fast(si->lpp, cst, op->attr.remat.ilp, -1.0);
-                               }
-                       } else {
-                               int   n;
+                                       if(value == irn) {
+                                               /* only collect remats up to the first use of a value */
+                                               lpp_set_factor_fast(si->lpp, cst, op->attr.remat.ilp, -1.0);
+                                       }
+                               } else {
+                                       int   n;
 
-                               for (n=get_irn_arity(tmp)-1; n>=0; --n) {
-                                       ir_node    *arg = get_irn_n(tmp, n);
+                                       for (n=get_irn_arity(tmp)-1; n>=0; --n) {
+                                               ir_node    *arg = get_irn_n(tmp, n);
 
-                                       if(arg == irn) {
-                                               /* if a value is used stop collecting remats */
-                                               cst = ILP_UNDEF;
+                                               if(arg == irn) {
+                                                       /* if a value is used stop collecting remats */
+                                                       cst = ILP_UNDEF;
+                                               }
+                                               break;
                                        }
-                                       break;
                                }
+                               if(cst == ILP_UNDEF) break;
                        }
-                       if(cst == ILP_UNDEF) break;
                }
        }
 
-
-       /* if a value is used by a mem-phi, then mem_in of this value is 0 (has to be spilled again into a different slot)
-          mem_in(phi) -> not mem_in(orig_value) TODO: how does this depend on a certain predecessor?
-        */
-
-       /* mem_in of mem-phi has associated costs (but first one is free) */
-       /* define n_mem_copies as positive integer in each predecessor block,
-          #mem_in into this block from predecessor block - 1 weighted with SPILL_COST*execfreq(predecessor)
-          TODO
-        */
-
-
        del_pset(live);
 }
 
@@ -2335,7 +2477,6 @@ memcopyhandler(spill_ilp_t * si)
                                                cst;
                const ir_node  *a  = interference->a;
                const ir_node  *b  = interference->b;
-               struct list_head *pos;
 
                /* any_interf <= \sum interf */
                ir_snprintf(buf, sizeof(buf), "interfere_%N_%N", a, b);
@@ -2353,11 +2494,11 @@ memcopyhandler(spill_ilp_t * si)
                        char           buf[256];
 
                        query.irn = a;
-                       spilla = set_find(spill_bb->ilp, &query, sizeof(query), HASH_PTR(a));
+                       spilla = set_find_spill(spill_bb->ilp, a);
                        assert(spilla);
 
                        query.irn = b;
-                       spillb = set_find(spill_bb->ilp, &query, sizeof(query), HASH_PTR(b));
+                       spillb = set_find_spill(spill_bb->ilp, b);
                        assert(spillb);
 
                        /* interfere <-> (mem_in_a or spill_a) and (mem_in_b or spill_b): */
@@ -2978,6 +3119,13 @@ walker_spill_placer(ir_node * bb, void * data) {
 
                name = si->lpp->vars[spill->spill];
                if(!is_zero(name->value)) {
+                       /* place spill directly after definition */
+                       if(get_nodes_block(spill->irn) == bb) {
+                               insert_spill(si, spill->irn, spill->irn, spill->irn);
+                               continue;
+                       }
+
+                       /* place spill at bb start */
                        if(spill->reg_in > 0) {
                                name = si->lpp->vars[spill->reg_in];
                                if(!is_zero(name->value)) {
@@ -2985,6 +3133,7 @@ walker_spill_placer(ir_node * bb, void * data) {
                                        continue;
                                }
                        }
+                       /* place spill after a remat */
                        pset_insert_ptr(spills_to_do, spill->irn);
                }
        }
@@ -3063,6 +3212,41 @@ walker_reload_placer(ir_node * bb, void * data) {
        int            i;
        irn_live_t    *li;
 
+       /* reloads at end of block */
+       if(spill_bb->reloads) {
+               keyval_t    *keyval;
+
+               set_foreach(spill_bb->reloads, keyval) {
+                       ir_node        *irn = (ir_node*)keyval->key;
+                       ilp_var_t       reload = PTR_TO_INT(keyval->val);
+                       lpp_name_t     *name;
+
+                       name = si->lpp->vars[reload];
+                       if(!is_zero(name->value)) {
+                               ir_node    *reload;
+                               ir_node    *insert_pos = bb;
+                               ir_node    *prev = sched_block_last_noncf(si, bb);
+                               op_t       *prev_op = get_irn_link(prev);
+
+                               /* insert reload before pre-remats */
+                               while(!sched_is_end(prev) && !be_is_Reload(prev) && !be_is_Spill(prev)
+                                               && prev_op->is_remat && prev_op->attr.remat.pre) {
+                                       insert_pos = prev;
+
+                                       prev = sched_prev(insert_pos);
+                                       prev_op = get_irn_link(prev);
+                               }
+
+                               reload = insert_reload(si, irn, insert_pos);
+
+#ifdef KEEPALIVE_RELOADS
+                               pset_insert_ptr(si->spills, reload);
+#endif
+                       }
+               }
+       }
+
+       /* walk and insert more reloads and collect remats */
        sched_foreach_reverse(bb, irn) {
                op_t     *op = get_irn_link(irn);
 
@@ -3121,40 +3305,6 @@ walker_reload_placer(ir_node * bb, void * data) {
                }
        }
 
-       /* reloads at end of block */
-       if(spill_bb->reloads) {
-               keyval_t    *keyval;
-
-               set_foreach(spill_bb->reloads, keyval) {
-                       ir_node        *irn = (ir_node*)keyval->key;
-                       ilp_var_t       reload = PTR_TO_INT(keyval->val);
-                       lpp_name_t     *name;
-
-                       name = si->lpp->vars[reload];
-                       if(!is_zero(name->value)) {
-                               ir_node    *reload;
-                               ir_node    *insert_pos = bb;
-                               ir_node    *prev = sched_prev(insert_pos);
-                               op_t       *prev_op = get_irn_link(prev);
-
-                               /* insert reload before pre-remats */
-                               while(!sched_is_end(prev) && !be_is_Reload(prev) && !be_is_Spill(prev)
-                                               && prev_op->is_remat && prev_op->attr.remat.pre) {
-                                       insert_pos = prev;
-
-                                       prev = sched_prev(insert_pos);
-                                       prev_op = get_irn_link(prev);
-                               }
-
-                               reload = insert_reload(si, irn, insert_pos);
-
-#ifdef KEEPALIVE_RELOADS
-                               pset_insert_ptr(si->spills, reload);
-#endif
-                       }
-               }
-       }
-
        del_set(spill_bb->ilp);
        if(spill_bb->reloads) del_set(spill_bb->reloads);
 }
@@ -3187,7 +3337,9 @@ walker_kill_unused(ir_node * bb, void * data)
                if(!lc_bitset_is_set(kh->used, get_irn_idx(irn))) {
                        if(be_is_Spill(irn) || be_is_Reload(irn)) {
                                DBG((kh->si->dbg, LEVEL_1, "\t SUBOPTIMAL! %+F IS UNUSED (cost: %g)\n", irn, get_cost(kh->si, irn)*execution_frequency(kh->si, bb)));
+#if 0
                                assert(lpp_get_sol_state(kh->si->lpp) != lpp_optimal && "optimal solution is suboptimal?");
+#endif
                        }
 
                        sched_remove(irn);
@@ -3441,6 +3593,8 @@ be_spill_remat(const be_chordal_env_t * chordal_env)
        dump_graph_with_remats(chordal_env->irg, dump_suffix);
 #endif
 
+       /* insert copies for phi arguments not in my regclass */
+       irg_walk_graph(chordal_env->irg, walker_regclass_copy_insertor, NULL, &si);
 
        /* recompute liveness */
        DBG((si.dbg, LEVEL_1, "Recomputing liveness\n"));
@@ -3518,8 +3672,8 @@ be_spill_remat(const be_chordal_env_t * chordal_env)
 
        // move reloads upwards
        be_liveness(chordal_env->irg);
-       irg_block_walk_graph(chordal_env->irg, walker_pressure_annotator, NULL, &si);
-       move_reloads_upward(&si);
+       //irg_block_walk_graph(chordal_env->irg, walker_pressure_annotator, NULL, &si);
+       //move_reloads_upward(&si);
 
        irg_block_walk_graph(chordal_env->irg, walker_pressure_annotator, NULL, &si);