[commit: ghc] master: Update test cases due to call arity (393ea73)
git at git.haskell.org
git at git.haskell.org
Mon Feb 10 13:53:20 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/393ea739567206d848f53e9ca75f532a49218694/ghc
>---------------------------------------------------------------
commit 393ea739567206d848f53e9ca75f532a49218694
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Mon Feb 10 11:13:19 2014 +0000
Update test cases due to call arity
Some nice improvements on already succeeding test cases (#876, #7954
and #4267)
Test #149 needed a little change, lest call arity causes a allocation
change that we do not want to test here.
>---------------------------------------------------------------
393ea739567206d848f53e9ca75f532a49218694
testsuite/tests/perf/compiler/all.T | 21 ++++++++------------
testsuite/tests/perf/should_run/T149_A.hs | 2 +-
testsuite/tests/perf/should_run/T149_B.hs | 2 +-
testsuite/tests/perf/should_run/all.T | 10 +++++++---
.../tests/simplCore/should_compile/T3234.stderr | 2 +-
.../tests/simplCore/should_compile/rule2.stderr | 2 +-
6 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index c77655b..ac6d5e8 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -69,7 +69,7 @@ test('T1969',
# 2012-10-08 303930948 (x86/Linux, new codegen)
# 2013-02-10 322937684 (x86/OSX)
# 2014-01-22 316103268 (x86/Linux)
- (wordsize(64), 698612512, 5)]),
+ (wordsize(64), 660922376, 5)]),
# 17/11/2009 434845560 (amd64/Linux)
# 08/12/2009 459776680 (amd64/Linux)
# 17/05/2010 519377728 (amd64/Linux)
@@ -77,19 +77,14 @@ test('T1969',
# 16/07/2012 589168872 (amd64/Linux)
# 20/07/2012 595936240 (amd64/Linux)
# 23/08/2012 606230880 (amd64/Linux)
- # 29/08/2012 633334184 (amd64/Linux)
- # (^ new codegen)
+ # 29/08/2012 633334184 (amd64/Linux) new codegen
# 18/09/2012 641959976 (amd64/Linux)
- # 19/10/2012 661832592 (amd64/Linux)
- # (^ -fPIC turned on)
- # 23/10/2012 642594312 (amd64/Linux)
- # (^ -fPIC turned off again)
- # 12/11/2012 658786936 (amd64/Linux)
- # (^ UNKNOWN REASON )
- # 17/1/13: 667160192 (x86_64/Linux)
- # (^ new demand analyser)
- # 18/10/2013 698612512 (x86_64/Linux)
- # (fix for #8456)
+ # 19/10/2012 661832592 (amd64/Linux) -fPIC turned on
+ # 23/10/2012 642594312 (amd64/Linux) -fPIC turned off again
+ # 12/11/2012 658786936 (amd64/Linux) UNKNOWN REASON
+ # 17/1/13: 667160192 (x86_64/Linux) new demand analyser
+ # 18/10/2013 698612512 (x86_64/Linux) fix for #8456
+ # 10/02/2014 660922376 (x86_64/Linux) call artiy analysis
only_ways(['normal']),
extra_hc_opts('-dcore-lint -static')
diff --git a/testsuite/tests/perf/should_run/T149_A.hs b/testsuite/tests/perf/should_run/T149_A.hs
index dd74546..dc24f4c 100644
--- a/testsuite/tests/perf/should_run/T149_A.hs
+++ b/testsuite/tests/perf/should_run/T149_A.hs
@@ -21,5 +21,5 @@ playerMostOccur1 (x:xs)
| otherwise = playerMostOccur1 xs
numOccur :: Int -> [Int] -> Int
-numOccur i is = length $ filter (i ==) is
+numOccur i is = length is
diff --git a/testsuite/tests/perf/should_run/T149_B.hs b/testsuite/tests/perf/should_run/T149_B.hs
index fcc87cd..ef5b9c5 100644
--- a/testsuite/tests/perf/should_run/T149_B.hs
+++ b/testsuite/tests/perf/should_run/T149_B.hs
@@ -22,5 +22,5 @@ playerMostOccur2 (x:xs)
where pmo = playerMostOccur2 xs
numOccur :: Int -> [Int] -> Int
-numOccur i is = length $ filter (i ==) is
+numOccur i is = length is
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 98f9dc2..9ce4d45 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -57,8 +57,9 @@ test('lazy-bs-alloc',
test('T876',
[stats_num_field('bytes allocated',
- [(wordsize(64), 1263712 , 5),
+ [(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)]),
only_ways(['normal']),
extra_run_opts('10000')
@@ -289,7 +290,8 @@ test('T7797',
test('T7954',
[stats_num_field('bytes allocated',
[(wordsize(32), 1380051408, 10),
- (wordsize(64), 2720051528, 10)]),
+ (wordsize(64), 1680051336, 10)]),
+ # 2014-02-10: 1680051336 (x86_64/Linux), call arity analysis
only_ways(['normal'])
],
compile_and_run,
@@ -313,8 +315,10 @@ test('T5949',
test('T4267',
[stats_num_field('bytes allocated',
- [ (wordsize(64), 130000, 10)]),
+ [ (wordsize(64), 40992, 10)]),
# previously, it was >170000 bytes
+ # 2014-01-17: 130000
+ # 2014-02-10: 40992 (x86_64/Linux), call arity analysis
only_ways(['normal'])],
compile_and_run,
['-O'])
diff --git a/testsuite/tests/simplCore/should_compile/T3234.stderr b/testsuite/tests/simplCore/should_compile/T3234.stderr
index 4ccc5a1..c3591d0 100644
--- a/testsuite/tests/simplCore/should_compile/T3234.stderr
+++ b/testsuite/tests/simplCore/should_compile/T3234.stderr
@@ -61,6 +61,6 @@ Total ticks: 45
1 c
1 n
1 a
-10 SimplifierDone 10
+11 SimplifierDone 11
diff --git a/testsuite/tests/simplCore/should_compile/rule2.stderr b/testsuite/tests/simplCore/should_compile/rule2.stderr
index dbc7b0c..2c29fa4 100644
--- a/testsuite/tests/simplCore/should_compile/rule2.stderr
+++ b/testsuite/tests/simplCore/should_compile/rule2.stderr
@@ -25,6 +25,6 @@ Total ticks: 11
1 a
1 m
1 b
-8 SimplifierDone 8
+9 SimplifierDone 9
More information about the ghc-commits
mailing list