Merge pull request #3436 from ntherning/fix-alt-dir-separator-not-replaced-in-Path...
[mono.git] / mono / mini / local-propagation.c
index e3d9e11f33987001a225115f65eb6b1d9efe7820..04373359fb46ead9bc1ea8d96249d33ee4c15948 100644 (file)
@@ -42,13 +42,17 @@ mono_bitset_mp_new_noinit (MonoMemPool *mp,  guint32 max_size)
        return mono_bitset_mem_new (mem, max_size, MONO_BITSET_DONT_FREE);
 }
 
-#if SIZEOF_REGISTER == 8
 struct magic_unsigned {
        guint32 magic_number;
        gboolean addition;
        int shift;
 };
 
+struct magic_signed {
+       gint32 magic_number;
+       int shift;
+};
+
 /* http://www.hackersdelight.org/hdcodetxt/magicu.c.txt */
 static struct magic_unsigned
 compute_magic_unsigned (guint32 divisor) {
@@ -93,7 +97,49 @@ compute_magic_unsigned (guint32 divisor) {
        magu.shift = p - 32;
        return magu;
 }
-#endif
+
+/* http://www.hackersdelight.org/hdcodetxt/magic.c.txt */
+static struct magic_signed
+compute_magic_signed (gint32 divisor) {
+       int p;
+       guint32 ad, anc, delta, q1, r1, q2, r2, t;
+       const guint32 two31 = 0x80000000;
+       struct magic_signed mag;
+
+       ad = abs (divisor);
+       t = two31 + ((unsigned)divisor >> 31);
+       anc = t - 1 - t % ad;
+       p = 31;
+       q1 = two31 / anc;
+       r1 = two31 - q1 * anc;
+       q2 = two31 / ad;
+       r2 = two31 - q2 * ad;
+       do {
+               p++;
+               q1 *= 2;
+               r1 *= 2;
+               if (r1 >= anc) {
+                       q1++;
+                       r1 -= anc;
+               }
+
+               q2 *= 2;
+               r2 *= 2;
+
+               if (r2 >= ad) {
+                       q2++;
+                       r2 -= ad;
+               }
+
+               delta = ad - r2;
+       } while (q1 < delta || (q1 == delta && r1 == 0));
+
+       mag.magic_number = q2 + 1;
+       if (divisor < 0)
+               mag.magic_number = -mag.magic_number;
+       mag.shift = p - 32;
+       return mag;
+}
 
 static gboolean
 mono_strength_reduction_division (MonoCompile *cfg, MonoInst *ins)
@@ -104,10 +150,14 @@ mono_strength_reduction_division (MonoCompile *cfg, MonoInst *ins)
         * platforms we emulate long multiplication, driving the
         * performance back down.
         */
-#if SIZEOF_REGISTER == 8
        switch (ins->opcode) {
                case OP_IDIV_UN_IMM: {
-                       guint32 tmp_regl, dividend_reg;
+                       guint32 tmp_regl;
+#if SIZEOF_REGISTER == 8
+                       guint32 dividend_reg;
+#else
+                       guint32 tmp_regi;
+#endif
                        struct magic_unsigned mag;
                        int power2 = mono_is_power_of_two (ins->inst_imm);
 
@@ -128,6 +178,7 @@ mono_strength_reduction_division (MonoCompile *cfg, MonoInst *ins)
                         */
                        mag = compute_magic_unsigned (ins->inst_imm);
                        tmp_regl = alloc_lreg (cfg);
+#if SIZEOF_REGISTER == 8
                        dividend_reg = alloc_lreg (cfg);
                        MONO_EMIT_NEW_I8CONST (cfg, tmp_regl, mag.magic_number);
                        MONO_EMIT_NEW_UNALU (cfg, OP_ZEXT_I4, dividend_reg, ins->sreg1);
@@ -139,10 +190,106 @@ mono_strength_reduction_division (MonoCompile *cfg, MonoInst *ins)
                        } else {
                                MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_UN_IMM, ins->dreg, tmp_regl, 32 + mag.shift);
                        }
+#else
+                       tmp_regi = alloc_ireg (cfg);
+                       MONO_EMIT_NEW_ICONST (cfg, tmp_regi, mag.magic_number);
+                       MONO_EMIT_NEW_BIALU (cfg, OP_BIGMUL_UN, tmp_regl, ins->sreg1, tmp_regi);
+                       /* Long shifts below will be decomposed during cprop */
+                       if (mag.addition) {
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_UN_IMM, tmp_regl, tmp_regl, 32);
+                               MONO_EMIT_NEW_BIALU (cfg, OP_IADDCC, MONO_LVREG_LS (tmp_regl), MONO_LVREG_LS (tmp_regl), ins->sreg1);
+                               /* MONO_LVREG_MS (tmp_reg) is 0, save in it the carry */
+                               MONO_EMIT_NEW_BIALU (cfg, OP_IADC, MONO_LVREG_MS (tmp_regl), MONO_LVREG_MS (tmp_regl), MONO_LVREG_MS (tmp_regl));
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_UN_IMM, tmp_regl, tmp_regl, mag.shift);
+                       } else {
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_UN_IMM, tmp_regl, tmp_regl, 32 + mag.shift);
+                       }
+                       MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, ins->dreg, MONO_LVREG_LS (tmp_regl));
+#endif
+                       mono_jit_stats.optimized_divisions++;
                        break;
                }
