Commit 13f1f864 authored by Austin Seipp's avatar Austin Seipp

Fix 32bit numbers (again)

My build settings were wrong last time.
Signed-off-by: default avatarAustin Seipp <austin@well-typed.com>
parent 7c48e76a
......@@ -47,9 +47,10 @@ test('T1969',
# 2013-02-10 5159748 (x86/Windows)
# 2013-02-10 5030080 (x86/Windows)
# 2013-11-13 7295012 (x86/Windows, 64bit machine)
(wordsize(32), 6149572, 1),
(wordsize(32), 6429864, 1),
# 6707308 (x86/OS X)
# 2009-12-31 6149572 (x86/Linux)
# 2014-01-22 6429864 (x86/Linux)
(wordsize(64), 11000000, 20)]),
# looks like the peak is around ~10M, but we're
# unlikely to GC exactly on the peak.
......@@ -62,11 +63,12 @@ test('T1969',
# 2012-10-29 298921816 (x86/Windows)
# 2013-02-10 310633884 (x86/Windows)
# 2013-11-13 317975916 (x86/Windows, 64bit machine)
(wordsize(32), 322937684, 1),
(wordsize(32), 316103268, 1),
# 221667908 (x86/OS X)
# 274932264 (x86/Linux)
# 2012-10-08 303930948 (x86/Linux, new codegen)
# 2013-02-10 322937684 (x86/OSX)
# 2014-01-22 316103268 (x86/Linux)
(wordsize(64), 698612512, 5)]),
# 17/11/2009 434845560 (amd64/Linux)
# 08/12/2009 459776680 (amd64/Linux)
......@@ -130,11 +132,12 @@ test('T3294',
# (reason for increase back to earlier value unknown)
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 1478325844, 5),
[(wordsize(32), 1565185140, 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)
# 2013-11-13: 1478325844 (x86/Windows, 64bit machine)
# 2014-01-12: 1565185140 (x86/Linux)
(wordsize(64), 3083825616, 5)]),
# old: 1357587088 (amd64/Linux)
# 29/08/2012: 2961778696 (amd64/Linux)
......@@ -170,9 +173,9 @@ test('T4801',
[(platform('x86_64-apple-darwin'), 464872776, 5),
# expected value: 510938976 (amd64/OS X):
(wordsize(32), 185669232, 10),
# expected value: 228286660 (x86/OS X)
(wordsize(32), 211198056, 10),
# prev: 185669232 (x86/OSX)
# 2014-01-22: 211198056 (x86/Linux)
(wordsize(64), 392409984, 10)]),
# prev: 360243576 (amd64/Linux)
# 19/10/2012: 447190832 (amd64/Linux) (-fPIC turned on)
......@@ -219,10 +222,11 @@ test('T3064',
# (amd64/Linux) 2013-09-11: 37; better arity analysis (weird)
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 146626504, 10),
[(wordsize(32), 162457940, 10),
# 2011-06-28: 56380288 (x86/Linux)
# 2012-10-30: 111189536 (x86/Windows)
# 2012-10-30: 111189536 (x86/Windows)
# 2013-11-13: 146626504 (x86/Windows, 64bit machine)
# 2014-01-22: 162457940 (x86/Linux)
(wordsize(64), 329795912, 5)]),
# (amd64/Linux) (28/06/2011): 73259544
# (amd64/Linux) (07/02/2013): 224798696
......
......@@ -10,11 +10,11 @@ test('haddock.base',
,(platform('i386-unknown-mingw32'), 163, 10)
# 2013-02-10: 133 (x86/Windows)
# 2013-11-13: 163 (x86/Windows, 64bit machine)
,(wordsize(32), 177, 1)])
,(wordsize(32), 168, 1)])
# 2012-08-14: 144 (x86/OSX)
# 2012-10-30: 113 (x86/Windows)
# 2013-02-10: 139 (x86/OSX)
# 2014-01-22: 177 (x86/Linux - new haddock)
# 2014-01-22: 168 (x86/Linux - new haddock)
,stats_num_field('max_bytes_used',
[(wordsize(64), 115113864, 10)
# 2012-08-14: 87374568 (amd64/Linux)
......@@ -26,9 +26,9 @@ test('haddock.base',
,(platform('i386-unknown-mingw32'), 58557136, 10)
# 2013-02-10: 47988488 (x86/Windows)
# 2013-11-13: 58557136 (x86/Windows, 64bit machine)
,(wordsize(32), 64232092, 1)])
,(wordsize(32), 62189068, 1)])
# 2013-02-10: 52237984 (x86/OSX)
# 2014-01-22: 64232092 (x86/Linux)
# 2014-01-22: 62189068 (x86/Linux)
,stats_num_field('bytes allocated',
[(wordsize(64), 7128342344, 5)
# 2012-08-14: 5920822352 (amd64/Linux)
......@@ -43,11 +43,11 @@ test('haddock.base',
,(platform('i386-unknown-mingw32'), 3097751052, 1)
# 2013-02-10: 3358693084 (x86/Windows)
# 2013-11-13: 3097751052 (x86/Windows, 64bit machine)
,(wordsize(32), 3506260912, 1)])
,(wordsize(32), 3554624600, 1)])
# 2012-08-14: 3046487920 (x86/OSX)
# 2012-10-30: 2955470952 (x86/Windows)
# 2013-02-10: 3146596848 (x86/OSX)
# 2014-02-22: 3506260912 (x86/Linux - new haddock)
# 2014-02-22: 3554624600 (x86/Linux - new haddock)
],
stats,
['../../../../libraries/base/dist-install/doc/html/base/base.haddock.t'])
......@@ -67,10 +67,10 @@ test('haddock.Cabal',
# 2012-10-30: 83 (x86/Windows)
# 2013-02-10: 116 (x86/Windows)
# 2013-11-13: 129(x86/Windows, 64bit machine)
,(wordsize(32), 145, 1)])
,(wordsize(32), 139, 1)])
# 2012-08-14: 116 (x86/OSX)
# 2013-02-10: 89 (x86/Windows)
# 2014-01-22: 145 (x86/Linux - new haddock, but out of date before)
# 2014-01-22: 139 (x86/Linux - new haddock, but out of date before)
,stats_num_field('max_bytes_used',
[(wordsize(64), 95356616, 15)
# 2012-08-14: 74119424 (amd64/Linux)
......@@ -81,10 +81,10 @@ test('haddock.Cabal',
,(platform('i386-unknown-mingw32'), 49391436, 15)
# 2012-10-30: 44224896 (x86/Windows)
# 2013-11-13: 49391436 (x86/Windows, 64bit machine)
,(wordsize(32), 60559708, 1)])
,(wordsize(32), 52718512, 1)])
# 2012-08-14: 47461532 (x86/OSX)
# 2013-02-10: 46563344 (x86/OSX)
# 2014-01-22: 60559708 (x86/Linux)
# 2014-01-22: 52718512 (x86/Linux)
,stats_num_field('bytes allocated',
[(wordsize(64), 3979151552, 5)
# 2012-08-14: 3255435248 (amd64/Linux)
......@@ -100,9 +100,9 @@ test('haddock.Cabal',
,(platform('i386-unknown-mingw32'), 1906532680, 1)
# 2012-10-30: 1733638168 (x86/Windows)
# 2013-02-10: 1906532680 (x86/Windows)
,(wordsize(32), 2007658888, 1)])
,(wordsize(32), 1986290624, 1)])
# 2012-08-14: 1648610180 (x86/OSX)
# 2014-01-22: 2007658888 (x86/Linux)
# 2014-01-22: 1986290624 (x86/Linux)
],
stats,
['../../../../libraries/Cabal/Cabal/dist-install/doc/html/Cabal/Cabal.haddock.t'])
......@@ -122,10 +122,10 @@ test('haddock.compiler',
# 2012-10-30: 606 (x86/Windows)
# 2013-02-10: 653 (x86/Windows)
# 2013-11-13: 735 (x86/Windows, 64bit machine)
,(wordsize(32), 762, 1)])
,(wordsize(32), 727, 1)])
# 2012-08-14: 631 (x86/OSX)
# 2013-02-10: 663 (x86/OSX)
# 2014-01-22: 762 (x86/Linux - new haddock, but out of date before)
# 2014-01-22: 727 (x86/Linux - new haddock, but out of date before)
,stats_num_field('max_bytes_used',
[(wordsize(64), 541926264, 10)
# 2012-08-14: 428775544 (amd64/Linux)
......@@ -139,10 +139,10 @@ test('haddock.compiler',
# 2012-10-30: 220847924 (x86/Windows)
# 2013-02-10: 238529512 (x86/Windows)
# 2013-11-13: 269147084 (x86/Windows, 64bit machine)
,(wordsize(32), 285964272, 1)])
,(wordsize(32), 278124612, 1)])
# 2012-08-14: 231064920 (x86/OSX)
# 2013-02-10: 241785276 (x86/Windows)
# 2014-01-22: 285964272 (x86/Linux - new haddock)
# 2014-01-22: 278124612 (x86/Linux - new haddock)
,stats_num_field('bytes allocated',
[(wordsize(64), 28708374824, 10)
# 2012-08-14: 26070600504 (amd64/Linux)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment