X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FsimplCore%2FOccurAnal.lhs;h=3dff2dec90170fe025b59bbfc59c8c23c11a4085;hb=dcf6daa80768154d11c8853af7b52fc51fba4742;hp=9bb19b9be0504c3fdb9fec4dd20c148888c89a7d;hpb=62514f77fc32d5381708474142b5bbc1b2c3b033;p=ghc-hetmet.git diff --git a/ghc/compiler/simplCore/OccurAnal.lhs b/ghc/compiler/simplCore/OccurAnal.lhs index 9bb19b9..3dff2de 100644 --- a/ghc/compiler/simplCore/OccurAnal.lhs +++ b/ghc/compiler/simplCore/OccurAnal.lhs @@ -12,37 +12,34 @@ core expression with (hopefully) improved usage information. \begin{code} module OccurAnal ( - occurAnalyseBinds, occurAnalyseExpr, occurAnalyseGlobalExpr, - markBinderInsideLambda + occurAnalyseBinds, occurAnalyseGlobalExpr, occurAnalyseRule ) where #include "HsVersions.h" import BinderInfo -import CmdLineOpts ( SimplifierSwitch(..) ) import CoreSyn -import CoreUtils ( exprIsTrivial, idSpecVars ) -import Const ( Con(..), Literal(..) ) -import Id ( idWantsToBeINLINEd, isSpecPragmaId, - getInlinePragma, setInlinePragma, - omitIfaceSigForId, - getIdSpecialisation, +import CoreFVs ( idRuleVars ) +import CoreUtils ( exprIsTrivial ) +import Id ( isDataConId, isOneShotLambda, setOneShotLambda, + idOccInfo, setIdOccInfo, + isExportedId, modifyIdInfo, idInfo, + idSpecialisation, isLocalId, idType, idUnique, Id ) -import IdInfo ( InlinePragInfo(..), OccInfo(..) ) -import SpecEnv ( isEmptySpecEnv ) +import IdInfo ( OccInfo(..), shortableIdInfo, copyIdInfo ) import VarSet import VarEnv -import PrelInfo ( noRepStrIds, noRepIntegerIds ) -import Name ( isExported, isLocallyDefined ) import Type ( splitFunTy_maybe, splitForAllTys ) import Maybes ( maybeToBool ) import Digraph ( stronglyConnCompR, SCC(..) ) +import PrelNames ( buildIdKey, foldrIdKey, runSTRepIdKey, augmentIdKey ) import Unique ( u2i ) import UniqFM ( keysUFM ) import Util ( zipWithEqual, mapAndUnzip ) +import FastTypes import Outputable \end{code} @@ -56,23 +53,6 @@ import Outputable Here's the externally-callable interface: \begin{code} -occurAnalyseBinds - :: (SimplifierSwitch -> Bool) - -> [CoreBind] - -> [CoreBind] - -occurAnalyseBinds simplifier_sw_chkr binds - = binds' - where - (_, _, binds') = occAnalTop initial_env binds - - initial_env = OccEnv (simplifier_sw_chkr IgnoreINLINEPragma) - (\id -> isLocallyDefined id) -- Anything local is interesting - emptyVarSet -\end{code} - - -\begin{code} occurAnalyseExpr :: (Id -> Bool) -- Tells if a variable is interesting -> CoreExpr -> (IdEnv BinderInfo, -- Occ info for interesting free vars @@ -81,15 +61,22 @@ occurAnalyseExpr :: (Id -> Bool) -- Tells if a variable is interesting occurAnalyseExpr interesting expr = occAnal initial_env expr where - initial_env = OccEnv False {- Do not ignore INLINE Pragma -} - interesting - emptyVarSet + initial_env = OccEnv interesting emptyVarSet [] occurAnalyseGlobalExpr :: CoreExpr -> CoreExpr occurAnalyseGlobalExpr expr = -- Top level expr, so no interesting free vars, and -- discard occurence info returned snd (occurAnalyseExpr (\_ -> False) expr) + +occurAnalyseRule :: CoreRule -> CoreRule +occurAnalyseRule rule@(BuiltinRule _) = rule +occurAnalyseRule (Rule str tpl_vars tpl_args rhs) + -- Add occ info to tpl_vars, rhs + = Rule str tpl_vars' tpl_args rhs' + where + (rhs_uds, rhs') = occurAnalyseExpr isLocalId rhs + (_, tpl_vars') = tagBinders rhs_uds tpl_vars \end{code} @@ -101,22 +88,20 @@ occurAnalyseGlobalExpr expr In @occAnalTop@ we do indirection-shorting. That is, if we have this: - loc = + x_local = ... - exp = loc + x_exported = loc where exp is exported, and loc is not, then we replace it with this: - loc = exp - exp = + x_local = x_exported + x_exported = ... -Without this we never get rid of the exp = loc thing. -This save a gratuitous jump -(from \tr{x_exported} to \tr{x_local}), and makes strictness -information propagate better. -This used to happen in the final phase, but its tidier to do it here. - +Without this we never get rid of the x_exported = x_local thing. This +save a gratuitous jump (from \tr{x_exported} to \tr{x_local}), and +makes strictness information propagate better. This used to happen in +the final phase, but it's tidier to do it here. If more than one exported thing is equal to a local thing (i.e., the local thing really is shared), then we do one only: @@ -147,82 +132,90 @@ and it's dangerous to do this fiddling in STG land because we might elminate a binding that's mentioned in the unfolding for something. - \begin{code} -occAnalTop :: OccEnv -- What's in scope - -> [CoreBind] - -> (IdEnv BinderInfo, -- Occurrence info - IdEnv Id, -- Indirection elimination info - [CoreBind] - ) - -occAnalTop env [] = (emptyDetails, emptyVarEnv, []) - --- Special case for eliminating indirections --- Note: it's a shortcoming that this only works for --- non-recursive bindings. Elminating indirections --- makes perfect sense for recursive bindings too, but --- it's more complicated to implement, so I haven't done so - -occAnalTop env (bind : binds) - = case bind of - NonRec exported_id (Var local_id) | shortMeOut ind_env exported_id local_id - -> -- Aha! An indirection; let's eliminate it! - (scope_usage, ind_env', binds') - where - ind_env' = extendVarEnv ind_env local_id exported_id +occurAnalyseBinds :: [CoreBind] -> [CoreBind] - other -> -- Ho ho! The normal case - (final_usage, ind_env, new_binds ++ binds') - where - (final_usage, new_binds) = occAnalBind env (zap_bind bind) scope_usage +occurAnalyseBinds binds + = binds' where - new_env = env `addNewCands` (bindersOf bind) - (scope_usage, ind_env, binds') = occAnalTop new_env binds - - -- Deal with any indirections - zap_bind (NonRec bndr rhs) - | bndr `elemVarEnv` ind_env = Rec (zap (bndr,rhs)) - -- The Rec isn't strictly necessary, but it's convenient - zap_bind (Rec pairs) - | or [id `elemVarEnv` ind_env | (id,_) <- pairs] = Rec (concat (map zap pairs)) + (_, _, binds') = go initialTopEnv binds + + go :: OccEnv -> [CoreBind] + -> (UsageDetails, -- Occurrence info + IdEnv Id, -- Indirection elimination info + -- Maps local-id -> exported-id, but it embodies + -- bindings of the form exported-id = local-id in + -- the argument to go + [CoreBind]) -- Occ-analysed bindings, less the exported-id=local-id ones + + go env [] = (emptyDetails, emptyVarEnv, []) + + go env (bind : binds) + = let + new_env = env `addNewCands` (bindersOf bind) + (scope_usage, ind_env, binds') = go new_env binds + (final_usage, new_binds) = occAnalBind env (zapBind ind_env bind) scope_usage + -- NB: I zap before occur-analysing, so + -- I don't need to worry about getting the + -- occ info on the new bindings right. + in + case bind of + NonRec exported_id (Var local_id) + | shortMeOut ind_env exported_id local_id + -- Special case for eliminating indirections + -- Note: it's a shortcoming that this only works for + -- non-recursive bindings. Elminating indirections + -- makes perfect sense for recursive bindings too, but + -- it's more complicated to implement, so I haven't done so + -> (scope_usage, ind_env', binds') + where + ind_env' = extendVarEnv ind_env local_id exported_id - zap_bind bind = bind + other -> -- Ho ho! The normal case + (final_usage, ind_env, new_binds ++ binds') + +initialTopEnv = OccEnv isLocalId -- Anything local is interesting + emptyVarSet + [] - zap pair@(bndr,rhs) = case lookupVarEnv ind_env bndr of - Nothing -> [pair] - Just exported_id -> [(bndr, Var exported_id), - (exported_id, rhs)] +-- Deal with any indirections +zapBind ind_env (NonRec bndr rhs) + | bndr `elemVarEnv` ind_env = Rec (zap ind_env (bndr,rhs)) + -- The Rec isn't strictly necessary, but it's convenient +zapBind ind_env (Rec pairs) + | or [id `elemVarEnv` ind_env | (id,_) <- pairs] = Rec (concat (map (zap ind_env) pairs)) + +zapBind ind_env bind = bind + +zap ind_env pair@(local_id,rhs) + = case lookupVarEnv ind_env local_id of + Nothing -> [pair] + Just exported_id -> [(local_id, Var exported_id), + (exported_id', rhs)] + where + exported_id' = modifyIdInfo (copyIdInfo (idInfo local_id)) exported_id + shortMeOut ind_env exported_id local_id - = isExported exported_id && -- Only if this is exported - - isLocallyDefined local_id && -- Only if this one is defined in this - -- module, so that we *can* change its - -- binding to be the exported thing! - - not (isExported local_id) && -- Only if this one is not itself exported, - -- since the transformation will nuke it - - not (omitIfaceSigForId local_id) && -- Don't do the transformation if rhs_id is - -- something like a constructor, whose - -- definition is implicitly exported and - -- which must not vanish. - -- To illustrate the preceding check consider - -- data T = MkT Int - -- mkT = MkT - -- f x = MkT (x+1) - -- Here, we'll make a local, non-exported, defn for MkT, and without the - -- above condition we'll transform it to: - -- mkT = \x. MkT [x] - -- f = \y. mkT (y+1) - -- This is bad because mkT will get the IdDetails of MkT, and won't - -- be exported. Also the code generator won't make a definition for - -- the MkT constructor. - -- Slightly gruesome, this. - - - not (local_id `elemVarEnv` ind_env) -- Only if not already substituted for +-- The if-then-else stuff is just so I can get a pprTrace to see +-- how often I don't get shorting out becuase of IdInfo stuff + = if isExportedId exported_id && -- Only if this is exported + + isLocalId local_id && -- Only if this one is defined in this + -- module, so that we *can* change its + -- binding to be the exported thing! + + not (isExportedId local_id) && -- Only if this one is not itself exported, + -- since the transformation will nuke it + + not (local_id `elemVarEnv` ind_env) -- Only if not already substituted for + then + if shortableIdInfo (idInfo exported_id) -- Only if its IdInfo is 'shortable' + -- (see the defn of IdInfo.shortableIdInfo + then True + else pprTrace "shortMeOut:" (ppr exported_id) False + else + False \end{code} @@ -302,15 +295,13 @@ It isn't easy to do a perfect job in one blow. Consider occAnalBind env (Rec pairs) body_usage = foldr (_scc_ "occAnalBind.dofinal" do_final_bind) (body_usage, []) sccs where - pp_item (_, bndr, _) = ppr bndr - binders = map fst pairs - new_env = env `addNewCands` binders + rhs_env = env `addNewCands` binders analysed_pairs :: [Details1] analysed_pairs = [ (bndr, rhs_usage, rhs') | (bndr, rhs) <- pairs, - let (rhs_usage, rhs') = occAnalRhs new_env bndr rhs + let (rhs_usage, rhs') = occAnalRhs rhs_env bndr rhs ] sccs :: [SCC (Node Details1)] @@ -320,7 +311,7 @@ occAnalBind env (Rec pairs) body_usage ---- stuff for dependency analysis of binds ------------------------------- edges :: [Node Details1] edges = _scc_ "occAnalBind.assoc" - [ (details, IBOX(u2i (idUnique id)), edges_from rhs_usage) + [ (details, iBox (u2i (idUnique id)), edges_from rhs_usage) | details@(id, rhs_usage, rhs) <- analysed_pairs ] @@ -436,7 +427,7 @@ reOrderRec env (AcyclicSCC (bind, _, _)) = [bind] -- Common case of simple self-recursion reOrderRec env (CyclicSCC [bind]) - = [(setInlinePragma tagged_bndr IAmALoopBreaker, rhs)] + = [(setIdOccInfo tagged_bndr IAmALoopBreaker, rhs)] where ((tagged_bndr, rhs), _, _) = bind @@ -445,7 +436,7 @@ reOrderRec env (CyclicSCC (bind : binds)) -- do SCC analysis on the rest, and recursively sort them out concat (map (reOrderRec env) (stronglyConnCompR unchosen)) ++ - [(setInlinePragma tagged_bndr IAmALoopBreaker, rhs)] + [(setIdOccInfo tagged_bndr IAmALoopBreaker, rhs)] where (chosen_pair, unchosen) = choose_loop_breaker bind (score bind) [] binds @@ -467,22 +458,31 @@ reOrderRec env (CyclicSCC (bind : binds)) score :: Node Details2 -> Int -- Higher score => less likely to be picked as loop breaker score ((bndr, rhs), _, _) - | exprIsTrivial rhs && - not (isExported bndr) = 3 -- Practically certain to be inlined - | inlineCandidate bndr = 3 -- Likely to be inlined - | not_fun_ty (idType bndr) = 2 -- Data types help with cases - | not (isEmptySpecEnv (getIdSpecialisation bndr)) = 1 - -- Avoid things with a SpecEnv; we'd like - -- to take advantage of the SpecEnv in the subsequent bindings + | exprIsTrivial rhs = 4 -- Practically certain to be inlined + -- Used to have also: && not (isExportedId bndr) + -- But I found this sometimes cost an extra iteration when we have + -- rec { d = (a,b); a = ...df...; b = ...df...; df = d } + -- where df is the exported dictionary. Then df makes a really + -- bad choice for loop breaker + + | not_fun_ty (idType bndr) = 3 -- Data types help with cases + -- This used to have a lower score than inlineCandidate, but + -- it's *really* helpful if dictionaries get inlined fast, + -- so I'm experimenting with giving higher priority to data-typed things + + | inlineCandidate bndr rhs = 2 -- Likely to be inlined + + | not (isEmptyCoreRules (idSpecialisation bndr)) = 1 + -- Avoid things with specialisations; we'd like + -- to take advantage of them in the subsequent bindings + | otherwise = 0 - inlineCandidate :: Id -> Bool - inlineCandidate id - = case getInlinePragma id of - IWantToBeINLINEd -> True - IMustBeINLINEd -> True - ICanSafelyBeINLINEd _ _ -> True - other -> False + inlineCandidate :: Id -> CoreExpr -> Bool + inlineCandidate id (Note InlineMe _) = True + inlineCandidate id rhs = case idOccInfo id of + OneOcc _ _ -> True + other -> False -- Real example (the Enum Ordering instance from PrelBase): -- rec f = \ x -> case d of (p,q,r) -> p x @@ -509,43 +509,27 @@ ToDo: try using the occurrence info for the inline'd binder. [March 97] We do the same for atomic RHSs. Reason: see notes with reOrderRec. [June 98, SLPJ] I've undone this change; I don't understand it. See notes with reOrderRec. -[March 98] A new wrinkle is that if the binder has specialisations inside -it then we count the specialised Ids as "extra rhs's". That way -the "parent" keeps the specialised "children" alive. If the parent -dies (because it isn't referenced any more), then the children will -die too unless they are already referenced directly. \begin{code} occAnalRhs :: OccEnv -> Id -> CoreExpr -- Binder and rhs -> (UsageDetails, CoreExpr) -{- DELETED SLPJ June 98: seems quite bogus to me -occAnalRhs env id (Var v) - | isCandidate env v - = (unitVarEnv v (markMany (funOccurrence 0)), Var v) - - | otherwise - = (emptyDetails, Var v) --} - occAnalRhs env id rhs - | idWantsToBeINLINEd id - = (mapVarEnv markMany total_usage, rhs') - - | otherwise - = (total_usage, rhs') - + = (final_usage, rhs') where - (rhs_usage, rhs') = occAnal env rhs - lazy_rhs_usage = mapVarEnv markLazy rhs_usage - total_usage = foldVarSet add lazy_rhs_usage spec_ids - add v u = addOneOcc u v noBinderInfo -- Give a non-committal binder info - -- (i.e manyOcc) because many copies - -- of the specialised thing can appear - spec_ids = idSpecVars id -\end{code} - + (rhs_usage, rhs') = occAnal (zapCtxt env) rhs + + -- [March 98] A new wrinkle is that if the binder has specialisations inside + -- it then we count the specialised Ids as "extra rhs's". That way + -- the "parent" keeps the specialised "children" alive. If the parent + -- dies (because it isn't referenced any more), then the children will + -- die too unless they are already referenced directly. + + final_usage = foldVarSet add rhs_usage (idRuleVars id) + add v u = addOneOcc u v noBinderInfo -- Give a non-committal binder info + -- (i.e manyOcc) because many copies + -- of the specialised thing can appear \end{code} Expressions @@ -558,9 +542,19 @@ occAnal :: OccEnv occAnal env (Type t) = (emptyDetails, Type t) -occAnal env (Var v) - | isCandidate env v = (unitVarEnv v funOccZero, Var v) - | otherwise = (emptyDetails, Var v) +occAnal env (Var v) + = (var_uds, Var v) + where + var_uds | isCandidate env v = unitVarEnv v funOccZero + | otherwise = emptyDetails + + -- At one stage, I gathered the idRuleVars for v here too, + -- which in a way is the right thing to do. + -- But that went wrong right after specialisation, when + -- the *occurrences* of the overloaded function didn't have any + -- rules in them, so the *specialised* versions looked as if they + -- weren't used at all. + \end{code} We regard variables that occur as constructor arguments as "dangerousToDup": @@ -579,40 +573,15 @@ If we aren't careful we duplicate the (expensive x) call! Constructors are rather like lambdas in this way. \begin{code} - -- For NoRep literals we have to report an occurrence of - -- the things which tidyCore will later add, so that when - -- we are compiling the very module in which those thin-air Ids - -- are defined we have them in scope! -occAnal env expr@(Con (Literal lit) args) - = ASSERT( null args ) - (mk_lit_uds lit, expr) - where - mk_lit_uds (NoRepStr _ _) = try noRepStrIds - mk_lit_uds (NoRepInteger _ _) = try noRepIntegerIds - mk_lit_uds lit = emptyDetails - - try vs = foldr add emptyDetails vs - add v uds | isCandidate env v = extendVarEnv uds v funOccZero - | otherwise = uds - -occAnal env (Con con args) - = case mapAndUnzip (occAnal env) args of { (arg_uds_s, args') -> - let - arg_uds = foldr combineUsageDetails emptyDetails arg_uds_s - - -- We mark the free vars of the argument of a constructor as "many" - -- This means that nothing gets inlined into a constructor argument - -- position, which is what we want. Typically those constructor - -- arguments are just variables, or trivial expressions. - final_arg_uds = case con of - DataCon _ -> mapVarEnv markMany arg_uds - other -> arg_uds - in - (final_arg_uds, Con con args') - } +occAnal env expr@(Lit lit) = (emptyDetails, expr) \end{code} \begin{code} +occAnal env (Note InlineMe body) + = case occAnal env body of { (usage, body') -> + (mapVarEnv markMany usage, Note InlineMe body') + } + occAnal env (Note note@(SCC cc) body) = case occAnal env body of { (usage, body') -> (mapVarEnv markInsideSCC usage, Note note body') @@ -625,12 +594,17 @@ occAnal env (Note note body) \end{code} \begin{code} -occAnal env (App fun arg) - = case occAnal env fun of { (fun_usage, fun') -> - case occAnal env arg of { (arg_usage, arg') -> - (fun_usage `combineUsageDetails` mapVarEnv markLazy arg_usage, App fun' arg') - }} - +occAnal env app@(App fun arg) + = occAnalApp env (collectArgs app) + +-- Ignore type variables altogether +-- (a) occurrences inside type lambdas only not marked as InsideLam +-- (b) type variables not in environment + +occAnal env expr@(Lam x body) | isTyVar x + = case occAnal env body of { (body_usage, body') -> + (body_usage, Lam x body') + } -- For value lambdas we do a special hack. Consider -- (\x. \y. ...x...) @@ -642,36 +616,120 @@ occAnal env (App fun arg) -- Then, the simplifier is careful when partially applying lambdas. occAnal env expr@(Lam _ _) - = case occAnal (env `addNewCands` binders) body of { (body_usage, body') -> + = case occAnal (env_body `addNewCands` binders) body of { (body_usage, body') -> let (final_usage, tagged_binders) = tagBinders body_usage binders + -- URGH! Sept 99: we don't seem to be able to use binders' here, because + -- we get linear-typed things in the resulting program that we can't handle yet. + -- (e.g. PrelShow) TODO + + really_final_usage = if linear then + final_usage + else + mapVarEnv markInsideLam final_usage in - (mapVarEnv markInsideLam final_usage, + (really_final_usage, mkLams tagged_binders body') } where - (binders, body) = collectBinders expr - + (binders, body) = collectBinders expr + (linear, env_body, _) = oneShotGroup env binders occAnal env (Case scrut bndr alts) = case mapAndUnzip (occAnalAlt alt_env) alts of { (alts_usage_s, alts') -> - case occAnal env scrut of { (scrut_usage, scrut') -> + case occAnal (zapCtxt env) scrut of { (scrut_usage, scrut') -> let alts_usage = foldr1 combineAltsUsageDetails alts_usage_s - (alts_usage1, tagged_bndr) = tagBinder alts_usage bndr + alts_usage' = addCaseBndrUsage alts_usage + (alts_usage1, tagged_bndr) = tagBinder alts_usage' bndr total_usage = scrut_usage `combineUsageDetails` alts_usage1 in total_usage `seq` (total_usage, Case scrut' tagged_bndr alts') }} where alt_env = env `addNewCand` bndr + -- The case binder gets a usage of either "many" or "dead", never "one". + -- Reason: we like to inline single occurrences, to eliminate a binding, + -- but inlining a case binder *doesn't* eliminate a binding. + -- We *don't* want to transform + -- case x of w { (p,q) -> f w } + -- into + -- case x of w { (p,q) -> f (p,q) } + addCaseBndrUsage usage = case lookupVarEnv usage bndr of + Nothing -> usage + Just occ -> extendVarEnv usage bndr (markMany occ) + occAnal env (Let bind body) = case occAnal new_env body of { (body_usage, body') -> case occAnalBind env bind body_usage of { (final_usage, new_binds) -> (final_usage, mkLets new_binds body') }} where new_env = env `addNewCands` (bindersOf bind) + +occAnalArgs env args + = case mapAndUnzip (occAnal arg_env) args of { (arg_uds_s, args') -> + (foldr combineUsageDetails emptyDetails arg_uds_s, args')} + where + arg_env = zapCtxt env +\end{code} + +Applications are dealt with specially because we want +the "build hack" to work. + +\begin{code} +-- Hack for build, fold, runST +occAnalApp env (Var fun, args) + = case args_stuff of { (args_uds, args') -> + let + final_uds = fun_uds `combineUsageDetails` args_uds + in + (final_uds, mkApps (Var fun) args') } + where + fun_uniq = idUnique fun + + fun_uds | isCandidate env fun = unitVarEnv fun funOccZero + | otherwise = emptyDetails + + args_stuff | fun_uniq == buildIdKey = appSpecial env 2 [True,True] args + | fun_uniq == augmentIdKey = appSpecial env 2 [True,True] args + | fun_uniq == foldrIdKey = appSpecial env 3 [False,True] args + | fun_uniq == runSTRepIdKey = appSpecial env 2 [True] args + + | isDataConId fun = case occAnalArgs env args of + (arg_uds, args') -> (mapVarEnv markMany arg_uds, args') + -- We mark the free vars of the argument of a constructor as "many" + -- This means that nothing gets inlined into a constructor argument + -- position, which is what we want. Typically those constructor + -- arguments are just variables, or trivial expressions. + + | otherwise = occAnalArgs env args + + +occAnalApp env (fun, args) + = case occAnal (zapCtxt env) fun of { (fun_uds, fun') -> + case occAnalArgs env args of { (args_uds, args') -> + let + final_uds = fun_uds `combineUsageDetails` args_uds + in + (final_uds, mkApps fun' args') }} + +appSpecial :: OccEnv -> Int -> CtxtTy -> [CoreExpr] -> (UsageDetails, [CoreExpr]) +appSpecial env n ctxt args + = go n args + where + go n [] = (emptyDetails, []) -- Too few args + + go 1 (arg:args) -- The magic arg + = case occAnal (setCtxt env ctxt) arg of { (arg_uds, arg') -> + case occAnalArgs env args of { (args_uds, args') -> + (combineUsageDetails arg_uds args_uds, arg':args') }} + + go n (arg:args) + = case occAnal env arg of { (arg_uds, arg') -> + case go (n-1) args of { (args_uds, args') -> + (combineUsageDetails arg_uds args_uds, arg':args') }} \end{code} + Case alternatives ~~~~~~~~~~~~~~~~~ \begin{code} @@ -691,29 +749,67 @@ occAnalAlt env (con, bndrs, rhs) %************************************************************************ \begin{code} -data OccEnv = - OccEnv - Bool -- IgnoreINLINEPragma flag - -- False <=> OK to use INLINEPragma information - -- True <=> ignore INLINEPragma information +-- We gather inforamtion for variables that are either +-- (a) in scope or +-- (b) interesting - (Id -> Bool) -- Tells whether an Id occurrence is interesting, - -- given the set of in-scope variables +data OccEnv = + OccEnv (Id -> Bool) -- Tells whether an Id occurrence is interesting, + IdSet -- In-scope Ids + CtxtTy -- Tells about linearity - IdSet -- In-scope Ids +type CtxtTy = [Bool] + -- [] No info + -- + -- True:ctxt Analysing a function-valued expression that will be + -- applied just once + -- + -- False:ctxt Analysing a function-valued expression that may + -- be applied many times; but when it is, + -- the CtxtTy inside applies +isCandidate :: OccEnv -> Id -> Bool +isCandidate (OccEnv ifun cands _) id = id `elemVarSet` cands || ifun id addNewCands :: OccEnv -> [Id] -> OccEnv -addNewCands (OccEnv ip ifun cands) ids - = OccEnv ip ifun (cands `unionVarSet` mkVarSet ids) +addNewCands (OccEnv ifun cands ctxt) ids + = OccEnv ifun (cands `unionVarSet` mkVarSet ids) ctxt addNewCand :: OccEnv -> Id -> OccEnv -addNewCand (OccEnv ip ifun cands) id - = OccEnv ip ifun (extendVarSet cands id) +addNewCand (OccEnv ifun cands ctxt) id + = OccEnv ifun (extendVarSet cands id) ctxt + +setCtxt :: OccEnv -> CtxtTy -> OccEnv +setCtxt (OccEnv ifun cands _) ctxt = OccEnv ifun cands ctxt + +oneShotGroup :: OccEnv -> [CoreBndr] -> (Bool, OccEnv, [CoreBndr]) + -- True <=> this is a one-shot linear lambda group + -- The [CoreBndr] are the binders. + + -- The result binders have one-shot-ness set that they might not have had originally. + -- This happens in (build (\cn -> e)). Here the occurrence analyser + -- linearity context knows that c,n are one-shot, and it records that fact in + -- the binder. This is useful to guide subsequent float-in/float-out tranformations + +oneShotGroup (OccEnv ifun cands ctxt) bndrs + = case go ctxt bndrs [] of + (new_ctxt, new_bndrs) -> (all is_one_shot new_bndrs, OccEnv ifun cands new_ctxt, new_bndrs) + where + is_one_shot b = isId b && isOneShotLambda b + + go ctxt [] rev_bndrs = (ctxt, reverse rev_bndrs) + + go (lin_ctxt:ctxt) (bndr:bndrs) rev_bndrs + | isId bndr = go ctxt bndrs (bndr':rev_bndrs) + where + bndr' | lin_ctxt = setOneShotLambda bndr + | otherwise = bndr + + go ctxt (bndr:bndrs) rev_bndrs = go ctxt bndrs (bndr:rev_bndrs) -isCandidate :: OccEnv -> Id -> Bool -isCandidate (OccEnv _ ifun cands) id = id `elemVarSet` cands || ifun id +zapCtxt env@(OccEnv ifun cands []) = env +zapCtxt (OccEnv ifun cands _ ) = OccEnv ifun cands [] type UsageDetails = IdEnv BinderInfo -- A finite map from ids to their usage @@ -733,12 +829,8 @@ addOneOcc usage id info emptyDetails = (emptyVarEnv :: UsageDetails) -unitDetails id info = (unitVarEnv id info :: UsageDetails) - usedIn :: Id -> UsageDetails -> Bool -v `usedIn` details = isExported v - || v `elemVarEnv` details - || isSpecPragmaId v +v `usedIn` details = isExportedId v || v `elemVarEnv` details tagBinders :: UsageDetails -- Of scope -> [Id] -- Binders @@ -748,7 +840,7 @@ tagBinders :: UsageDetails -- Of scope tagBinders usage binders = let usage' = usage `delVarEnvList` binders - uss = map (setBinderPrag usage) binders + uss = map (setBinderOcc usage) binders in usage' `seq` (usage', uss) @@ -760,58 +852,27 @@ tagBinder :: UsageDetails -- Of scope tagBinder usage binder = let usage' = usage `delVarEnv` binder - binder' = setBinderPrag usage binder + binder' = setBinderOcc usage binder in usage' `seq` (usage', binder') -setBinderPrag :: UsageDetails -> CoreBndr -> CoreBndr -setBinderPrag usage bndr - | isTyVar bndr - = bndr - - | otherwise - = case old_prag of - NoInlinePragInfo -> new_bndr - IAmDead -> new_bndr -- The next three are annotations - ICanSafelyBeINLINEd _ _ -> new_bndr -- from the previous iteration of - IAmALoopBreaker -> new_bndr -- the occurrence analyser - - IAmASpecPragmaId -> bndr -- Don't ever overwrite or drop these as dead - - other | its_now_dead -> new_bndr -- Overwrite the others iff it's now dead - | otherwise -> bndr - +setBinderOcc :: UsageDetails -> CoreBndr -> CoreBndr +setBinderOcc usage bndr + | isTyVar bndr = bndr + | isExportedId bndr + = -- Don't use local usage info for visible-elsewhere things + -- BUT *do* erase any IAmALoopBreaker annotation, because we're + -- about to re-generate it and it shouldn't be "sticky" + case idOccInfo bndr of + NoOccInfo -> bndr + other -> setIdOccInfo bndr NoOccInfo + + | otherwise = setIdOccInfo bndr occ_info where - old_prag = getInlinePragma bndr - new_bndr = setInlinePragma bndr new_prag - - its_now_dead = case new_prag of - IAmDead -> True - other -> False - - new_prag = occInfoToInlinePrag occ_info - - occ_info - | isExported bndr = noBinderInfo - -- Don't use local usage info for visible-elsewhere things - -- But NB that we do set NoInlinePragma for exported things - -- thereby nuking any IAmALoopBreaker from a previous pass. - - | otherwise = case lookupVarEnv usage bndr of - Nothing -> deadOccurrence - Just info -> info - -markBinderInsideLambda :: CoreBndr -> CoreBndr -markBinderInsideLambda bndr - | isTyVar bndr - = bndr - - | otherwise - = case getInlinePragma bndr of - ICanSafelyBeINLINEd not_in_lam nalts - -> bndr `setInlinePragma` ICanSafelyBeINLINEd InsideLam nalts - other -> bndr + occ_info = case lookupVarEnv usage bndr of + Nothing -> IAmDead + Just info -> binderInfoToOccInfo info funOccZero = funOccurrence 0 \end{code}