Small simplification in ia32 ASM emitter.
[libfirm] / ir / be / ia32 / ia32_optimize.c
index 8844940..341437c 100644 (file)
@@ -51,6 +51,7 @@
 #include "ia32_optimize.h"
 #include "bearch_ia32_t.h"
 #include "gen_ia32_regalloc_if.h"
+#include "ia32_common_transform.h"
 #include "ia32_transform.h"
 #include "ia32_dbg_stat.h"
 #include "ia32_util.h"
@@ -154,15 +155,76 @@ static ir_node *turn_into_mode_t(ir_node *node)
        reg = arch_get_irn_register(arch_env, node);
        arch_set_irn_register(arch_env, res_proj, reg);
 
-       be_peephole_before_exchange(node, res_proj);
        sched_add_before(node, new_node);
-       sched_remove(node);
-       exchange(node, res_proj);
-       be_peephole_after_exchange(res_proj);
-
+       be_peephole_exchange(node, res_proj);
        return new_node;
 }
 
+/**
+ * Replace Cmp(x, 0) by a Test(x, x)
+ */
+static void peephole_ia32_Cmp(ir_node *const node)
+{
+       ir_node                     *right;
+       ia32_immediate_attr_t const *imm;
+       dbg_info                    *dbgi;
+       ir_graph                    *irg;
+       ir_node                     *block;
+       ir_node                     *noreg;
+       ir_node                     *nomem;
+       ir_node                     *op;
+       ia32_attr_t           const *attr;
+       int                          ins_permuted;
+       int                          cmp_unsigned;
+       ir_node                     *test;
+       arch_register_t       const *reg;
+       ir_edge_t             const *edge;
+       ir_edge_t             const *tmp;
+
+       if (get_ia32_op_type(node) != ia32_Normal)
+               return;
+
+       right = get_irn_n(node, n_ia32_Cmp_right);
+       if (!is_ia32_Immediate(right))
+               return;
+
+       imm = get_ia32_immediate_attr_const(right);
+       if (imm->symconst != NULL || imm->offset != 0)
+               return;
+
+       dbgi         = get_irn_dbg_info(node);
+       irg          = current_ir_graph;
+       block        = get_nodes_block(node);
+       noreg        = ia32_new_NoReg_gp(cg);
+       nomem        = get_irg_no_mem(irg);
+       op           = get_irn_n(node, n_ia32_Cmp_left);
+       attr         = get_irn_generic_attr(node);
+       ins_permuted = attr->data.ins_permuted;
+       cmp_unsigned = attr->data.cmp_unsigned;
+
+       if (is_ia32_Cmp(node)) {
+               test = new_rd_ia32_Test(dbgi, irg, block, noreg, noreg, nomem,
+                                       op, op, ins_permuted, cmp_unsigned);
+       } else {
+               test = new_rd_ia32_Test8Bit(dbgi, irg, block, noreg, noreg, nomem,
+                                           op, op, ins_permuted, cmp_unsigned);
+       }
+       set_ia32_ls_mode(test, get_ia32_ls_mode(node));
+
+       reg = arch_get_irn_register(arch_env, node);
+       arch_set_irn_register(arch_env, test, reg);
+
+       foreach_out_edge_safe(node, edge, tmp) {
+               ir_node *const user = get_edge_src_irn(edge);
+
+               if (is_Proj(user))
+                       exchange(user, test);
+       }
+
+       sched_add_before(node, test);
+       be_peephole_exchange(node, test);
+}
+
 /**
  * Peephole optimization for Test instructions.
  * We can remove the Test, if a zero flags was produced which is still
@@ -232,10 +294,7 @@ static void peephole_ia32_Test(ir_node *node)
 
        assert(get_irn_mode(node) != mode_T);
 
-       be_peephole_before_exchange(node, flags_proj);
-       exchange(node, flags_proj);
-       sched_remove(node);
-       be_peephole_after_exchange(flags_proj);
+       be_peephole_exchange(node, flags_proj);
 }
 
 /**
@@ -251,20 +310,6 @@ static void peephole_ia32_Return(ir_node *node) {
 
        block = get_nodes_block(node);
 
-       if (get_Block_n_cfgpreds(block) == 1) {
-               ir_node *pred = get_Block_cfgpred(block, 0);
-
-               if (is_Jmp(pred)) {
-                       /* The block of the return has only one predecessor,
-                          which jumps directly to this block.
-                          This jump will be encoded as a fall through, so we
-                          ignore it here.
-                          However, the predecessor might be empty, so it must be
-                          ensured that empty blocks are gone away ... */
-                       return;
-               }
-       }
-
        /* check if this return is the first on the block */
        sched_foreach_reverse_from(node, irn) {
                switch (get_irn_opcode(irn)) {
@@ -285,18 +330,11 @@ static void peephole_ia32_Return(ir_node *node) {
                        return;
                }
        }
-       /* yep, return is the first real instruction in this block */
-#if 0
-       {
-               /* add an rep prefix to the return */
-               ir_node *rep = new_rd_ia32_RepPrefix(get_irn_dbg_info(node), current_ir_graph, block);
-               keep_alive(rep);
-               sched_add_before(node, rep);
-       }
-#else
-       /* ensure, that the 3 byte return is generated */
+
+       /* ensure, that the 3 byte return is generated
+        * actually the emitter tests again if the block beginning has a label and
+        * isn't just a fallthrough */
        be_Return_set_emit_pop(node, 1);
-#endif
 }
 
 /* only optimize up to 48 stores behind IncSPs */
