diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2021-12-20 15:19:20 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-01-06 02:24:54 -0500 |
| commit | ec26c38bfac24d958377abbae6fce3a6fcf4ae39 (patch) | |
| tree | 42f27638f1605424be0cfc4323922ed01985a551 /compiler/GHC/Builtin/Utils.hs | |
| parent | c080b44314248545c6ddea0c0eff02f8c9edbca4 (diff) | |
| download | haskell-ec26c38bfac24d958377abbae6fce3a6fcf4ae39.tar.gz | |
Use primOpIds cache more often (#20857)
Use primOpId instead of mkPrimOpId in a few places to benefit from
Id caching.
I had to mess a little bit with the module hierarchy to fix cycles and
to avoid adding too many new dependencies to count-deps tests.
Diffstat (limited to 'compiler/GHC/Builtin/Utils.hs')
| -rw-r--r-- | compiler/GHC/Builtin/Utils.hs | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/compiler/GHC/Builtin/Utils.hs b/compiler/GHC/Builtin/Utils.hs index 4428716681..c577c46b75 100644 --- a/compiler/GHC/Builtin/Utils.hs +++ b/compiler/GHC/Builtin/Utils.hs @@ -31,11 +31,9 @@ module GHC.Builtin.Utils ( -- * Miscellaneous wiredInIds, ghcPrimIds, - primOpRules, builtinRules, ghcPrimExports, ghcPrimDeclDocs, - primOpId, -- * Random other things maybeCharLikeCon, maybeIntLikeCon, @@ -49,6 +47,7 @@ import GHC.Prelude import GHC.Builtin.Uniques import GHC.Builtin.PrimOps +import GHC.Builtin.PrimOps.Ids import GHC.Builtin.Types import GHC.Builtin.Types.Literals ( typeNatTyCons ) import GHC.Builtin.Types.Prim @@ -56,7 +55,6 @@ import GHC.Builtin.Names.TH ( templateHaskellNames ) import GHC.Builtin.Names import GHC.Core.ConLike ( ConLike(..) ) -import GHC.Core.Opt.ConstantFold import GHC.Core.DataCon import GHC.Core.Class import GHC.Core.TyCon @@ -78,7 +76,6 @@ import GHC.Hs.Doc import GHC.Unit.Module.ModIface (IfaceExport) import GHC.Data.List.SetOps -import GHC.Data.SmallArray import Control.Applicative ((<|>)) import Data.List ( intercalate , find ) @@ -230,30 +227,8 @@ knownNamesInfo = unitNameEnv coercibleTyConName $ We let a lot of "non-standard" values be visible, so that we can make sense of them in interface pragmas. It's cool, though they all have "non-standard" names, so they won't get past the parser in user code. - -************************************************************************ -* * - PrimOpIds -* * -************************************************************************ -} --- | A cache of the PrimOp Ids, indexed by PrimOp tag (0 indexed) -primOpIds :: SmallArray Id -{-# NOINLINE primOpIds #-} -primOpIds = listToArray (maxPrimOpTag+1) primOpTag mkPrimOpId allThePrimOps - --- | Get primop id. --- --- Retrieve it from `primOpIds` cache without performing bounds checking. -primOpId :: PrimOp -> Id -primOpId op = indexSmallArray primOpIds (primOpTag op) - --- | All the primop ids, as a list -allThePrimOpIds :: [Id] -{-# INLINE allThePrimOpIds #-} -allThePrimOpIds = map (indexSmallArray primOpIds) [0..maxPrimOpTag] - {- ************************************************************************ * * |