diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-31 09:12:01 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-10-31 09:12:01 +0000 |
| commit | f28972a13e9e1a25a1102a4ccd5955b0a60bb243 (patch) | |
| tree | 79cc362cb3bc6a6fe0fc5841e770c339130d77a0 /testsuite | |
| parent | 2f6b81588a27c85e02e93b2a7d443cc3c52ac907 (diff) | |
| download | haskell-f28972a13e9e1a25a1102a4ccd5955b0a60bb243.tar.gz | |
Improved performance bounds on 32-bit win
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/perf/compiler/all.T | 12 | ||||
| -rw-r--r-- | testsuite/tests/perf/haddock/all.T | 30 |
2 files changed, 29 insertions, 13 deletions
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T index 77d6b4c7af..ec14ef70de 100644 --- a/testsuite/tests/perf/compiler/all.T +++ b/testsuite/tests/perf/compiler/all.T @@ -32,11 +32,12 @@ test('T1969', # varies quite a lot with CLEANUP and BINDIST, # hence 10% range. if_wordsize(32, - compiler_stats_range_field('bytes allocated', 303930948, 1)), + compiler_stats_range_field('bytes allocated', 303930948, 5)), # expected value: 215582916 (x86/Windows) # 221667908 (x86/OS X) # 274932264 (x86/Linux) # 2012-10-08: 303930948 (x86/Linux, new codegen) + # 2012-10-29: 298921816 (x86/Windows; increased range to 5% if_wordsize(64, compiler_stats_range_field('bytes allocated', 642594312, 1)), # 17/11/2009: 434,845,560 (amd64/Linux) @@ -154,19 +155,26 @@ test('T3064', # expected value: 14 (x86/Linux 28-06-2012): if_wordsize(32, compiler_stats_range_field('peak_megabytes_allocated', 14, 30)), + # expected value: 18 (amd64/Linux): if_wordsize(64, compiler_stats_num_field('peak_megabytes_allocated', 20, 28)), + # expected value: 56380288 (x86/Linux) (28/6/2011) + # 111189536 (x86/Windows) (30/10/12) if_wordsize(32, - compiler_stats_range_field('bytes allocated', 124952112, 10)), + compiler_stats_range_field('bytes allocated', 111189536, 10)), + + # expected value: 73259544 (amd64/Linux) (28/6/2011): if_wordsize(64, compiler_stats_num_field('bytes allocated', 200000000, 280000000)), + # expected value: 2247016 (x86/Linux) (28/6/2011): if_wordsize(32, compiler_stats_range_field('max_bytes_used', 5511604, 20)), + # expected value: 4032024 (amd64/Linux, intree) (28/6/2011): if_wordsize(64, compiler_stats_num_field('max_bytes_used', 8000000, diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T index 3896c41d6d..a7bea9ab4c 100644 --- a/testsuite/tests/perf/haddock/all.T +++ b/testsuite/tests/perf/haddock/all.T @@ -7,9 +7,10 @@ test('haddock.base', # 2012-08-14: 240 (amd64/Linux) # 2012-09-18: 237 (amd64/Linux) ,if_wordsize(32, - stats_num_field('peak_megabytes_allocated', 142, - 143)) + stats_num_field('peak_megabytes_allocated', 110, + 115)) # 2012-08-14: 144 (x86/OSX) + # 2012-10-30: 113 (x86/Windows) ,if_wordsize(64, stats_range_field('max_bytes_used', 84794136, 2)) # 2012-08-14: 87374568 (amd64/Linux) @@ -24,8 +25,9 @@ test('haddock.base', # 2012-09-20: 5829972376 (amd64/Linux) # 2012-10-08: 5902601224 (amd64/Linux) ,if_wordsize(32, - stats_range_field('bytes allocated', 3046487920, 1)) + stats_range_field('bytes allocated', 2955470952, 1)) # 2012-08-14: 3046487920 (x86/OSX) + # 2012-10-30: 2955470952 (x86/Windows) ], stats, ['../../../../libraries/base/dist-install/doc/html/base/base.haddock.t']) @@ -39,9 +41,10 @@ test('haddock.Cabal', # 2012-09-20: 227 (amd64/Linux) # 2012-10-08: 217 (amd64/Linux) ,if_wordsize(32, - stats_num_field('peak_megabytes_allocated', 115, - 117)) + stats_num_field('peak_megabytes_allocated', 80, + 85)) # 2012-08-14: 116 (x86/OSX) + # 2012-10-30: 83 (x86/Windows) ,if_wordsize(64, stats_range_field('max_bytes_used', 80590280, 15)) # 2012-08-14: 74119424 (amd64/Linux) @@ -49,16 +52,18 @@ test('haddock.Cabal', # 2012-10-02: 91341568 (amd64/Linux) # 2012-10-08: 80590280 (amd64/Linux) ,if_wordsize(32, - stats_range_field('max_bytes_used', 47461532, 1)) + stats_range_field('max_bytes_used', 44224896, 5)) # 2012-08-14: 47461532 (x86/OSX) + # 2012-10-30: 44224896 (x86/Windows insreased range to 5%) ,if_wordsize(64, stats_range_field('bytes allocated', 3373401360, 2)) # 2012-08-14: 3255435248 (amd64/Linux) # 2012-08-29: 3324606664 (amd64/Linux, new codegen) # 2012-10-08: 3373401360 (amd64/Linux) ,if_wordsize(32, - stats_range_field('bytes allocated', 1648610180, 1)) + stats_range_field('bytes allocated', 1733638168, 1)) # 2012-08-14: 1648610180 (x86/OSX) + # 2012-10-30: 1733638168 (x86/Windows) ], stats, ['../../../../libraries/Cabal/Cabal/dist-install/doc/html/Cabal/Cabal.haddock.t']) @@ -72,25 +77,28 @@ test('haddock.compiler', # 2012-09-20: 1228 (amd64/Linux) # 2012-10-08: 1240 (amd64/Linux) ,if_wordsize(32, - stats_num_field('peak_megabytes_allocated', 630, - 632)) + stats_num_field('peak_megabytes_allocated', 600, + 610)) # 2012-08-14: 631 (x86/OSX) + # 2012-10-30: 606 (x86/Windows) ,if_wordsize(64, stats_range_field('max_bytes_used', 442768280, 2)) # 2012-08-14: 428775544 (amd64/Linux) # 2012-09-20: 437618008 (amd64/Linux) # 2012-10-08: 442768280 (amd64/Linux) ,if_wordsize(32, - stats_range_field('max_bytes_used', 231064920, 1)) + stats_range_field('max_bytes_used', 220847924, 1)) # 2012-08-14: 231064920 (x86/OSX) + # 2012-10-30: 220847924 (x86/Windows) ,if_wordsize(64, stats_range_field('bytes allocated', 26882813032, 1)) # 2012-08-14: 26,070,600,504 (amd64/Linux) # 2012-08-29: 26,353,100,288 (amd64/Linux, new CG) # 2012-09-18: 26,882,813,032 (amd64/Linux) ,if_wordsize(32, - stats_range_field('bytes allocated', 13471797488, 1)) + stats_range_field('bytes allocated', 13773051312, 1)) # 2012-08-14: 13471797488 (x86/OSX) + # 2012-10-30: 13773051312 (x86/Windows) ], stats, ['../../../../compiler/stage2/doc/html/ghc/ghc.haddock.t']) |