[commit: testsuite] master: Adjust tests to match -funbox-small-strict-fields change (83eedab)

[Johan Tibell]

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

On branch  : master

https://github.com/ghc/testsuite/commit/83eedab29ff0cdab492b5733bbbdb266d23bfe9c

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

commit 83eedab29ff0cdab492b5733bbbdb266d23bfe9c
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Fri May 3 12:04:40 2013 -0700

    Adjust tests to match -funbox-small-strict-fields change
    
    One adjustment is to the core output of some tests (false positive).
    
    The other adjustment is due to higher allocation when (now) unboxed
    values are put into a polymorphic data structure. This is a problem
    with polymorphic data structures in general (e.g. it happens in Java
    too) and not about having unboxed fields per say.

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

 tests/perf/should_run/all.T                 |   21 +++++++++------------
 tests/simplCore/should_compile/T7360.stderr |   10 +++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/tests/perf/should_run/all.T b/tests/perf/should_run/all.T
index 58ffe8f..07e6d96 100644
--- a/tests/perf/should_run/all.T
+++ b/tests/perf/should_run/all.T
@@ -163,30 +163,27 @@ test('T5549',
 
 test('T4474a',
      [stats_num_field('bytes allocated',
-                      [(wordsize(32), 1879095912, 5),
-                    # expected value: 1879095912 (i386/OSX)
-                       (wordsize(64), 3766493912, 5)]),
-                    # expected value: 3766493912 (amd64/Linux)
+                      [(wordsize(32), 2405242767, 5),
+                       (wordsize(64), 4831890304, 5)]),
+                    # expected value: 4831890304 (amd64/OSX)
       only_ways(['normal'])
       ],
      compile_and_run,
      ['-O'])
 test('T4474b',
      [stats_num_field('bytes allocated',
-                      [(wordsize(32), 1879095912, 5),
-                    # expected value: 1879095912 (i386/OSX)
-                       (wordsize(64), 3766493912, 5)]),
-                    # expected value: 3766493912 (amd64/Linux)
+                      [(wordsize(32), 2405242767, 5),
+                       (wordsize(64), 4831890304, 5)]),
+                    # expected value: 4831890304 (amd64/OSX)
       only_ways(['normal'])
       ],
      compile_and_run,
      ['-O'])
 test('T4474c',
      [stats_num_field('bytes allocated',
-                      [(wordsize(32), 1879095912, 5),
-                    # expected value: 1879095912 (i386/OSX)
-                       (wordsize(64), 3766493912, 5)]),
-                    # expected value: 3766493912 (amd64/Linux)
+                      [(wordsize(32), 2405242767, 5),
+                       (wordsize(64), 4831890304, 5)]),
+                    # expected value: 4831890304 (amd64/OSX)
       only_ways(['normal'])
       ],
      compile_and_run,
diff --git a/tests/simplCore/should_compile/T7360.stderr b/tests/simplCore/should_compile/T7360.stderr
index 62dc4b8..a204c9e 100644
--- a/tests/simplCore/should_compile/T7360.stderr
+++ b/tests/simplCore/should_compile/T7360.stderr
@@ -1,6 +1,6 @@
 
 ==================== Tidy Core ====================
-Result size of Tidy Core = {terms: 36, types: 28, coercions: 0}
+Result size of Tidy Core = {terms: 36, types: 29, coercions: 0}
 
 T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo
 [GblId[DataConWrapper],
@@ -10,11 +10,11 @@ T7360.$WFoo3 [InlPrag=INLINE] :: GHC.Types.Int -> T7360.Foo
  Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
          ConLike=True, WorkFree=True, Expandable=True,
          Guidance=ALWAYS_IF(unsat_ok=False,boring_ok=False)
-         Tmpl= \ (dt [Occ=Once] :: GHC.Types.Int) ->
-                 case dt of dt { __DEFAULT -> T7360.Foo3 dt }}]
+         Tmpl= \ (dt [Occ=Once!] :: GHC.Types.Int) ->
+                 case dt of _ { GHC.Types.I# dt [Occ=Once] -> T7360.Foo3 dt }}]
 T7360.$WFoo3 =
-  \ (dt [Occ=Once] :: GHC.Types.Int) ->
-    case dt of dt { __DEFAULT -> T7360.Foo3 dt }
+  \ (dt [Occ=Once!] :: GHC.Types.Int) ->
+    case dt of _ { GHC.Types.I# dt [Occ=Once] -> T7360.Foo3 dt }
 
 T7360.fun1 [InlPrag=NOINLINE] :: T7360.Foo -> ()
 [GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U>]