-       }
+               case OP_IDIV_IMM: {
+                       guint32 tmp_regl;
+#if SIZEOF_REGISTER == 8
+                       guint32 dividend_reg;
+#else
+                       guint32 tmp_regi;
 #endif
+                       struct magic_signed mag;
+                       int power2 = mono_is_power_of_two (ins->inst_imm);
+                       /* The decomposition doesn't handle exception throwing */
+                       /* Optimization with MUL does not apply for -1, 0 and 1 divisors */
+                       if (ins->inst_imm == 0 || ins->inst_imm == -1) {
+                               break;
+                       } else if (ins->inst_imm == 1) {
+                               ins->opcode = OP_MOVE;
+                               ins->inst_imm = 0;
+                               break;
+                       }
+                       allocated_vregs = TRUE;
+                       if (power2 == 1) {
+                               guint32 r1 = alloc_ireg (cfg);
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, r1, ins->sreg1, 31);
+                               MONO_EMIT_NEW_BIALU (cfg, OP_IADD, r1, r1, ins->sreg1);
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, ins->dreg, r1, 1);
+                               break;
+                       } else if (power2 > 0 && power2 < 31) {
+                               guint32 r1 = alloc_ireg (cfg);
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, r1, ins->sreg1, 31);
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, r1, r1, (32 - power2));
+                               MONO_EMIT_NEW_BIALU (cfg, OP_IADD, r1, r1, ins->sreg1);
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, ins->dreg, r1, power2);
+                               break;
+                       }
+
+                       /*
+                        * Replacement of signed division with multiplication,
+                        * shifts and additions Hacker's Delight, chapter 10-6.
+                        */
+                       mag = compute_magic_signed (ins->inst_imm);
+                       tmp_regl = alloc_lreg (cfg);
+#if SIZEOF_REGISTER == 8
+                       dividend_reg = alloc_lreg (cfg);
+                       MONO_EMIT_NEW_I8CONST (cfg, tmp_regl, mag.magic_number);
+                       MONO_EMIT_NEW_UNALU (cfg, OP_SEXT_I4, dividend_reg, ins->sreg1);
+                       MONO_EMIT_NEW_BIALU (cfg, OP_LMUL, tmp_regl, dividend_reg, tmp_regl);
+                       if ((ins->inst_imm > 0 && mag.magic_number < 0) || (ins->inst_imm < 0 && mag.magic_number > 0)) {
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_IMM, tmp_regl, tmp_regl, 32);
+                               if (ins->inst_imm > 0 && mag.magic_number < 0) {
+                                       MONO_EMIT_NEW_BIALU (cfg, OP_LADD, tmp_regl, tmp_regl, dividend_reg);
+                               } else if (ins->inst_imm < 0 && mag.magic_number > 0) {
+                                       MONO_EMIT_NEW_BIALU (cfg, OP_LSUB, tmp_regl, tmp_regl, dividend_reg);
+                               }
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_IMM, tmp_regl, tmp_regl, mag.shift);
+                       } else {
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_IMM, tmp_regl, tmp_regl, 32 + mag.shift);
+                       }
+                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_LSHR_UN_IMM, ins->dreg, tmp_regl, SIZEOF_REGISTER * 8 - 1);
+                       MONO_EMIT_NEW_BIALU (cfg, OP_LADD, ins->dreg, ins->dreg, tmp_regl);
+#else
+                       tmp_regi = alloc_ireg (cfg);
+                       MONO_EMIT_NEW_ICONST (cfg, tmp_regi, mag.magic_number);
+                       MONO_EMIT_NEW_BIALU (cfg, OP_BIGMUL, tmp_regl, ins->sreg1, tmp_regi);
+                       if ((ins->inst_imm > 0 && mag.magic_number < 0) || (ins->inst_imm < 0 && mag.magic_number > 0)) {
+                               if (ins->inst_imm > 0 && mag.magic_number < 0) {
+                                       /* Opposite sign, cannot overflow */
+                                       MONO_EMIT_NEW_BIALU (cfg, OP_IADD, tmp_regi, MONO_LVREG_MS (tmp_regl), ins->sreg1);
+                               } else if (ins->inst_imm < 0 && mag.magic_number > 0) {
+                                       /* Same sign, cannot overflow */
+                                       MONO_EMIT_NEW_BIALU (cfg, OP_ISUB, tmp_regi, MONO_LVREG_MS (tmp_regl), ins->sreg1);
+                               }
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, tmp_regi, tmp_regi, mag.shift);
+                       } else {
+                               MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, tmp_regi, MONO_LVREG_MS (tmp_regl), mag.shift);
+                       }
+                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, ins->dreg, tmp_regi, SIZEOF_REGISTER * 8 - 1);
+                       MONO_EMIT_NEW_BIALU (cfg, OP_IADD, ins->dreg, ins->dreg, tmp_regi);
+#endif
+                       mono_jit_stats.optimized_divisions++;
+                       break;
+               }
+       }
        return allocated_vregs;
 }
 
