diff options
author | Simon Peyton Jones <simonpj@microsoft.com> | 2016-01-06 17:40:09 +0000 |
---|---|---|
committer | Simon Peyton Jones <simonpj@microsoft.com> | 2016-01-07 08:37:23 +0000 |
commit | 9915b6564403a6d17651e9969e9ea5d7d7e78e7f (patch) | |
tree | e064a66dca1e8d1be5e04d0349c53e99fe391353 /testsuite | |
parent | a5cea73c658888e01c162723d3e0e1439514ecdb (diff) | |
download | haskell-9915b6564403a6d17651e9969e9ea5d7d7e78e7f.tar.gz |
Make demand analysis understand catch
As Trac #11222, and #10712 note, the strictness analyser
needs to be rather careful about exceptions. Previously
it treated them as identical to divergence, but that
won't quite do.
See Note [Exceptions and strictness] in Demand, which
explains the deal.
Getting more strictness in 'catch' and friends is a
very good thing. Here is the nofib summary, keeping
only the big ones.
--------------------------------------------------------------------------------
Program Size Allocs Runtime Elapsed TotalMem
--------------------------------------------------------------------------------
fasta -0.1% -6.9% -3.0% -3.0% +0.0%
hpg -0.1% -2.0% -6.2% -6.2% +0.0%
maillist -0.1% -0.3% 0.08 0.09 +1.2%
reverse-complem -0.1% -10.9% -6.0% -5.9% +0.0%
sphere -0.1% -4.3% 0.08 0.08 +0.0%
x2n1 -0.1% -0.0% 0.00 0.00 +0.0%
--------------------------------------------------------------------------------
Min -0.2% -10.9% -17.4% -17.3% +0.0%
Max -0.0% +0.0% +4.3% +4.4% +1.2%
Geometric Mean -0.1% -0.3% -2.9% -3.0% +0.0%
On the way I did quite a bit of refactoring in Demand.hs
Diffstat (limited to 'testsuite')
8 files changed, 13 insertions, 13 deletions
diff --git a/testsuite/tests/deSugar/should_compile/T2431.stderr b/testsuite/tests/deSugar/should_compile/T2431.stderr index 37bf170f28..0184513754 100644 --- a/testsuite/tests/deSugar/should_compile/T2431.stderr +++ b/testsuite/tests/deSugar/should_compile/T2431.stderr @@ -55,7 +55,7 @@ T2431.$tc:~: = -- RHS size: {terms: 4, types: 8, coercions: 0} absurd :: forall a. Int :~: Bool -> a -[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>b] +[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>x] absurd = \ (@ a4) (x :: Int :~: Bool) -> case x of _ [Occ=Dead] { } diff --git a/testsuite/tests/numeric/should_compile/T7116.stdout b/testsuite/tests/numeric/should_compile/T7116.stdout index f64b8414b3..373e3c5ec8 100644 --- a/testsuite/tests/numeric/should_compile/T7116.stdout +++ b/testsuite/tests/numeric/should_compile/T7116.stdout @@ -35,7 +35,7 @@ dr :: Double -> Double [GblId, Arity=1, Caf=NoCafRefs, - Str=DmdType <S,1*U(U)>m, + Str=DmdType <S(S),1*U(U)>m, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) @@ -54,7 +54,7 @@ dl :: Double -> Double [GblId, Arity=1, Caf=NoCafRefs, - Str=DmdType <S,1*U(U)>m, + Str=DmdType <S(S),1*U(U)>m, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) @@ -69,7 +69,7 @@ fr :: Float -> Float [GblId, Arity=1, Caf=NoCafRefs, - Str=DmdType <S,1*U(U)>m, + Str=DmdType <S(S),1*U(U)>m, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) @@ -88,7 +88,7 @@ fl :: Float -> Float [GblId, Arity=1, Caf=NoCafRefs, - Str=DmdType <S,1*U(U)>m, + Str=DmdType <S(S),1*U(U)>m, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) diff --git a/testsuite/tests/simplCore/should_compile/T3772.stdout b/testsuite/tests/simplCore/should_compile/T3772.stdout index 130ee076e1..679d1eb2f6 100644 --- a/testsuite/tests/simplCore/should_compile/T3772.stdout +++ b/testsuite/tests/simplCore/should_compile/T3772.stdout @@ -16,7 +16,7 @@ end Rec } -- RHS size: {terms: 14, types: 5, coercions: 0} foo [InlPrag=NOINLINE] :: Int -> () -[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,1*U(U)>] +[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S(S),1*U(U)>] foo = \ (n :: Int) -> case n of _ [Occ=Dead] { GHC.Types.I# y -> diff --git a/testsuite/tests/simplCore/should_compile/T4930.stderr b/testsuite/tests/simplCore/should_compile/T4930.stderr index c145cad6e8..d7d97d5ab0 100644 --- a/testsuite/tests/simplCore/should_compile/T4930.stderr +++ b/testsuite/tests/simplCore/should_compile/T4930.stderr @@ -34,7 +34,7 @@ Rec { -- RHS size: {terms: 23, types: 6, coercions: 0} T4930.$wfoo [InlPrag=[0], Occ=LoopBreaker] :: GHC.Prim.Int# -> GHC.Prim.Int# -[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <L,U>] +[GblId, Arity=1, Caf=NoCafRefs, Str=DmdType <S,U>] T4930.$wfoo = \ (ww :: GHC.Prim.Int#) -> case case GHC.Prim.tagToEnum# @ Bool (GHC.Prim.<# ww 5#) @@ -53,7 +53,7 @@ foo [InlPrag=INLINE[0]] :: Int -> Int [GblId, Arity=1, Caf=NoCafRefs, - Str=DmdType <S,1*U(U)>m, + Str=DmdType <S(S),1*U(U)>m, Unf=Unf{Src=InlineStable, TopLvl=True, Value=True, ConLike=True, WorkFree=True, Expandable=True, Guidance=ALWAYS_IF(arity=1,unsat_ok=True,boring_ok=False) diff --git a/testsuite/tests/simplCore/should_compile/spec-inline.stderr b/testsuite/tests/simplCore/should_compile/spec-inline.stderr index 27981eebd4..c19aef0555 100644 --- a/testsuite/tests/simplCore/should_compile/spec-inline.stderr +++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr @@ -32,7 +32,7 @@ Roman.$trModule = -- RHS size: {terms: 2, types: 2, coercions: 0} Roman.foo3 :: Int -[GblId, Str=DmdType b] +[GblId, Str=DmdType x] Roman.foo3 = Control.Exception.Base.patError @ 'GHC.Types.Lifted diff --git a/testsuite/tests/stranal/sigs/HyperStrUse.stderr b/testsuite/tests/stranal/sigs/HyperStrUse.stderr index f04a2118fd..442576db56 100644 --- a/testsuite/tests/stranal/sigs/HyperStrUse.stderr +++ b/testsuite/tests/stranal/sigs/HyperStrUse.stderr @@ -1,6 +1,6 @@ ==================== Strictness signatures ==================== HyperStrUse.$trModule: m -HyperStrUse.f: <S(SL),1*U(1*U(U),A)><S,1*U>m +HyperStrUse.f: <S(S(S)L),1*U(1*U(U),A)><S,1*U>m diff --git a/testsuite/tests/stranal/sigs/T8598.stderr b/testsuite/tests/stranal/sigs/T8598.stderr index 477d408157..28d5dd0c7d 100644 --- a/testsuite/tests/stranal/sigs/T8598.stderr +++ b/testsuite/tests/stranal/sigs/T8598.stderr @@ -1,6 +1,6 @@ ==================== Strictness signatures ==================== T8598.$trModule: m -T8598.fun: <S,1*U(U)>m +T8598.fun: <S(S),1*U(U)>m diff --git a/testsuite/tests/stranal/sigs/UnsatFun.stderr b/testsuite/tests/stranal/sigs/UnsatFun.stderr index 5f2d27ff20..f5093981eb 100644 --- a/testsuite/tests/stranal/sigs/UnsatFun.stderr +++ b/testsuite/tests/stranal/sigs/UnsatFun.stderr @@ -1,8 +1,8 @@ ==================== Strictness signatures ==================== UnsatFun.$trModule: m -UnsatFun.f: <B,1*U(U)><B,A>b -UnsatFun.g: <B,1*U(U)>b +UnsatFun.f: <B,1*U(U)><B,A>x +UnsatFun.g: <B,1*U(U)>x UnsatFun.g': <L,1*U(U)> UnsatFun.g3: <L,U(U)>m UnsatFun.h: <C(S),1*C1(U(U))> |