X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplMonad.lhs;h=1cdbde62c4d5b5e3f2b9d1307f5e106e3e05b6ce;hb=64bfc0114c0811fe175149dd6d803c7c77de0062;hp=a198b32cce5d51bebcfe9fcf8c86692236e2bbb0;hpb=317fc69d18eda68fd65f5ba634feafbe4a3923da;p=ghc-hetmet.git diff --git a/compiler/simplCore/SimplMonad.lhs b/compiler/simplCore/SimplMonad.lhs index a198b32..1cdbde6 100644 --- a/compiler/simplCore/SimplMonad.lhs +++ b/compiler/simplCore/SimplMonad.lhs @@ -4,12 +4,19 @@ \section[SimplMonad]{The simplifier Monad} \begin{code} +{-# OPTIONS -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings +-- for details + module SimplMonad ( -- The monad SimplM, initSmpl, returnSmpl, thenSmpl, thenSmpl_, mapSmpl, mapAndUnzipSmpl, mapAccumLSmpl, - getDOptsSmpl, + getDOptsSmpl, getRules, getFamEnvs, -- Unique supply getUniqueSmpl, getUniquesSmpl, getUniqSupplySmpl, newId, @@ -29,6 +36,8 @@ module SimplMonad ( import Id ( Id, mkSysLocal ) import Type ( Type ) +import FamInstEnv ( FamInstEnv ) +import Rules ( RuleBase ) import UniqSupply ( uniqsFromSupply, uniqFromSupply, splitUniqSupply, UniqSupply ) @@ -41,11 +50,8 @@ import FastString ( FastString ) import Outputable import FastTypes -import GHC.Exts ( indexArray# ) - -import GHC.Arr ( Array(..) ) - -import Array ( array, (//) ) +import Data.Array +import Data.Array.Base (unsafeAt) infixr 0 `thenSmpl`, `thenSmpl_` \end{code} @@ -61,22 +67,28 @@ For the simplifier monad, we want to {\em thread} a unique supply and a counter. \begin{code} newtype SimplM result - = SM { unSM :: DynFlags -- We thread the unique supply because - -> UniqSupply -- constantly splitting it is rather expensive - -> SimplCount - -> (result, UniqSupply, SimplCount)} + = SM { unSM :: SimplTopEnv -- Envt that does not change much + -> UniqSupply -- We thread the unique supply because + -- constantly splitting it is rather expensive + -> SimplCount + -> (result, UniqSupply, SimplCount)} + +data SimplTopEnv = STE { st_flags :: DynFlags + , st_rules :: RuleBase + , st_fams :: (FamInstEnv, FamInstEnv) } \end{code} \begin{code} -initSmpl :: DynFlags +initSmpl :: DynFlags -> RuleBase -> (FamInstEnv, FamInstEnv) -> UniqSupply -- No init count; set to 0 -> SimplM a -> (a, SimplCount) -initSmpl dflags us m - = case unSM m dflags us (zeroSimplCount dflags) of +initSmpl dflags rules fam_envs us m + = case unSM m env us (zeroSimplCount dflags) of (result, _, count) -> (result, count) - + where + env = STE { st_flags = dflags, st_rules = rules, st_fams = fam_envs } {-# INLINE thenSmpl #-} {-# INLINE thenSmpl_ #-} @@ -88,20 +100,20 @@ instance Monad SimplM where return = returnSmpl returnSmpl :: a -> SimplM a -returnSmpl e = SM (\ dflags us sc -> (e, us, sc)) +returnSmpl e = SM (\ st_env us sc -> (e, us, sc)) thenSmpl :: SimplM a -> (a -> SimplM b) -> SimplM b thenSmpl_ :: SimplM a -> SimplM b -> SimplM b thenSmpl m k - = SM (\ dflags us0 sc0 -> - case (unSM m dflags us0 sc0) of - (m_result, us1, sc1) -> unSM (k m_result) dflags us1 sc1 ) + = SM (\ st_env us0 sc0 -> + case (unSM m st_env us0 sc0) of + (m_result, us1, sc1) -> unSM (k m_result) st_env us1 sc1 ) thenSmpl_ m k - = SM (\dflags us0 sc0 -> - case (unSM m dflags us0 sc0) of - (_, us1, sc1) -> unSM k dflags us1 sc1) + = SM (\st_env us0 sc0 -> + case (unSM m st_env us0 sc0) of + (_, us1, sc1) -> unSM k st_env us1 sc1) \end{code} @@ -138,22 +150,27 @@ mapAccumLSmpl f acc (x:xs) = f acc x `thenSmpl` \ (acc', x') -> \begin{code} getUniqSupplySmpl :: SimplM UniqSupply getUniqSupplySmpl - = SM (\dflags us sc -> case splitUniqSupply us of + = SM (\st_env us sc -> case splitUniqSupply us of (us1, us2) -> (us1, us2, sc)) getUniqueSmpl :: SimplM Unique getUniqueSmpl - = SM (\dflags us sc -> case splitUniqSupply us of + = SM (\st_env us sc -> case splitUniqSupply us of (us1, us2) -> (uniqFromSupply us1, us2, sc)) getUniquesSmpl :: SimplM [Unique] getUniquesSmpl - = SM (\dflags us sc -> case splitUniqSupply us of + = SM (\st_env us sc -> case splitUniqSupply us of (us1, us2) -> (uniqsFromSupply us1, us2, sc)) getDOptsSmpl :: SimplM DynFlags -getDOptsSmpl - = SM (\dflags us sc -> (dflags, us, sc)) +getDOptsSmpl = SM (\st_env us sc -> (st_flags st_env, us, sc)) + +getRules :: SimplM RuleBase +getRules = SM (\st_env us sc -> (st_rules st_env, us, sc)) + +getFamEnvs :: SimplM (FamInstEnv, FamInstEnv) +getFamEnvs = SM (\st_env us sc -> (st_fams st_env, us, sc)) newId :: FastString -> Type -> SimplM Id newId fs ty = getUniqueSmpl `thenSmpl` \ uniq -> @@ -169,18 +186,18 @@ newId fs ty = getUniqueSmpl `thenSmpl` \ uniq -> \begin{code} getSimplCount :: SimplM SimplCount -getSimplCount = SM (\dflags us sc -> (sc, us, sc)) +getSimplCount = SM (\st_env us sc -> (sc, us, sc)) tick :: Tick -> SimplM () tick t - = SM (\dflags us sc -> let sc' = doTick t sc + = SM (\st_env us sc -> let sc' = doTick t sc in sc' `seq` ((), us, sc')) freeTick :: Tick -> SimplM () -- Record a tick, but don't add to the total tick count, which is -- used to decide when nothing further has happened freeTick t - = SM (\dflags us sc -> let sc' = doFreeTick t sc + = SM (\st_env us sc -> let sc' = doFreeTick t sc in sc' `seq` ((), us, sc')) \end{code} @@ -456,11 +473,7 @@ isAmongSimpl on_switches -- Switches mentioned later occur *earlier* defined_elems = map mk_assoc_elem tidied_on_switches in -- (avoid some unboxing, bounds checking, and other horrible things:) - case sw_tbl of { Array _ _ stuff -> - \ switch -> - case (indexArray# stuff (tagOf_SimplSwitch switch)) of - (# v #) -> v - } + \ switch -> unsafeAt sw_tbl $ iBox (tagOf_SimplSwitch switch) where mk_assoc_elem k@(MaxSimplifierIterations lvl) = (iBox (tagOf_SimplSwitch k), SwInt lvl)