[commit: ghc] master: Fix scc001 (5ebf83e)
git at git.haskell.org
git at git.haskell.org
Wed Mar 29 14:37:23 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/5ebf83e0bdde02ccf289eb7bdaf1d360f20eebd2/ghc
>---------------------------------------------------------------
commit 5ebf83e0bdde02ccf289eb7bdaf1d360f20eebd2
Author: Simon Marlow <smarlow at fb.com>
Date: Wed Mar 29 06:17:38 2017 -0700
Fix scc001
>---------------------------------------------------------------
5ebf83e0bdde02ccf289eb7bdaf1d360f20eebd2
testsuite/tests/profiling/should_run/all.T | 2 +-
.../tests/profiling/should_run/scc001.prof.sample | 42 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 96041ff..ec5f154 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -38,7 +38,7 @@ test('T3001-2', [only_ways(['prof_hb']), extra_ways(['prof_hb'])],
# As with ioprof001, the unoptimised profile is different but
# not badly wrong (CAF attribution is different).
-test('scc001', [], compile_and_run,
+test('scc001', expect_broken_for_10037, compile_and_run,
['-fno-state-hack -fno-full-laziness']) # Note [consistent stacks]
test('scc002', [], compile_and_run, [''])
diff --git a/testsuite/tests/profiling/should_run/scc001.prof.sample b/testsuite/tests/profiling/should_run/scc001.prof.sample
index 1144774..f2e55d5 100644
--- a/testsuite/tests/profiling/should_run/scc001.prof.sample
+++ b/testsuite/tests/profiling/should_run/scc001.prof.sample
@@ -1,33 +1,33 @@
- Sat Jun 4 11:59 2016 Time and Allocation Profiling Report (Final)
+ Wed Mar 29 06:17 2017 Time and Allocation Profiling Report (Final)
scc001 +RTS -hc -p -RTS
total time = 0.00 secs (0 ticks @ 1000 us, 1 processor)
- total alloc = 50,888 bytes (excludes profiling overheads)
+ total alloc = 50,856 bytes (excludes profiling overheads)
COST CENTRE MODULE SRC %time %alloc
-MAIN MAIN <built-in> 0.0 1.7
+MAIN MAIN <built-in> 0.0 1.6
+CAF GHC.IO.Handle.FD <entire-module> 0.0 68.3
CAF GHC.IO.Encoding <entire-module> 0.0 5.4
CAF GHC.Conc.Signal <entire-module> 0.0 1.3
-CAF GHC.IO.Handle.FD <entire-module> 0.0 67.8
-main Main scc001.hs:(5,1)-(7,23) 0.0 22.5
+main Main scc001.hs:(5,1)-(7,23) 0.0 22.2
- individual inherited
-COST CENTRE MODULE SRC no. entries %time %alloc %time %alloc
+ individual inherited
+COST CENTRE MODULE SRC no. entries %time %alloc %time %alloc
-MAIN MAIN <built-in> 46 0 0.0 1.7 0.0 100.0
- CAF Main <entire-module> 91 0 0.0 0.1 0.0 0.1
- (...) Main scc001.hs:16:1-16 97 1 0.0 0.0 0.0 0.0
- h Main scc001.hs:16:1-16 96 1 0.0 0.0 0.0 0.0
- main Main scc001.hs:(5,1)-(7,23) 92 1 0.0 0.0 0.0 0.0
- CAF GHC.Show <entire-module> 88 0 0.0 0.6 0.0 0.6
- CAF GHC.IO.Handle.FD <entire-module> 85 0 0.0 67.8 0.0 67.8
- CAF GHC.IO.Handle.Text <entire-module> 84 0 0.0 0.2 0.0 0.2
- CAF GHC.Conc.Signal <entire-module> 82 0 0.0 1.3 0.0 1.3
- CAF GHC.IO.Encoding <entire-module> 79 0 0.0 5.4 0.0 5.4
- CAF GHC.IO.Encoding.Iconv <entire-module> 65 0 0.0 0.5 0.0 0.5
- main Main scc001.hs:(5,1)-(7,23) 93 0 0.0 22.5 0.0 22.5
- f Main scc001.hs:10:1-7 94 1 0.0 0.0 0.0 0.0
- g Main scc001.hs:13:1-7 95 1 0.0 0.0 0.0 0.0
+MAIN MAIN <built-in> 111 0 0.0 1.6 0.0 100.0
+ CAF Main <entire-module> 221 0 0.0 0.0 0.0 0.6
+ (...) Main scc001.hs:16:1-16 227 1 0.0 0.0 0.0 0.0
+ main Main scc001.hs:(5,1)-(7,23) 222 1 0.0 0.5 0.0 0.5
+ f Main scc001.hs:10:1-7 224 1 0.0 0.0 0.0 0.0
+ g Main scc001.hs:13:1-7 225 1 0.0 0.0 0.0 0.0
+ h Main scc001.hs:16:1-16 226 1 0.0 0.0 0.0 0.0
+ CAF GHC.Conc.Signal <entire-module> 216 0 0.0 1.3 0.0 1.3
+ CAF GHC.IO.Encoding <entire-module> 206 0 0.0 5.4 0.0 5.4
+ CAF GHC.IO.Encoding.Iconv <entire-module> 204 0 0.0 0.4 0.0 0.4
+ CAF GHC.IO.Handle.FD <entire-module> 196 0 0.0 68.3 0.0 68.3
+ CAF GHC.IO.Handle.Text <entire-module> 194 0 0.0 0.2 0.0 0.2
+ CAF GHC.Show <entire-module> 179 0 0.0 0.6 0.0 0.6
+ main Main scc001.hs:(5,1)-(7,23) 223 0 0.0 21.7 0.0 21.7
More information about the ghc-commits
mailing list