Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2a9f42095cb2d9aace991b11bf052d12ca654ef8

>---------------------------------------------------------------

commit 2a9f42095cb2d9aace991b11bf052d12ca654ef8
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Oct 12 11:50:55 2011 +0100

    Increase max simplifier tick count magic number (Trac #5539)

>---------------------------------------------------------------

 compiler/simplCore/SimplMonad.lhs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/compiler/simplCore/SimplMonad.lhs 
b/compiler/simplCore/SimplMonad.lhs
index c48673c..a7615d2 100644
--- a/compiler/simplCore/SimplMonad.lhs
+++ b/compiler/simplCore/SimplMonad.lhs
@@ -67,13 +67,16 @@ initSmpl dflags rules fam_envs us size m
        (result, _, count) -> (result, count)
   where
     -- Compute the max simplifier ticks as
-    --     pgm-size * k * tick-factor/100
-    -- where k is a constant that gives reasonable results
-    max_ticks = fromInteger ((toInteger size * toInteger (simplTickFactor 
dflags * k)) 
+    --     pgm-size * magic-multiplier * tick-factor/100
+    -- where magic-multiplier is a constant that gives reasonable results
+    max_ticks = fromInteger ((toInteger size * toInteger (simplTickFactor 
dflags 
+                                                          * magic_multiplier)) 
                              `div` 100)
-    k = 20     -- MAGIC NUMBER, multiplies the simplTickFactor
-               -- We can afford to be generous; this is really
-               -- just checking for loops, and shouldn't usually fire
+    magic_multiplier = 40
+       -- MAGIC NUMBER, multiplies the simplTickFactor
+       -- We can afford to be generous; this is really
+       -- just checking for loops, and shouldn't usually fire
+       -- A figure of 20 was too small: see Trac #553
 
     env = STE { st_flags = dflags, st_rules = rules
              , st_max_ticks = max_ticks



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to