mark stores in int->float, float->int and float->float convs as spills

That way the spill engine can rematerialize the loads and needs no
extra spills for these values.

diff --git a/ir/be/be_types.h b/ir/be/be_types.h
index b7f1e2d..5e563e2 100644 (file)
--- a/ir/be/be_types.h
+++ b/ir/be/be_types.h
@@ -48,7 +48,10 @@ typedef enum arch_irn_flags_t {
                                                        implementation in beflags */
        arch_irn_flags_simple_jump      = 1U << 3, /**< a simple jump instruction */
        arch_irn_flags_not_scheduled    = 1U << 4, /**< node must not be scheduled*/
-       arch_irn_flags_backend          = 1U << 5, /**< begin of custom backend
+       /** node writes to a spillslot, this means we can load from the spillslot
+        * anytime (important when deciding wether we can rematerialize) */
+       arch_irn_flags_spill            = 1U << 5,
+       arch_irn_flags_backend          = 1U << 6, /**< begin of custom backend
                                                        flags */
 } arch_irn_flags_t;
 ENUM_BITSET(arch_irn_flags_t)

diff --git a/ir/be/benode.c b/ir/be/benode.c
index 5cfa862..e151145 100644 (file)
--- a/ir/be/benode.c
+++ b/ir/be/benode.c
@@ -264,6 +264,7 @@ ir_node *be_new_Spill(const arch_register_class_t *cls,
        be_node_set_reg_class_in(res, n_be_Spill_frame, cls_frame);
        be_node_set_reg_class_in(res, n_be_Spill_val, cls);
        arch_set_irn_register_req_out(res, 0, arch_no_register_req);
+       arch_add_irn_flags(res, arch_irn_flags_spill);
 
        return res;
 }

diff --git a/ir/be/bespillutil.c b/ir/be/bespillutil.c
index 4744e03..b4b2005 100644 (file)
--- a/ir/be/bespillutil.c
+++ b/ir/be/bespillutil.c
@@ -506,7 +506,7 @@ static int is_value_available(spill_env_t *env, const ir_node *arg,
        if (is_Unknown(arg) || is_NoMem(arg))
                return 1;
 
-       if (be_is_Spill(skip_Proj_const(arg)))
+       if (arch_irn_is(skip_Proj_const(arg), spill))
                return 1;
 
        if (arg == get_irg_frame(env->irg))

diff --git a/ir/be/ia32/ia32_transform.c b/ir/be/ia32/ia32_transform.c
index c36410a..11319bb 100644 (file)
--- a/ir/be/ia32/ia32_transform.c
+++ b/ir/be/ia32/ia32_transform.c
@@ -3597,6 +3597,7 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node)
        set_irn_pinned(fist, op_pin_state_floats);
        set_ia32_use_frame(fist);
        set_ia32_op_type(fist, ia32_AddrModeD);
+       arch_add_irn_flags(fist, arch_irn_flags_spill);
 
        assert((long)pn_ia32_fist_M == (long) pn_ia32_fisttp_M);
        mem = new_r_Proj(fist, mode_M, pn_ia32_fist_M);
@@ -3646,6 +3647,7 @@ static ir_node *gen_x87_conv(ir_mode *tgt_mode, ir_node *node)
        store = new_bd_ia32_fst(dbgi, block, frame, noreg_GP, nomem, node, tgt_mode);
        set_ia32_use_frame(store);
        set_ia32_op_type(store, ia32_AddrModeD);
+       arch_add_irn_flags(store, arch_irn_flags_spill);
        SET_IA32_ORIG_NODE(store, node);
 
        store_mem = new_r_Proj(store, mode_M, pn_ia32_fst_M);
@@ -3729,6 +3731,7 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode)
        set_ia32_use_frame(store);
        set_ia32_op_type(store, ia32_AddrModeD);
        set_ia32_ls_mode(store, mode_Iu);
+       arch_add_irn_flags(store, arch_irn_flags_spill);
 
        store_mem = new_r_Proj(store, mode_M, pn_ia32_Store_M);
 
@@ -3746,6 +3749,7 @@ static ir_node *gen_x87_gp_to_fp(ir_node *node, ir_mode *src_mode)
                set_ia32_op_type(zero_store, ia32_AddrModeD);
                add_ia32_am_offs_int(zero_store, 4);
                set_ia32_ls_mode(zero_store, mode_Iu);
+               arch_add_irn_flags(zero_store, arch_irn_flags_spill);
 
                in[0] = zero_store_mem;
                in[1] = store_mem;
@@ -3998,6 +4002,7 @@ static ir_node *gen_be_Return(ir_node *node)
        set_ia32_ls_mode(sse_store, mode);
        set_ia32_op_type(sse_store, ia32_AddrModeD);
        set_ia32_use_frame(sse_store);
