diff options
| author | Tamar Christina <tamar@zhox.com> | 2017-02-21 11:21:48 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-02-21 19:41:55 -0500 |
| commit | 9ef2749c3f3818944ae7dac5c9d10851b63b834a (patch) | |
| tree | a75dcfa3af6c31c055e3f1af3521e122529c8a6f | |
| parent | 499a15db0d71a9d0b91cbd5f509dabff50df2566 (diff) | |
| download | haskell-9ef2749c3f3818944ae7dac5c9d10851b63b834a.tar.gz | |
Fix all broken perf tests on x64 Windows
various perf tests have been broken over the course of the past few
months. This updates the numbers.
Test Plan: ./validate
Reviewers: austin, bgamari
Subscribers: thomie, #ghc_windows_task_force
Differential Revision: https://phabricator.haskell.org/D3160
| -rw-r--r-- | testsuite/tests/deriving/perf/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/perf/compiler/all.T | 13 | ||||
| -rw-r--r-- | testsuite/tests/perf/haddock/all.T | 5 | ||||
| -rw-r--r-- | testsuite/tests/perf/join_points/all.T | 7 | ||||
| -rw-r--r-- | testsuite/tests/perf/should_run/all.T | 5 |
5 files changed, 29 insertions, 6 deletions
diff --git a/testsuite/tests/deriving/perf/all.T b/testsuite/tests/deriving/perf/all.T index 8dee98961b..a13a6aa7b9 100644 --- a/testsuite/tests/deriving/perf/all.T +++ b/testsuite/tests/deriving/perf/all.T @@ -1,6 +1,9 @@ test('T10858', [compiler_stats_num_field('bytes allocated', - [ (wordsize(64), 304094944, 8) ]), + [(platform('x86_64-unknown-mingw32'), 272402736, 8), + # 2017-02-19 272402736 (x64/Windows) - unknown + + (wordsize(64), 304094944, 8) ]), # Initial: 476296112 # 2016-12-19 247768192 Join points (#19288) # 2016-02-12 304094944 Type-indexed Typeable diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T index c9b50919f5..e5fefaad22 100644 --- a/testsuite/tests/perf/compiler/all.T +++ b/testsuite/tests/perf/compiler/all.T @@ -612,6 +612,9 @@ test('T5837', # 2014-12-08: 115905208 Constraint solver perf improvements (esp kick-out) # 2016-04-06: 24199320 (x86/Linux, 64-bit machine) TypeInType + (platform('x86_64-unknown-mingw32'), 59161648, 7), + # 2017-02-19 59161648 (x64/Windows) - Unknown + (wordsize(64), 58648600, 7)]) # sample: 3926235424 (amd64/Linux, 15/2/2012) # 2012-10-02 81879216 @@ -901,7 +904,10 @@ test('T10370', test('T10547', [ compiler_stats_num_field('bytes allocated', - [(wordsize(64), 37681360, 20), + [(platform('x86_64-unknown-mingw32'), 37485128, 20), + # 2017-02-19 37485128 (x64/Windows) - Unknown + + (wordsize(64), 37681360, 20), # initial: 39165544 # 2016-11-25: 31041520 Linux Around the time of refactoring the constraint solver; # but I think that only pushed it over the edge @@ -940,8 +946,9 @@ test('T12425', test('T12234', [ only_ways(['optasm']), compiler_stats_num_field('bytes allocated', - [(platform('x86_64-unknown-mingw32'), 77949232, 5), - # initial: 77949232 + [(platform('x86_64-unknown-mingw32'), 89180624, 5), + # initial: 89180624 + # 2017-02-19 89180624 (x64/Windows) - Unknown (wordsize(64), 86525344, 5), # initial: 72958288 # 2016-01-17: 76848856 (x86-64, Linux. drift?) diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T index a148b712d2..9bd29ff8a8 100644 --- a/testsuite/tests/perf/haddock/all.T +++ b/testsuite/tests/perf/haddock/all.T @@ -5,7 +5,10 @@ test('haddock.base', [unless(in_tree_compiler(), skip), req_haddock ,stats_num_field('bytes allocated', - [(wordsize(64), 25592972912, 5) + [(platform('x86_64-unknown-mingw32'), 24286343184, 5) + # 2017-02-19 24286343184 (x64/Windows) - Generalize kind of (->) + + ,(wordsize(64), 25592972912, 5) # 2012-08-14: 5920822352 (amd64/Linux) # 2012-09-20: 5829972376 (amd64/Linux) # 2012-10-08: 5902601224 (amd64/Linux) diff --git a/testsuite/tests/perf/join_points/all.T b/testsuite/tests/perf/join_points/all.T index 0747daeade..fe202b6487 100644 --- a/testsuite/tests/perf/join_points/all.T +++ b/testsuite/tests/perf/join_points/all.T @@ -25,6 +25,11 @@ test('join005', normal, compile, ['']) test('join006', normal, compile, ['']) test('join007', - [stats_num_field('bytes allocated', [(wordsize(64), 50944, 5)])], + [stats_num_field('bytes allocated', + [(platform('x86_64-unknown-mingw32'), 47368, 5), + # 2017-02-19 47368 (x64/Windows) - Unknown + + (wordsize(64), 50944, 5)])], + # Initial 50944 compile_and_run, ['']) diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T index 27d8df87b8..6670f341a6 100644 --- a/testsuite/tests/perf/should_run/all.T +++ b/testsuite/tests/perf/should_run/all.T @@ -450,6 +450,11 @@ test('T9203', test('T9339', [stats_num_field('bytes allocated', [ (wordsize(32), 40046844, 5) + # is this number correct? Seems very high. + + , (platform('x86_64-unknown-mingw32'), 47088, 7) + # 2017-02-19 47088 (x64/Windows) - Unknown + , (wordsize(64), 50728, 5) ]), # w/o fusing last: 320005080 # 2014-07-22: 80050760 |