From bd79b98774f50c8252d139690bce2bb221a59cd8 Mon Sep 17 00:00:00 2001
From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Mon, 7 Apr 2014 15:22:46 +0100
Subject: [PATCH] Update long-out-of-date performance numbers on 32-bit
Many are improvements!
---
testsuite/tests/callarity/perf/all.T | 9 ++++++---
testsuite/tests/perf/compiler/all.T | 24 +++++++++++++++---------
testsuite/tests/perf/haddock/all.T | 12 ++++++++----
testsuite/tests/perf/should_run/all.T | 26 ++++++++++++++++++--------
4 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/testsuite/tests/callarity/perf/all.T b/testsuite/tests/callarity/perf/all.T
index d5a1108356b4..765a2e94a757 100644
--- a/testsuite/tests/callarity/perf/all.T
+++ b/testsuite/tests/callarity/perf/all.T
@@ -1,7 +1,10 @@
test('T3924',
- [stats_num_field('bytes allocated', (51480, 5)),
- # previously, without call-arity: 22326544
- # 2014-01-18: 51480 (amd64/Linux)
+ [stats_num_field('bytes allocated',
+ [ (wordsize(64), 51480, 5),
+ # previously, without call-arity: 22326544
+ # 2014-01-18: 51480 (amd64/Linux)
+ (wordsize(32), 44988, 5) ]),
+ # 2014-04-04: 44988 (Windows, 64-bit machine)
only_ways(['normal'])
],
compile_and_run,
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 647548a9c2a3..2f4151f859b4 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -58,11 +58,12 @@ test('T1969',
# hence 10% range.
# See Note [residency] to get an accurate view.
compiler_stats_num_field('bytes allocated',
- [(platform('i386-unknown-mingw32'), 317975916, 5),
+ [(platform('i386-unknown-mingw32'), 301784492, 5),
# 215582916 (x86/Windows)
# 2012-10-29 298921816 (x86/Windows)
# 2013-02-10 310633884 (x86/Windows)
# 2013-11-13 317975916 (x86/Windows, 64bit machine)
+ # 2014-04-04 301784492 (x86/Windows, 64bit machine)
(wordsize(32), 316103268, 1),
# 221667908 (x86/OS X)
# 274932264 (x86/Linux)
@@ -127,12 +128,13 @@ test('T3294',
# (reason for increase back to earlier value unknown)
compiler_stats_num_field('bytes allocated',
- [(wordsize(32), 1565185140, 5),
+ [(wordsize(32), 1377050640, 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)
# 2014-01-12: 1565185140 (x86/Linux)
+ # 2013-04-04: 1377050640 (x86/Windows, 64bit machine)
(wordsize(64), 2705289664, 5)]),
# old: 1357587088 (amd64/Linux)
# 29/08/2012: 2961778696 (amd64/Linux)
@@ -233,10 +235,11 @@ test('T3064',
# (amd64/Linux) (11/02/2014): 308422280, optimize Coercions in simpleOptExpr
compiler_stats_num_field('max_bytes_used',
- [(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(32), 11202304, 20),
+ # 2011-06-28: 2247016 (x86/Linux) (28/6/2011):
+ #(some date): 5511604
+ # 2013-11-13: 7218200 (x86/Windows, 64bit machine)
+ # 2014-04-04: 11202304 (x86/Windows, 64bit machine)
(wordsize(64), 19821544, 20)]),
# (amd64/Linux, intree) (28/06/2011): 4032024
# (amd64/Linux, intree) (07/02/2013): 9819288
@@ -282,8 +285,9 @@ test('T5030',
test('T5631',
[compiler_stats_num_field('bytes allocated',
- [(wordsize(32), 392904228, 10),
+ [(wordsize(32), 346389856, 10),
# expected value: 392904228 (x86/Linux)
+ # 2014-04-04: 346389856 (x86 Windows, 64 bit machine)
(wordsize(64), 690742040, 5)]),
# expected value: 774595008 (amd64/Linux):
# expected value: 735486328 (amd64/Linux) 2012/12/12:
@@ -307,10 +311,11 @@ 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), 333833658, 2),
+ [(wordsize(32), 319179104, 5),
# 2012-10-08: 226907420 (x86/Linux)
# 2013-02-10: 329202116 (x86/Windows)
# 2013-02-10: 338465200 (x86/OSX)
+ # 2014-04-04: 319179104 (x86 Windows, 64 bit machine)
(wordsize(64), 654804144, 10)]),
# prev: 349263216 (amd64/Linux)
# 07/08/2012: 384479856 (amd64/Linux)
@@ -390,9 +395,10 @@ test('T5837',
test('T6048',
[ only_ways(['optasm']),
compiler_stats_num_field('bytes allocated',
- [(wordsize(32), 48887164, 10),
+ [(wordsize(32), 62618072, 10),
# prev: 38000000 (x86/Linux)
# 2012-10-08: 48887164 (x86/Linux)
+ # 2014-04-04: 62618072 (x86 Windows, 64 bit machine)
(wordsize(64), 110646312, 10)])
# 18/09/2012 97247032 amd64/Linux
# 16/01/2014 108578664 amd64/Linux (unknown, likely foldl-via-foldr)
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 41dd24829b85..e1d7e9f4321d 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -40,9 +40,10 @@ test('haddock.base',
# 2013-09-18: 6294339840 (x86_64/Linux)
# 2013-11-21: 6756213256 (x86_64/Linux)
# 2014-01-12: 7128342344 (x86_64/Linux)
- ,(platform('i386-unknown-mingw32'), 3097751052, 1)
+ ,(platform('i386-unknown-mingw32'), 3548581572, 5)
# 2013-02-10: 3358693084 (x86/Windows)
# 2013-11-13: 3097751052 (x86/Windows, 64bit machine)
+ # 2014-04-04: 3548581572 (x86/Windows, 64bit machine)
,(wordsize(32), 3554624600, 1)])
# 2012-08-14: 3046487920 (x86/OSX)
# 2012-10-30: 2955470952 (x86/Windows)
@@ -63,11 +64,12 @@ 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'), 136, 1)
+ ,(platform('i386-unknown-mingw32'), 144, 10)
# 2012-10-30: 83 (x86/Windows)
# 2013-02-10: 116 (x86/Windows)
# 2013-11-13: 129 (x86/Windows, 64bit machine)
# 2014-01-28: 136
+ # 2014-04-04: 144
,(wordsize(32), 139, 1)])
# 2012-08-14: 116 (x86/OSX)
# 2013-02-10: 89 (x86/Windows)
@@ -79,9 +81,10 @@ 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'), 49391436, 15)
+ ,(platform('i386-unknown-mingw32'), 63493200, 15)
# 2012-10-30: 44224896 (x86/Windows)
# 2013-11-13: 49391436 (x86/Windows, 64bit machine)
+ # 2014-04-04: 63493200 (x86/Windows, 64bit machine)
,(wordsize(32), 52718512, 1)])
# 2012-08-14: 47461532 (x86/OSX)
# 2013-02-10: 46563344 (x86/OSX)
@@ -137,11 +140,12 @@ 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'), 283814088, 1)
+ ,(platform('i386-unknown-mingw32'), 278706344, 10)
# 2012-10-30: 220847924 (x86/Windows)
# 2013-02-10: 238529512 (x86/Windows)
# 2013-11-13: 269147084 (x86/Windows, 64bit machine)
# 2014-01-28: 283814088 (x86/Windows)
+ # 2014-04-04: 278706344 (x86/Windows)
,(wordsize(32), 278124612, 1)])
# 2012-08-14: 231064920 (x86/OSX)
# 2013-02-10: 241785276 (x86/Windows)
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 1e1b6ccba8ec..606448b01115 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -60,7 +60,9 @@ test('T876',
[(wordsize(64), 63216 , 5),
# 2013-02-14: 1263712 (x86_64/Linux)
# 2014-02-10: 63216 (x86_64/Linux), call arity analysis
- (wordsize(32), 663712, 5)]),
+ (wordsize(32), 56820, 5) ]),
+ # some date: 663712 (Windows, 64-bit machine)
+ # 2014-04-04: 56820 (Windows, 64-bit machine)
only_ways(['normal']),
extra_run_opts('10000')
],
@@ -289,7 +291,9 @@ test('T7797',
test('T7954',
[stats_num_field('bytes allocated',
- [(wordsize(32), 1380051408, 10),
+ [(wordsize(32), 920045264, 10),
+ # some date: 1380051408 (64-bit Windows machine)
+ # 2014-04-04: 920045264 (64-bit Windows machine)
(wordsize(64), 1680051336, 10)]),
# 2014-02-10: 1680051336 (x86_64/Linux), call arity analysis
only_ways(['normal'])
@@ -307,7 +311,8 @@ test('T7850',
test('T5949',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 201008, 10)]),
+ [ (wordsize(32), 101000, 10),
+ (wordsize(64), 201008, 10)]),
# previously, it was >400000 bytes
only_ways(['normal'])],
compile_and_run,
@@ -315,7 +320,8 @@ test('T5949',
test('T4267',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 40992, 10)]),
+ [ (wordsize(32), 20992, 10)
+ , (wordsize(64), 40992, 10) ]),
# previously, it was >170000 bytes
# 2014-01-17: 130000
# 2014-02-10: 40992 (x86_64/Linux), call arity analysis
@@ -325,7 +331,8 @@ test('T4267',
test('T7619',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 40992, 10)]),
+ [ (wordsize(32), 20992, 10)
+ , (wordsize(64), 40992, 10) ]),
# previously, it was >400000 bytes
only_ways(['normal'])],
compile_and_run,
@@ -333,21 +340,24 @@ test('T7619',
test('InlineArrayAlloc',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 1600040960, 5)]),
+ [ (wordsize(32), 800040960, 5)
+ , (wordsize(64), 1600040960, 5) ]),
only_ways(['normal'])],
compile_and_run,
['-O2'])
test('InlineByteArrayAlloc',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 1440040960, 5)]),
+ [ (wordsize(32), 720040960, 5)
+ , (wordsize(64), 1440040960, 5) ]),
only_ways(['normal'])],
compile_and_run,
['-O2'])
test('InlineCloneArrayAlloc',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 1600041120, 5)]),
+ [ (wordsize(32), 800041120, 5)
+ , (wordsize(64), 1600041120, 5) ]),
only_ways(['normal'])],
compile_and_run,
['-O2'])
--
GitLab