diff options
Diffstat (limited to 'testsuite/tests/perf/should_run/all.T')
| -rw-r--r-- | testsuite/tests/perf/should_run/all.T | 223 |
1 files changed, 90 insertions, 133 deletions
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T index b201bb1b11..5b17e452c8 100644 --- a/testsuite/tests/perf/should_run/all.T +++ b/testsuite/tests/perf/should_run/all.T @@ -4,21 +4,19 @@ # because the test allocates an unboxed array of doubles. test('T3586', - [stats_num_field('peak_megabytes_allocated', 17, - 18), - # expected value: 17 (amd64/Linux) - stats_num_field('bytes allocated', 16000000, - 17000000), - # expected value: 16835544 (amd64/Linux) + [stats_num_field('peak_megabytes_allocated', (17, 1)), + # expected value: 17 (amd64/Linux) + stats_num_field('bytes allocated', (16835544, 5)), + # expected value: 16835544 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('T4830', - [stats_num_field('bytes allocated', 60000, - 200000), - # expected value: 127,000 (amd64/Linux) + [stats_num_field('bytes allocated', (99264, 1)), + # (amd64/Linux): 127000 + # (amd64/Linux) 2013-02-07: 99264 only_ways(['normal']) ], compile_and_run, @@ -30,12 +28,11 @@ test('T3245', normal, compile_and_run, ['-O']) # a bug in hGetBufNonBlocking in 6.13 that triggered this. # test('lazy-bs-alloc', - [stats_num_field('peak_megabytes_allocated', 1, - 3), - # expected value: 2 (amd64/Linux) - stats_num_field('bytes allocated', 400000, - 600000), - # expected value: 489776 (amd64/Linux) + [stats_num_field('peak_megabytes_allocated', (2, 1)), + # expected value: 2 (amd64/Linux) + stats_num_field('bytes allocated', (429744, 1)), + # (amd64/Linux): 489776 + # (amd64/Linux) 2013-02-07: 429744 only_ways(['normal']), extra_run_opts('../../numeric/should_run/arith011.stdout'), ignore_output @@ -60,35 +57,27 @@ test('T3736', ['$MAKE -s --no-print-directory T3736']) test('T3738', [extra_clean(['T3738a.hi', 'T3738a.o']), - stats_num_field('peak_megabytes_allocated', 1, - 1), - # expected value: 1 (amd64/Linux) - # expected value: 45648 (x86/Linux): - if_wordsize(32, - stats_num_field('bytes allocated', 40000, - 50000)), - if_wordsize(64, - stats_num_field('bytes allocated', 40000, - 60000)), - # expected value: 49400 (amd64/Linux) + stats_num_field('peak_megabytes_allocated', (1, 0)), + # expected value: 1 (amd64/Linux) + stats_num_field('bytes allocated', + [(wordsize(32), 45648, 5), + # expected value: 45648 (x86/Linux) + (wordsize(64), 49400, 5)]), + # expected value: 49400 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('MethSharing', - [stats_num_field('peak_megabytes_allocated', 1, - 1), - # expected value: 1 (amd64/Linux) - # expected value: 2685858140 (x86/OS X): - if_wordsize(32, - stats_num_field('bytes allocated', 300000000, - 400000000)), - # expected: 360940756 (x86/Linux) - if_wordsize(64, - stats_num_field('bytes allocated', 600000000, - 700000000)), - # expected: 640067672 (amd64/Linux) + [stats_num_field('peak_megabytes_allocated', (1, 0)), + # expected value: 1 (amd64/Linux) + stats_num_field('bytes allocated', + [(wordsize(32), 360940756, 5), + # expected value: 2685858140 (x86/OS X) + # expected: 360940756 (x86/Linux) + (wordsize(64), 640067672, 5)]), + # expected: 640067672 (amd64/Linux) only_ways(['normal']) ], compile_and_run, @@ -112,127 +101,98 @@ test('T149', ['$MAKE -s --no-print-directory T149']) test('T5113', - [ - if_wordsize(32, - stats_num_field('bytes allocated', 3000000, - 5000000)), - if_wordsize(64, - stats_num_field('bytes allocated', 8000000, - 9000000)), + [stats_num_field('bytes allocated', + [(wordsize(32), 4000000, 5), + (wordsize(64), 8000000, 5)]), only_ways(['normal']), - normal - # WAS: expect_broken(7046) - # but it started working again around 01/2013, see #7046 + expect_broken(7046) ], compile_and_run, ['-O']) test('T4978', - [if_wordsize(32, - stats_num_field('bytes allocated', 9000000, - 11000000)), - if_wordsize(64, - stats_num_field('bytes allocated', 9000000, - 11000000)), - # expected value: 10137680 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 10000000, 5), + (wordsize(64), 10137680, 5)]), + # expected value: 10137680 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O2']) test('T5205', - [if_wordsize(32, - stats_num_field('bytes allocated', 40000, - 50000)), - # expected value: 47088 (x86/Darwin) - if_wordsize(64, - stats_num_field('bytes allocated', 40000, - 60000)), - # expected value: 51320 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 47088, 5), + # expected value: 47088 (x86/Darwin) + (wordsize(64), 51320, 5)]), + # expected value: 51320 (amd64/Linux) only_ways(['normal', 'optasm']) ], compile_and_run, ['']) test('T5549', - [if_wordsize(32, - stats_num_field('bytes allocated', 3000000000, - 8000000000)), - # expected value: 3362958676 (Windows) - if_wordsize(64, - stats_num_field('bytes allocated', 5000000000, - 8000000000)), - # expected value: 6,725,846,120 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 3362958676, 5), + # expected value: 3362958676 (Windows) + (wordsize(64), 6725846120, 5)]), + # expected value: 6725846120 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('T4474a', - [if_wordsize(32, - stats_num_field('bytes allocated', 1600000000, - 2000000000)), - # expected value: 1879095912 (i386/OSX) - if_wordsize(64, - stats_num_field('bytes allocated', 3500000000, - 3900000000)), - # expected value: 3766493912 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 1879095912, 5), + # expected value: 1879095912 (i386/OSX) + (wordsize(64), 3766493912, 5)]), + # expected value: 3766493912 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('T4474b', - [if_wordsize(32, - stats_num_field('bytes allocated', 1600000000, - 2000000000)), - # expected value: 1879095912 (i386/OSX) - if_wordsize(64, - stats_num_field('bytes allocated', 3500000000, - 3900000000)), - # expected value: 3766493912 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 1879095912, 5), + # expected value: 1879095912 (i386/OSX) + (wordsize(64), 3766493912, 5)]), + # expected value: 3766493912 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('T4474c', - [if_wordsize(32, - stats_num_field('bytes allocated', 1600000000, - 2000000000)), - # expected value: 1879095912 (i386/OSX) - if_wordsize(64, - stats_num_field('bytes allocated', 3500000000, - 3900000000)), - # expected value: 3766493912 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 1879095912, 5), + # expected value: 1879095912 (i386/OSX) + (wordsize(64), 3766493912, 5)]), + # expected value: 3766493912 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('T5237', - [if_wordsize(32, - stats_num_field('bytes allocated', 70000, - 90000)), - # expected value: 78328 (i386/Linux) - if_wordsize(64, - stats_num_field('bytes allocated', 90000, - 130000)), - # expected value: 110888 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 78328, 5), + # expected value: 78328 (i386/Linux) + (wordsize(64), 110888, 5)]), + # expected value: 110888 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O ' + sse2_opts]) test('T5536', - [if_wordsize(32, - stats_num_field('bytes allocated', 1150000000, - 1250000000)), - # expected value: 1246287228 (i386/Linux) - if_wordsize(64, - stats_range_field('bytes allocated', 892399040, 5)), - # expected value: 2,492,589,480 (amd64/Linux) - # 17/1/13: 892,399,040 (x86_64/Linux) - # (new demand analyser) + [stats_num_field('bytes allocated', + [(wordsize(32), 1246287228, 5), + # expected value: 1246287228 (i386/Linux) + (wordsize(64), 892399040, 5)]), + # expected value: 2492589480 (amd64/Linux) + # 17/1/13: 892399040 (x86_64/Linux) + # (new demand analyser) extra_clean(['T5536.data']), ignore_output, only_ways(['normal']) @@ -241,30 +201,27 @@ test('T5536', ['-O']) test('T7257', - [if_wordsize(32, - stats_range_field('bytes allocated', 1150000000, 10)), - # expected value: 1246287228 (i386/Linux) - if_wordsize(32, - stats_range_field('peak_megabytes_allocated', 217, 5)), - # 2012-10-08: 217 (x86/Linux) - if_wordsize(64, - stats_range_field('bytes allocated', 1774893760, 5)), - # 2012-09-21: 1774893760 (amd64/Linux) - if_wordsize(64, - stats_range_field('peak_megabytes_allocated', 227, 5)), - # 2012-09-21: 227 (amd64/Linux) + [stats_num_field('bytes allocated', + [(wordsize(32), 1150000000, 10), + # expected value: 1246287228 (i386/Linux) + (wordsize(64), 1774893760, 5)]), + # 2012-09-21: 1774893760 (amd64/Linux) + stats_num_field('peak_megabytes_allocated', + [(wordsize(32), 217, 5), + # 2012-10-08: 217 (x86/Linux) + (wordsize(64), 227, 5)]), + # 2012-09-21: 227 (amd64/Linux) only_ways(['normal']) ], compile_and_run, ['-O']) test('Conversions', - [if_wordsize(32, - stats_range_field('bytes allocated', 55316, 5)), - # 2012-12-18: Guessed 64-bit value / 2 - if_wordsize(64, - stats_range_field('bytes allocated', 110632, 5)), - # 2012-12-18: 109608 (amd64/OS X) + [stats_num_field('bytes allocated', + [(wordsize(32), 55316, 5), + # 2012-12-18: Guessed 64-bit value / 2 + (wordsize(64), 110632, 5)]), + # 2012-12-18: 109608 (amd64/OS X) only_ways(['normal']) ], @@ -274,9 +231,9 @@ test('T7507', omit_ways(['ghci']), compile_and_run, ['-O']) # For 7507, stack overflow is the bad case test('T7436', - [stats_num_field('max_bytes_used', 50000, - 100000), - # expected value: 127,000 (amd64/Linux) + [stats_num_field('max_bytes_used', (60360, 1)), + # (amd64/Linux): 127000 + # (amd64/Linux) 2013-02-07: 60360 only_ways(['normal']) ], compile_and_run, |