X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FsimplCore%2FSimplCore.lhs;h=7d3c04ade9817d0468aebdffd32e68babd7ba405;hb=6858f7c15fcf9efe9e6fdf22de34d0791b0f0c08;hp=1d73c5b56e176e2fbd2dca4875da89ebf88dd5e4;hpb=90fa6b84fdc99ba99c0b7df9691ca69d50b62530;p=ghc-hetmet.git diff --git a/ghc/compiler/simplCore/SimplCore.lhs b/ghc/compiler/simplCore/SimplCore.lhs index 1d73c5b..7d3c04a 100644 --- a/ghc/compiler/simplCore/SimplCore.lhs +++ b/ghc/compiler/simplCore/SimplCore.lhs @@ -4,36 +4,42 @@ \section[SimplCore]{Driver for simplifying @Core@ programs} \begin{code} -module SimplCore ( core2core ) where +module SimplCore ( core2core, simplifyExpr ) where #include "HsVersions.h" -import CmdLineOpts ( CoreToDo(..), SimplifierSwitch(..), - SwitchResult(..), intSwitchSet, - opt_UsageSPOn, - DynFlags, DynFlag(..), dopt +import CmdLineOpts ( CoreToDo(..), SimplifierSwitch(..), SimplifierMode(..), + DynFlags, DynFlag(..), dopt, dopt_CoreToDo ) -import CoreLint ( beginPass, endPass ) import CoreSyn +import CoreFVs ( ruleRhsFreeVars ) +import HscTypes ( PersistentCompilerState(..), + PackageRuleBase, HomeSymbolTable, IsExported, ModDetails(..) + ) import CSE ( cseProgram ) -import Rules ( RuleBase, extendRuleBaseList, addRuleBaseFVs ) -import CoreUnfold -import PprCore ( pprCoreBindings, pprCoreRulePair ) -import OccurAnal ( occurAnalyseBinds ) -import CoreUtils ( exprIsTrivial, etaReduceExpr, coreBindsSize ) +import Rules ( RuleBase, emptyRuleBase, ruleBaseFVs, ruleBaseIds, + extendRuleBaseList, addRuleBaseFVs, pprRuleBase, + ruleCheckProgram ) +import Module ( moduleEnvElts ) +import PprCore ( pprCoreBindings, pprCoreExpr ) +import OccurAnal ( occurAnalyseBinds, occurAnalyseGlobalExpr ) +import CoreUtils ( coreBindsSize ) import Simplify ( simplTopBinds, simplExpr ) import SimplUtils ( simplBinders ) import SimplMonad -import ErrUtils ( dumpIfSet, dumpIfSet_dyn ) +import ErrUtils ( dumpIfSet, dumpIfSet_dyn, showPass ) +import CoreLint ( endPass ) import FloatIn ( floatInwards ) import FloatOut ( floatOutwards ) -import Id ( isDataConWrapId ) +import Id ( idName, setIdLocalExported, isImplicitId ) 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 ) import CprAnalyse ( cprAnalyse ) @@ -41,6 +47,7 @@ import UniqSupply ( UniqSupply, mkSplitUniqSupply, splitUniqSupply ) import IO ( hPutStr, stderr ) import Outputable +import Maybes ( orElse ) import List ( partition ) \end{code} @@ -51,26 +58,33 @@ import List ( partition ) %************************************************************************ \begin{code} -core2core :: DynFlags - -> PackageRuleBase -- Rule-base accumulated from imported packages +core2core :: DynFlags -- includes spec of what core-to-core passes to do + -> PersistentCompilerState -> HomeSymbolTable - -> [CoreToDo] -- Spec of what core-to-core passes to do - -> [CoreBind] -- Binds in - -> [IdCoreRule] -- Rules in - -> IO ([CoreBind], [IdCoreRule]) -- binds, local orphan rules out + -> IsExported + -> ModDetails + -> IO ModDetails -core2core dflags pkg_rule_base hst core_todos binds rules +core2core dflags pcs hst is_exported + mod_details@(ModDetails { md_binds = binds_in, md_rules = rules_in }) = do + let core_todos = dopt_CoreToDo dflags + let pkg_rule_base = pcs_rules 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, binds1, orphan_rules) <- prepareRules pkg_rule_base hst binds rules + (rule_base, local_rule_ids, orphan_rules, rule_rhs_fvs) + <- prepareRules dflags pkg_rule_base hst ru_us binds_in rules_in + -- PREPARE THE BINDINGS + let binds1 = updateBinders local_rule_ids rule_rhs_fvs is_exported binds_in -- DO THE BUSINESS (stats, processed_binds) - <- doCorePasses dflags (zeroSimplCount dflags) cp_us binds1 rule_base core_todos + <- doCorePasses dflags rule_base (zeroSimplCount dflags) cp_us binds1 core_todos dumpIfSet_dyn dflags Opt_D_dump_simpl_stats "Grand total simplifier statistics" @@ -79,7 +93,30 @@ core2core dflags pkg_rule_base hst core_todos binds rules -- 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 (processed_binds, orphan_rules) + return (mod_details { md_binds = processed_binds, md_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 + = do { + ; showPass dflags "Simplify" + + ; us <- mkSplitUniqSupply 's' + + ; let env = emptySimplEnv (SimplPhase 0) [] emptyVarSet + (expr', _counts) = initSmpl dflags us (simplExprGently env expr) + + ; dumpIfSet_dyn dflags Opt_D_dump_simpl "Simplified expression" + (pprCoreExpr expr') + + ; return expr' + } doCorePasses :: DynFlags @@ -97,12 +134,12 @@ doCorePasses dflags rb stats us binds (to_do : to_dos) = do let (us1, us2) = splitUniqSupply us - (stats1, binds1, mlrb1) <- doCorePass dflags rb us1 binds to_do + (stats1, binds1) <- doCorePass dflags rb us1 binds to_do 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 @@ -114,26 +151,38 @@ 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 (saBinds dfs binds) + = _scc_ "Stranal" noStats dfs (do { binds1 <- saBinds dfs binds ; + dmdAnalPgm dfs binds1 }) 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) -doCorePass dfs us binds CoreDoPrintCore +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 phase pat) + = noStats dfs (ruleCheck dfs phase pat binds) +doCorePass dfs rb us binds CoreDoNothing + = noStats dfs (return binds) printCore binds = do dumpIfSet True "Print Core" (pprCoreBindings 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) } + \end{code} @@ -155,76 +204,94 @@ noStats dfs thing = do { binds <- thing; return (zeroSimplCount dfs, binds) } \begin{code} prepareRules :: DynFlags -> PackageRuleBase -> HomeSymbolTable -> UniqSupply - -> [CoreBind] -> [IdCoreRule] -- Local bindings and rules - -> IO (RuleBase, -- Full rule base - [CoreBind], -- Bindings augmented with rules - [IdCoreRule]) -- Orphan rules - -prepareRules dflags pkg_rule_base hst us binds rules - = do { let (better_rules,_) = initSmpl dflags sw_chkr us local_ids black_list_all - (mapSmpl simplRule rules) + -> [CoreBind] + -> [IdCoreRule] -- Local rules + -> IO (RuleBase, -- Full rule base + IdSet, -- Local rule Ids + [IdCoreRule], -- Orphan rules + IdSet) -- RHS free vars of all rules + +prepareRules dflags pkg_rule_base hst 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 + -- isLocalId isn't true of class methods. + -- If we miss any rules for Ids defined here, then we end up + -- giving the local decl a new Unique (because the in-scope-set is the + -- same as the rule-id set), and now the binding for the class method + -- doesn't have the same Unique as the one in the Class and the tc-env + -- Example: class Foo a where + -- op :: a -> a + -- {-# RULES "op" op x = x #-} + + 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) + 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 ; dumpIfSet_dyn dflags Opt_D_dump_rules "Transformation rules" - (vcat (map pprCoreRulePair better_rules)) - - ; let (local_id_rules, orphan_rules) = partition (`elemVarSet` local_ids . fst) better_rules - (binds1, local_rule_fvs) = addRulesToBinds binds local_id_rules - imp_rule_base = foldl add_rules pkg_rule_base (moduleEnvElts hst) - rule_base = extendRuleBaseList imp_rule_base orphan_rules - final_rule_base = addRuleBaseFVs rule_base local_rule_fvs - -- The last step black-lists the free vars of local rules too + (vcat [text "Local rules", pprRuleBase local_rule_base, + text "", + text "Imported rules", pprRuleBase final_rule_base]) - ; return (rule_base, binds1, orphan_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) -- Boringly, we need to gather the in-scope set. - -- Typically this thunk won't even be forced, but the test in - -- simpVar fails if it isn't right, and it might conceiveably matter local_ids = foldr (unionVarSet . mkVarSet . bindersOf) emptyVarSet binds -addRulesToBinds :: [CoreBind] -> [(Id,CoreRule)] -> ([CoreBind], FreeVars) + +updateBinders :: IdSet -- Locally defined ids with their Rules attached + -> IdSet -- Ids free in the RHS of local rules + -> IsExported + -> [CoreBind] -> [CoreBind] -- A horrible function - -- Attach the rules for each locally-defined Id to that Id. - -- - This makes the rules easier to look up - -- - It means that transformation rules and specialisations for - -- locally defined Ids are handled uniformly - -- - It keeps alive things that are referred to only from a rule - -- (the occurrence analyser knows about rules attached to Ids) - -- - It makes sure that, when we apply a rule, the free vars - -- of the RHS are more likely to be in scope - -- - -- The LHS and RHS Ids are marked 'no-discard'. - -- This means that the binding won't be discarded EVEN if the binding - -- ends up being trivial (v = w) -- the simplifier would usually just - -- substitute w for v throughout, but we don't apply the substitution to - -- the rules (maybe we should?), so this substitution would make the rule - -- bogus. - -addRulesToBinds binds imported_rule_base local_rules - = (map zap_bind binds, rule_lhs_fvs) +-- 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 +-- +-- Reason for (a) +-- - It makes the rules easier to look up +-- - It means that transformation rules and specialisations for +-- locally defined Ids are handled uniformly +-- - It keeps alive things that are referred to only from a rule +-- (the occurrence analyser knows about rules attached to Ids) +-- - It makes sure that, when we apply a rule, the free vars +-- of the RHS are more likely to be in scope +-- +-- Reason for (b) +-- It means that the binding won't be discarded EVEN if the binding +-- ends up being trivial (v = w) -- the simplifier would usually just +-- substitute w for v throughout, but we don't apply the substitution to +-- the rules (maybe we should?), so this substitution would make the rule +-- bogus. + +updateBinders rule_ids rule_rhs_fvs is_exported binds + = map update_bndrs binds where - RuleBase rule_ids rule_lhs_fvs = extendRuleBaseList emptyRuleBase local_rules - - imported_id_rule_ids = filterVarSet (not . isLocallyDefined) rule_ids - - -- rule_fvs is the set of all variables mentioned in this module's rules - rule_fvs = foldVarSet (unionVarSet . idRuleVars) rule_lhs_fvs rule_ids - - zap_bind (NonRec b r) = NonRec (zap_bndr b) r - zap_bind (Rec prs) = Rec [(zap_bndr b, r) | (b,r) <- prs] - - zap_bndr bndr = case lookupVarSet rule_ids bndr of - Just bndr' -> setIdNoDiscard bndr' - Nothing | bndr `elemVarSet` rule_fvs -> setIdNoDiscard bndr - | otherwise -> bndr + 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 + bndr_with_rules = lookupVarSet rule_ids bndr `orElse` bndr + + dont_discard bndr = is_exported (idName bndr) + || bndr `elemVarSet` rule_rhs_fvs \end{code} @@ -235,24 +302,37 @@ 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 simpl_arg args `thenSmpl` \ args' -> - simplExpr rhs `thenSmpl` \ rhs' -> - returnSmpl (id, Rule name bndrs' args' rhs') - -simpl_arg e --- I've seen rules in which a LHS like +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: -- augment g (build h) --- turns into +-- we do not want to get -- augment (\a. g a) (build h) --- So it's a help to eta-reduce the args as we simplify them. --- Otherwise we don't match when given an argument like +-- otherwise we don't match when given an argument like -- (\a. h a a) - = simplExpr e `thenSmpl` \ e' -> - returnSmpl (etaReduceExpr e') +-- +-- The simplifier does indeed do eta reduction (it's in +-- Simplify.completeLam) but only if -O is on. +\end{code} + +\begin{code} +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 env expr + = simplExpr env (occurAnalyseGlobalExpr expr) `thenSmpl` \ expr1 -> + simplExpr env (occurAnalyseGlobalExpr expr1) \end{code} @@ -290,7 +370,7 @@ glomBinds :: DynFlags -> [CoreBind] -> IO [CoreBind] -- analyser as free in f. glomBinds dflags binds - = do { beginPass dflags "GlomBinds" ; + = do { showPass dflags "GlomBinds" ; let { recd_binds = [Rec (flattenBinds binds)] } ; return recd_binds } -- Not much point in printing the result... @@ -307,15 +387,16 @@ glomBinds dflags binds \begin{code} simplifyPgm :: DynFlags -> RuleBase - -> (SimplifierSwitch -> SwitchResult) + -> SimplifierMode + -> [SimplifierSwitch] -> UniqSupply -> [CoreBind] -- Input -> IO (SimplCount, [CoreBind]) -- New bindings -simplifyPgm dflags (RuleBase imported_rule_ids rule_lhs_fvs) - sw_chkr us binds +simplifyPgm dflags rule_base + mode switches us binds = do { - beginPass dflags "Simplify"; + showPass dflags "Simplify"; (termination_msg, it_count, counts_out, binds') <- iteration us 1 (zeroSimplCount dflags) binds; @@ -327,17 +408,20 @@ simplifyPgm dflags (RuleBase imported_rule_ids rule_lhs_fvs) text "", pprSimplCount counts_out]); - endPass dflags "Simplify" - (dopt Opt_D_verbose_core2core dflags - && not (dopt Opt_D_dump_simpl_iterations dflags)) - binds' ; + endPass dflags "Simplify" Opt_D_verbose_core2core binds'; 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 + 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 -- space usage, especially with -O. JRS, 000620. @@ -360,15 +444,18 @@ simplifyPgm dflags (RuleBase imported_rule_ids rule_lhs_fvs) -- 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 @@ -376,18 +463,10 @@ simplifyPgm dflags (RuleBase imported_rule_ids rule_lhs_fvs) 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') ; - if dopt Opt_D_dump_simpl_iterations dflags then - endPass dflags - ("Simplifier iteration " ++ show iteration_no ++ " result") - (dopt Opt_D_verbose_core2core dflags) - binds' - else - return [] ; + endPass dflags herald Opt_D_dump_simpl_iterations binds' ; -- Stop if we've run out of iterations if iteration_no == max_iterations then