[commit: testsuite] master: Simplifier trace wibbles for cardinality analysis (2d01b47)
Simon Peyton Jones
simonpj at microsoft.com
Thu Jun 6 15:32:28 CEST 2013
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : master
https://github.com/ghc/testsuite/commit/2d01b4790399e225a4c892c2e525e1b5f8f18e2c
>---------------------------------------------------------------
commit 2d01b4790399e225a4c892c2e525e1b5f8f18e2c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu Jun 6 14:31:47 2013 +0100
Simplifier trace wibbles for cardinality analysis
>---------------------------------------------------------------
tests/simplCore/should_compile/T3717.stderr | 4 ++--
tests/simplCore/should_compile/T3772.stdout | 2 +-
tests/simplCore/should_compile/T4201.stdout | 2 +-
tests/simplCore/should_compile/T4908.stderr | 6 +++---
tests/simplCore/should_compile/T4930.stderr | 2 +-
tests/simplCore/should_compile/T7360.stderr | 4 ++--
tests/simplCore/should_compile/spec-inline.stderr | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tests/simplCore/should_compile/T3717.stderr b/tests/simplCore/should_compile/T3717.stderr
index bafc974..5a495e4 100644
--- a/tests/simplCore/should_compile/T3717.stderr
+++ b/tests/simplCore/should_compile/T3717.stderr
@@ -4,7 +4,7 @@ Result size of Tidy Core = {terms: 22, types: 10, coercions: 0}
Rec {
T3717.$wfoo [Occ=LoopBreaker] :: GHC.Prim.Int# -> GHC.Prim.Int#
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
T3717.$wfoo =
\ (ww :: GHC.Prim.Int#) ->
case ww of ds {
@@ -17,7 +17,7 @@ T3717.foo [InlPrag=INLINE[0]] :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S(S),U(U)>m,
+ Str=DmdType <S(S),1*U(1*U)>m,
Unf=Unf{Src=Worker=T3717.$wfoo, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T3772.stdout b/tests/simplCore/should_compile/T3772.stdout
index 0b21950..5dadfec 100644
--- a/tests/simplCore/should_compile/T3772.stdout
+++ b/tests/simplCore/should_compile/T3772.stdout
@@ -14,7 +14,7 @@ xs =
end Rec }
T3772.foo [InlPrag=NOINLINE] :: GHC.Types.Int -> ()
-[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U(U)>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U(U)>]
T3772.foo =
\ (n :: GHC.Types.Int) ->
case n of _ { GHC.Types.I# n# ->
diff --git a/tests/simplCore/should_compile/T4201.stdout b/tests/simplCore/should_compile/T4201.stdout
index 9f3c2ac..e93fbd6 100644
--- a/tests/simplCore/should_compile/T4201.stdout
+++ b/tests/simplCore/should_compile/T4201.stdout
@@ -1,3 +1,3 @@
- {- Arity: 1, HasNoCafRefs, Strictness: <S,U>m,
+ {- Arity: 1, HasNoCafRefs, Strictness: <S,1*U()>m,
Unfolding: InlineRule (0, True, True)
Eta.bof `cast` (Sym (Eta.NTCo:Foo[0]) -> Refl Eta.T) -}
diff --git a/tests/simplCore/should_compile/T4908.stderr b/tests/simplCore/should_compile/T4908.stderr
index fa52056..67b02e1 100644
--- a/tests/simplCore/should_compile/T4908.stderr
+++ b/tests/simplCore/should_compile/T4908.stderr
@@ -6,7 +6,7 @@ Rec {
T4908.f_$s$wf [Occ=LoopBreaker]
:: GHC.Prim.Int#
-> GHC.Types.Int -> GHC.Prim.Int# -> GHC.Types.Bool
-[GblId, Arity=3, Caf=NoCafRefs, Str=DmdType <S,U><L,U><L,U>]
+[GblId, Arity=3, Caf=NoCafRefs, Str=DmdType <S,1*U><L,A><L,U>]
T4908.f_$s$wf =
\ (sc :: GHC.Prim.Int#)
(sc1 :: GHC.Types.Int)
@@ -27,7 +27,7 @@ T4908.$wf
[GblId,
Arity=2,
Caf=NoCafRefs,
- Str=DmdType <S,U><L,U(UU(U))>,
+ Str=DmdType <S,1*U><L,1*U(A,U(U))>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [30 20] 101 20}]
@@ -52,7 +52,7 @@ T4908.f [InlPrag=INLINE[0]]
[GblId,
Arity=2,
Caf=NoCafRefs,
- Str=DmdType <S(S),U(U)><L,U(UU(U))>,
+ Str=DmdType <S(S),1*U(1*U)><L,1*U(A,U(U))>,
Unf=Unf{Src=Worker=T4908.$wf, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T4930.stderr b/tests/simplCore/should_compile/T4930.stderr
index 2d7c582..5cde5c0 100644
--- a/tests/simplCore/should_compile/T4930.stderr
+++ b/tests/simplCore/should_compile/T4930.stderr
@@ -13,7 +13,7 @@ T4930.foo1 = GHC.Err.error @ GHC.Types.Int lvl
T4930.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
- Str=DmdType <S,U(U)>m,
+ Str=DmdType <S,1*U(U)>m,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/T7360.stderr b/tests/simplCore/should_compile/T7360.stderr
index a204c9e..70c9184 100644
--- a/tests/simplCore/should_compile/T7360.stderr
+++ b/tests/simplCore/should_compile/T7360.stderr
@@ -17,7 +17,7 @@ T7360.$WFoo3 =
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>]
+[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U>]
T7360.fun1 =
\ (x :: T7360.Foo) -> case x of _ { __DEFAULT -> GHC.Tuple.() }
@@ -41,7 +41,7 @@ T7360.fun3 = GHC.Types.I# 0
T7360.fun2 :: forall a. [a] -> ((), GHC.Types.Int)
[GblId,
Arity=1,
- Str=DmdType <L,U>m,
+ Str=DmdType <L,1*U>m,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
diff --git a/tests/simplCore/should_compile/spec-inline.stderr b/tests/simplCore/should_compile/spec-inline.stderr
index b604214..28e54da 100644
--- a/tests/simplCore/should_compile/spec-inline.stderr
+++ b/tests/simplCore/should_compile/spec-inline.stderr
@@ -44,7 +44,7 @@ Roman.$wgo
-> Data.Maybe.Maybe GHC.Types.Int -> GHC.Prim.Int#
[GblId,
Arity=2,
- Str=DmdType <S,U><S,U>,
+ Str=DmdType <S,1*U><S,1*U>,
Unf=Unf{Src=<vanilla>, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=IF_ARGS [60 30] 253 0}]
@@ -92,7 +92,7 @@ Roman.foo_go [InlPrag=INLINE[0]]
-> Data.Maybe.Maybe GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=2,
- Str=DmdType <S,U><S,U>m,
+ Str=DmdType <S,1*U><S,1*U>m,
Unf=Unf{Src=Worker=Roman.$wgo, TopLvl=True, Arity=2, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
@@ -126,7 +126,7 @@ Roman.foo :: GHC.Types.Int -> GHC.Types.Int
[GblId,
Arity=1,
Caf=NoCafRefs,
- Str=DmdType <S,U>m,
+ Str=DmdType <S,1*U>m,
Unf=Unf{Src=InlineStable, TopLvl=True, Arity=1, Value=True,
ConLike=True, WorkFree=True, Expandable=True,
Guidance=ALWAYS_IF(unsat_ok=True,boring_ok=False)
More information about the ghc-commits
mailing list