Tune loop unrolling heuristics. Increase trace recorder limits.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/lj_jit.h b/src/lj_jit.h
index 92631440..cced4813 100644
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -67,17 +67,17 @@
 /* Optimization parameters and their defaults. Length is a char in octal! */
 #define JIT_PARAMDEF(_) \
   _(\010, maxtrace,     1000)   /* Max. # of traces in cache. */ \
-  _(\011, maxrecord,    2000)   /* Max. # of recorded IR instructions. */ \
+  _(\011, maxrecord,    4000)   /* Max. # of recorded IR instructions. */ \
   _(\012, maxirconst,   500)    /* Max. # of IR constants of a trace. */ \
   _(\007, maxside,      100)    /* Max. # of side traces of a root trace. */ \
-  _(\007, maxsnap,      100)    /* Max. # of snapshots for a trace. */ \
+  _(\007, maxsnap,      500)    /* Max. # of snapshots for a trace. */ \
   \
   _(\007, hotloop,      56)     /* # of iter. to detect a hot loop/call. */ \
   _(\007, hotexit,      10)     /* # of taken exits to start a side trace. */ \
   _(\007, tryside,      4)      /* # of attempts to compile a side trace. */ \
   \
   _(\012, instunroll,   4)      /* Max. unroll for instable loops. */ \
-  _(\012, loopunroll,   7)      /* Max. unroll for loop ops in side traces. */ \
+  _(\012, loopunroll,   15)     /* Max. unroll for loop ops in side traces. */ \
   _(\012, callunroll,   3)      /* Max. unroll for recursive calls. */ \
   _(\011, recunroll,    2)      /* Min. unroll for true recursion. */ \
   \
diff --git a/src/lj_record.c b/src/lj_record.c
index 36425086..41b2221a 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -521,7 +521,9 @@ static void rec_loop_interp(jit_State *J, const BCIns *pc, LoopEvent ev)
       */
       if (!innerloopleft(J, pc))
         lj_trace_err(J, LJ_TRERR_LINNER);  /* Root trace hit an inner loop. */
-      if ((J->loopref && J->cur.nins - J->loopref > 8) || --J->loopunroll < 0)
+      if ((J->loopref && J->cur.nins - J->loopref >
+                         ((IRRef)J->param[JIT_P_maxrecord] >> 5)) ||
+          --J->loopunroll < 0)
         lj_trace_err(J, LJ_TRERR_LUNROLL);  /* Limit loop unrolling. */
       J->loopref = J->cur.nins;
     }