+       arch_add_irn_flags(sse_store, arch_irn_flags_spill);
        store_mem = new_r_Proj(sse_store, mode_M, pn_ia32_xStoreSimple_M);
 
        /* load into x87 register */
@@ -4241,6 +4246,8 @@ static ir_node *gen_ia32_l_LLtoFloat(ir_node *node)
        set_ia32_op_type(store_high, ia32_AddrModeD);
        set_ia32_ls_mode(store_low, mode_Iu);
        set_ia32_ls_mode(store_high, mode_Is);
+       arch_add_irn_flags(store_low, arch_irn_flags_spill);
+       arch_add_irn_flags(store_high, arch_irn_flags_spill);
        add_ia32_am_offs_int(store_high, 4);
 
        in[0] = mem_low;
@@ -4309,6 +4316,7 @@ static ir_node *gen_ia32_l_FloattoLL(ir_node *node)
        set_ia32_use_frame(fist);
        set_ia32_op_type(fist, ia32_AddrModeD);
        set_ia32_ls_mode(fist, mode_Ls);
+       arch_add_irn_flags(fist, arch_irn_flags_spill);
 
        assert((long)pn_ia32_fist_M == (long) pn_ia32_fisttp_M);
        return new_r_Proj(fist, mode_M, pn_ia32_fist_M);
@@ -5776,6 +5784,7 @@ static void postprocess_fp_call_results(void)
                                                                res, res_mode);
                                        set_ia32_op_type(vfst, ia32_AddrModeD);
                                        set_ia32_use_frame(vfst);
+                                       arch_add_irn_flags(vfst, arch_irn_flags_spill);
 
                                        vfst_mem = new_r_Proj(vfst, mode_M, pn_ia32_fst_M);
 

diff --git a/ir/be/sparc/sparc_transform.c b/ir/be/sparc/sparc_transform.c
index 75fcf55..73789bf 100644 (file)
--- a/ir/be/sparc/sparc_transform.c
+++ b/ir/be/sparc/sparc_transform.c
@@ -1288,6 +1288,7 @@ static ir_node *create_ftoi(dbg_info *dbgi, ir_node *block, ir_node *op,
        ir_node  *nomem = get_irg_no_mem(irg);
        ir_node  *stf   = create_stf(dbgi, block, ftoi, sp, nomem, mode_fp,
                                     NULL, 0, true);
+       arch_add_irn_flags(stf, arch_irn_flags_spill);
        ir_node  *ld    = new_bd_sparc_Ld_imm(dbgi, block, sp, stf, mode_gp,
                                              NULL, 0, true);
        ir_node  *res   = new_r_Proj(ld, mode_gp, pn_sparc_Ld_res);
@@ -1305,6 +1306,7 @@ static ir_node *create_itof(dbg_info *dbgi, ir_node *block, ir_node *op,
        ir_node  *nomem = get_irg_no_mem(irg);
        ir_node  *st    = new_bd_sparc_St_imm(dbgi, block, op, sp, nomem,
                                              mode_gp, NULL, 0, true);
+       arch_add_irn_flags(st, arch_irn_flags_spill);
        ir_node  *ldf   = new_bd_sparc_Ldf_s(dbgi, block, sp, st, mode_fp,
                                             NULL, 0, true);
        ir_node  *res   = new_r_Proj(ldf, mode_fp, pn_sparc_Ldf_res);
@@ -1611,11 +1613,13 @@ static ir_node *bitcast_int_to_float(dbg_info *dbgi, ir_node *block,
        ir_mode  *mode;
        ir_node  *ldf;
        ir_node  *mem;
+       arch_add_irn_flags(st, arch_irn_flags_spill);
        set_irn_pinned(st, op_pin_state_floats);
 
        if (value1 != NULL) {
                ir_node *st1 = new_bd_sparc_St_imm(dbgi, block, value1, sp, nomem,
                                                   mode_gp, NULL, 4, true);
+               arch_add_irn_flags(st1, arch_irn_flags_spill);
                ir_node *in[2] = { st, st1 };
                ir_node *sync  = new_r_Sync(block, 2, in);
                set_irn_pinned(st1, op_pin_state_floats);
@@ -1665,6 +1669,7 @@ static void bitcast_float_to_int(dbg_info *dbgi, ir_node *block,
                ir_node  *stf   = create_stf(dbgi, block, new_value, stack, nomem,
                                             float_mode, NULL, 0, true);
                ir_node  *ld;
+               arch_add_irn_flags(stf, arch_irn_flags_spill);
                set_irn_pinned(stf, op_pin_state_floats);
 
                ld = new_bd_sparc_Ld_imm(dbgi, block, stack, stf, mode_gp, NULL, 0, true);