[commit: testsuite] master: Update adding source locations to cost centres. (e92b106)
Simon Marlow
marlowsd at gmail.com
Fri Dec 2 16:42:03 CET 2011
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e92b106aa40afb7f3dccac2f4da5bd13bba5b917
>---------------------------------------------------------------
commit e92b106aa40afb7f3dccac2f4da5bd13bba5b917
Author: Simon Marlow <marlowsd at gmail.com>
Date: Fri Dec 2 13:10:19 2011 +0000
Update adding source locations to cost centres.
>---------------------------------------------------------------
tests/profiling/should_run/all.T | 4 +-
tests/profiling/should_run/callstack001.stdout | 4 +-
tests/profiling/should_run/callstack002.stderr | 24 ++++++++--------
tests/profiling/should_run/callstack002.stdout | 13 ++++----
tests/profiling/should_run/scc002.hs | 2 +-
tests/profiling/should_run/scc002.prof.sample | 36 ++++++++++++-----------
6 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/tests/profiling/should_run/all.T b/tests/profiling/should_run/all.T
index 18c1eec..154d382 100644
--- a/tests/profiling/should_run/all.T
+++ b/tests/profiling/should_run/all.T
@@ -102,8 +102,8 @@ test('T5559', # unicode in cost centre names
test('callstack001',
[ req_profiling, extra_ways(['prof']), only_ways(prof_ways) ],
- compile_and_run, ['-fno-state-hack'])
+ compile_and_run, ['-fprof-auto-calls -fno-full-laziness -fno-state-hack'])
test('callstack002',
[ req_profiling, extra_ways(['prof']), only_ways(prof_ways) ],
- compile_and_run, ['-fno-full-laziness -fno-state-hack'])
+ compile_and_run, ['-fprof-auto-calls -fno-full-laziness -fno-state-hack'])
diff --git a/tests/profiling/should_run/callstack001.stdout b/tests/profiling/should_run/callstack001.stdout
index 7c33871..f5a8580 100644
--- a/tests/profiling/should_run/callstack001.stdout
+++ b/tests/profiling/should_run/callstack001.stdout
@@ -1,2 +1,2 @@
-["Main.CAF","Main.main","Main.mapM","Main.mapM.go","Main.f"]
-["Main.CAF","Main.main","Main.mapM","Main.mapM.go","Main.f"]
+["Main.CAF (<entire-module>)","Main.main (callstack001.hs:17:8-21)","Main.mapM (callstack001.hs:10:13-17)","Main.mapM.go (callstack001.hs:13:17-19)","Main.f (callstack001.hs:7:10-35)"]
+["Main.CAF (<entire-module>)","Main.main (callstack001.hs:17:8-21)","Main.mapM (callstack001.hs:10:13-17)","Main.mapM.go (callstack001.hs:13:17-19)","Main.f (callstack001.hs:7:10-35)"]
diff --git a/tests/profiling/should_run/callstack002.stderr b/tests/profiling/should_run/callstack002.stderr
index b1eaf4f..21891b6 100644
--- a/tests/profiling/should_run/callstack002.stderr
+++ b/tests/profiling/should_run/callstack002.stderr
@@ -1,16 +1,16 @@
f: 42
Stack trace:
- Main.CAF
- Main.main
- Main.main.xs
- Main.map
- Main.map.go
- Main.f
+ Main.CAF (<entire-module>)
+ Main.main.xs (callstack002.hs:18:12-24)
+ Main.map (callstack002.hs:13:12-16)
+ Main.map.go (callstack002.hs:15:21-34)
+ Main.map.go (callstack002.hs:15:21-23)
+ Main.f (callstack002.hs:10:7-43)
f: 43
Stack trace:
- Main.CAF
- Main.main
- Main.main.xs
- Main.map
- Main.map.go
- Main.f
+ Main.CAF (<entire-module>)
+ Main.main.xs (callstack002.hs:18:12-24)
+ Main.map (callstack002.hs:13:12-16)
+ Main.map.go (callstack002.hs:15:21-34)
+ Main.map.go (callstack002.hs:15:21-23)
+ Main.f (callstack002.hs:10:7-43)
diff --git a/tests/profiling/should_run/callstack002.stdout b/tests/profiling/should_run/callstack002.stdout
index a68ecf9..ae605e2 100644
--- a/tests/profiling/should_run/callstack002.stdout
+++ b/tests/profiling/should_run/callstack002.stdout
@@ -1,8 +1,9 @@
[84,86]
Stack trace:
- Main.CAF
- Main.main
- Main.main.xs
- Main.map
- Main.map.go
- Main.f
+ Main.CAF (<entire-module>)
+ Main.main.xs (callstack002.hs:18:12-24)
+ Main.map (callstack002.hs:13:12-16)
+ Main.map.go (callstack002.hs:15:21-34)
+ Main.map.go (callstack002.hs:15:21-23)
+ Main.f (callstack002.hs:10:7-43)
+ Main.f (callstack002.hs:10:38-42)
diff --git a/tests/profiling/should_run/scc002.hs b/tests/profiling/should_run/scc002.hs
index edf0670..5e1f402 100644
--- a/tests/profiling/should_run/scc002.hs
+++ b/tests/profiling/should_run/scc002.hs
@@ -23,4 +23,4 @@ Note the 2 entries for yan.\, the lambda expression inside yan.
big :: Int -> Int
big x = (array (0,1000000) [(0,x)] :: UArray Int Int) ! 0
-yan = {-# SCC yan #-} let e = big 20 in \x -> {-# SCC yan1 #-} x + e
+yan = let e = big 20 in \x -> {-# SCC yan1 #-} x + e
diff --git a/tests/profiling/should_run/scc002.prof.sample b/tests/profiling/should_run/scc002.prof.sample
index c564aeb..1e2e0ca 100644
--- a/tests/profiling/should_run/scc002.prof.sample
+++ b/tests/profiling/should_run/scc002.prof.sample
@@ -1,27 +1,29 @@
- Wed Oct 26 14:19 2011 Time and Allocation Profiling Report (Final)
+ Fri Dec 2 12:54 2011 Time and Allocation Profiling Report (Final)
- scc002 +RTS -p -RTS
+ scc002 +RTS -hc -p -RTS
- total time = 0.00 secs (0 ticks @ 20 ms)
- total alloc = 4,045,376 bytes (excludes profiling overheads)
+ total time = 0.01 secs (15 ticks @ 1000 us, 1 processor)
+ total alloc = 8,049,336 bytes (excludes profiling overheads)
COST CENTRE MODULE %time %alloc
-big Main 0.0 98.9
+big Main 100.0 99.4
individual inherited
COST CENTRE MODULE no. entries %time %alloc %time %alloc
-MAIN MAIN 106 0 0.0 0.0 0.0 100.0
- CAF Main 211 0 0.0 0.0 0.0 99.1
- yan Main 213 2 0.0 0.0 0.0 98.9
- yan.e Main 217 1 0.0 0.0 0.0 98.9
- big Main 218 1 0.0 98.9 0.0 98.9
- main Main 212 1 0.0 0.2 0.0 0.2
- yan Main 214 0 0.0 0.0 0.0 0.0
- yan.\ Main 215 2 0.0 0.0 0.0 0.0
- yan1 Main 216 2 0.0 0.0 0.0 0.0
- CAF GHC.Conc.Signal 206 0 0.0 0.0 0.0 0.0
- CAF GHC.IO.Encoding.Iconv 195 0 0.0 0.0 0.0 0.0
- CAF GHC.IO.Handle.FD 187 0 0.0 0.8 0.0 0.8
+MAIN MAIN 105 0 0.0 0.0 100.0 100.0
+ main Main 211 0 0.0 0.1 0.0 0.1
+ CAF GHC.IO.Handle.FD 136 0 0.0 0.4 0.0 0.4
+ CAF GHC.IO.Encoding.Iconv 128 0 0.0 0.0 0.0 0.0
+ CAF GHC.IO.Encoding 126 0 0.0 0.0 0.0 0.0
+ CAF GHC.Conc.Signal 117 0 0.0 0.0 0.0 0.0
+ CAF Main 112 0 0.0 0.0 100.0 99.4
+ yan Main 212 1 0.0 0.0 100.0 99.4
+ yan.e Main 216 1 0.0 0.0 100.0 99.4
+ big Main 217 1 100.0 99.4 100.0 99.4
+ main Main 210 1 0.0 0.0 0.0 0.0
+ yan Main 213 0 0.0 0.0 0.0 0.0
+ yan.\ Main 214 2 0.0 0.0 0.0 0.0
+ yan1 Main 215 2 0.0 0.0 0.0 0.0
More information about the Cvs-ghc
mailing list