GitLab

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

Commits:

8149c987

by Cheng Shao at 2025-12-20T17:06:51-05:00

hadrian: add with_profiled_libs flavour transformer

This patch adds a `with_profiled_libs` flavour transformer to hadrian
which is the exact opposite of `no_profiled_libs`. It adds profiling
ways to stage1+ rts/library ways, and doesn't alter other flavour
settings. It is useful when needing to test profiling logic locally
with a quick flavour.

746b18cd

by Cheng Shao at 2025-12-20T17:06:51-05:00

hadrian: fix missing profiled dynamic libraries in profiled_ghc

This commit fixes the profiled_ghc flavour transformer to include
profiled dynamic libraries as well, since they're supported by GHC
since !12595.

2 changed files:

hadrian/doc/flavours.md
hadrian/src/Flavour.hs

Changes:

hadrian/doc/flavours.md

@@ -249,10 +249,6 @@ The supported transformers are listed below:
      <tr>
          <td><code>profiled_ghc</code></td>
          <td>Build the GHC executable with cost-centre profiling support.
 -            It is recommended that you use this in conjunction with `no_dynamic_ghc` since
 -            GHC does not support loading of profiled libraries with the
 -            dynamic linker. You should use a flavour that builds profiling libs and rts,
 -            i.e. not <code>quick</code>. <br>
              This flag adds cost centres with the -fprof-late flag.</td>
      </tr>
      <tr>
@@ -274,6 +270,10 @@ The supported transformers are listed below:
          <td><code>text_simdutf</code></td>
          <td>Enable building the <code>text</code> package with <code>simdutf</code> support.</td>
      </tr>
 +    <tr>
 +        <td><code>with_profiled_libs</code></td>
 +        <td>Enables building of stage1+ libraries and the RTS in profiled build ways (the opposite of <code>no_profiled_libs</code>).</td>
 +    </tr>
      <tr>
          <td><code>no_profiled_libs</code></td>
          <td>Disables building of libraries in profiled build ways.</td>

hadrian/src/Flavour.hs

@@ -15,6 +15,7 @@ module Flavour
    , enableProfiledGhc
    , disableDynamicGhcPrograms
    , disableDynamicLibs
 +  , enableProfiledLibs
    , disableProfiledLibs
    , enableLinting
    , enableHaddock
@@ -62,6 +63,7 @@ flavourTransformers = M.fromList
      , "no_dynamic_libs"  =: disableDynamicLibs
      , "native_bignum"    =: useNativeBignum
      , "text_simdutf"     =: enableTextWithSIMDUTF
 +    , "with_profiled_libs" =: enableProfiledLibs
      , "no_profiled_libs" =: disableProfiledLibs
      , "omit_pragmas"     =: omitPragmas
      , "ipe"              =: enableIPE
@@ -308,29 +310,11 @@ enableUBSan =
  viaLlvmBackend :: Flavour -> Flavour
  viaLlvmBackend = addArgs $ notStage0 ? builder Ghc ? arg "-fllvm"
 --- | Build the GHC executable with profiling enabled in stages 2 and later. It
 --- is also recommended that you use this with @'dynamicGhcPrograms' = False@
 --- since GHC does not support loading of profiled libraries with the
 --- dynamically-linker.
 +-- | Build the GHC executable with profiling enabled in stages 2 and
 +-- later.
  enableProfiledGhc :: Flavour -> Flavour
  enableProfiledGhc flavour =
 -  enableLateCCS flavour
 -    { rtsWays = do
 -        ws <- rtsWays flavour
 -        mconcat
 -          [ pure ws
 -          , buildingCompilerStage' (>= Stage2) ? pure (foldMap profiled_ways ws)
 -          ]
 -    , libraryWays = mconcat
 -        [ libraryWays flavour
 -        , buildingCompilerStage' (>= Stage2) ? pure (Set.singleton profiling)
 -        ]
 -    , ghcProfiled = (>= Stage2)
 -    }
 -    where
 -      profiled_ways w
 -        | wayUnit Dynamic w = Set.empty
 -        | otherwise         = Set.singleton (w <> profiling)
 +  enableLateCCS $ enableProfiledLibs flavour { ghcProfiled = (>= Stage2) }
  -- | Disable 'dynamicGhcPrograms'.
  disableDynamicGhcPrograms :: Flavour -> Flavour
@@ -347,6 +331,20 @@ disableDynamicLibs flavour =
      prune :: Ways -> Ways
      prune = fmap $ Set.filter (not . wayUnit Dynamic)
 +-- | Build libraries and the RTS in profiled ways (opposite of
 +-- 'disableProfiledLibs').
 +enableProfiledLibs :: Flavour -> Flavour
 +enableProfiledLibs flavour =
 +  flavour
 +    { libraryWays = addProfilingWays $ libraryWays flavour,
 +      rtsWays = addProfilingWays $ rtsWays flavour
 +    }
 +  where
 +    addProfilingWays :: Ways -> Ways
 +    addProfilingWays ways = do
 +      ws <- ways
 +      buildProfiled <- notStage0
 +      pure $ if buildProfiled then ws <> Set.map (<> profiling) ws else ws
  -- | Don't build libraries in profiled 'Way's.
  disableProfiledLibs :: Flavour -> Flavour