Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d71c537632c36b037c3dc7c74686fc18c547c6e9 >--------------------------------------------------------------- commit d71c537632c36b037c3dc7c74686fc18c547c6e9 Author: Simon Marlow <[email protected]> Date: Mon Nov 14 14:57:17 2011 +0000 update results (and add an expected failure) for the ioprof test >--------------------------------------------------------------- tests/profiling/should_run/all.T | 6 ++- tests/profiling/should_run/ioprof.prof.sample | 57 +++++++++++++------------ 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/tests/profiling/should_run/all.T b/tests/profiling/should_run/all.T index 86c3907..bfd5954 100644 --- a/tests/profiling/should_run/all.T +++ b/tests/profiling/should_run/all.T @@ -61,6 +61,10 @@ test('T949', test('ioprof', [ req_profiling, extra_ways(['prof']), only_ways(['prof'] + prof_ways), + expect_fail_for(['prof']), + # The results for 'prof' are fine, but the ordering changes. + # We care more about getting the optimised results right, so ignoring + # this for now. exit_code(1) ], compile_and_run, ['-fno-full-laziness -fno-state-hack']) # Note [consistent stacks] @@ -75,7 +79,7 @@ test('prof-doc-fib', test('prof-doc-last', [ req_profiling, extra_ways(['prof']), only_ways(['prof'] + prof_ways) ], compile_and_run, - ['']) + ['-fno-full-laziness']) test('T5559', # unicode in cost centre names [ req_profiling, extra_ways(['prof']), only_ways(['prof'] + prof_ways) ], diff --git a/tests/profiling/should_run/ioprof.prof.sample b/tests/profiling/should_run/ioprof.prof.sample index dd606dc..0cdfa82 100644 --- a/tests/profiling/should_run/ioprof.prof.sample +++ b/tests/profiling/should_run/ioprof.prof.sample @@ -1,38 +1,39 @@ - Wed Oct 26 14:25 2011 Time and Allocation Profiling Report (Final) + Mon Nov 14 13:28 2011 Time and Allocation Profiling Report (Final) - ioprof +RTS -p -RTS + ioprof +RTS -hc -p -RTS total time = 0.00 secs (0 ticks @ 20 ms) - total alloc = 46,804 bytes (excludes profiling overheads) + total alloc = 53,288 bytes (excludes profiling overheads) -COST CENTRE MODULE %time %alloc +COST CENTRE MODULE %time %alloc -CAF GHC.IO.Handle.FD 0.0 73.0 -CAF GHC.IO.Encoding.Iconv 0.0 1.5 -main Main 0.0 18.2 -errorM.\ Main 0.0 5.1 +main Main 0.0 16.4 +errorM.\ Main 0.0 8.3 +CAF GHC.IO.Handle.FD 0.0 65.5 +CAF GHC.Conc.Signal 0.0 1.3 +CAF GHC.IO.Encoding 0.0 5.9 individual inherited COST CENTRE MODULE no. entries %time %alloc %time %alloc -MAIN MAIN 102 0 0.0 0.0 0.0 100.0 - CAF Main 203 0 0.0 0.6 0.0 24.1 - main Main 204 1 0.0 18.2 0.0 23.5 - bar Main 206 1 0.0 0.2 0.0 0.2 - foo Main 211 1 0.0 0.0 0.0 0.0 - errorM Main 212 1 0.0 0.0 0.0 0.0 - >>= Main 207 1 0.0 0.0 0.0 0.0 - runM Main 205 1 0.0 0.0 0.0 5.1 - bar Main 208 0 0.0 0.0 0.0 5.1 - foo Main 213 0 0.0 0.0 0.0 5.1 - errorM Main 214 0 0.0 0.0 0.0 5.1 - errorM.\ Main 215 1 0.0 5.1 0.0 5.1 - >>= Main 209 0 0.0 0.0 0.0 0.0 - >>=.\ Main 210 1 0.0 0.0 0.0 0.0 - CAF GHC.Conc.Signal 200 0 0.0 0.7 0.0 0.7 - CAF GHC.Conc.Sync 199 0 0.0 0.3 0.0 0.3 - CAF GHC.Exception 197 0 0.0 0.2 0.0 0.2 - CAF GHC.IO.Encoding 192 0 0.0 0.4 0.0 0.4 - CAF GHC.IO.Encoding.Iconv 190 0 0.0 1.5 0.0 1.5 - CAF GHC.IO.Handle.FD 182 0 0.0 73.0 0.0 73.0 +MAIN MAIN 45 0 0.0 0.7 0.0 100.0 + CAF GHC.IO.Encoding.Iconv 76 0 0.0 0.5 0.0 0.5 + CAF GHC.Conc.Sync 74 0 0.0 0.5 0.0 0.5 + CAF GHC.IO.Encoding 65 0 0.0 5.9 0.0 5.9 + CAF GHC.Conc.Signal 62 0 0.0 1.3 0.0 1.3 + CAF GHC.IO.Handle.FD 56 0 0.0 65.5 0.0 65.5 + CAF GHC.Exception 55 0 0.0 0.2 0.0 0.2 + CAF Main 51 0 0.0 0.6 0.0 25.6 + main Main 90 1 0.0 16.4 0.0 24.9 + runM Main 93 1 0.0 0.0 0.0 8.3 + bar Main 94 0 0.0 0.0 0.0 8.3 + foo Main 99 0 0.0 0.0 0.0 8.3 + errorM Main 100 0 0.0 0.0 0.0 8.3 + errorM.\ Main 101 1 0.0 8.3 0.0 8.3 + >>= Main 95 0 0.0 0.0 0.0 0.0 + >>=.\ Main 96 1 0.0 0.0 0.0 0.0 + bar Main 91 1 0.0 0.2 0.0 0.2 + foo Main 97 1 0.0 0.0 0.0 0.0 + errorM Main 98 1 0.0 0.0 0.0 0.0 + >>= Main 92 1 0.0 0.0 0.0 0.0 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