@@ -409,10 +447,7 @@ static void peephole_IncSP_Store_to_push(ir_node *irn)
                mem_proj = new_r_Proj(irg, block, push, mode_M, pn_ia32_Push_M);
 
                /* use the memproj now */
-               exchange(store, mem_proj);
-
-               /* we can remove the Store now */
-               sched_remove(store);
+               be_peephole_exchange(store, mem_proj);
 
                inc_ofs -= 4;
        }
@@ -590,14 +625,13 @@ static void peephole_Load_IncSP_to_pop(ir_node *irn)
                        set_Proj_pred(proj, pop);
                }
 
-
                /* we can remove the Load now */
                sched_remove(load);
                kill_node(load);
        }
+
        be_set_IncSP_offset(irn, -ofs);
        be_set_IncSP_pred(irn, pred_sp);
-
 }
 
 
@@ -671,19 +705,14 @@ static ir_node *create_pop(dbg_info *dbgi, ir_graph *irg, ir_node *block,
  * @return the new stack value
  */
 static ir_node *create_push(dbg_info *dbgi, ir_graph *irg, ir_node *block,
-                            ir_node *stack, ir_node *schedpoint,
-                            const arch_register_t *reg)
+                            ir_node *stack, ir_node *schedpoint)
 {
        const arch_register_t *esp = &ia32_gp_regs[REG_ESP];
-       ir_node *noreg, *nomem, *push, *val;
 
-       val  = new_rd_ia32_ProduceVal(NULL, irg, block);
-       arch_set_irn_register(arch_env, val, reg);
-       sched_add_before(schedpoint, val);
-
-       noreg = ia32_new_NoReg_gp(cg);
-       nomem = get_irg_no_mem(irg);
-       push  = new_rd_ia32_Push(dbgi, irg, block, noreg, noreg, nomem, val, stack);
+       ir_node *val   = ia32_new_Unknown_gp(cg);
+       ir_node *noreg = ia32_new_NoReg_gp(cg);
+       ir_node *nomem = get_irg_no_mem(irg);
+       ir_node *push  = new_rd_ia32_Push(dbgi, irg, block, noreg, noreg, nomem, val, stack);
        sched_add_before(schedpoint, push);
 
        stack = new_r_Proj(irg, block, push, mode_Iu, pn_ia32_Push_stack);
@@ -744,19 +773,14 @@ static void peephole_be_IncSP(ir_node *node)
                dbgi  = get_irn_dbg_info(node);
                block = get_nodes_block(node);
                stack = be_get_IncSP_pred(node);
-               reg   = &ia32_gp_regs[REG_EAX];
-
-               stack = create_push(dbgi, irg, block, stack, node, reg);
+               stack = create_push(dbgi, irg, block, stack, node);
 
                if (offset == +8) {
-                       stack = create_push(dbgi, irg, block, stack, node, reg);
+                       stack = create_push(dbgi, irg, block, stack, node);
                }
        }
 
