diff options
Diffstat (limited to 'testsuite/tests/perf/compiler/all.T')
| -rw-r--r-- | testsuite/tests/perf/compiler/all.T | 134 |
1 files changed, 63 insertions, 71 deletions
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T index 09cdb0111f..09a02975a2 100644 --- a/testsuite/tests/perf/compiler/all.T +++ b/testsuite/tests/perf/compiler/all.T @@ -1,4 +1,4 @@ -def no_lint(opts): +def no_lint(name, opts): opts.compiler_always_flags = \ filter(lambda opt: opt != '-dcore-lint' and opt != '-dcmm-lint', opts.compiler_always_flags) @@ -6,39 +6,36 @@ setTestOpts(no_lint) test('T1969', - [if_wordsize(32, - compiler_stats_num_field('peak_megabytes_allocated', 13, - 19)), + [when(wordsize(32), + compiler_stats_range_field('peak_megabytes_allocated', 18, 1)), # expected value: 14 (x86/Windows 17/05/10) # 15 (x86/OS X) # 19 (x86/OS X) - if_wordsize(64, - compiler_stats_num_field('peak_megabytes_allocated', 22, - 28)), + when(wordsize(64), + compiler_stats_range_field('peak_megabytes_allocated', 25, 1)), # expected value: 28 (amd64/Linux) # expected value: 34 (amd64/Linux) # 2012-09-20 23 (amd64/Linux) # 2012-10-03 25 (amd64/Linux if .hi exists) - if_wordsize(32, - compiler_stats_num_field('max_bytes_used', 4000000, - 7000000)), + when(wordsize(32), + compiler_stats_range_field('max_bytes_used', 6149572, 5)), # expected value: 6707308 (x86/OS X) # 5717704 (x86/Windows 17/05/10) # 6149572 (x86/Linux, 31/12/09) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('max_bytes_used', 9000000, 20)), # looks like the peak is around 10M, but we're # unlikely to GC exactly on the peak. # varies quite a lot with CLEANUP and BINDIST, # hence 10% range. - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 303930948, 5)), # expected value: 215582916 (x86/Windows) # 221667908 (x86/OS X) # 274932264 (x86/Linux) # 2012-10-08: 303930948 (x86/Linux, new codegen) # 2012-10-29: 298921816 (x86/Windows; increased range to 5% - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 658786936, 5)), # 17/11/2009: 434,845,560 (amd64/Linux) # 08/12/2009: 459,776,680 (amd64/Linux) @@ -80,24 +77,23 @@ else: conf_3294 = skip test('T3294', - [if_wordsize(32, - compiler_stats_num_field('max_bytes_used', 12000000, - 20000000)), + [when(wordsize(32), + compiler_stats_range_field('max_bytes_used', 17725476, 5)), # expected value: 17725476 (x86/OS X) - # 14593500 (Windows) - if_wordsize(64, + # 14593500 (Windows) + when(wordsize(64), compiler_stats_range_field('max_bytes_used', 44894544, 15)), # prev: 25753192 (amd64/Linux) # 29/08/2012: 37724352 (amd64/Linux) # (increase due to new codegen, see #7198) # 13/13/2012: 44894544 (amd64/Linux) # (reason for increase unknown) - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 1373514844, 5)), # previous: 815479800 (x86/Linux) # (^ increase due to new codegen, see #7198) # 2012-10-08: 1373514844 (x86/Linux) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 2717327208, 5)), # old: 1,357,587,088 (amd64/Linux) # 29/08/2012: 2,961,778,696 (amd64/Linux) @@ -111,10 +107,10 @@ test('T3294', test('T4801', [ # expect_broken(5224), # temporarily unbroken (#5227) - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('peak_megabytes_allocated', 30, 20)), - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('peak_megabytes_allocated', 49, 20)), # prev: 50 (amd64/Linux) # 19/10/2012: 64 (amd64/Linux) (REASON UNKNOWN!) @@ -122,12 +118,12 @@ test('T4801', # expected value: 58 (amd64/OS X): if_platform('x86_64-apple-darwin', - compiler_stats_num_field('peak_megabytes_allocated', 56, 60)), + compiler_stats_range_field('peak_megabytes_allocated', 58, 1)), # expected value: 228286660 (x86/OS X) - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 185669232, 10)), - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 392409984, 10)), # prev: 360243576 (amd64/Linux) # 19/10/2012: 447190832 (amd64/Linux) (-fPIC turned on) @@ -135,15 +131,13 @@ test('T4801', # expected value: 510938976 (amd64/OS X): if_platform('x86_64-apple-darwin', - compiler_stats_num_field('bytes allocated', 490000000, - 530000000)), + compiler_stats_range_field('bytes allocated', 510938976, 5)), - if_wordsize(32, + when(wordsize(32), + compiler_stats_range_field('max_bytes_used', 9651948, 5)), # expected value: x86/OS X: 9651948 - compiler_stats_num_field('max_bytes_used', 8000000, - 12000000)), - # expected value: 10290952 (windows) - if_wordsize(64, + # expected value: 10290952 (windows) + when(wordsize(64), compiler_stats_range_field('max_bytes_used', 21657520, 15)), # prev: 20486256 (amd64/OS X) # 30/08/2012: 17305600--20391920 (varies a lot) @@ -151,8 +145,7 @@ test('T4801', # 19/10/2012: 18619912 (-fPIC turned off) # 24/12/2012: 21657520 (perhaps gc sampling time wibbles?) if_platform('x86_64-apple-darwin', - compiler_stats_num_field('max_bytes_used', 20000000, - 23000000)), + compiler_stats_range_field('max_bytes_used', 21657520, 5)), only_ways(['normal']), extra_hc_opts('-static') ], @@ -162,32 +155,33 @@ test('T4801', test('T3064', [# expect_broken( 3064 ), # expected value: 14 (x86/Linux 28-06-2012): - if_wordsize(32, - compiler_stats_range_field('peak_megabytes_allocated', 14, 30)), + when(wordsize(32), + compiler_stats_range_field('peak_megabytes_allocated', 14, 1)), - # expected value: 18 (amd64/Linux): - if_wordsize(64, - compiler_stats_num_field('peak_megabytes_allocated', 20, 28)), + when(wordsize(64), + compiler_stats_range_field('peak_megabytes_allocated', 26, 1)), + # (amd64/Linux): 18 + # (amd64/Linux) 2012-02-07: 26 # expected value: 56380288 (x86/Linux) (28/6/2011) # 111189536 (x86/Windows) (30/10/12) - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 111189536, 10)), - # expected value: 73259544 (amd64/Linux) (28/6/2011): - if_wordsize(64, - compiler_stats_num_field('bytes allocated', 200000000, - 280000000)), + when(wordsize(64), + compiler_stats_range_field('bytes allocated', 224798696, 5)), + # (amd64/Linux) (28/06/2011): 73259544 + # (amd64/Linux) (07/02/2013): 224798696 # expected value: 2247016 (x86/Linux) (28/6/2011): - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('max_bytes_used', 5511604, 20)), - # expected value: 4032024 (amd64/Linux, intree) (28/6/2011): - if_wordsize(64, - compiler_stats_num_field('max_bytes_used', 8000000, - 14000000)), + when(wordsize(64), + compiler_stats_range_field('max_bytes_used', 9819288, 5)), + # (amd64/Linux, intree) (28/06/2011): 4032024 + # (amd64/Linux, intree) (07/02/2013): 9819288 only_ways(['normal']) ], compile, @@ -200,12 +194,12 @@ test('T4007', test('T5030', [ - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 259547660, 10)), # previous: 196457520 # 2012-10-08: 259547660 (x86/Linux, new codegen) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 602993184, 10)), # Previously 530000000 (+/- 10%) # 17/1/13: 602,993,184 (x86_64/Linux) @@ -217,12 +211,11 @@ test('T5030', ['-fcontext-stack=300']) test('T5631', - [if_wordsize(32, # sample from x86/Linux + [when(wordsize(32), # sample from x86/Linux compiler_stats_range_field('bytes allocated', 392904228, 10)), # expected value: 774,595,008 (amd64/Linux): - if_wordsize(64, - compiler_stats_num_field('bytes allocated', 600000000, - 900000000)), + when(wordsize(64), + compiler_stats_range_field('bytes allocated', 774595008, 5)), only_ways(['normal']) ], compile, @@ -230,12 +223,11 @@ test('T5631', test('parsing001', [# expected value: ? - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 274000576, 10)), # expected value: 587079016 (amd64/Linux): - if_wordsize(64, - compiler_stats_num_field('bytes allocated', 540000000, - 620000000)), + when(wordsize(64), + compiler_stats_range_field('bytes allocated', 587079016, 5)), only_ways(['normal']), ], compile_fail, ['']) @@ -244,10 +236,10 @@ test('parsing001', test('T783', [ only_ways(['normal']), # no optimisation for this one # expected value: 175,569,928 (x86/Linux) - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 226907420, 10)), # 2012-10-08: 226907420 (x86/Linux) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 640324528, 10)), # prev: 349,263,216 (amd64/Linux) # 07/08/2012: 384,479,856 (amd64/Linux) @@ -262,12 +254,12 @@ test('T783', test('T5321Fun', [ only_ways(['normal']), # no optimisation for this one # sample from x86/Linux - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 344416344, 10)), # prev: 300000000 # 2012-10-08: 344416344 # (increase due to new codegen) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 713385808, 10)) # prev: 585,521,080 # 29/08/2012: 713,385,808 @@ -277,12 +269,12 @@ test('T5321Fun', test('T5321FD', [ only_ways(['normal']), # no optimisation for this one - if_wordsize(32, + when(wordsize(32), compiler_stats_range_field('bytes allocated', 240302920, 10)), # prev: 213380256 # 2012-10-08: 240302920 (x86/Linux) # (increase due to new codegen) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 492905640, 10)) # prev: 418,306,336 # 29/08/2012: 492,905,640 @@ -292,20 +284,20 @@ test('T5321FD', test('T5642', [ only_ways(['normal']), - if_wordsize(32, # sample from x86/Linux + when(wordsize(32), # sample from x86/Linux compiler_stats_range_field('bytes allocated', 650000000, 10)), - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 1300000000, 10)) ], compile,['-O']) test('T5837', [ only_ways(['normal']), - if_wordsize(32, # sample from x86/Linux + when(wordsize(32), # sample from x86/Linux compiler_stats_range_field('bytes allocated', 40000000, 10)), # sample: 3926235424 (amd64/Linux, 15/2/2012) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 81879216, 10)) # 2012-10-02 81879216 # 2012-09-20 87254264 amd64/Linux @@ -314,11 +306,11 @@ test('T5837', test('T6048', [ only_ways(['optasm']), - if_wordsize(32, # sample from x86/Linux + when(wordsize(32), # sample from x86/Linux compiler_stats_range_field('bytes allocated', 48887164, 10)), # prev: 38000000 # 2012-10-08: 48887164 (x86/Linux) - if_wordsize(64, + when(wordsize(64), compiler_stats_range_field('bytes allocated', 97247032, 10)) # 18/09/2012 97247032 amd64/Linux ], |