[commit: ghc] master: User's Guide: various unfolding-related fixes (2388146)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/238814620e188e4f3ff22950960c41994211fdc0/ghc

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

commit 238814620e188e4f3ff22950960c41994211fdc0
Author: Reid Barton <rwbarton at gmail.com>
Date:   Thu Sep 25 23:10:50 2014 -0500

    User's Guide: various unfolding-related fixes
    
    Test Plan: harbormaster
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: simonmar, ezyang, carter, thomie
    
    Differential Revision: https://phabricator.haskell.org/D243


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

238814620e188e4f3ff22950960c41994211fdc0
 docs/users_guide/flags.xml | 15 +++++++++++----
 docs/users_guide/using.xml |  8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 94b4598..affe194 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -1937,28 +1937,35 @@
             <entry><option>-funfolding-creation-threshold</option></entry>
             <entry>Tweak unfolding settings</entry>
             <entry>dynamic</entry>
-            <entry><option>-fno-unfolding-creation-threshold</option></entry>
+            <entry>-</entry>
           </row>
 
           <row>
             <entry><option>-funfolding-fun-discount</option></entry>
             <entry>Tweak unfolding settings</entry>
             <entry>dynamic</entry>
-            <entry><option>-fno-unfolding-fun-discount</option></entry>
+            <entry>-</entry>
+          </row>
+
+          <row>
+            <entry><option>-funfolding-dict-discount</option></entry>
+            <entry>Tweak unfolding settings</entry>
+            <entry>dynamic</entry>
+            <entry>-</entry>
           </row>
 
           <row>
             <entry><option>-funfolding-keeness-factor</option></entry>
             <entry>Tweak unfolding settings</entry>
             <entry>dynamic</entry>
-            <entry><option>-fno-unfolding-keeness-factor</option></entry>
+            <entry>-</entry>
           </row>
 
           <row>
             <entry><option>-funfolding-use-threshold</option></entry>
             <entry>Tweak unfolding settings</entry>
             <entry>dynamic</entry>
-            <entry><option>-fno-unfolding-use-threshold</option></entry>
+            <entry>-</entry>
           </row>
 
           <row>
diff --git a/docs/users_guide/using.xml b/docs/users_guide/using.xml
index 09747ae..54c127d 100644
--- a/docs/users_guide/using.xml
+++ b/docs/users_guide/using.xml
@@ -2475,7 +2475,7 @@ _  = rhs3        -- No warning: lone wild-card pattern
             <indexterm><primary>unfolding, controlling</primary></indexterm>
           </term>
           <listitem>
-            <para>(Default: 45) Governs the maximum size that GHC will allow a
+            <para>(Default: 750) Governs the maximum size that GHC will allow a
             function unfolding to be. (An unfolding has a “size”
             that reflects the cost in terms of “code bloat” of
             expanding (aka inlining) that unfolding at a call site. A bigger
@@ -2502,12 +2502,12 @@ _  = rhs3        -- No warning: lone wild-card pattern
             <indexterm><primary>unfolding, controlling</primary></indexterm>
           </term>
           <listitem>
-            <para>(Default: 8) This is the magic cut-off figure for unfolding
+            <para>(Default: 60) This is the magic cut-off figure for unfolding
             (aka inlining): below this size, a function definition will be
             unfolded at the call-site, any bigger and it won't. The size
             computed for a function depends on two things: the actual size of
-            the expression minus any discounts that
-            apply (see <option>-funfolding-con-discount</option>).
+            the expression minus any discounts that apply depending on the
+            context into which the expression is to be inlined.
             </para>
 
             <para>The difference between this and