-       be_peephole_before_exchange(node, stack);
-       sched_remove(node);
-       exchange(node, stack);
-       be_peephole_after_exchange(stack);
+       be_peephole_exchange(node, stack);
 }
 
 /**
@@ -799,10 +823,7 @@ static void peephole_ia32_Const(ir_node *node)
        sched_add_before(node, produceval);
        sched_add_before(node, xor);
 
-       be_peephole_before_exchange(node, xor);
-       exchange(node, xor);
-       sched_remove(node);
-       be_peephole_after_exchange(xor);
+       be_peephole_exchange(node, xor);
 }
 
 static INLINE int is_noreg(ia32_code_gen_t *cg, const ir_node *node)
@@ -1007,11 +1028,8 @@ exchange:
        DBG_OPT_LEA2ADD(node, res);
 
        /* exchange the Add and the LEA */
-       be_peephole_before_exchange(node, res);
        sched_add_before(node, res);
-       sched_remove(node);
-       exchange(node, res);
-       be_peephole_after_exchange(res);
+       be_peephole_exchange(node, res);
 }
 
 /**
@@ -1062,7 +1080,7 @@ static void peephole_ia32_Imul_split(ir_node *imul) {
        res = new_rd_Proj(dbgi, irg, block, load, mode_Iu, pn_ia32_Load_res);
 
        arch_set_irn_register(arch_env, res, reg);
-       be_peephole_after_exchange(res);
+       be_peephole_new_node(res);
 
        set_irn_n(imul, n_ia32_IMul_mem, mem);
        noreg = get_irn_n(imul, n_ia32_IMul_left);
@@ -1093,12 +1111,14 @@ void ia32_peephole_optimization(ia32_code_gen_t *new_cg)
 
        /* register peephole optimisations */
        clear_irp_opcodes_generic_func();
-       register_peephole_optimisation(op_ia32_Const, peephole_ia32_Const);
-       register_peephole_optimisation(op_be_IncSP, peephole_be_IncSP);
-       register_peephole_optimisation(op_ia32_Lea, peephole_ia32_Lea);
-       register_peephole_optimisation(op_ia32_Test, peephole_ia32_Test);
+       register_peephole_optimisation(op_ia32_Const,    peephole_ia32_Const);
+       register_peephole_optimisation(op_be_IncSP,      peephole_be_IncSP);
+       register_peephole_optimisation(op_ia32_Lea,      peephole_ia32_Lea);
+       register_peephole_optimisation(op_ia32_Cmp,      peephole_ia32_Cmp);
+       register_peephole_optimisation(op_ia32_Cmp8Bit,  peephole_ia32_Cmp);
+       register_peephole_optimisation(op_ia32_Test,     peephole_ia32_Test);
        register_peephole_optimisation(op_ia32_Test8Bit, peephole_ia32_Test);
-       register_peephole_optimisation(op_be_Return, peephole_ia32_Return);
+       register_peephole_optimisation(op_be_Return,     peephole_ia32_Return);
        if (! ia32_cg_config.use_imul_mem_imm32)
                register_peephole_optimisation(op_ia32_IMul, peephole_ia32_Imul_split);
        if (ia32_cg_config.use_pxor)
@@ -1129,7 +1149,7 @@ static INLINE void try_kill(ir_node *node)
                sched_remove(node);
        }
 
-       be_kill_node(node);
+       kill_node(node);
 }
 
 static void optimize_conv_store(ir_node *node)
@@ -1163,9 +1183,9 @@ static void optimize_conv_store(ir_node *node)
 
        set_irn_n(node, n_ia32_Store_val, get_irn_n(pred, n_ia32_Conv_I2I_val));
        if(get_irn_n_edges(pred_proj) == 0) {
-               be_kill_node(pred_proj);
+               kill_node(pred_proj);
                if(pred != pred_proj)
-                       be_kill_node(pred);
+                       kill_node(pred);
        }
 }
 
@@ -1290,9 +1310,9 @@ static void optimize_conv_conv(ir_node *node)
        exchange(node, result_conv);
 
        if(get_irn_n_edges(pred_proj) == 0) {
-               be_kill_node(pred_proj);
+               kill_node(pred_proj);
                if(pred != pred_proj)
-                       be_kill_node(pred);
+                       kill_node(pred);
        }
        optimize_conv_conv(result_conv);
 }