Commit 646e3dc2 authored by Sebastian Graf's avatar Sebastian Graf Committed by Marge Bot

Add a bench flavour to Hadrian

parent 505c5ab2
...@@ -87,6 +87,17 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH ...@@ -87,6 +87,17 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
<td>-O</td> <td>-O</td>
<td>-O</td> <td>-O</td>
</tr> </tr>
<tr>
<th>bench</td>
<td>-O<br>-H64m</td>
<td>-O<br>-H64m</td>
<td></td>
<td>-O2</td>
<td>-O2</td>
<td>-O0</td>
<td>-O2</td>
<td>-O2</td>
</tr>
<tr> <tr>
<th>devel1</td> <th>devel1</td>
<td>-O<br>-H64m</td> <td>-O<br>-H64m</td>
...@@ -109,41 +120,16 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH ...@@ -109,41 +120,16 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
<td></td> <td></td>
<td>-O0<br>-DDEBUG</td> <td>-O0<br>-DDEBUG</td>
</tr> </tr>
<tr>
<th>quick-llvm</td>
<td>-O0<br>-H64m<br>-fllvm</td>
<td>-O0<br>-H64m<br>-fllvm</td>
<td></td>
<td>-O</td>
<td>-O</td>
<td></td>
<td>-O</td>
<td></td>
</tr>
<tr>
<th>perf-llvm</td>
<td>-O<br>-H64m<br>-fllvm</td>
<td>-O<br>-H64m<br>-fllvm</td>
<td></td>
<td>-O2</td>
<td>-O</td>
<td>-O2</td>
<td>-O</td>
<td>-O2</td>
</tr>
<tr>
<th>prof-llvm</td>
<td>-O0<br>-H64m<br>-fllvm</td>
<td>-O0<br>-H64m<br>-fllvm</td>
<td></td>
<td>-O</td>
<td>-O</td>
<td>-O</td>
<td>-O</td>
<td>-O</td>
</tr>
</table> </table>
### LLVM variants
In addition to the above, there are LLVM variants for the flavours `quick`,
`prof`, `perf` and `bench`, available by appending a `-llvm` suffix (i.e.,
`quick-llvm` for the LLVM variant of `quick`). These differ only in that there
is an additional `-fllvm` flag in `hsDefault` when the stage0 compiler is GHC.
See `src/Settings/Flavours/Llvm.hs` for details.
## Ways ## Ways
Libraries and GHC can be built in different _ways_, e.g. with or without profiling Libraries and GHC can be built in different _ways_, e.g. with or without profiling
...@@ -197,7 +183,7 @@ information. The following table lists ways that are built in different flavours ...@@ -197,7 +183,7 @@ information. The following table lists ways that are built in different flavours
<td>No</td> <td>No</td>
</tr> </tr>
<tr> <tr>
<th>quickest</th> <th>quickest<br>bench</th>
<td>vanilla</td> <td>vanilla</td>
<td>vanilla</td> <td>vanilla</td>
<td>vanilla<br>threaded</td> <td>vanilla<br>threaded</td>
......
...@@ -89,6 +89,7 @@ executable hadrian ...@@ -89,6 +89,7 @@ executable hadrian
, Settings.Builders.RunTest , Settings.Builders.RunTest
, Settings.Builders.Xelatex , Settings.Builders.Xelatex
, Settings.Default , Settings.Default
, Settings.Flavours.Benchmark
, Settings.Flavours.Common , Settings.Flavours.Common
, Settings.Flavours.Development , Settings.Flavours.Development
, Settings.Flavours.Llvm , Settings.Flavours.Llvm
......
...@@ -11,6 +11,7 @@ import Packages ...@@ -11,6 +11,7 @@ import Packages
import UserSettings (userFlavours, userPackages, userDefaultFlavour) import UserSettings (userFlavours, userPackages, userDefaultFlavour)
import {-# SOURCE #-} Settings.Default import {-# SOURCE #-} Settings.Default
import Settings.Flavours.Benchmark
import Settings.Flavours.Development import Settings.Flavours.Development
import Settings.Flavours.Llvm import Settings.Flavours.Llvm
import Settings.Flavours.Performance import Settings.Flavours.Performance
...@@ -36,9 +37,9 @@ stagePackages stage = do ...@@ -36,9 +37,9 @@ stagePackages stage = do
hadrianFlavours :: [Flavour] hadrianFlavours :: [Flavour]
hadrianFlavours = hadrianFlavours =
[ defaultFlavour, developmentFlavour Stage1, developmentFlavour Stage2 [ benchmarkFlavour, defaultFlavour, developmentFlavour Stage1
, performanceFlavour, profiledFlavour, quickFlavour, quickestFlavour , developmentFlavour Stage2, performanceFlavour, profiledFlavour
, quickCrossFlavour , quickFlavour, quickestFlavour, quickCrossFlavour, benchmarkLlvmFlavour
, performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour , performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour
, ghcInGhciFlavour ] , ghcInGhciFlavour ]
......
module Settings.Flavours.Benchmark (benchmarkFlavour) where
import Expression
import Flavour
import {-# SOURCE #-} Settings.Default
-- Please update doc/flavours.md when changing this file.
benchmarkFlavour :: Flavour
benchmarkFlavour = defaultFlavour
{ name = "bench"
, args = defaultBuilderArgs <> benchmarkArgs <> defaultPackageArgs
, libraryWays = pure [vanilla]
, rtsWays = pure [vanilla, threaded] }
benchmarkArgs :: Args
benchmarkArgs = sourceArgs SourceArgs
{ hsDefault = pure ["-O", "-H64m"]
, hsLibrary = pure ["-O2"]
-- TODO: We should really pass -O2 when notStage0. Otherwise, we aren't
-- really measuring the overhead of a potential new optimisation we want
-- to benchmark. This has to happen in sync with the Makefile build, though.
, hsCompiler = mconcat [stage0 ? arg "-O2", notStage0 ? arg "-O0"]
, hsGhc = pure ["-O2"] }
module Settings.Flavours.Llvm ( module Settings.Flavours.Llvm (
benchmarkLlvmFlavour,
performanceLlvmFlavour, performanceLlvmFlavour,
profiledLlvmFlavour, profiledLlvmFlavour,
quickLlvmFlavour, quickLlvmFlavour,
...@@ -7,12 +8,14 @@ module Settings.Flavours.Llvm ( ...@@ -7,12 +8,14 @@ module Settings.Flavours.Llvm (
import Expression import Expression
import Flavour import Flavour
import Settings.Flavours.Benchmark
import Settings.Flavours.Performance import Settings.Flavours.Performance
import Settings.Flavours.Profiled import Settings.Flavours.Profiled
import Settings.Flavours.Quick import Settings.Flavours.Quick
-- Please update doc/flavours.md when changing this file. -- Please update doc/flavours.md when changing this file.
performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour :: Flavour benchmarkLlvmFlavour, performanceLlvmFlavour, profiledLlvmFlavour, quickLlvmFlavour :: Flavour
benchmarkLlvmFlavour = mkLlvmFlavour benchmarkFlavour
performanceLlvmFlavour = mkLlvmFlavour performanceFlavour performanceLlvmFlavour = mkLlvmFlavour performanceFlavour
profiledLlvmFlavour = mkLlvmFlavour profiledFlavour profiledLlvmFlavour = mkLlvmFlavour profiledFlavour
quickLlvmFlavour = mkLlvmFlavour quickFlavour quickLlvmFlavour = mkLlvmFlavour quickFlavour
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment