GitLab

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

Commits:

604e1180

by Cheng Shao at 2026-03-11T15:00:42-04:00

hadrian: remove the broken bench flavour

This patch removes the bench flavour from hadrian which has been
broken for years and not used for actual benchmarking (for which
`perf`/`release` is used instead). Closes #26825.

4 changed files:

hadrian/doc/flavours.md
hadrian/hadrian.cabal
hadrian/src/Settings.hs
− hadrian/src/Settings/Flavours/Benchmark.hs

Changes:

hadrian/doc/flavours.md

@@ -118,18 +118,6 @@ when compiling the `compiler` library, and `hsGhc` when compiling/linking the GH
      <td>-O</td>
      <td>-O2</td>
    </tr>
 -  <tr>
 -    <th>bench</td>
 -    <td></td>
 -    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
 -    <td>-O<br>+RTS<br>-O64M<br>-RTS</td>
 -    <td></td>
 -    <td>-O2</td>
 -    <td>-O2</td>
 -    <td>-O0</td>
 -    <td>-O2</td>
 -    <td>-O2</td>
 -  </tr>
    <tr>
      <th>devel1</td>
      <td></td>
@@ -404,7 +392,7 @@ information. The following table lists ways that are built in different flavours
      <td>debug<br>threaded<br>threadedDebug<br>debugDynamic<br>threadedDynamic<br>threadedDebugDynamic</td>
  </tr>
  <tr>
 -    <th>quickest<br>bench</th>
 +    <th>quickest</th>
      <td>vanilla</td>
      <td>vanilla</td>
      <td>vanilla<br>threaded</td>

hadrian/hadrian.cabal

@@ -119,7 +119,6 @@ executable hadrian
                         , Settings.Builders.Win32Tarballs
                         , Settings.Builders.Xelatex
                         , Settings.Default
 -                       , Settings.Flavours.Benchmark
                         , Settings.Flavours.Development
                         , Settings.Flavours.GhcInGhci
                         , Settings.Flavours.Performance

hadrian/src/Settings.hs

@@ -17,7 +17,6 @@ import Settings.Parser
  import UserSettings (userFlavours, userPackages, userDefaultFlavour)
  import {-# SOURCE #-} Settings.Default
 -import Settings.Flavours.Benchmark
  import Settings.Flavours.Development
  import Settings.Flavours.GhcInGhci
  import Settings.Flavours.Performance
@@ -59,7 +58,7 @@ stagePackages stage = do
  hadrianFlavours :: [Flavour]
  hadrianFlavours =
 -    [ benchmarkFlavour, defaultFlavour, developmentFlavour Stage1
 +    [ defaultFlavour, developmentFlavour Stage1
      , developmentFlavour Stage2, performanceFlavour
      , releaseFlavour
      , quickFlavour, quickValidateFlavour, quickDebugFlavour

hadrian/src/Settings/Flavours/Benchmark.hs deleted

 -module Settings.Flavours.Benchmark (benchmarkFlavour) where
+-
 -import qualified Data.Set as Set
 -import Expression
 -import Flavour
 -import Oracles.Flag
 -import {-# SOURCE #-} Settings.Default
+-
 --- Please update doc/flavours.md when changing this file.
 -benchmarkFlavour :: Flavour
 -benchmarkFlavour = defaultFlavour
 -    { name = "bench"
 -    , extraArgs = benchmarkArgs <> defaultHaddockExtraArgs
 -    , libraryWays = pure $ Set.fromList [vanilla]
 -    , rtsWays = Set.fromList <$> mconcat [pure [vanilla], targetSupportsThreadedRts ? pure [threaded]] }
+-
 -benchmarkArgs :: Args
 -benchmarkArgs = sourceArgs SourceArgs
 -    { hsDefault  = pure ["-O", "+RTS", "-O64M", "-RTS"]
 -    , 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"] }