[commit: ghc] wip/perf-testsuite: Rebase on origin/master and modify some tests introduced by rebase (40d6fdf)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/perf-testsuite
Link       : http://ghc.haskell.org/trac/ghc/changeset/40d6fdffe69dfce4cbb9af89b516addc7ff45ad4/ghc

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

commit 40d6fdffe69dfce4cbb9af89b516addc7ff45ad4
Author: Jared Weakly <jweakly at pdx.edu>
Date:   Sat Sep 2 14:20:35 2017 -0700

    Rebase on origin/master and modify some tests introduced by rebase


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

40d6fdffe69dfce4cbb9af89b516addc7ff45ad4
 libraries/base/tests/all.T          | 2 +-
 testsuite/tests/perf/compiler/all.T | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 26ea796..6bf0da8 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -208,6 +208,6 @@ test('T13525', when(opsys('mingw32'), skip), compile_and_run, [''])
 test('T13097', normal, compile_and_run, [''])
 test('functorOperators', normal, compile_and_run, [''])
 test('T3474',
-     [stats_num_field('max_bytes_used', [ (wordsize(64), 44504, 5) ]),
+     [collect_stats('max_bytes_used',5),
       only_ways(['normal'])],
      compile_and_run, ['-O'])
diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 676bdf3..75ec285 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -293,10 +293,7 @@ test('T12707',
 
 test('T12150',
      [ only_ways(['optasm']),
-       compiler_stats_num_field('bytes allocated',
-          [(wordsize(64), 74358208, 5)
-          # initial:    70773000
-          # 2017-08-25: 74358208  Refactor the Mighty Simplifier
+       collect_stats('bytes allocated',5,True),
           ]),
      ],
     compile,