@@ -213,32 +360,10 @@ mono_strength_reduction_ins (MonoCompile *cfg, MonoInst *ins, const char **spec)
                }
                break;
        }
-       case OP_IDIV_UN_IMM: {
-               allocated_vregs = mono_strength_reduction_division (cfg, ins);
-               break;
-       }
+       case OP_IDIV_UN_IMM:
        case OP_IDIV_IMM: {
-               int c = ins->inst_imm;
-               int power2 = mono_is_power_of_two (c);
-
-               if (power2 == 1) {
-                       int r1 = mono_alloc_ireg (cfg);
-
-                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, r1, ins->sreg1, 31);
-                       MONO_EMIT_NEW_BIALU (cfg, OP_IADD, r1, r1, ins->sreg1);
-                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, ins->dreg, r1, 1);
-
-                       allocated_vregs = TRUE;
-               } else if (power2 > 0 && power2 < 31) {
-                       int r1 = mono_alloc_ireg (cfg);
-
-                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, r1, ins->sreg1, 31);
-                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_UN_IMM, r1, r1, (32 - power2));
-                       MONO_EMIT_NEW_BIALU (cfg, OP_IADD, r1, r1, ins->sreg1);
-                       MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ISHR_IMM, ins->dreg, r1, power2);
-
-                       allocated_vregs = TRUE;
-               }
+               if (!COMPILE_LLVM (cfg))
+                       allocated_vregs = mono_strength_reduction_division (cfg, ins);
                break;
        }
 #if SIZEOF_REGISTER == 8