[commit: ghc] master: Reclassify some performance tests (8a70ccb)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8a70ccbb552191e1972f3c5d7fce839176c4c0e3/ghc

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

commit 8a70ccbb552191e1972f3c5d7fce839176c4c0e3
Author: Richard Eisenberg <rae at cs.brynmawr.edu>
Date:   Sat Jul 14 15:43:01 2018 -0400

    Reclassify some performance tests
    
    There were some performance tests not classified by
    compiler_num_stats_field, causing erroneous failures when
    testing a DEBUG compiler. This fixes that oversight,
    addressing #15374.


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

8a70ccbb552191e1972f3c5d7fce839176c4c0e3
 testsuite/tests/perf/should_run/all.T        |  2 +-
 testsuite/tests/pmcheck/should_compile/all.T | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 0e7996ef..a8107c4 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -562,7 +562,7 @@ test('T13623',
     ['-O2'])
 
 test('T14052',
-     [stats_num_field('bytes allocated',
+     [compiler_stats_num_field('bytes allocated',
                       [ (wordsize(64), 2346183840, 15) ])],
      ghci_script,
      ['T14052.script'])
diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index db6e726..e382e3f 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -37,10 +37,26 @@ test('T9951b', [], compile,
 test('T9951', [], compile,
      ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T11303', normal, compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
-test('T11276', compile_timeout_multiplier(0.01), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
-test('T11303b', compile_timeout_multiplier(0.01), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
-test('T11374', compile_timeout_multiplier(0.01), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
-test('T11195', compile_timeout_multiplier(0.60), compile, ['-package ghc -fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M2G -RTS'])
+test('T11276', compiler_stats_num_field('bytes allocated',
+  [(wordsize(64), 165890392, 10)]
+    # 2018-07-14: 165890392   INITIAL
+  ), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
+
+test('T11303b', compiler_stats_num_field('bytes allocated',
+  [(wordsize(64), 54373936, 10)]
+    # 2018-07-14: 54373936    INITIAL    
+  ), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
+  
+test('T11374', compiler_stats_num_field('bytes allocated',
+  [(wordsize(64), 280144864, 10)]
+    # 2018-07-14: 280144864   INITIAL
+  ), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
+  
+test('T11195', compiler_stats_num_field('bytes allocated',
+  [(wordsize(64), 7852567480, 10)]
+    # 2018-07-14: 7852567480   INITIAL
+  ), compile, ['-package ghc -fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M2G -RTS'])
+  
 test('T11984', normal, compile,
     ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T14086', normal, compile,