[commit: ghc] master: Accept output for scc003 (034e01e)

git at git.haskell.org git at git.haskell.org
Mon Nov 14 14:43:54 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/034e01e4b0a92240883b125e2362457932e785cf/ghc

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

commit 034e01e4b0a92240883b125e2362457932e785cf
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 9 10:58:57 2016 +0000

    Accept output for scc003
    
    Looks like e3f341f334d89c88f388d8e864ed8762d0890a64 broke it, but we
    wouldn't have noticed because the test isn't run in validate.
    
    I think the change is OK.  We don't get a tick for x' any more, because
    it is converted directly to a case instead of a let-binding, but we
    still get a tick for the "pattern binding" (!x').  This could be better
    - f.(...) isn't all that intuitive - but it's not strictly wrong.


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

034e01e4b0a92240883b125e2362457932e785cf
 .../tests/profiling/should_run/scc003.prof.sample  | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/testsuite/tests/profiling/should_run/scc003.prof.sample b/testsuite/tests/profiling/should_run/scc003.prof.sample
index b1c60e8..c809013 100644
--- a/testsuite/tests/profiling/should_run/scc003.prof.sample
+++ b/testsuite/tests/profiling/should_run/scc003.prof.sample
@@ -1,35 +1,34 @@
-	Sat Jun  4 11:59 2016 Time and Allocation Profiling Report  (Final)
+	Wed Nov  9 10:58 2016 Time and Allocation Profiling Report  (Final)
 
 	   scc003 +RTS -hc -p -RTS
 
-	total time  =        0.04 secs   (35 ticks @ 1000 us, 1 processor)
-	total alloc =      48,704 bytes  (excludes profiling overheads)
+	total time  =        0.04 secs   (38 ticks @ 1000 us, 1 processor)
+	total alloc =      48,784 bytes  (excludes profiling overheads)
 
 COST CENTRE MODULE           SRC               %time %alloc
 
 fib         Main             scc003.hs:8:1-50  100.0    0.0
-MAIN        MAIN             <built-in>          0.0    1.7
+MAIN        MAIN             <built-in>          0.0    1.9
+CAF         GHC.IO.Handle.FD <entire-module>     0.0   70.8
 CAF         GHC.IO.Encoding  <entire-module>     0.0    5.7
 CAF         GHC.Conc.Signal  <entire-module>     0.0    1.3
-CAF         GHC.IO.Handle.FD <entire-module>     0.0   70.9
 main        Main             scc003.hs:2:1-22    0.0   19.6
 
 
                                                                        individual      inherited
 COST CENTRE MODULE                SRC               no.     entries  %time %alloc   %time %alloc
 
-MAIN        MAIN                  <built-in>         44          0    0.0    1.7   100.0  100.0
- CAF        Main                  <entire-module>    87          0    0.0    0.0   100.0    0.7
-  main      Main                  scc003.hs:2:1-22   88          1    0.0    0.6   100.0    0.7
-   f        Main                  scc003.hs:5:1-41   90          1    0.0    0.0   100.0    0.1
-    f.(...) Main                  scc003.hs:5:11-21  91          1    0.0    0.0     0.0    0.0
-     fib    Main                  scc003.hs:8:1-50   92      21891    0.0    0.0     0.0    0.0
-    f.\     Main                  scc003.hs:5:32-41  94          1    0.0    0.0   100.0    0.0
-     fib    Main                  scc003.hs:8:1-50   95    2692537  100.0    0.0   100.0    0.0
-    f.x'    Main                  scc003.hs:5:11-21  93          1    0.0    0.0     0.0    0.0
- CAF        GHC.IO.Handle.FD      <entire-module>    82          0    0.0   70.9     0.0   70.9
- CAF        GHC.IO.Handle.Text    <entire-module>    81          0    0.0    0.2     0.0    0.2
- CAF        GHC.Conc.Signal       <entire-module>    79          0    0.0    1.3     0.0    1.3
- CAF        GHC.IO.Encoding       <entire-module>    76          0    0.0    5.7     0.0    5.7
- CAF        GHC.IO.Encoding.Iconv <entire-module>    63          0    0.0    0.5     0.0    0.5
- main       Main                  scc003.hs:2:1-22   89          0    0.0   19.0     0.0   19.0
+MAIN        MAIN                  <built-in>        104          0    0.0    1.9   100.0  100.0
+ CAF        Main                  <entire-module>   207          0    0.0    0.0   100.0    0.7
+  main      Main                  scc003.hs:2:1-22  208          1    0.0    0.6   100.0    0.7
+   f        Main                  scc003.hs:5:1-41  210          1    0.0    0.0   100.0    0.1
+    f.(...) Main                  scc003.hs:5:11-21 211          1    0.0    0.0     0.0    0.0
+     fib    Main                  scc003.hs:8:1-50  212      21891    0.0    0.0     0.0    0.0
+    f.\     Main                  scc003.hs:5:32-41 213          1    0.0    0.0   100.0    0.0
+     fib    Main                  scc003.hs:8:1-50  214    2692537  100.0    0.0   100.0    0.0
+ CAF        GHC.Conc.Signal       <entire-module>   201          0    0.0    1.3     0.0    1.3
+ CAF        GHC.IO.Encoding       <entire-module>   191          0    0.0    5.7     0.0    5.7
+ CAF        GHC.IO.Encoding.Iconv <entire-module>   189          0    0.0    0.5     0.0    0.5
+ CAF        GHC.IO.Handle.FD      <entire-module>   181          0    0.0   70.8     0.0   70.8
+ CAF        GHC.IO.Handle.Text    <entire-module>   179          0    0.0    0.2     0.0    0.2
+ main       Main                  scc003.hs:2:1-22  209          0    0.0   19.0     0.0   19.0



More information about the ghc-commits mailing list