X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FsimplCore%2FSimplCore.lhs;h=c7e484fc99aa1d5d575d4955b35bbf5bbd94ea0b;hb=957bf3756ffd56f5329a2aabe1022d6f996dd641;hp=39811e78f6d8fef8d5ffbecefb5000e3067bbd03;hpb=5ab261bb3fd75f45a4f219f1399be84208e12463;p=ghc-hetmet.git diff --git a/ghc/compiler/simplCore/SimplCore.lhs b/ghc/compiler/simplCore/SimplCore.lhs index 39811e7..c7e484f 100644 --- a/ghc/compiler/simplCore/SimplCore.lhs +++ b/ghc/compiler/simplCore/SimplCore.lhs @@ -8,21 +8,25 @@ module SimplCore ( core2core, simplifyExpr ) where #include "HsVersions.h" -import CmdLineOpts ( CoreToDo(..), SimplifierSwitch(..), - SwitchResult(..), intSwitchSet, - DynFlags, DynFlag(..), dopt, dopt_CoreToDo +import CmdLineOpts ( CoreToDo(..), SimplifierSwitch(..), + SimplifierMode(..), DynFlags, DynFlag(..), dopt, + dopt_CoreToDo ) import CoreSyn import CoreFVs ( ruleRhsFreeVars ) -import HscTypes ( PersistentCompilerState(..), - PackageRuleBase, HomeSymbolTable, IsExported, ModDetails(..) +import HscTypes ( PersistentCompilerState(..), ExternalPackageState(..), + HscEnv(..), GhciMode(..), + ModGuts(..), ModGuts, Avails, availsToNameSet, + PackageRuleBase, HomePackageTable, ModDetails(..), + HomeModInfo(..) ) import CSE ( cseProgram ) import Rules ( RuleBase, emptyRuleBase, ruleBaseFVs, ruleBaseIds, extendRuleBaseList, addRuleBaseFVs, pprRuleBase, ruleCheckProgram ) import Module ( moduleEnvElts ) -import CoreUnfold +import Name ( Name, isExternalName ) +import NameSet ( elemNameSet ) import PprCore ( pprCoreBindings, pprCoreExpr ) import OccurAnal ( occurAnalyseBinds, occurAnalyseGlobalExpr ) import CoreUtils ( coreBindsSize ) @@ -33,17 +37,18 @@ import ErrUtils ( dumpIfSet, dumpIfSet_dyn, showPass ) import CoreLint ( endPass ) import FloatIn ( floatInwards ) import FloatOut ( floatOutwards ) -import Id ( idName, isDataConWrapId, setIdLocalExported, isImplicitId ) +import Id ( idName, setIdLocalExported ) import VarSet import LiberateCase ( liberateCase ) import SAT ( doStaticArgs ) import Specialise ( specProgram) import SpecConstr ( specConstrProgram) -import UsageSPInf ( doUsageSPInf ) -import StrictAnal ( saBinds ) import DmdAnal ( dmdAnalPgm ) import WorkWrap ( wwTopBinds ) +#ifdef OLD_STRICTNESS +import StrictAnal ( saBinds ) import CprAnalyse ( cprAnalyse ) +#endif import UniqSupply ( UniqSupply, mkSplitUniqSupply, splitUniqSupply ) import IO ( hPutStr, stderr ) @@ -60,29 +65,32 @@ import List ( partition ) %************************************************************************ \begin{code} -core2core :: DynFlags -- includes spec of what core-to-core passes to do +core2core :: HscEnv -> PersistentCompilerState - -> HomeSymbolTable - -> IsExported - -> ModDetails - -> IO ModDetails + -> ModGuts + -> IO ModGuts -core2core dflags pcs hst is_exported - mod_details@(ModDetails { md_binds = binds_in, md_rules = rules_in }) +core2core hsc_env pcs + mod_impl@(ModGuts { mg_exports = exports, + mg_binds = binds_in, + mg_rules = rules_in }) = do - let core_todos = dopt_CoreToDo dflags - let pkg_rule_base = pcs_rules pcs -- Rule-base accumulated from imported packages - + let dflags = hsc_dflags hsc_env + hpt = hsc_HPT hsc_env + ghci_mode = hsc_mode hsc_env + core_todos = dopt_CoreToDo dflags + pkg_rule_base = eps_rule_base (pcs_EPS pcs) -- Rule-base accumulated from imported packages us <- mkSplitUniqSupply 's' let (cp_us, ru_us) = splitUniqSupply us -- COMPUTE THE RULE BASE TO USE (rule_base, local_rule_ids, orphan_rules, rule_rhs_fvs) - <- prepareRules dflags pkg_rule_base hst ru_us binds_in rules_in + <- prepareRules dflags pkg_rule_base hpt ru_us binds_in rules_in -- PREPARE THE BINDINGS - let binds1 = updateBinders local_rule_ids rule_rhs_fvs is_exported binds_in + let binds1 = updateBinders ghci_mode local_rule_ids + rule_rhs_fvs exports binds_in -- DO THE BUSINESS (stats, processed_binds) @@ -95,33 +103,28 @@ core2core dflags pcs hst is_exported -- Return results -- We only return local orphan rules, i.e., local rules not attached to an Id -- The bindings cotain more rules, embedded in the Ids - return (mod_details { md_binds = processed_binds, md_rules = orphan_rules}) + return (mod_impl { mg_binds = processed_binds, mg_rules = orphan_rules}) simplifyExpr :: DynFlags -- includes spec of what core-to-core passes to do - -> PersistentCompilerState - -> HomeSymbolTable -> CoreExpr -> IO CoreExpr -- simplifyExpr is called by the driver to simplify an -- expression typed in at the interactive prompt -simplifyExpr dflags pcs hst expr +simplifyExpr dflags expr = do { ; showPass dflags "Simplify" ; us <- mkSplitUniqSupply 's' - ; let (expr', _counts) = initSmpl dflags sw_chkr us emptyVarSet black_list_nothing - (simplExprGently expr) + ; let env = emptySimplEnv SimplGently [] emptyVarSet + (expr', _counts) = initSmpl dflags us (simplExprGently env expr) ; dumpIfSet_dyn dflags Opt_D_dump_simpl "Simplified expression" (pprCoreExpr expr') ; return expr' } - where - sw_chkr any = SwBool False -- A bit bogus - black_list_nothing v = False -- Black list nothing doCorePasses :: DynFlags @@ -143,8 +146,8 @@ doCorePasses dflags rb stats us binds (to_do : to_dos) doCorePasses dflags rb (stats `plusSimplCount` stats1) us2 binds1 to_dos -doCorePass dfs rb us binds (CoreDoSimplify sw_chkr) - = _scc_ "Simplify" simplifyPgm dfs rb sw_chkr us binds +doCorePass dfs rb us binds (CoreDoSimplify mode switches) + = _scc_ "Simplify" simplifyPgm dfs rb mode switches us binds doCorePass dfs rb us binds CoreCSE = _scc_ "CommonSubExpr" noStats dfs (cseProgram dfs binds) doCorePass dfs rb us binds CoreLiberateCase @@ -156,34 +159,40 @@ doCorePass dfs rb us binds (CoreDoFloatOutwards f) doCorePass dfs rb us binds CoreDoStaticArgs = _scc_ "StaticArgs" noStats dfs (doStaticArgs us binds) doCorePass dfs rb us binds CoreDoStrictness - = _scc_ "Stranal" noStats dfs (do { binds1 <- saBinds dfs binds ; - dmdAnalPgm dfs binds1 }) + = _scc_ "Stranal" noStats dfs (dmdAnalPgm dfs binds) doCorePass dfs rb us binds CoreDoWorkerWrapper = _scc_ "WorkWrap" noStats dfs (wwTopBinds dfs us binds) doCorePass dfs rb us binds CoreDoSpecialising = _scc_ "Specialise" noStats dfs (specProgram dfs us binds) doCorePass dfs rb us binds CoreDoSpecConstr = _scc_ "SpecConstr" noStats dfs (specConstrProgram dfs us binds) -doCorePass dfs rb us binds CoreDoCPResult - = _scc_ "CPResult" noStats dfs (cprAnalyse dfs binds) +#ifdef OLD_STRICTNESS +doCorePass dfs rb us binds CoreDoOldStrictness + = _scc_ "OldStrictness" noStats dfs (doOldStrictness dfs binds) +#endif doCorePass dfs rb us binds CoreDoPrintCore = _scc_ "PrintCore" noStats dfs (printCore binds) -doCorePass dfs rb us binds CoreDoUSPInf - = _scc_ "CoreUsageSPInf" noStats dfs (doUsageSPInf dfs us binds) doCorePass dfs rb us binds CoreDoGlomBinds = noStats dfs (glomBinds dfs binds) -doCorePass dfs rb us binds (CoreDoRuleCheck pat) - = noStats dfs (ruleCheck dfs pat binds) +doCorePass dfs rb us binds (CoreDoRuleCheck phase pat) + = noStats dfs (ruleCheck dfs phase pat binds) doCorePass dfs rb us binds CoreDoNothing = noStats dfs (return binds) +#ifdef OLD_STRICTNESS +doOldStrictness dfs binds + = do binds1 <- saBinds dfs binds + binds2 <- cprAnalyse dfs binds1 + return binds2 +#endif + printCore binds = do dumpIfSet True "Print Core" (pprCoreBindings binds) return binds -ruleCheck dflags pat binds = do showPass dflags "RuleCheck" - printDump (ruleCheckProgram pat binds) - return binds +ruleCheck dflags phase pat binds = do showPass dflags "RuleCheck" + printDump (ruleCheckProgram phase pat binds) + return binds -- most passes return no stats and don't change rules noStats dfs thing = do { binds <- thing; return (zeroSimplCount dfs, binds) } @@ -207,7 +216,7 @@ noStats dfs thing = do { binds <- thing; return (zeroSimplCount dfs, binds) } -- so that the opportunity to apply the rule isn't lost too soon \begin{code} -prepareRules :: DynFlags -> PackageRuleBase -> HomeSymbolTable +prepareRules :: DynFlags -> PackageRuleBase -> HomePackageTable -> UniqSupply -> [CoreBind] -> [IdCoreRule] -- Local rules @@ -216,9 +225,9 @@ prepareRules :: DynFlags -> PackageRuleBase -> HomeSymbolTable [IdCoreRule], -- Orphan rules IdSet) -- RHS free vars of all rules -prepareRules dflags pkg_rule_base hst us binds local_rules - = do { let (better_rules,_) = initSmpl dflags sw_chkr us local_ids black_list_all - (mapSmpl simplRule local_rules) +prepareRules dflags pkg_rule_base hpt us binds local_rules + = do { let env = emptySimplEnv SimplGently [] local_ids + (better_rules,_) = initSmpl dflags us (mapSmpl (simplRule env) local_rules) ; let (local_rules, orphan_rules) = partition ((`elemVarSet` local_ids) . fst) better_rules -- We use (`elemVarSet` local_ids) rather than isLocalId because @@ -234,7 +243,7 @@ prepareRules dflags pkg_rule_base hst us binds local_rules rule_rhs_fvs = unionVarSets (map (ruleRhsFreeVars . snd) better_rules) local_rule_base = extendRuleBaseList emptyRuleBase local_rules local_rule_ids = ruleBaseIds local_rule_base -- Local Ids with rules attached - imp_rule_base = foldl add_rules pkg_rule_base (moduleEnvElts hst) + imp_rule_base = foldl add_rules pkg_rule_base (moduleEnvElts hpt) rule_base = extendRuleBaseList imp_rule_base orphan_rules final_rule_base = addRuleBaseFVs rule_base (ruleBaseFVs local_rule_base) -- The last step black-lists the free vars of local rules too @@ -247,27 +256,27 @@ prepareRules dflags pkg_rule_base hst us binds local_rules ; return (final_rule_base, local_rule_ids, orphan_rules, rule_rhs_fvs) } where - sw_chkr any = SwBool False -- A bit bogus - black_list_all v = not (isDataConWrapId v) - -- This stops all inlining except the - -- wrappers for data constructors - - add_rules rule_base mds = extendRuleBaseList rule_base (md_rules mds) + add_rules rule_base mod_info = extendRuleBaseList rule_base (md_rules (hm_details mod_info)) -- Boringly, we need to gather the in-scope set. local_ids = foldr (unionVarSet . mkVarSet . bindersOf) emptyVarSet binds -updateBinders :: IdSet -- Locally defined ids with their Rules attached +updateBinders :: GhciMode + -> IdSet -- Locally defined ids with their Rules attached -> IdSet -- Ids free in the RHS of local rules - -> IsExported + -> Avails -- What is exported -> [CoreBind] -> [CoreBind] -- A horrible function -- Update the binders of top-level bindings as follows -- a) Attach the rules for each locally-defined Id to that Id. -- b) Set the no-discard flag if either the Id is exported, --- or it's mentoined in the RHS of a rule +-- or it's mentioned in the RHS of a rule +-- +-- You might wonder why exported Ids aren't already marked as such; +-- it's just because the type checker is rather busy already and +-- I didn't want to pass in yet another mapping. -- -- Reason for (a) -- - It makes the rules easier to look up @@ -285,16 +294,13 @@ updateBinders :: IdSet -- Locally defined ids with their Rules attached -- the rules (maybe we should?), so this substitution would make the rule -- bogus. -updateBinders rule_ids rule_rhs_fvs is_exported binds +updateBinders ghci_mode rule_ids rule_rhs_fvs exports binds = map update_bndrs binds where update_bndrs (NonRec b r) = NonRec (update_bndr b) r update_bndrs (Rec prs) = Rec [(update_bndr b, r) | (b,r) <- prs] update_bndr bndr - | isImplicitId bndr = bndr -- Constructors, selectors; doesn't - -- make sense to call setIdLocalExported - -- Also can't have rules | dont_discard bndr = setIdLocalExported bndr_with_rules | otherwise = bndr_with_rules where @@ -302,6 +308,19 @@ updateBinders rule_ids rule_rhs_fvs is_exported binds dont_discard bndr = is_exported (idName bndr) || bndr `elemVarSet` rule_rhs_fvs + + -- In interactive mode, we don't want to discard any top-level + -- entities at all (eg. do not inline them away during + -- simplification), and retain them all in the TypeEnv so they are + -- available from the command line. + -- + -- isExternalName separates the user-defined top-level names from those + -- introduced by the type checker. + is_exported :: Name -> Bool + is_exported | ghci_mode == Interactive = isExternalName + | otherwise = (`elemNameSet` export_fvs) + + export_fvs = availsToNameSet exports \end{code} @@ -312,13 +331,13 @@ which without simplification looked like: This doesn't match unless you do eta reduction on the build argument. \begin{code} -simplRule rule@(id, BuiltinRule _ _) +simplRule env rule@(id, BuiltinRule _ _) = returnSmpl rule -simplRule rule@(id, Rule name bndrs args rhs) - = simplBinders bndrs $ \ bndrs' -> - mapSmpl simplExprGently args `thenSmpl` \ args' -> - simplExprGently rhs `thenSmpl` \ rhs' -> - returnSmpl (id, Rule name bndrs' args' rhs') +simplRule env rule@(id, Rule act name bndrs args rhs) + = simplBinders env bndrs `thenSmpl` \ (env, bndrs') -> + mapSmpl (simplExprGently env) args `thenSmpl` \ args' -> + simplExprGently env rhs `thenSmpl` \ rhs' -> + returnSmpl (id, Rule act name bndrs' args' rhs') -- It's important that simplExprGently does eta reduction. -- For example, in a rule like: @@ -333,16 +352,21 @@ simplRule rule@(id, Rule name bndrs args rhs) \end{code} \begin{code} -simplExprGently :: CoreExpr -> SimplM CoreExpr +simplExprGently :: SimplEnv -> CoreExpr -> SimplM CoreExpr -- Simplifies an expression -- does occurrence analysis, then simplification -- and repeats (twice currently) because one pass -- alone leaves tons of crud. -- Used (a) for user expressions typed in at the interactive prompt -- (b) the LHS and RHS of a RULE -simplExprGently expr - = simplExpr (occurAnalyseGlobalExpr expr) `thenSmpl` \ expr1 -> - simplExpr (occurAnalyseGlobalExpr expr1) +-- +-- The name 'Gently' suggests that the SimplifierMode is SimplGently, +-- and in fact that is so.... but the 'Gently' in simplExprGently doesn't +-- enforce that; it just simplifies the expression twice + +simplExprGently env expr + = simplExpr env (occurAnalyseGlobalExpr expr) `thenSmpl` \ expr1 -> + simplExpr env (occurAnalyseGlobalExpr expr1) \end{code} @@ -397,13 +421,14 @@ glomBinds dflags binds \begin{code} simplifyPgm :: DynFlags -> RuleBase - -> (SimplifierSwitch -> SwitchResult) + -> SimplifierMode + -> [SimplifierSwitch] -> UniqSupply -> [CoreBind] -- Input -> IO (SimplCount, [CoreBind]) -- New bindings simplifyPgm dflags rule_base - sw_chkr us binds + mode switches us binds = do { showPass dflags "Simplify"; @@ -422,10 +447,14 @@ simplifyPgm dflags rule_base return (counts_out, binds') } where - max_iterations = getSimplIntSwitch sw_chkr MaxSimplifierIterations - black_list_fn = blackListed rule_lhs_fvs (intSwitchSet sw_chkr SimplInlinePhase) + phase_info = case mode of + SimplGently -> "gentle" + SimplPhase n -> show n + imported_rule_ids = ruleBaseIds rule_base - rule_lhs_fvs = ruleBaseFVs rule_base + simpl_env = emptySimplEnv mode switches imported_rule_ids + sw_chkr = getSwitchChecker simpl_env + max_iterations = intSwitchSet sw_chkr MaxSimplifierIterations `orElse` 2 iteration us iteration_no counts binds -- Try and force thunks off the binds; significantly reduces @@ -449,15 +478,18 @@ simplifyPgm dflags rule_base -- case t of {(_,counts') -> if counts'=0 then ... -- So the conditional didn't force counts', because the -- selection got duplicated. Sigh! - case initSmpl dflags sw_chkr us1 imported_rule_ids black_list_fn - (simplTopBinds tagged_binds) - of { (binds', counts') -> do { + case initSmpl dflags us1 (simplTopBinds simpl_env tagged_binds) of { + (binds', counts') -> do { -- The imported_rule_ids are used by initSmpl to initialise -- the in-scope set. That way, the simplifier will change any -- occurrences of the imported id to the one in the imported_rule_ids -- set, which are decorated with their rules. - let { all_counts = counts `plusSimplCount` counts' } ; + let { all_counts = counts `plusSimplCount` counts' ; + herald = "Simplifier phase " ++ phase_info ++ + ", iteration " ++ show iteration_no ++ + " out of " ++ show max_iterations + } ; -- Stop if nothing happened; don't dump output if isZeroSimplCount counts' then @@ -465,15 +497,10 @@ simplifyPgm dflags rule_base else do { -- Dump the result of this iteration - dumpIfSet_dyn dflags Opt_D_dump_simpl_iterations - ("Simplifier iteration " ++ show iteration_no - ++ " out of " ++ show max_iterations) + dumpIfSet_dyn dflags Opt_D_dump_simpl_iterations herald (pprSimplCount counts') ; - endPass dflags - ("Simplifier iteration " ++ show iteration_no ++ " result") - Opt_D_dump_simpl_iterations - binds' ; + endPass dflags herald Opt_D_dump_simpl_iterations binds' ; -- Stop if we've run out of iterations if iteration_no == max_iterations then