diff --git a/tests/perf/compiler/all.T b/tests/perf/compiler/all.T index ea5807e01..c58c6013f 100644 --- a/tests/perf/compiler/all.T +++ b/tests/perf/compiler/all.T @@ -26,12 +26,13 @@ setTestOpts(no_lint) test('T1969', [compiler_stats_num_field('peak_megabytes_allocated', # Note [residency] - [(wordsize(32), 14, 1), + [(wordsize(32), 17, 15), # 2010-05-17 14 (x86/Windows) # 15 (x86/OS X) # 19 (x86/OS X) # 2013-02-10 13 (x86/Windows) # 2013-02-10 14 (x86/OSX) + # 2013-11-13 17 (x86/Windows, 64bit machine) (wordsize(64), 30, 15)]), # 28 (amd64/Linux) # 34 (amd64/Linux) @@ -41,24 +42,26 @@ test('T1969', # 2013-02-13 27, very unstable! # 2013-09-11 30 (amd64/Linux) compiler_stats_num_field('max_bytes_used', - [(platform('i386-unknown-mingw32'), 5094914, 2), + [(platform('i386-unknown-mingw32'), 7295012, 20), # 2010-05-17 5717704 (x86/Windows) # 2013-02-10 5159748 (x86/Windows) # 2013-02-10 5030080 (x86/Windows) + # 2013-11-13 7295012 (x86/Windows, 64bit machine) (wordsize(32), 6149572, 1), # 6707308 (x86/OS X) # 2009-12-31 6149572 (x86/Linux) - (wordsize(64), 11000000, 20)]), + (wordsize(64), 11,000,000, 20)]), # looks like the peak is around ~10M, but we're # unlikely to GC exactly on the peak. # varies quite a lot with CLEANUP and BINDIST, # hence 10% range. # See Note [residency] to get an accurate view. compiler_stats_num_field('bytes allocated', - [(platform('i386-unknown-mingw32'), 310633884, 1), + [(platform('i386-unknown-mingw32'), 317975916, 5), # 215582916 (x86/Windows) # 2012-10-29 298921816 (x86/Windows) # 2013-02-10 310633884 (x86/Windows) + # 2013-11-13 317975916 (x86/Windows, 64bit machine) (wordsize(32), 322937684, 1), # 221667908 (x86/OS X) # 274932264 (x86/Linux) @@ -109,26 +112,29 @@ else: test('T3294', [ compiler_stats_num_field('max_bytes_used', # Note [residency] - [(wordsize(32), 20712280, 1), + [(wordsize(32), 24009436, 15), # 17725476 (x86/OS X) # 14593500 (Windows) # 2013-02-10 20651576 (x86/Windows) # 2013-02-10 20772984 (x86/OSX) + # 2013-11-13 24009436 (x86/Windows, 64bit machine) (wordsize(64), 43224080, 15)]), - # prev: 25753192 (amd64/Linux) - # 29/08/2012: 37724352 (amd64/Linux) - # (increase due to new codegen, see #7198) - # 13/13/2012: 44894544 (amd64/Linux) - # (reason for increase unknown) - # 15/5/2013: 36904752 (amd64/Linux) - # (reason for decrease unknown) - # 29/5/2013: 43224080 (amd64/Linux) - # (reason for increase back to earlier value unknown) + # prev: 25753192 (amd64/Linux) + # 29/08/2012: 37724352 (amd64/Linux) + # (increase due to new codegen, see #7198) + # 13/13/2012: 44894544 (amd64/Linux) + # (reason for increase unknown) + # 15/5/2013: 36904752 (amd64/Linux) + # (reason for decrease unknown) + # 29/5/2013: 43224080 (amd64/Linux) + # (reason for increase back to earlier value unknown) + compiler_stats_num_field('bytes allocated', - [(wordsize(32), 1373514844, 5), + [(wordsize(32), 1478325844, 5), # previous: 815479800 (x86/Linux) # (^ increase due to new codegen, see #7198) # 2012-10-08: 1373514844 (x86/Linux) + # 2013-11-13: 1478325844 (x86/Windows, 64bit machine) (wordsize(64), 3083825616, 5)]), # old: 1357587088 (amd64/Linux) # 29/08/2012: 2961778696 (amd64/Linux) @@ -173,11 +179,13 @@ test('T4801', compiler_stats_num_field('max_bytes_used', [(platform('x86_64-apple-darwin'), 21657520, 5), - (wordsize(32), 11139444, 1), - # 9651948 (x86/OSX) - # 10290952 (windows) - # 2013-02-10 11071060 (x86/Windows) - # 2013-02-10 11207828 (x86/OSX) + (wordsize(32), 11829000, 15), + # 9651948 (x86/OSX) + # 10290952 (windows) + # 2013-02-10 11071060 (x86/Windows) + # 2013-02-10: 11207828 (x86/OSX) + # (some date): 11139444 + # 2013-11-13: 11829000 (x86/Windows, 64bit machine) (wordsize(64), 21657520, 15)]), # prev: 20486256 (amd64/OS X) # 30/08/2012: 17305600--20391920 (varies a lot) @@ -193,8 +201,10 @@ test('T4801', test('T3064', [# expect_broken( 3064 ), compiler_stats_num_field('peak_megabytes_allocated',# Note [residency] - [(wordsize(32), 14, 1), - # expected value: 14 (x86/Linux 28-06-2012): + [(wordsize(32), 18, 20), + # expected value: 14 (x86/Linux 28-06-2012): + # 2013-11-13: 18 (x86/Windows, 64bit machine) + (wordsize(64), 37, 20)]), # (amd64/Linux): 18 # (amd64/Linux) 2012-02-07: 26 @@ -206,9 +216,10 @@ test('T3064', # (amd64/Linux) 2013-09-11: 37; better arity analysis (weird) compiler_stats_num_field('bytes allocated', - [(wordsize(32), 111189536, 10), - # expected value: 56380288 (x86/Linux) (28/6/2011) - # 111189536 (x86/Windows) (30/10/12) + [(wordsize(32), 146626504, 10), + # 2011-06-28: 56380288 (x86/Linux) + # 2012-10-30: 111189536 (x86/Windows) + # 2013-11-13: 146626504 (x86/Windows, 64bit machine) (wordsize(64), 329795912, 5)]), # (amd64/Linux) (28/06/2011): 73259544 # (amd64/Linux) (07/02/2013): 224798696 @@ -216,9 +227,13 @@ test('T3064', # (amd64/Linux) (11/09/2013): 290165632, increase from AMP warnings # (amd64/Linux) (22/11/2013): 308300448, GND via Coercible and counters for constraints solving # (amd64/Linux) (02/12/2013): 329795912, Coercible refactor + compiler_stats_num_field('max_bytes_used', - [(wordsize(32), 5511604, 20), - # expected value: 2247016 (x86/Linux) (28/6/2011): + [(wordsize(32), 7218200 , 20), + # 2011-06-28: 2247016 (x86/Linux) (28/6/2011): + #(some date): 5511604 + # 2013-11-13: 7218200 (x86/Windows, 64bit machine) + (wordsize(64), 19821544, 20)]), # (amd64/Linux, intree) (28/06/2011): 4032024 # (amd64/Linux, intree) (07/02/2013): 9819288 @@ -242,9 +257,10 @@ test('T4007', test('T5030', [compiler_stats_num_field('bytes allocated', - [(wordsize(32), 259547660, 10), + [(wordsize(32), 198573456, 10), # previous: 196457520 # 2012-10-08: 259547660 (x86/Linux, new codegen) + # 2013-11-21: 198573456 (x86 Windows, 64 bit machine) (wordsize(64), 397672152, 10)]), # Previously 530000000 (+/- 10%) # 17/1/13: 602993184 (x86_64/Linux) @@ -354,10 +370,11 @@ test('T5642', test('T5837', [ only_ways(['normal']), compiler_stats_num_field('bytes allocated', - [(wordsize(32), 40000000, 10), - # sample from x86/Linux + [(wordsize(32), 45520936 , 10), + # 40000000 (x86/Linux) + # 2013-11-13: 45520936 (x86/Windows, 64bit machine) (wordsize(64), 86795752, 10)]) - # sample: 3926235424 (amd64/Linux, 15/2/2012) + # sample: 3926235424 (amd64/Linux, 15/2/2012) # 2012-10-02 81879216 # 2012-09-20 87254264 amd64/Linux # 2013-09-18 90587232 amd64/Linux diff --git a/tests/perf/haddock/all.T b/tests/perf/haddock/all.T index c50f6705b..07797f42c 100644 --- a/tests/perf/haddock/all.T +++ b/tests/perf/haddock/all.T @@ -7,8 +7,9 @@ test('haddock.base', # 2012-11-12: 249 (amd64/Linux) # 2013-01-29: 274 (amd64/Linux) # 2013-10-18: 323 (amd64/Linux) - ,(platform('i386-unknown-mingw32'), 133, 1) + ,(platform('i386-unknown-mingw32'), 163, 10) # 2013-02-10: 133 (x86/Windows) + # 2013-11-13: 163 (x86/Windows, 64bit machine) ,(wordsize(32), 139, 1)]) # 2012-08-14: 144 (x86/OSX) # 2012-10-30: 113 (x86/Windows) @@ -21,8 +22,9 @@ test('haddock.base', # 2012-11-12: 87265136 (amd64/Linux) # 2013-01-29: 96022312 (amd64/Linux) # 2013-10-18: 115113864 (amd64/Linux) - ,(platform('i386-unknown-mingw32'), 47988488, 1) + ,(platform('i386-unknown-mingw32'), 58557136, 10) # 2013-02-10: 47988488 (x86/Windows) + # 2013-11-13: 58557136 (x86/Windows, 64bit machine) ,(wordsize(32), 52237984, 1)]) # 2013-02-10: 52237984 (x86/OSX) ,stats_num_field('bytes allocated', @@ -35,8 +37,9 @@ test('haddock.base', # 2013-09-17: 6634886456 (x86_64/Linux) # 2013-09-18: 6294339840 (x86_64/Linux) # 2013-11-21: 6756213256 (x86_64/Linux) - ,(platform('i386-unknown-mingw32'), 3358693084, 1) + ,(platform('i386-unknown-mingw32'), 3097751052, 1) # 2013-02-10: 3358693084 (x86/Windows) + # 2013-11-13: 3097751052 (x86/Windows, 64bit machine) ,(wordsize(32), 3146596848, 1)]) # 2012-08-14: 3046487920 (x86/OSX) # 2012-10-30: 2955470952 (x86/Windows) @@ -56,12 +59,14 @@ test('haddock.Cabal', # 2013-06-07: 246 (amd64/Linux) (reason unknown) # 2013-11-21: 269 # 2013-11-22: 278 (amd64/Linux) (TH refactoring; weird) - ,(platform('i386-unknown-mingw32'), 116, 1) + ,(platform('i386-unknown-mingw32'), 129, 1) # 2012-10-30: 83 (x86/Windows) # 2013-02-10: 116 (x86/Windows) + # 2013-11-13: 129(x86/Windows, 64bit machine) ,(wordsize(32), 89, 1)]) # 2012-08-14: 116 (x86/OSX) # 2013-02-10: 89 (x86/Windows) + ,stats_num_field('max_bytes_used', [(wordsize(64), 95356616, 15) # 2012-08-14: 74119424 (amd64/Linux) @@ -69,8 +74,9 @@ test('haddock.Cabal', # 2012-10-02: 91341568 (amd64/Linux) # 2012-10-08: 80590280 (amd64/Linux) # 2013-03-13: 95356616 (amd64/Linux) Cabal updated - ,(platform('i386-unknown-mingw32'), 44224896, 1) - # 2012-10-30: 44224896 (x86/Windows) + ,(platform('i386-unknown-mingw32'), 49391436, 15) + # 2012-10-30: 44224896 (x86/Windows) + # 2013-11-13: 49391436 (x86/Windows, 64bit machine) ,(wordsize(32), 46563344, 1)]) # 2012-08-14: 47461532 (x86/OSX) # 2013-02-10: 46563344 (x86/OSX) @@ -105,9 +111,10 @@ test('haddock.compiler', # 2013-08-26: 1250 (amd64/Linux) Cabal updated # 2013-10-18: 1408 (amd64/Linux) # 2013-12-12: 1551 (amd64/Linux) - ,(platform('i386-unknown-mingw32'), 653, 1) + ,(platform('i386-unknown-mingw32'), 735, 10) # 2012-10-30: 606 (x86/Windows) # 2013-02-10: 653 (x86/Windows) + # 2013-11-13: 735 (x86/Windows, 64bit machine) ,(wordsize(32), 663, 1)]) # 2012-08-14: 631 (x86/OSX) # 2013-02-10: 663 (x86/OSX) @@ -120,9 +127,10 @@ test('haddock.compiler', # 2013-06-08: 477593712 (amd64/Linux) (reason unknown) # 2013-11-21: 502920176 (amd64/Linux) # 2013-11-22: 541926264 (amd64/Linux) (TH refactoring; weird) - ,(platform('i386-unknown-mingw32'), 238529512, 1) + ,(platform('i386-unknown-mingw32'), 269147084, 1) # 2012-10-30: 220847924 (x86/Windows) # 2013-02-10: 238529512 (x86/Windows) + # 2013-11-13: 269147084 (x86/Windows, 64bit machine) ,(wordsize(32), 241785276, 1)]) # 2012-08-14: 231064920 (x86/OSX) # 2013-02-10: 241785276 (x86/Windows) @@ -133,9 +141,10 @@ test('haddock.compiler', # 2012-09-18: 26882813032 (amd64/Linux) # 2012-11-12: 25990254632 (amd64/Linux) # 2012-11-27: 28708374824 (amd64/Linux) - ,(platform('i386-unknown-mingw32'), 14925262356, 1) + ,(platform('i386-unknown-mingw32'), 14328363592, 10) # 2012-10-30: 13773051312 (x86/Windows) # 2013-02-10: 14925262356 (x86/Windows) + # 2013-11-13: 14328363592 (x86/Windows, 64bit machine) ,(wordsize(32), 13773051312, 1)]) # 2012-08-14: 13471797488 (x86/OSX) ], diff --git a/tests/perf/should_run/all.T b/tests/perf/should_run/all.T index a780a268c..5bbbe4b11 100644 --- a/tests/perf/should_run/all.T +++ b/tests/perf/should_run/all.T @@ -266,9 +266,10 @@ test('T7436', test('T7797', [stats_num_field('bytes allocated', - [(wordsize(32), 360940756, 5), - # expected value: 2685858140 (x86/OS X) + [(wordsize(32), 240044984, 5), + # expected value: 2685858140 (x86/OS X) # expected: 360940756 (x86/Linux) + # expected: 240044984 (x86/Windows, 64bit machine) (wordsize(64), 480050944, 5)]), # expected: 480050944 (amd64/Linux) extra_clean(['T7797a.hi', 'T7797a.o']), @@ -287,7 +288,9 @@ test('T7954', ['-O']) test('T7850', - [stats_num_field('peak_megabytes_allocated', (4, 1)), + [stats_num_field('peak_megabytes_allocated', + [(wordsize(32), 2, 10), + (wordsize(64), 4, 10)]), only_ways(['normal'])], compile_and_run, ['-O'])