[commit: testsuite] master: Fix perf bounds on amd64/Linux following the change to *_range_field (c3e9cbb)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c3e9cbb909a83db94421ce3efde3d5a231c7a9ae

>---------------------------------------------------------------

commit c3e9cbb909a83db94421ce3efde3d5a231c7a9ae
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Feb 7 02:02:53 2013 +0000

    Fix perf bounds on amd64/Linux following the change to *_range_field

>---------------------------------------------------------------

 tests/perf/compiler/all.T    |   15 +++++++++------
 tests/perf/should_run/all.T  |   15 +++++++++------
 tests/perf/space_leaks/all.T |   10 +++++-----
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/tests/perf/compiler/all.T b/tests/perf/compiler/all.T
index 9242f83..29e6ea9 100644
--- a/tests/perf/compiler/all.T
+++ b/tests/perf/compiler/all.T
@@ -159,8 +159,9 @@ test('T3064',
           compiler_stats_range_field('peak_megabytes_allocated', 14, 1)),
 
       if_wordsize(64,
-          compiler_stats_range_field('peak_megabytes_allocated', 24, 1)),
-                                    # expected value: 18 (amd64/Linux):
+          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)
@@ -168,17 +169,19 @@ test('T3064',
           compiler_stats_range_field('bytes allocated', 111189536, 10)),
 
 
-      # expected value: 73259544 (amd64/Linux) (28/6/2011):
       if_wordsize(64,
-          compiler_stats_range_field('bytes allocated', 240000000, 5)),
+          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,
           compiler_stats_range_field('max_bytes_used', 5511604, 20)),
 
-      # expected value: 4032024 (amd64/Linux, intree) (28/6/2011):
       if_wordsize(64,
-          compiler_stats_range_field('max_bytes_used', 11000000, 5)),
+          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,
diff --git a/tests/perf/should_run/all.T b/tests/perf/should_run/all.T
index 9e1da9c..ed78003 100644
--- a/tests/perf/should_run/all.T
+++ b/tests/perf/should_run/all.T
@@ -14,8 +14,9 @@ test('T3586',
      ['-O'])
 
 test('T4830',
-     [stats_range_field('bytes allocated', 127000, 5),
-                                     # expected value: 127,000 (amd64/Linux)
+     [stats_range_field('bytes allocated',  99264, 1),
+               # (amd64/Linux):            127000
+               # (amd64/Linux) 2013-02-07:  99264
       only_ways(['normal'])
       ],
      compile_and_run,
@@ -29,8 +30,9 @@ test('T3245', normal, compile_and_run, ['-O'])
 test('lazy-bs-alloc',
      [stats_range_field('peak_megabytes_allocated', 2, 1),
                                      # expected value: 2 (amd64/Linux)
-      stats_range_field('bytes allocated', 489776, 5),
-                                     # expected value: 489776 (amd64/Linux)
+      stats_range_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
@@ -244,8 +246,9 @@ test('T7507', omit_ways(['ghci']), compile_and_run, ['-O'])
 # For 7507, stack overflow is the bad case
 
 test('T7436',
-     [stats_range_field('max_bytes_used', 70000, 5),
-                                     # expected value: 127,000 (amd64/Linux)
+     [stats_range_field('max_bytes_used', 60360, 1),
+           # (amd64/Linux):              127000
+           # (amd64/Linux) 2013-02-07:    60360
       only_ways(['normal'])
       ],
      compile_and_run,
diff --git a/tests/perf/space_leaks/all.T b/tests/perf/space_leaks/all.T
index 23afe42..dcc1f08 100644
--- a/tests/perf/space_leaks/all.T
+++ b/tests/perf/space_leaks/all.T
@@ -5,11 +5,11 @@ test('space_leak_001',
      #           4 (x86/OS X)
      #           5 (x86/Linux)
      [stats_range_field('peak_megabytes_allocated', 4, 1),
-      stats_range_field('max_bytes_used', 481456, 1),
-                      # expected value: 440224 (amd64/Linux)
-                      #                 417016 (x86/OS X)
-                      #                 415672 (x86/Windows)
-                      #                 481456 (unreg amd64/Linux)
+      stats_range_field('max_bytes_used', 440000, 10),
+                        # expected value: 440224 (amd64/Linux)
+                        #                 417016 (x86/OS X)
+                        #                 415672 (x86/Windows)
+                        #                 481456 (unreg amd64/Linux)
       stats_range_field('bytes allocated', 9079316016, 1),
                            # expected value: 9079316016 (amd64/Linux)
                            #                 9331570416 (x86/Linux)