Commit 6d774ff2 authored by Ben Gamari's avatar Ben Gamari 🐢

testsuite: Update performance numbers for 32-bit platforms

parent aecbfb90
T13257.hs:6:11: warning: [-Woverflowed-literals (in -Wdefault)]
Literal -1 is out of the Word range 0..4294967295
......@@ -61,13 +61,14 @@ test('T1969',
# 2013-02-10 5030080 (x86/Windows)
# 2013-11-13 7295012 (x86/Windows, 64bit machine)
# 2014-04-24 5719436 (x86/Windows, 64bit machine)
(wordsize(32), 9093608, 1),
(wordsize(32), 9261052, 1),
# 6707308 (x86/OS X)
# 2009-12-31 6149572 (x86/Linux)
# 2014-01-22 6429864 (x86/Linux)
# 2014-06-29 5949188 (x86/Linux)
# 2015-07-11 6241108 (x86/Linux, 64bit machine) use +RTS -G1
# 2016-04-06 9093608 (x86/Linux, 64bit machine)
# 2017-03-24 9261052 (x86/Linux, 64-bit machine)
(wordsize(64), 19924328, 15)]),
# 2014-09-10 10463640, 10 # post-AMP-update (somewhat stabelish)
......@@ -91,7 +92,7 @@ test('T1969',
# 2013-02-10 310633884 (x86/Windows)
# 2013-11-13 317975916 (x86/Windows, 64bit machine)
# 2014-04-04 301784492 (x86/Windows, 64bit machine)
(wordsize(32), 344730660, 1),
(wordsize(32), 324586096, 1),
# 221667908 (x86/OS X)
# 274932264 (x86/Linux)
# 2012-10-08 303930948 (x86/Linux, new codegen)
......@@ -100,6 +101,7 @@ test('T1969',
# 2014-06-29 303300692 (x86/Linux)
# 2015-07-11 288699104 (x86/Linux, 64-bit machine) use +RTS -G1
# 2016-04-06 344730660 (x86/Linux, 64-bit machine)
# 2017-03-24 324586096 (x86/Linux, 64-bit machine)
(wordsize(64), 695354904, 5)]),
# 2009-11-17 434845560 (amd64/Linux)
# 2009-12-08 459776680 (amd64/Linux)
......@@ -202,7 +204,7 @@ test('T3294',
# 2014-09-10: 2709595808 (amd64/Linux) post-AMP cleanup
# 2016-07-11: 2664479936 (Windows) before fix for #12227
# 2016-07-11: 2739731144 (Windows) after fix for #12227 (ignoring)
# 2016-02-17: 2758641264 (amd64/Linux) (Type indexed Typeable)
# 2017-02-17: 2758641264 (amd64/Linux) (Type indexed Typeable)
conf_3294,
# Use `+RTS -G1` for more stable residency measurements. Note [residency].
......@@ -238,12 +240,13 @@ test('T4801',
# prev: 510938976 (amd64/OS X):
# 2015-12-11: 465653312 (amd64/OS X) Update, bump tolerance to +/-10%
(wordsize(32), 239556572, 10),
(wordsize(32), 199856388, 10),
# prev: 185669232 (x86/OSX)
# 2014-01-22: 211198056 (x86/Linux)
# 2014-09-03: 185242032 (Windows laptop)
# 2014-12-01: 203962148 (Windows laptop)
# 2016-04-06: 239556572 (x86/Linux)
# 2017-03-24: 199856388 (x86/Linux)
(wordsize(64), 388898280, 10)]),
# prev: 360243576 (amd64/Linux)
# 19/10/2012: 447190832 (amd64/Linux) (-fPIC turned on)
......@@ -293,7 +296,8 @@ test('T3064',
# 2013-11-13: 18 (x86/Windows, 64bit machine)
# 2014-01-22: 23 (x86/Linux)
# 2014-12-22: 23 (x86/Linux) death to silent superclasses
# 2015-07-11 28 (x86/Linux, 64-bit machine) use +RTS -G1
# 2015-07-11: 28 (x86/Linux, 64-bit machine) use +RTS -G1
(wordsize(64), 66, 20)]),
# (amd64/Linux): 18
# (amd64/Linux) 2012-02-07: 26
......@@ -311,7 +315,7 @@ test('T3064',
# (amd64/Linux) 2016-10-25: 66: Presumably creep
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 153261024, 10),
[(wordsize(32), 134044092, 10),
# 2011-06-28: 56380288 (x86/Linux)
# 2012-10-30: 111189536 (x86/Windows)
# 2013-11-13: 146626504 (x86/Windows, 64bit machine)
......@@ -319,6 +323,7 @@ test('T3064',
# 2014-12-01: 162457940 (Windows)
# 2014-12-22: 122836340 (Windows) Death to silent superclasses
# 2016-04-06: 153261024 (x86/Linux) probably wildcard refactor
# 2017-03-24: 134044092 (x86/Linux, 64-bit machine) Update
(wordsize(64), 259815560, 5)]),
# (amd64/Linux) (2011-06-28): 73259544
......@@ -450,7 +455,9 @@ test('T5631',
test('parsing001',
[compiler_stats_num_field('bytes allocated',
[(wordsize(32), 274000576, 10),
[(wordsize(32), 232777056, 10),
# Initial: 274000576
# 2017-03-24: 232777056
(wordsize(64), 463931280, 5)]),
# expected value: 587079016 (amd64/Linux)
# 2016-09-01: 581551384 (amd64/Linux) Restore w/w limit (#11565)
......@@ -465,7 +472,7 @@ test('T783',
[ only_ways(['normal']), # no optimisation for this one
# expected value: 175,569,928 (x86/Linux)
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 249332816, 5),
[(wordsize(32), 225911912, 5),
# 2012-10-08: 226907420 (x86/Linux)
# 2013-02-10: 329202116 (x86/Windows)
# 2013-02-10: 338465200 (x86/OSX)
......@@ -473,6 +480,7 @@ test('T783',
# 2014-09-03: 223377364 (Windows) better specialisation, raft of core-to-core optimisations
# 2014-12-22: 235002220 (Windows) not sure why
# 2016-04-06: 249332816 (x86/Linux, 64-bit machine)
# 2017-03-24: 225911912 (x86/Linux, 64-bit machine)
(wordsize(64), 436978192, 10)]),
# prev: 349263216 (amd64/Linux)
......@@ -512,13 +520,15 @@ test('T783',
test('T5321Fun',
[ only_ways(['normal']), # no optimisation for this one
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 279922360, 10),
[(wordsize(32), 244387620, 10),
# prev: 300000000
# 2012-10-08: 344416344 x86/Linux
# (increase due to new codegen)
# 2014-09-03: 299656164 (specialisation and inlining)
# 2014-12-10: 206406188 # Improvements in constraint solver
# 2016-04-06: 279922360 x86/Linux
# 2017-03-24: 244387620 x86/Linux (64-bit machine)
(wordsize(64), 488295304, 5)])
# prev: 585521080
# 2012-08-29: 713385808 # (increase due to new codegen)
......@@ -558,6 +568,7 @@ test('T5321FD',
# 2014-07-31: 211699816 (Windows) (-11%)
# (due to better optCoercion, 5e7406d9, #9233)
# 2016-04-06: 250757460 (x86/Linux)
(wordsize(64), 477840432, 10)])
# prev: 418306336
# 29/08/2012: 492905640
......@@ -586,12 +597,13 @@ test('T5642',
[ only_ways(['normal']),
normal,
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 462677300, 10),
[(wordsize(32), 413517560, 10),
# sample from x86/Linux
# prev: 650000000
# 2014-09-03: 753045568
# 2014-12-10: 641085256 Improvements in constraints solver
# 2016-04-06: 462677300
# 2017-03-24: 413517560 (x86/Linux, 64-bit machine)
(wordsize(64), 838316496, 10)])
# prev: 1300000000
......@@ -616,13 +628,14 @@ test('T5642',
test('T5837',
[ only_ways(['normal']),
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 24199320, 10),
[(wordsize(32), 27028956, 10),
# 40000000 (x86/Linux)
# 2013-11-13: 45520936 (x86/Windows, 64bit machine)
# 2014-09-03: 37096484 (Windows laptop, w/w for INLINABLE things
# 2014-12-01: 135914136 (Windows laptop, regression see below)
# 2014-12-08: 115905208 Constraint solver perf improvements (esp kick-out)
# 2016-04-06: 24199320 (x86/Linux, 64-bit machine) TypeInType
# 2017-03-24: 27028956 (x86/Linux, 64-bit machine)
(platform('x86_64-unknown-mingw32'), 59161648, 7),
# 2017-02-19 59161648 (x64/Windows) - Unknown
......@@ -696,9 +709,10 @@ test('T6048',
test('T9020',
[ only_ways(['optasm']),
compiler_stats_num_field('bytes allocated',
[(wordsize(32), 343005716, 10),
[(wordsize(32), 249904136, 10),
# Original: 381360728
# 2014-07-31: 343005716 (Windows) (general round of updates)
# 2017-03-24: 249904136 (x86/Linux, 64-bit machine)
(wordsize(64), 500707080, 10)])
# prev: 795469104
# 2014-07-17: 728263536 (general round of updates)
......@@ -752,8 +766,10 @@ test('T9675',
# 2017-02-17 731171072 Type-indexed Typeable
# 2017-03-13 656137960 Put join ceiling underneath lambdas?
,(wordsize(32), 279480696, 10)
,(wordsize(32), 322901484, 10)
# 2015-07-11 279480696 (x86/Linux, 64-bit machine) use +RTS -G1
# 2017-03-24 322901484 (x86/Linux, 64-bit machine)
]),
# Use `+RTS -G1` for more stable residency measurements. Note [residency].
......@@ -775,9 +791,10 @@ test('T9872a',
# 2017-02-17 3298422648 Type-indexed Typeable
# 2017-02-25 3005891848 Early inlining patch
(wordsize(32), 1740903516, 5)
(wordsize(32), 1493198244, 5)
# was 1325592896
# 2016-04-06 1740903516 x86/Linux
# 2017-03-24 1493198244 x86/Linux, 64-bit machine
]),
],
compile_fail,
......@@ -796,9 +813,10 @@ test('T9872b',
# 2016-09-15: 4069522928 Fix #12422
# 2017-02-14 3730686224 Early inlining: 5% improvement
(wordsize(32), 2422750696, 5)
(wordsize(32), 1740903516, 5)
# was 1700000000
# 2016-04-06 2422750696 x86/Linux
# 2017-03-24 1740903516 x86/Linux, 64-bit machine
]),
],
compile_fail,
......@@ -816,9 +834,10 @@ test('T9872c',
# 2016-09-15: 3702580928 Fixing #12422
# 2017-02-14 3404346032 Early inlining: 5% improvement
(wordsize(32), 2257242896, 5)
(wordsize(32), 1727582260, 5)
# was 1500000000
# 2016-04-06 2257242896
# 2017-03-24 1727582260 x86/Linux, 64-bit machine
]),
],
compile_fail,
......@@ -840,10 +859,11 @@ test('T9872d',
# 2017-02-25 498855104 Early inlining
# 2017-03-03 462817352 Share Typeable KindReps
(wordsize(32), 264566040, 5)
(wordsize(32), 232954000, 5)
# some date 328810212
# 2015-07-11 350369584
# 2016-04-06 264566040 x86/Linux
# 2017-03-24 232954000 x86/Linux, 64-bit machine
]),
],
compile,
......@@ -864,9 +884,10 @@ test('T9961',
# 2016-12-19 571246936 x64_64/Linux Join points (#12988)
# 2017-02-14 498326216 Early inline patch; 13% improvement
(wordsize(32), 275264188, 5)
(wordsize(32), 255409052, 5)
# was 375647160
# 2016-04-06 275264188 x86/Linux
# 2017-03-24 255409052 x86/Linux, 64-bit machine
]),
],
compile,
......@@ -888,8 +909,9 @@ test('T9233',
# 2017-02-17 974530192 Type-indexed Typeable
# 2017-03-21 924299320 It's unclear
(wordsize(32), 515672240, 5) # Put in your value here if you hit this
(wordsize(32), 460112888, 5)
# 2016-04-06 515672240 (x86/Linux) initial value
# 2017-03-24 460112888 x86/Linux, 64-bit machine
]),
extra_clean(['T9233a.hi', 'T9233a.o'])
],
......@@ -916,8 +938,9 @@ test('T10370',
# 2017-02-27 43455848 Likely drift from recent simplifier improvements
# 2017-02-25 41291976 Early inline patch
(wordsize(32), 11371496, 15),
(wordsize(32), 19276304, 15),
# 2015-10-22 11371496
# 2017-03-24 19276304 (x86/Linux, 64-bit machine)
]),
compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
[(wordsize(64), 154, 15),
......@@ -927,8 +950,9 @@ test('T10370',
# 2017-01-18 146 Allow top-level string literals in Core
# 2017-02-17 187 Type-indexed Typeable
# 2017-02-25 154 Early inline patch
(wordsize(32), 39, 15),
(wordsize(32), 69, 15),
# 2015-10-22 39
# 2017-03-24 69
]),
# Use `+RTS -G1` for more stable residency measurements. Note [residency].
extra_hc_opts('+RTS -G1 -RTS')
......
......@@ -47,13 +47,14 @@ test('haddock.base',
# 2014-12-01: 4202377432 (x86/Windows, 64bit machine)
# 2015-01-20: 4434804940 (x86/Windows, 64bit machine)
,(wordsize(32), 5509757068, 5)])
,(wordsize(32), 3623926468, 5)])
# 2012-08-14: 3046487920 (x86/OSX)
# 2012-10-30: 2955470952 (x86/Windows)
# 2013-02-10: 3146596848 (x86/OSX)
# 2014-02-22: 3554624600 (x86/Linux - new haddock)
# 2014-06-29: 3799130400 (x86/Linux)
# 2016-04-06: 5509757068 (x86/Linux)
# 2017-03-24: 3623926468 (x86/Linux)
],
stats,
['haddock.t'])
......@@ -116,11 +117,12 @@ test('haddock.Cabal',
# 2014-12-01: 3088635556 (x86/Windows)
# 2015-01-20: 3293415576
,(wordsize(32), 6268156056, 5)])
,(wordsize(32), 3511151136, 5)])
# 2012-08-14: 1648610180 (x86/OSX)
# 2014-01-22: 1986290624 (x86/Linux)
# 2014-06-29: 2127198484 (x86/Linux)
# 2016-04-06: 6268156056 (x86/Linux)
# 2017-03-24: 3511151136 (x86/Linux)
],
stats,
['haddock.t'])
......@@ -155,11 +157,12 @@ test('haddock.compiler',
# 2014-12-01: 104140852 (x86/Windows, sudden shrinkage!)
# 2014-12-10: 217933548 increased again
,(wordsize(32), 16222702892, 5)])
,(wordsize(32), 3872262112, 5)])
# 2012-08-14: 13471797488 (x86/OSX)
# 2014-01-22: 14581475024 (x86/Linux - new haddock)
# 2014-06-29: 15110426000 (x86/Linux)
# 2016-04-06: 16222702892 (x86/Linux)
# 2017-03-24: 3872262112 (x86/Linux)
],
stats,
['haddock.t'])
......@@ -85,13 +85,14 @@ test('lazy-bs-alloc',
# 2015-12-15: 444720 (amd64/Linux, D1616)
# 2015-12-17: 444720 (widen 3->5%, Windows is at 462688)
# 2017-01-30: 421792 (amd64/Linux, strangely Type-indexed Typeable)
(wordsize(32), 429760, 2)]),
(wordsize(32), 410040, 5)]),
# 2013-02-10: 421296 (x86/Windows)
# 2013-02-10: 414180 (x86/OSX)
# 2014-01-22: 411500 (x86/Linux)
# 2014-01-28: Widen 1->2% (x86/Windows was at 425212)
# 2016-04-06: 429760 (x86/Linux) no idea what happened
# 2017-02-14: 421448 Early inline patch
# 2017-03-24: 410040 It's not entirely clear, widen threshold to match 64-bit case
only_ways(['normal']),
extra_run_opts('arith011.stdout'),
......@@ -115,12 +116,13 @@ test('T876',
# 2014-02-10: 63216 (x86_64/Linux), call arity analysis
# 2016-11-11: 58128 (x86_64/Linux), it's not clear
(wordsize(32), 53156, 5) ]),
(wordsize(32), 50408, 5) ]),
# some date: 663712 (Windows, 64-bit machine)
# 2014-04-04: 56820 (Windows, 64-bit machine)
# 2014-06-29: 53024 (x86_64/Linux)
# 2014-12-01: 56796 (Windows)
# 2015-07-11: 53156 (x86_64/Linux)
# 2017-03-24: 50408 (x86/Linux, 64-bit machine)
only_ways(['normal']),
extra_run_opts('10000')
......@@ -162,12 +164,13 @@ test('MethSharing',
# expected value: 1 (amd64/Linux)
# 2016-08-31: 2 (allocation area size bumped to 1MB)
stats_num_field('bytes allocated',
[(wordsize(32), 360940756, 5),
[(wordsize(32), 240071008, 5),
# expected value: 2685858140 (x86/OS X)
# expected: 360940756 (x86/Linux)
# expected: 360940756 (x86/Linux)
# 2017-03-24: 240071008 (x86/Linux, 64-bit machine)
(wordsize(64), 480098192, 5)]),
# expected: 640067672 (amd64/Linux)
# 2017-01-31: 480098192 work/wrap noinline things
# expected: 640067672 (amd64/Linux)
# 2017-01-31: 480098192 work/wrap noinline things
only_ways(['normal'])
],
compile_and_run,
......@@ -204,8 +207,9 @@ test('T4978',
test('T5205',
[stats_num_field('bytes allocated',
[(wordsize(32), 47088, 5),
[(wordsize(32), 49460, 5),
# expected value: 47088 (x86/Darwin)
# 2017-03-24: 49460 (x86/Linux, 64-bit machine)
(platform('x86_64-unknown-mingw32'), 52264, 5),
# 2016-12-14: 52264 (Separate out Windows results)
......@@ -224,9 +228,10 @@ test('T5205',
test('T5549',
[stats_num_field('bytes allocated',
[(wordsize(32), 4096606332, 5),
[(wordsize(32), 2896607976, 5),
# expected value: 3362958676 (Windows)
# 2014-12-01: 4096606332 (Windows) integer-gmp2
# 2017-03-24: 2896607976 (x86/Linux, 64-bit machine)
(wordsize(64), 5793140200, 5)]),
# expected value: 6725846120 (amd64/Linux)
......@@ -297,9 +302,10 @@ test('T5536',
test('T7257',
[stats_num_field('bytes allocated',
[(wordsize(32), 989850664, 10),
[(wordsize(32), 869850704, 10),
# expected value: 1246287228 (i386/Linux)
# 2016-04-06: 989850664 (i386/Linux) no idea what happened
# 2017-03-25: 869850704 (x86/Linux, 64-bit machine) probably sizeExpr fix
(wordsize(64), 1414893248, 5)]),
# 2012-09-21: 1774893760 (amd64/Linux)
# 2015-11-03: 1654893248 (amd64/Linux)
......@@ -338,9 +344,10 @@ test('T7436',
# 127000 (amd64/Linux)
# 2013-02-07: 60360 (amd64/Linux)
# 2015-04-03: Widen 1->4% (amd64/Windows was doing better)
(wordsize(32), 58434, 1)]),
(wordsize(32), 42772, 1)]),
# 2013-02-10: 58032 (x86/Windows)
# 2013-02-10: 58836 (x86/OSX)
# 2017-03-24: 42772 (x86/Linux, 64-bit machine) no idea why
only_ways(['normal'])
],
compile_and_run,
......@@ -440,9 +447,11 @@ test('InlineCloneArrayAlloc',
test('T9203',
[stats_num_field('bytes allocated',
[ (wordsize(32), 84345136 , 5)
[ (wordsize(32), 77969268, 5)
# was
# 2016-04-06 84345136 (i386/Debian) not sure
# 2017-03-24 77969268 (x86/Linux, 64-bit machine) probably join points
, (wordsize(64), 84620888, 5) ]),
# was 95747304
# 2019-09-10 94547280 post-AMP cleanup
......@@ -454,8 +463,9 @@ test('T9203',
test('T9339',
[stats_num_field('bytes allocated',
[ (wordsize(32), 40046844, 5)
[ (wordsize(32), 46904, 5)
# is this number correct? Seems very high.
# 2017-03-24: 46904 (x86/Linux, 64-bit machine) who knows
, (platform('x86_64-unknown-mingw32'), 47088, 7)
# 2017-02-19 47088 (x64/Windows) - Unknown
......
......@@ -12,10 +12,11 @@ test('space_leak_001',
# 417016 (x86/OS X)
# 415672 (x86/Windows)
# 481456 (unreg amd64/Linux)
(wordsize(32), 361400, 10)]),
(wordsize(32), 428220, 10)]),
# 2013-02-10 372072 (x86/OSX)
# 2013-02-10 439228 (x86/OSX)
# 2016-04-06 361400 (x86/Linux)
# 2017-03-24 428220 (x86/Linux, 64-bit machine)
stats_num_field('bytes allocated',
[ (wordsize(64), 11315747416, 5),
......@@ -25,8 +26,9 @@ test('space_leak_001',
# 9327959840 (x86/Windows)
# 11315747416 (amd64/Lnx, integer-gmp2)
(wordsize(32), 13550759068, 5),
# 2014-12-01 13550759068 (Windows)
(wordsize(32), 661907800, 5),
# 2014-12-01 13550759068 (Windows)
# 2017-03-24 661907800 (x86/Linux, 64-bit machine) No idea
]),
omit_ways(['profasm','profthreaded','threaded1','threaded2'])
......
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