Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

10 changed files:

Changes:

  • hadrian/doc/flavours.md
    ... ... @@ -37,8 +37,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    37 37 
       <tr>
    38 38 
         <th>default<br></td>
    39 39 
         <td> </td>
    40 
    -    <td>-O<br>-H32m<br></td>
    41 
    -    <td>-O2<br>-H32m</td>
    40 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS<br></td>
    41 
    +    <td>-O2<br>+RTS<br>-O64M<br>-RTS</td>
    42 42 
         <td></td>
    43 43 
         <td>-haddock</td>
    44 44 
         <td></td>
    ... ... @@ -49,8 +49,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    49 49 
       <tr>
    50 50 
         <th>quick</td>
    51 51 
         <td> </td>
    52 
    -    <td>-O0<br>-H64m</td>
    53 
    -    <td>-O0<br>-H64m</td>
    52 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    53 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    54 54 
         <td></td>
    55 55 
         <td>-O</td>
    56 56 
         <td>-O2</td>
    ... ... @@ -61,8 +61,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    61 61 
       <tr>
    62 62 
         <th>quick-validate</td>
    63 63 
         <td></td>
    64 
    -    <td>-O0<br>-H64m<br>-Werror</td>
    65 
    -    <td>-O0<br>-H64m<br>-Werror</td>
    64 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS<br>-Werror</td>
    65 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS<br>-Werror</td>
    66 66 
         <td></td>
    67 67 
         <td>-O</td>
    68 68 
         <td>-O2</td>
    ... ... @@ -73,8 +73,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    73 73 
       <tr>
    74 74 
         <th>quick-debug</td>
    75 75 
         <td></td>
    76 
    -    <td>-O0<br>-H64m</td>
    77 
    -    <td>-O0<br>-H64m</td>
    76 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    77 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    78 78 
         <td></td>
    79 79 
         <td>-O</td>
    80 80 
         <td>-O2</td>
    ... ... @@ -85,8 +85,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    85 85 
       <tr>
    86 86 
         <th>quickest</td>
    87 87 
         <td></td>
    88 
    -    <td>-O0<br>-H64m</td>
    89 
    -    <td>-O0<br>-H64m</td>
    88 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    89 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    90 90 
         <td></td>
    91 91 
         <td></td>
    92 92 
         <td>-O</td>
    ... ... @@ -97,8 +97,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    97 97 
       <tr>
    98 98 
         <th>perf</td>
    99 99 
         <td> Yes (on supported platforms) </td>
    100 
    -    <td>-O<br>-H64m</td>
    101 
    -    <td>-O<br>-H64m</td>
    100 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    101 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    102 102 
         <td></td>
    103 103 
         <td>-O2</td>
    104 104 
         <td>-O2</td>
    ... ... @@ -109,8 +109,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    109 109 
       <tr>
    110 110 
         <th>release (same as perf with -haddock and +no_self_recomp+hash_unit_ids)</td>
    111 111 
         <td></td>
    112 
    -    <td>-O<br>-H64m</td>
    113 
    -    <td>-O<br>-H64m</td>
    112 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    113 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    114 114 
         <td></td>
    115 115 
         <td>-O2</td>
    116 116 
         <td>-O2</td>
    ... ... @@ -121,8 +121,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    121 121 
       <tr>
    122 122 
         <th>bench</td>
    123 123 
         <td></td>
    124 
    -    <td>-O<br>-H64m</td>
    125 
    -    <td>-O<br>-H64m</td>
    124 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    125 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    126 126 
         <td></td>
    127 127 
         <td>-O2</td>
    128 128 
         <td>-O2</td>
    ... ... @@ -133,8 +133,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    133 133 
       <tr>
    134 134 
         <th>devel1</td>
    135 135 
         <td></td>
    136 
    -    <td>-O<br>-H64m</td>
    137 
    -    <td>-O<br>-H64m</td>
    136 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    137 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    138 138 
         <td></td>
    139 139 
         <td>-dcore-lint</td>
    140 140 
         <td>-O0<br>-DDEBUG</td>
    ... ... @@ -145,8 +145,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    145 145 
       <tr>
    146 146 
         <th>devel2</td>
    147 147 
         <td></td>
    148 
    -    <td>-O<br>-H64m</td>
    149 
    -    <td>-O<br>-H64m</td>
    148 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    149 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
    150 150 
         <td></td>
    151 151 
         <td>-dcore-lint</td>
    152 152 
         <td>-O2</td>
    ... ... @@ -157,7 +157,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    157 157 
       <tr>
    158 158 
         <th>validate</td>
    159 159 
         <td></td>
    160 
    -    <td>-O0<br>-H64m</td>
    160 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    161 161 
         <td>-fllvm-fill-undef-with-garbage<br>-fcheck-prim-bounds</td>
    162 162 
         <td></td>
    163 163 
         <td>-O<br>-dcore-lint<br>-dno-debug-output</td>
    ... ... @@ -169,7 +169,7 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    169 169 
       <tr>
    170 170 
         <th>slow-validate</td>
    171 171 
         <td></td>
    172 
    -    <td>-O0<br>-H64m</td>
    172 
    +    <td>-O0<br>+RTS<br>-O64M<br>-RTS</td>
    173 173 
         <td>-fllvm-fill-undef-with-garbage</td>
    174 174 
         <td></td>
    175 175 
         <td>-O<br>-dcore-lint<br>-dno-debug-output</td>
    ... ... @@ -181,8 +181,8 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
    181 181 
       <tr>
    182 182 
         <th>static</td>
    183 183 
         <td></td>
    184 
    -    <td>-O<br>-H64m<br>-fPIC -static</td>
    185 
    -    <td>-O<br>-H64m<br>-fPIC -static</td>
    184 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS<br>-fPIC -static</td>
    185 
    +    <td>-O<br>+RTS<br>-O64M<br>-RTS<br>-fPIC -static</td>
    186 186 
         <td></td>
    187 187 
         <td>-O2</td>
    188 188 
         <td>-O2</td>

  • hadrian/src/Settings/Default.hs
    ... ... @@ -274,7 +274,7 @@ defaultSourceArgs :: SourceArgs
    274 274 
     defaultSourceArgs = SourceArgs
    275 275 
         { hsDefault  = mconcat [ stage0    ? arg "-O"
    276 276 
                                , notStage0 ? arg "-O2"
    277 
    -                           , arg "-H32m" ]
    277 
    +                           , pure ["+RTS", "-O64M", "-RTS"] ]
    278 278 
         , hsLibrary  = notStage0 ? arg "-haddock"
    279 279 
         , hsCompiler = mempty
    280 280 
         , hsGhc      = mempty }

  • hadrian/src/Settings/Flavours/Benchmark.hs
    ... ... @@ -16,7 +16,7 @@ benchmarkFlavour = defaultFlavour
    16 16
    17 17 
     benchmarkArgs :: Args
    18 18 
     benchmarkArgs = sourceArgs SourceArgs
    19 
    -    { hsDefault  = pure ["-O", "-H64m"]
    19 
    +    { hsDefault  = pure ["-O", "+RTS", "-O64M", "-RTS"]
    20 20 
         , hsLibrary  = pure ["-O2"]
    21 21 
         -- TODO: We should really pass -O2 when notStage0. Otherwise, we aren't
    22 22 
         -- really measuring the overhead of a potential new optimisation we want

  • hadrian/src/Settings/Flavours/Development.hs
    ... ... @@ -26,7 +26,7 @@ developmentFlavour ghcStage = defaultFlavour
    26 26 
     developmentArgs :: Stage -> Args
    27 27 
     developmentArgs ghcStage =
    28 28 
         sourceArgs SourceArgs
    29 
    -        { hsDefault  = mconcat [ pure ["-O", "-H64m"],
    29 
    +        { hsDefault  = mconcat [ pure ["-O", "+RTS", "-O64M", "-RTS"],
    30 30 
                                      -- Disable optimization when building Cabal;
    31 31 
                                      -- this saves many minutes of build time.
    32 32 
                                      package cabal ? pure ["-O0"]]

  • hadrian/src/Settings/Flavours/GhcInGhci.hs
    ... ... @@ -22,7 +22,7 @@ ghcInGhciFlavour = defaultFlavour
    22 22 
     ghciArgs :: Args
    23 23 
     ghciArgs = sourceArgs SourceArgs
    24 24 
         { hsDefault  = mconcat $
    25 
    -        [ pure ["-O0", "-H64m"]
    25 
    +        [ pure ["-O0", "+RTS", "-O64M", "-RTS"]
    26 26 
             ]
    27 27 
         , hsLibrary  = mempty
    28 28 
         , hsCompiler = mempty

  • hadrian/src/Settings/Flavours/Performance.hs
    ... ... @@ -12,7 +12,7 @@ performanceFlavour = splitSections $ enableLateCCS $ defaultFlavour
    12 12
    13 13 
     performanceArgs :: Args
    14 14 
     performanceArgs = sourceArgs SourceArgs
    15 
    -    { hsDefault  = pure ["-O", "-H64m"]
    15 
    +    { hsDefault  = pure ["-O", "+RTS", "-O64M", "-RTS"]
    16 16 
         , hsLibrary  = orM [notStage0, cross] ? arg "-O2"
    17 17 
         , hsCompiler = pure ["-O2"]
    18 18 
         , hsGhc      = mconcat

  • hadrian/src/Settings/Flavours/Quick.hs
    ... ... @@ -34,7 +34,7 @@ quickFlavour = defaultFlavour
    34 34
    35 35 
     quickArgs :: Args
    36 36 
     quickArgs = sourceArgs SourceArgs
    37 
    -    { hsDefault  = mconcat [ pure ["-O0", "-H64m"] ]
    37 
    +    { hsDefault  = mconcat [ pure ["-O0", "+RTS", "-O64M", "-RTS"] ]
    38 38 
         , hsLibrary  = notStage0 ? arg "-O"
    39 39 
         , hsCompiler = stage0 ? arg "-O2"
    40 40 
         , hsGhc      = stage0 ? arg "-O" }

  • hadrian/src/Settings/Flavours/QuickCross.hs
    ... ... @@ -32,7 +32,7 @@ quickCrossFlavour = defaultFlavour
    32 32 
     quickCrossArgs :: Args
    33 33 
     quickCrossArgs = sourceArgs SourceArgs
    34 34 
         { hsDefault  = mconcat $
    35 
    -        [ pure ["-O0", "-H64m"]
    35 
    +        [ pure ["-O0", "+RTS", "-O64M", "-RTS"]
    36 36 
             ]
    37 37 
         , hsLibrary  = notStage0 ? mconcat [ arg "-O", arg "-fllvm" ]
    38 38 
         , hsCompiler = stage0 ? arg "-O2"

  • hadrian/src/Settings/Flavours/Quickest.hs
    ... ... @@ -19,7 +19,7 @@ quickestFlavour = defaultFlavour
    19 19 
     quickestArgs :: Args
    20 20 
     quickestArgs = sourceArgs SourceArgs
    21 21 
         { hsDefault  = mconcat $
    22 
    -        [ pure ["-O0", "-H64m"]
    22 
    +        [ pure ["-O0", "+RTS", "-O64M", "-RTS"]
    23 23 
             ]
    24 24 
         , hsLibrary  = mempty
    25 25 
         , hsCompiler = stage0 ? arg "-O"

  • hadrian/src/Settings/Flavours/Validate.hs
    ... ... @@ -16,11 +16,12 @@ validateFlavour = enableLinting $ quickValidateFlavour
    16 16
    17 17 
     validateArgs :: Args
    18 18 
     validateArgs = sourceArgs SourceArgs
    19 
    -    { hsDefault  = mconcat [ stage0 ? pure ["-O0", "-H64m"]
    19 
    +    { hsDefault  = mconcat [ stage0 ? pure ["-O0"]
    20 20 
                                  -- See #11487
    21 21 
                                , notStage0 ? arg "-fllvm-fill-undef-with-garbage"
    22 22 
                                , notStage0 ? arg "-dno-debug-output"
    23 23 
                                , notStage0 ? arg "-fcheck-prim-bounds"
    24 
    +                           , pure ["+RTS", "-O64M", "-RTS"]
    24 25 
                                ]
    25 26 
         , hsLibrary  = pure ["-O"]
    26 27 
         , hsCompiler = mconcat [ stage0 ? pure ["-O2"]
    ... ... @@ -37,7 +38,7 @@ slowValidateFlavour = validateFlavour
    37 38
    38 39 
     quickValidateArgs :: Args
    39 40 
     quickValidateArgs = sourceArgs SourceArgs
    40 
    -    { hsDefault  = mempty
    41 
    +    { hsDefault  = pure ["+RTS", "-O64M", "-RTS"]
    41 42 
         , hsLibrary  = pure [ "-O" ]
    42 43 
         , hsCompiler = mconcat [ stage0 ? arg "-O2", notStage0 ? arg "-O"]
    43 44 
         , hsGhc      = pure [ "-O", "-hide-all-packages" ]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help