Make 'count-deps' a ghc/util standalone program

- Move 'count-deps' into 'ghc/utils' so that it can be called standalone.
- Move 'testsuite/tests/parser/should_run/' tests 'CountParserDeps' and
'CountAstDeps' to 'testsuite/tests/count-deps' and reimplement in terms
of calling the utility
- Document how to use 'count-deps' in 'ghc/utils/count-deps/README'

6 files changed, 0 insertions, 651 deletions

diff --git a/testsuite/tests/parser/should_run/CountAstDeps.hs b/testsuite/tests/parser/should_run/CountAstDeps.hs
deleted file mode 100644
index ba7f0c50f9..0000000000
--- a/testsuite/tests/parser/should_run/CountAstDeps.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-module Main(main) where
-
--- Calculate the number of module dependencies of 'Parser.' If that
--- number exceeds a threshold, that indicates that the dependencies
--- have significantly gone up via the commit under test (and the test
--- is deemed to fail). In that case, this most likely means a cycle
--- has arisen that pulls in modules for Core generation. The
--- motivation for not allowing that to happen is so that the
--- 'ghc-lib-parser' package subset of the GHC API can continue to be
--- provided with as small a number of modules as possible for when the
--- need exists to produce ASTs and nothing more.
-
-import CountDeps
-
-main :: IO ()
-main = printDeps "Language.Haskell.Syntax"
diff --git a/testsuite/tests/parser/should_run/CountAstDeps.stdout b/testsuite/tests/parser/should_run/CountAstDeps.stdout
deleted file mode 100644
index 4b33ad2982..0000000000
--- a/testsuite/tests/parser/should_run/CountAstDeps.stdout
+++ /dev/null
@@ -1,267 +0,0 @@
-Found 266 Language.Haskell.Syntax module dependencies
-GHC.Builtin.Names
-GHC.Builtin.PrimOps
-GHC.Builtin.Types
-GHC.Builtin.Types.Prim
-GHC.Builtin.Uniques
-GHC.ByteCode.Types
-GHC.Cmm
-GHC.Cmm.BlockId
-GHC.Cmm.CLabel
-GHC.Cmm.Dataflow.Block
-GHC.Cmm.Dataflow.Collections
-GHC.Cmm.Dataflow.Graph
-GHC.Cmm.Dataflow.Label
-GHC.Cmm.Expr
-GHC.Cmm.MachOp
-GHC.Cmm.Node
-GHC.Cmm.Switch
-GHC.Cmm.Type
-GHC.CmmToAsm.CFG.Weight
-GHC.CmmToAsm.Config
-GHC.Core
-GHC.Core.Class
-GHC.Core.Coercion
-GHC.Core.Coercion.Axiom
-GHC.Core.Coercion.Opt
-GHC.Core.ConLike
-GHC.Core.DataCon
-GHC.Core.FVs
-GHC.Core.FamInstEnv
-GHC.Core.InstEnv
-GHC.Core.Lint
-GHC.Core.Make
-GHC.Core.Map.Expr
-GHC.Core.Map.Type
-GHC.Core.Multiplicity
-GHC.Core.Opt.Arity
-GHC.Core.Opt.CallerCC
-GHC.Core.Opt.ConstantFold
-GHC.Core.Opt.Monad
-GHC.Core.Opt.OccurAnal
-GHC.Core.PatSyn
-GHC.Core.Ppr
-GHC.Core.Predicate
-GHC.Core.Rules
-GHC.Core.Seq
-GHC.Core.SimpleOpt
-GHC.Core.Stats
-GHC.Core.Subst
-GHC.Core.Tidy
-GHC.Core.TyCo.FVs
-GHC.Core.TyCo.Ppr
-GHC.Core.TyCo.Rep
-GHC.Core.TyCo.Subst
-GHC.Core.TyCo.Tidy
-GHC.Core.TyCon
-GHC.Core.TyCon.Env
-GHC.Core.TyCon.RecWalk
-GHC.Core.Type
-GHC.Core.Unfold
-GHC.Core.Unfold.Make
-GHC.Core.Unify
-GHC.Core.UsageEnv
-GHC.Core.Utils
-GHC.CoreToIface
-GHC.Data.Bag
-GHC.Data.BooleanFormula
-GHC.Data.EnumSet
-GHC.Data.FastMutInt
-GHC.Data.FastString
-GHC.Data.FastString.Env
-GHC.Data.FiniteMap
-GHC.Data.Graph.Directed
-GHC.Data.IOEnv
-GHC.Data.List.SetOps
-GHC.Data.Maybe
-GHC.Data.OrdList
-GHC.Data.Pair
-GHC.Data.Stream
-GHC.Data.Strict
-GHC.Data.StringBuffer
-GHC.Data.TrieMap
-GHC.Driver.Backend
-GHC.Driver.CmdLine
-GHC.Driver.Env
-GHC.Driver.Env.Types
-GHC.Driver.Errors
-GHC.Driver.Errors.Ppr
-GHC.Driver.Errors.Types
-GHC.Driver.Flags
-GHC.Driver.Hooks
-GHC.Driver.Monad
-GHC.Driver.Phases
-GHC.Driver.Pipeline.Monad
-GHC.Driver.Plugins
-GHC.Driver.Ppr
-GHC.Driver.Session
-GHC.Hs
-GHC.Hs.Binds
-GHC.Hs.Decls
-GHC.Hs.Doc
-GHC.Hs.Expr
-GHC.Hs.Extension
-GHC.Hs.ImpExp
-GHC.Hs.Instances
-GHC.Hs.Lit
-GHC.Hs.Pat
-GHC.Hs.Type
-GHC.Hs.Utils
-GHC.HsToCore.Errors.Ppr
-GHC.HsToCore.Errors.Types
-GHC.HsToCore.Pmc.Ppr
-GHC.HsToCore.Pmc.Solver.Types
-GHC.HsToCore.Pmc.Types
-GHC.Iface.Ext.Fields
-GHC.Iface.Recomp.Binary
-GHC.Iface.Syntax
-GHC.Iface.Type
-GHC.Linker.Types
-GHC.Parser.Annotation
-GHC.Parser.Errors.Ppr
-GHC.Parser.Errors.Types
-GHC.Parser.Types
-GHC.Platform
-GHC.Platform.AArch64
-GHC.Platform.ARM
-GHC.Platform.Constants
-GHC.Platform.NoRegs
-GHC.Platform.PPC
-GHC.Platform.Profile
-GHC.Platform.RISCV64
-GHC.Platform.Reg
-GHC.Platform.Reg.Class
-GHC.Platform.Regs
-GHC.Platform.S390X
-GHC.Platform.SPARC
-GHC.Platform.Ways
-GHC.Platform.X86
-GHC.Platform.X86_64
-GHC.Prelude
-GHC.Runtime.Context
-GHC.Runtime.Eval.Types
-GHC.Runtime.Heap.Layout
-GHC.Runtime.Interpreter.Types
-GHC.Settings
-GHC.Settings.Config
-GHC.Settings.Constants
-GHC.Stg.Syntax
-GHC.StgToCmm.Types
-GHC.SysTools.BaseDir
-GHC.SysTools.Terminal
-GHC.Tc.Errors.Hole.FitTypes
-GHC.Tc.Errors.Ppr
-GHC.Tc.Errors.Types
-GHC.Tc.Solver.InertSet
-GHC.Tc.Solver.Types
-GHC.Tc.Types
-GHC.Tc.Types.Constraint
-GHC.Tc.Types.Evidence
-GHC.Tc.Types.Origin
-GHC.Tc.Utils.TcType
-GHC.Types.Annotations
-GHC.Types.Avail
-GHC.Types.Basic
-GHC.Types.CompleteMatch
-GHC.Types.CostCentre
-GHC.Types.CostCentre.State
-GHC.Types.Cpr
-GHC.Types.Demand
-GHC.Types.Error
-GHC.Types.FieldLabel
-GHC.Types.Fixity
-GHC.Types.Fixity.Env
-GHC.Types.ForeignCall
-GHC.Types.ForeignStubs
-GHC.Types.Hint
-GHC.Types.Hint.Ppr
-GHC.Types.HpcInfo
-GHC.Types.IPE
-GHC.Types.Id
-GHC.Types.Id.Info
-GHC.Types.Id.Make
-GHC.Types.Literal
-GHC.Types.Meta
-GHC.Types.Name
-GHC.Types.Name.Cache
-GHC.Types.Name.Env
-GHC.Types.Name.Occurrence
-GHC.Types.Name.Ppr
-GHC.Types.Name.Reader
-GHC.Types.Name.Set
-GHC.Types.RepType
-GHC.Types.SafeHaskell
-GHC.Types.SourceError
-GHC.Types.SourceFile
-GHC.Types.SourceText
-GHC.Types.SrcLoc
-GHC.Types.Target
-GHC.Types.Tickish
-GHC.Types.TyThing
-GHC.Types.TypeEnv
-GHC.Types.Unique
-GHC.Types.Unique.DFM
-GHC.Types.Unique.DSet
-GHC.Types.Unique.FM
-GHC.Types.Unique.Map
-GHC.Types.Unique.SDFM
-GHC.Types.Unique.Set
-GHC.Types.Unique.Supply
-GHC.Types.Var
-GHC.Types.Var.Env
-GHC.Types.Var.Set
-GHC.Unit
-GHC.Unit.Env
-GHC.Unit.External
-GHC.Unit.Finder.Types
-GHC.Unit.Home
-GHC.Unit.Home.ModInfo
-GHC.Unit.Info
-GHC.Unit.Module
-GHC.Unit.Module.Deps
-GHC.Unit.Module.Env
-GHC.Unit.Module.Graph
-GHC.Unit.Module.Imported
-GHC.Unit.Module.Location
-GHC.Unit.Module.ModDetails
-GHC.Unit.Module.ModGuts
-GHC.Unit.Module.ModIface
-GHC.Unit.Module.ModSummary
-GHC.Unit.Module.Name
-GHC.Unit.Module.Status
-GHC.Unit.Module.Warnings
-GHC.Unit.Parser
-GHC.Unit.Ppr
-GHC.Unit.State
-GHC.Unit.Types
-GHC.Utils.Binary
-GHC.Utils.Binary.Typeable
-GHC.Utils.BufHandle
-GHC.Utils.CliOption
-GHC.Utils.Constants
-GHC.Utils.Error
-GHC.Utils.Exception
-GHC.Utils.FV
-GHC.Utils.Fingerprint
-GHC.Utils.GlobalVars
-GHC.Utils.IO.Unsafe
-GHC.Utils.Json
-GHC.Utils.Lexeme
-GHC.Utils.Logger
-GHC.Utils.Misc
-GHC.Utils.Monad
-GHC.Utils.Monad.State.Strict
-GHC.Utils.Outputable
-GHC.Utils.Panic
-GHC.Utils.Panic.Plain
-GHC.Utils.Ppr
-GHC.Utils.Ppr.Colour
-GHC.Utils.TmpFs
-Language.Haskell.Syntax
-Language.Haskell.Syntax.Binds
-Language.Haskell.Syntax.Decls
-Language.Haskell.Syntax.Expr
-Language.Haskell.Syntax.Extension
-Language.Haskell.Syntax.Lit
-Language.Haskell.Syntax.Pat
-Language.Haskell.Syntax.Type
diff --git a/testsuite/tests/parser/should_run/CountDeps.hs b/testsuite/tests/parser/should_run/CountDeps.hs
deleted file mode 100644
index fab36de4a8..0000000000
--- a/testsuite/tests/parser/should_run/CountDeps.hs
+++ /dev/null
@@ -1,71 +0,0 @@
-module CountDeps (printDeps) where
-
-import GHC.Driver.Env
-import GHC.Unit.Module
-import GHC.Driver.Session
-import GHC.Driver.Main
-import GHC
-import GHC.Utils.Misc
-import Data.Maybe
-import Control.Monad
-import Control.Monad.IO.Class
-import System.Environment
-import System.Exit
-import GHC.Unit.Module.Deps
-import Data.Map.Strict qualified as Map
-
-dotSpec :: String -> Map.Map String [String] -> String
-dotSpec name g =
- "digraph \"" ++ name ++ "\" {\n" ++
-    Map.foldlWithKey' f "" g ++ "}\n"
-  where
-    f acc k ns = acc ++ concat ["  " ++ show k ++ " -> " ++ show n ++ ";\n" | n <- ns]
-
-printDeps :: String -> IO ()
-printDeps modName = do
-  [libdir] <- getArgs
-  modGraph <-
-    Map.map (map moduleNameString) .
-      Map.mapKeys moduleNameString <$> calcDeps modName libdir
-  let modules = Map.keys modGraph
-      num = length modules
-  putStrLn $ "Found " ++ show num ++ " " ++ modName ++ " module dependencies"
-  forM_ modules putStrLn
-  -- Uncomment the next line to print a dependency graph in dot
-  -- format:
-  -- putStr $ dotSpec modName modGraph
-  -- Then,
-  -- * Copy the digraph output to a file ('deps.dot' say)
-  -- * To render it, use a command along the lines of
-  --   'tred deps.dot > deps-tred.dot && dot -Tpdf -o deps.pdf deps-tred.dot'
-
-calcDeps :: String -> FilePath -> IO (Map.Map ModuleName [ModuleName])
-calcDeps modName libdir =
-  defaultErrorHandler defaultFatalMessager defaultFlushOut $ do
-    runGhc (Just libdir) $ do
-        df <- getSessionDynFlags
-        logger <- getLogger
-        (df, _, _) <- parseDynamicFlags logger df [noLoc "-package=ghc"]
-        setSessionDynFlags df
-        env <- getSession
-        loop env Map.empty [mkModuleName modName]
-  where
-    -- Source imports are only guaranteed to show up in the 'mi_deps'
-    -- of modules that import them directly and don’t propagate
-    -- transitively so we loop.
-    loop :: HscEnv -> Map.Map ModuleName [ModuleName] -> [ModuleName] -> Ghc (Map.Map ModuleName [ModuleName])
-    loop env modules (m : ms) =
-      if m `Map.member` modules
-        then loop env modules ms
-        else do
-          mi <- liftIO $ hscGetModuleInterface env (mkModule m)
-          let deps = modDeps mi
-          modules <- return $ Map.insert m [] modules
-          loop env (Map.insert m deps modules) $ ms ++ filter (not . (`Map.member` modules)) deps
-    loop _ modules [] = return modules
-
-    mkModule :: ModuleName -> Module
-    mkModule = Module (stringToUnit "ghc")
-
-    modDeps :: ModIface -> [ModuleName]
-    modDeps mi = map gwib_mod $ dep_direct_mods (mi_deps mi)
diff --git a/testsuite/tests/parser/should_run/CountParserDeps.hs b/testsuite/tests/parser/should_run/CountParserDeps.hs
deleted file mode 100644
index f1dacb1d62..0000000000
--- a/testsuite/tests/parser/should_run/CountParserDeps.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-module Main(main) where
-
--- Calculate the number of module dependencies of 'Parser.' If that
--- number exceeds a threshold, that indicates that the dependencies
--- have significantly gone up via the commit under test (and the test
--- is deemed to fail). In that case, this most likely means a cycle
--- has arisen that pulls in modules for Core generation. The
--- motivation for not allowing that to happen is so that the
--- 'ghc-lib-parser' package subset of the GHC API can continue to be
--- provided with as small a number of modules as possible for when the
--- need exists to produce ASTs and nothing more.
-
-import CountDeps
-
-main :: IO ()
-main = printDeps "GHC.Parser"
diff --git a/testsuite/tests/parser/should_run/CountParserDeps.stdout b/testsuite/tests/parser/should_run/CountParserDeps.stdout
deleted file mode 100644
index 16dbb8e185..0000000000
--- a/testsuite/tests/parser/should_run/CountParserDeps.stdout
+++ /dev/null
@@ -1,273 +0,0 @@
-Found 272 GHC.Parser module dependencies
-GHC.Builtin.Names
-GHC.Builtin.PrimOps
-GHC.Builtin.Types
-GHC.Builtin.Types.Prim
-GHC.Builtin.Uniques
-GHC.ByteCode.Types
-GHC.Cmm
-GHC.Cmm.BlockId
-GHC.Cmm.CLabel
-GHC.Cmm.Dataflow.Block
-GHC.Cmm.Dataflow.Collections
-GHC.Cmm.Dataflow.Graph
-GHC.Cmm.Dataflow.Label
-GHC.Cmm.Expr
-GHC.Cmm.MachOp
-GHC.Cmm.Node
-GHC.Cmm.Switch
-GHC.Cmm.Type
-GHC.CmmToAsm.CFG.Weight
-GHC.CmmToAsm.Config
-GHC.Core
-GHC.Core.Class
-GHC.Core.Coercion
-GHC.Core.Coercion.Axiom
-GHC.Core.Coercion.Opt
-GHC.Core.ConLike
-GHC.Core.DataCon
-GHC.Core.FVs
-GHC.Core.FamInstEnv
-GHC.Core.InstEnv
-GHC.Core.Lint
-GHC.Core.Make
-GHC.Core.Map.Expr
-GHC.Core.Map.Type
-GHC.Core.Multiplicity
-GHC.Core.Opt.Arity
-GHC.Core.Opt.CallerCC
-GHC.Core.Opt.ConstantFold
-GHC.Core.Opt.Monad
-GHC.Core.Opt.OccurAnal
-GHC.Core.PatSyn
-GHC.Core.Ppr
-GHC.Core.Predicate
-GHC.Core.Rules
-GHC.Core.Seq
-GHC.Core.SimpleOpt
-GHC.Core.Stats
-GHC.Core.Subst
-GHC.Core.Tidy
-GHC.Core.TyCo.FVs
-GHC.Core.TyCo.Ppr
-GHC.Core.TyCo.Rep
-GHC.Core.TyCo.Subst
-GHC.Core.TyCo.Tidy
-GHC.Core.TyCon
-GHC.Core.TyCon.Env
-GHC.Core.TyCon.RecWalk
-GHC.Core.Type
-GHC.Core.Unfold
-GHC.Core.Unfold.Make
-GHC.Core.Unify
-GHC.Core.UsageEnv
-GHC.Core.Utils
-GHC.CoreToIface
-GHC.Data.Bag
-GHC.Data.BooleanFormula
-GHC.Data.EnumSet
-GHC.Data.FastMutInt
-GHC.Data.FastString
-GHC.Data.FastString.Env
-GHC.Data.FiniteMap
-GHC.Data.Graph.Directed
-GHC.Data.IOEnv
-GHC.Data.List.SetOps
-GHC.Data.Maybe
-GHC.Data.OrdList
-GHC.Data.Pair
-GHC.Data.Stream
-GHC.Data.Strict
-GHC.Data.StringBuffer
-GHC.Data.TrieMap
-GHC.Driver.Backend
-GHC.Driver.Backpack.Syntax
-GHC.Driver.CmdLine
-GHC.Driver.Env
-GHC.Driver.Env.Types
-GHC.Driver.Errors
-GHC.Driver.Errors.Ppr
-GHC.Driver.Errors.Types
-GHC.Driver.Flags
-GHC.Driver.Hooks
-GHC.Driver.Monad
-GHC.Driver.Phases
-GHC.Driver.Pipeline.Monad
-GHC.Driver.Plugins
-GHC.Driver.Ppr
-GHC.Driver.Session
-GHC.Hs
-GHC.Hs.Binds
-GHC.Hs.Decls
-GHC.Hs.Doc
-GHC.Hs.Expr
-GHC.Hs.Extension
-GHC.Hs.ImpExp
-GHC.Hs.Instances
-GHC.Hs.Lit
-GHC.Hs.Pat
-GHC.Hs.Type
-GHC.Hs.Utils
-GHC.HsToCore.Errors.Ppr
-GHC.HsToCore.Errors.Types
-GHC.HsToCore.Pmc.Ppr
-GHC.HsToCore.Pmc.Solver.Types
-GHC.HsToCore.Pmc.Types
-GHC.Iface.Ext.Fields
-GHC.Iface.Recomp.Binary
-GHC.Iface.Syntax
-GHC.Iface.Type
-GHC.Linker.Types
-GHC.Parser
-GHC.Parser.Annotation
-GHC.Parser.CharClass
-GHC.Parser.Errors.Ppr
-GHC.Parser.Errors.Types
-GHC.Parser.Lexer
-GHC.Parser.PostProcess
-GHC.Parser.PostProcess.Haddock
-GHC.Parser.Types
-GHC.Platform
-GHC.Platform.AArch64
-GHC.Platform.ARM
-GHC.Platform.Constants
-GHC.Platform.NoRegs
-GHC.Platform.PPC
-GHC.Platform.Profile
-GHC.Platform.RISCV64
-GHC.Platform.Reg
-GHC.Platform.Reg.Class
-GHC.Platform.Regs
-GHC.Platform.S390X
-GHC.Platform.SPARC
-GHC.Platform.Ways
-GHC.Platform.X86
-GHC.Platform.X86_64
-GHC.Prelude
-GHC.Runtime.Context
-GHC.Runtime.Eval.Types
-GHC.Runtime.Heap.Layout
-GHC.Runtime.Interpreter.Types
-GHC.Settings
-GHC.Settings.Config
-GHC.Settings.Constants
-GHC.Stg.Syntax
-GHC.StgToCmm.Types
-GHC.SysTools.BaseDir
-GHC.SysTools.Terminal
-GHC.Tc.Errors.Hole.FitTypes
-GHC.Tc.Errors.Ppr
-GHC.Tc.Errors.Types
-GHC.Tc.Solver.InertSet
-GHC.Tc.Solver.Types
-GHC.Tc.Types
-GHC.Tc.Types.Constraint
-GHC.Tc.Types.Evidence
-GHC.Tc.Types.Origin
-GHC.Tc.Utils.TcType
-GHC.Types.Annotations
-GHC.Types.Avail
-GHC.Types.Basic
-GHC.Types.CompleteMatch
-GHC.Types.CostCentre
-GHC.Types.CostCentre.State
-GHC.Types.Cpr
-GHC.Types.Demand
-GHC.Types.Error
-GHC.Types.FieldLabel
-GHC.Types.Fixity
-GHC.Types.Fixity.Env
-GHC.Types.ForeignCall
-GHC.Types.ForeignStubs
-GHC.Types.Hint
-GHC.Types.Hint.Ppr
-GHC.Types.HpcInfo
-GHC.Types.IPE
-GHC.Types.Id
-GHC.Types.Id.Info
-GHC.Types.Id.Make
-GHC.Types.Literal
-GHC.Types.Meta
-GHC.Types.Name
-GHC.Types.Name.Cache
-GHC.Types.Name.Env
-GHC.Types.Name.Occurrence
-GHC.Types.Name.Ppr
-GHC.Types.Name.Reader
-GHC.Types.Name.Set
-GHC.Types.RepType
-GHC.Types.SafeHaskell
-GHC.Types.SourceError
-GHC.Types.SourceFile
-GHC.Types.SourceText
-GHC.Types.SrcLoc
-GHC.Types.Target
-GHC.Types.Tickish
-GHC.Types.TyThing
-GHC.Types.TypeEnv
-GHC.Types.Unique
-GHC.Types.Unique.DFM
-GHC.Types.Unique.DSet
-GHC.Types.Unique.FM
-GHC.Types.Unique.Map
-GHC.Types.Unique.SDFM
-GHC.Types.Unique.Set
-GHC.Types.Unique.Supply
-GHC.Types.Var
-GHC.Types.Var.Env
-GHC.Types.Var.Set
-GHC.Unit
-GHC.Unit.Env
-GHC.Unit.External
-GHC.Unit.Finder.Types
-GHC.Unit.Home
-GHC.Unit.Home.ModInfo
-GHC.Unit.Info
-GHC.Unit.Module
-GHC.Unit.Module.Deps
-GHC.Unit.Module.Env
-GHC.Unit.Module.Graph
-GHC.Unit.Module.Imported
-GHC.Unit.Module.Location
-GHC.Unit.Module.ModDetails
-GHC.Unit.Module.ModGuts
-GHC.Unit.Module.ModIface
-GHC.Unit.Module.ModSummary
-GHC.Unit.Module.Name
-GHC.Unit.Module.Status
-GHC.Unit.Module.Warnings
-GHC.Unit.Parser
-GHC.Unit.Ppr
-GHC.Unit.State
-GHC.Unit.Types
-GHC.Utils.Binary
-GHC.Utils.Binary.Typeable
-GHC.Utils.BufHandle
-GHC.Utils.CliOption
-GHC.Utils.Constants
-GHC.Utils.Error
-GHC.Utils.Exception
-GHC.Utils.FV
-GHC.Utils.Fingerprint
-GHC.Utils.GlobalVars
-GHC.Utils.IO.Unsafe
-GHC.Utils.Json
-GHC.Utils.Lexeme
-GHC.Utils.Logger
-GHC.Utils.Misc
-GHC.Utils.Monad
-GHC.Utils.Monad.State.Strict
-GHC.Utils.Outputable
-GHC.Utils.Panic
-GHC.Utils.Panic.Plain
-GHC.Utils.Ppr
-GHC.Utils.Ppr.Colour
-GHC.Utils.TmpFs
-Language.Haskell.Syntax
-Language.Haskell.Syntax.Binds
-Language.Haskell.Syntax.Decls
-Language.Haskell.Syntax.Expr
-Language.Haskell.Syntax.Extension
-Language.Haskell.Syntax.Lit
-Language.Haskell.Syntax.Pat
-Language.Haskell.Syntax.Type
diff --git a/testsuite/tests/parser/should_run/all.T b/testsuite/tests/parser/should_run/all.T
index 5c2112057e..92c6d0fcb3 100644
--- a/testsuite/tests/parser/should_run/all.T
+++ b/testsuite/tests/parser/should_run/all.T
@@ -14,14 +14,6 @@ test('NegativeZero', normal, compile_and_run, [''])
 test('HexFloatLiterals', normal, compile_and_run, [''])
 test('NumericUnderscores0', normal, compile_and_run, [''])
 test('NumericUnderscores1', normal, compile_and_run, [''])
-test('CountAstDeps',
-     [ extra_files(['CountDeps.hs']), only_ways(['normal']), extra_run_opts('"' + config.libdir + '"') ],
-     compile_and_run,
-     ['-package ghc'])
-test('CountParserDeps',
-     [ extra_files(['CountDeps.hs']), only_ways(['normal']), extra_run_opts('"' + config.libdir + '"') ],
-     compile_and_run,
-     ['-package ghc'])
 test('LexNegLit', normal, compile_and_run, [''])
 test('RecordDotSyntax1', normal, compile_and_run, [''])
 test('RecordDotSyntax2', normal, compile_and_run, [''])