diff options
author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-07-15 17:16:49 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-08-18 17:57:42 -0400 |
commit | 5f0d2dab9be5b0f89d61e9957bb728538b162230 (patch) | |
tree | 46a725692e2cea227160a61266063cc4a5c2444a /compiler/GHC/Unit | |
parent | 0ba21dbe28882d506c3536c40224ebff337a9f49 (diff) | |
download | haskell-5f0d2dab9be5b0f89d61e9957bb728538b162230.tar.gz |
Driver rework pt3: the upsweep
This patch specifies and simplifies the module cycle compilation
in upsweep. How things work are described in the Note [Upsweep]
Note [Upsweep]
~~~~~~~~~~~~~~
Upsweep takes a 'ModuleGraph' as input, computes a build plan and then executes
the plan in order to compile the project.
The first step is computing the build plan from a 'ModuleGraph'.
The output of this step is a `[BuildPlan]`, which is a topologically sorted plan for
how to build all the modules.
```
data BuildPlan = SingleModule ModuleGraphNode -- A simple, single module all alone but *might* have an hs-boot file which isn't part of a cycle
| ResolvedCycle [ModuleGraphNode] -- A resolved cycle, linearised by hs-boot files
| UnresolvedCycle [ModuleGraphNode] -- An actual cycle, which wasn't resolved by hs-boot files
```
The plan is computed in two steps:
Step 1: Topologically sort the module graph without hs-boot files. This returns a [SCC ModuleGraphNode] which contains
cycles.
Step 2: For each cycle, topologically sort the modules in the cycle *with* the relevant hs-boot files. This should
result in an acyclic build plan if the hs-boot files are sufficient to resolve the cycle.
The `[BuildPlan]` is then interpreted by the `interpretBuildPlan` function.
* `SingleModule nodes` are compiled normally by either the upsweep_inst or upsweep_mod functions.
* `ResolvedCycles` need to compiled "together" so that the information which ends up in
the interface files at the end is accurate (and doesn't contain temporary information from
the hs-boot files.)
- During the initial compilation, a `KnotVars` is created which stores an IORef TypeEnv for
each module of the loop. These IORefs are gradually updated as the loop completes and provide
the required laziness to typecheck the module loop.
- At the end of typechecking, all the interface files are typechecked again in
the retypecheck loop. This time, the knot-tying is done by the normal laziness
based tying, so the environment is run without the KnotVars.
* UnresolvedCycles are indicative of a proper cycle, unresolved by hs-boot files
and are reported as an error to the user.
The main trickiness of `interpretBuildPlan` is deciding which version of a dependency
is visible from each module. For modules which are not in a cycle, there is just
one version of a module, so that is always used. For modules in a cycle, there are two versions of
'HomeModInfo'.
1. Internal to loop: The version created whilst compiling the loop by upsweep_mod.
2. External to loop: The knot-tied version created by typecheckLoop.
Whilst compiling a module inside the loop, we need to use the (1). For a module which
is outside of the loop which depends on something from in the loop, the (2) version
is used.
As the plan is interpreted, which version of a HomeModInfo is visible is updated
by updating a map held in a state monad. So after a loop has finished being compiled,
the visible module is the one created by typecheckLoop and the internal version is not
used again.
This plan also ensures the most important invariant to do with module loops:
> If you depend on anything within a module loop, before you can use the dependency,
the whole loop has to finish compiling.
The end result of `interpretBuildPlan` is a `[MakeAction]`, which are pairs
of `IO a` actions and a `MVar (Maybe a)`, somewhere to put the result of running
the action. This list is topologically sorted, so can be run in order to compute
the whole graph.
As well as this `interpretBuildPlan` also outputs an `IO [Maybe (Maybe HomeModInfo)]` which
can be queried at the end to get the result of all modules at the end, with their proper
visibility. For example, if any module in a loop fails then all modules in that loop will
report as failed because the visible node at the end will be the result of retypechecking
those modules together.
Along the way we also fix a number of other bugs in the driver:
* Unify upsweep and parUpsweep.
* Fix #19937 (static points, ghci and -j)
* Adds lots of module loop tests due to Divam.
Also related to #20030
Co-authored-by: Divam Narula <dfordivam@gmail.com>
-------------------------
Metric Decrease:
T10370
-------------------------
Diffstat (limited to 'compiler/GHC/Unit')
-rw-r--r-- | compiler/GHC/Unit/Home/ModInfo.hs | 15 | ||||
-rw-r--r-- | compiler/GHC/Unit/Module/Graph.hs | 6 | ||||
-rw-r--r-- | compiler/GHC/Unit/Module/ModSummary.hs | 4 | ||||
-rw-r--r-- | compiler/GHC/Unit/Types.hs-boot | 10 |
4 files changed, 26 insertions, 9 deletions
diff --git a/compiler/GHC/Unit/Home/ModInfo.hs b/compiler/GHC/Unit/Home/ModInfo.hs index fd97689972..3450844cb5 100644 --- a/compiler/GHC/Unit/Home/ModInfo.hs +++ b/compiler/GHC/Unit/Home/ModInfo.hs @@ -10,10 +10,12 @@ module GHC.Unit.Home.ModInfo , mapHpt , delFromHpt , addToHpt + , addHomeModInfoToHpt , addListToHpt , lookupHptDirectly , lookupHptByModule , listToHpt + , listHMIToHpt , pprHPT ) where @@ -30,6 +32,8 @@ import GHC.Types.Unique import GHC.Types.Unique.DFM import GHC.Utils.Outputable +import Data.List +import Data.Ord -- | Information about modules in the package being compiled data HomeModInfo = HomeModInfo @@ -93,6 +97,9 @@ delFromHpt = delFromUDFM addToHpt :: HomePackageTable -> ModuleName -> HomeModInfo -> HomePackageTable addToHpt = addToUDFM +addHomeModInfoToHpt :: HomeModInfo -> HomePackageTable -> HomePackageTable +addHomeModInfoToHpt hmi hpt = addToHpt hpt (moduleName (mi_module (hm_iface hmi))) hmi + addListToHpt :: HomePackageTable -> [(ModuleName, HomeModInfo)] -> HomePackageTable addListToHpt = addListToUDFM @@ -100,6 +107,14 @@ addListToHpt = addListToUDFM listToHpt :: [(ModuleName, HomeModInfo)] -> HomePackageTable listToHpt = listToUDFM +listHMIToHpt :: [HomeModInfo] -> HomePackageTable +listHMIToHpt hmis = + listToHpt [(moduleName (mi_module (hm_iface hmi)), hmi) | hmi <- sorted_hmis] + where + -- Sort to put Non-boot things last, so they overwrite the boot interfaces + -- in the HPT, other than that, the order doesn't matter + sorted_hmis = sortOn (Down . mi_boot . hm_iface) hmis + lookupHptByModule :: HomePackageTable -> Module -> Maybe HomeModInfo -- The HPT is indexed by ModuleName, not Module, -- we must check for a hit on the right Module diff --git a/compiler/GHC/Unit/Module/Graph.hs b/compiler/GHC/Unit/Module/Graph.hs index 5b5d152711..027cbef51b 100644 --- a/compiler/GHC/Unit/Module/Graph.hs +++ b/compiler/GHC/Unit/Module/Graph.hs @@ -21,7 +21,7 @@ module GHC.Unit.Module.Graph , needsTemplateHaskellOrQQ , isTemplateHaskellOrQQNonBoot , showModMsg - ) + , moduleGraphNodeModule) where import GHC.Prelude @@ -54,6 +54,10 @@ data ModuleGraphNode -- | There is a module summary node for each module, signature, and boot module being built. | ModuleNode ExtendedModSummary +moduleGraphNodeModule :: ModuleGraphNode -> Maybe ExtendedModSummary +moduleGraphNodeModule (InstantiationNode {}) = Nothing +moduleGraphNodeModule (ModuleNode ems) = Just ems + instance Outputable ModuleGraphNode where ppr = \case InstantiationNode iuid -> ppr iuid diff --git a/compiler/GHC/Unit/Module/ModSummary.hs b/compiler/GHC/Unit/Module/ModSummary.hs index d36636e340..ba59655033 100644 --- a/compiler/GHC/Unit/Module/ModSummary.hs +++ b/compiler/GHC/Unit/Module/ModSummary.hs @@ -11,7 +11,6 @@ module GHC.Unit.Module.ModSummary , ms_mod_name , ms_imps , ms_mnwib - , ms_home_allimps , ms_home_srcimps , ms_home_imps , msHiFilePath @@ -128,9 +127,6 @@ home_imps imps = [ lmodname | (mb_pkg, lmodname) <- imps, isLocal (Just pkg) | pkg == fsLit "this" = True -- "this" is special isLocal _ = False -ms_home_allimps :: ModSummary -> [ModuleName] -ms_home_allimps ms = map unLoc (ms_home_srcimps ms ++ ms_home_imps ms) - -- | Like 'ms_home_imps', but for SOURCE imports. ms_home_srcimps :: ModSummary -> [Located ModuleName] ms_home_srcimps = home_imps . ms_srcimps diff --git a/compiler/GHC/Unit/Types.hs-boot b/compiler/GHC/Unit/Types.hs-boot index f8ad571935..fa4dde3feb 100644 --- a/compiler/GHC/Unit/Types.hs-boot +++ b/compiler/GHC/Unit/Types.hs-boot @@ -1,13 +1,15 @@ +{-# LANGUAGE KindSignatures #-} module GHC.Unit.Types where import GHC.Prelude () import {-# SOURCE #-} GHC.Utils.Outputable -import {-# SOURCE #-} GHC.Unit.Module.Name +import {-# SOURCE #-} GHC.Unit.Module.Name ( ModuleName ) +import Data.Kind (Type) data UnitId -data GenModule unit -data GenUnit uid -data Indefinite unit +data GenModule (unit :: Type) +data GenUnit (uid :: Type) +data Indefinite (unit :: Type) type Module = GenModule Unit type Unit = GenUnit UnitId |