X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=c%CE%BBash%2FCLasH%2FNormalize.hs;h=2b5c8999147c03662ff5bf806cab27af9e992ff3;hb=74c1f82bd035a57c9df445d803644fb338b32120;hp=bbdd23925b169542904c49ce4650e9a0964f1926;hpb=392d75eeca669762072ed691573533b2a0bba664;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git "a/c\316\273ash/CLasH/Normalize.hs" "b/c\316\273ash/CLasH/Normalize.hs" index bbdd239..2b5c899 100644 --- "a/c\316\273ash/CLasH/Normalize.hs" +++ "b/c\316\273ash/CLasH/Normalize.hs" @@ -23,6 +23,7 @@ import qualified CoreUtils import qualified Type import qualified Id import qualified Var +import qualified Name import qualified VarSet import qualified CoreFVs import qualified Class @@ -33,6 +34,7 @@ import Outputable ( showSDoc, ppr, nest ) import CLasH.Normalize.NormalizeTypes import CLasH.Translator.TranslatorTypes import CLasH.Normalize.NormalizeTools +import CLasH.VHDL.Constants (builtinIds) import qualified CLasH.Utils as Utils import CLasH.Utils.Core.CoreTools import CLasH.Utils.Core.BinderTools @@ -43,16 +45,22 @@ import CLasH.Utils.Pretty -------------------------------- -------------------------------- --- η abstraction +-- η expansion -------------------------------- +-- Make sure all parameters to the normalized functions are named by top +-- level lambda expressions. For this we apply η expansion to the +-- function body (possibly enclosed in some lambda abstractions) while +-- it has a function type. Eventually this will result in a function +-- body consisting of a bunch of nested lambdas containing a +-- non-function value (e.g., a complete application). eta, etatop :: Transform -eta expr | is_fun expr && not (is_lam expr) = do +eta c expr | is_fun expr && not (is_lam expr) && all (== LambdaBody) c = do let arg_ty = (fst . Type.splitFunTy . CoreUtils.exprType) expr id <- Trans.lift $ mkInternalVar "param" arg_ty change (Lam id (App expr (Var id))) -- Leave all other expressions unchanged -eta e = return e -etatop = notappargs ("eta", eta) +eta c e = return e +etatop = everywhere ("eta", eta) -------------------------------- -- β-reduction @@ -60,17 +68,17 @@ etatop = notappargs ("eta", eta) beta, betatop :: Transform -- Substitute arg for x in expr. For value lambda's, also clone before -- substitution. -beta (App (Lam x expr) arg) | CoreSyn.isTyVar x = setChanged >> substitute x arg expr - | otherwise = setChanged >> substitute_clone x arg expr +beta c (App (Lam x expr) arg) | CoreSyn.isTyVar x = setChanged >> substitute x arg c expr + | otherwise = setChanged >> substitute_clone x arg c expr -- Propagate the application into the let -beta (App (Let binds expr) arg) = change $ Let binds (App expr arg) +beta c (App (Let binds expr) arg) = change $ Let binds (App expr arg) -- Propagate the application into each of the alternatives -beta (App (Case scrut b ty alts) arg) = change $ Case scrut b ty' alts' +beta c (App (Case scrut b ty alts) arg) = change $ Case scrut b ty' alts' where alts' = map (\(con, bndrs, expr) -> (con, bndrs, (App expr arg))) alts ty' = CoreUtils.applyTypeToArg ty arg -- Leave all other expressions unchanged -beta expr = return expr +beta c expr = return expr -- Perform this transform everywhere betatop = everywhere ("beta", beta) @@ -79,12 +87,12 @@ betatop = everywhere ("beta", beta) -------------------------------- -- Try to move casts as much downward as possible. castprop, castproptop :: Transform -castprop (Cast (Let binds expr) ty) = change $ Let binds (Cast expr ty) -castprop expr@(Cast (Case scrut b _ alts) ty) = change (Case scrut b ty alts') +castprop c (Cast (Let binds expr) ty) = change $ Let binds (Cast expr ty) +castprop c expr@(Cast (Case scrut b _ alts) ty) = change (Case scrut b ty alts') where alts' = map (\(con, bndrs, expr) -> (con, bndrs, (Cast expr ty))) alts -- Leave all other expressions unchanged -castprop expr = return expr +castprop c expr = return expr -- Perform this transform everywhere castproptop = everywhere ("castprop", castprop) @@ -93,7 +101,7 @@ castproptop = everywhere ("castprop", castprop) -- perhaps for others as well. -------------------------------- castsimpl, castsimpltop :: Transform -castsimpl expr@(Cast val ty) = do +castsimpl c expr@(Cast val ty) = do -- Don't extract values that are already simpl local_var <- Trans.lift $ is_local_var val -- Don't extract values that are not representable, to prevent loops with @@ -108,45 +116,50 @@ castsimpl expr@(Cast val ty) = do else return expr -- Leave all other expressions unchanged -castsimpl expr = return expr +castsimpl c expr = return expr -- Perform this transform everywhere castsimpltop = everywhere ("castsimpl", castsimpl) - -------------------------------- --- Lambda simplication +-- Ensure that a function that just returns another function (or rather, +-- another top-level binder) is still properly normalized. This is a temporary +-- solution, we should probably integrate this pass with lambdasimpl and +-- letsimpl instead. -------------------------------- --- Ensure that a lambda always evaluates to a let expressions or a simple --- variable reference. -lambdasimpl, lambdasimpltop :: Transform --- Don't simplify a lambda that evaluates to let, since this is already --- normal form (and would cause infinite loops). -lambdasimpl expr@(Lam _ (Let _ _)) = return expr --- Put the of a lambda in its own binding, but not when the expression is --- already a local variable, or not representable (to prevent loops with --- inlinenonrep). -lambdasimpl expr@(Lam bndr res) = do - repr <- isRepr res - local_var <- Trans.lift $ is_local_var res +retvalsimpl c expr@(Let (Rec binds) body) | all (== LambdaBody) c = do + -- Don't extract values that are already a local variable, to prevent + -- loops with ourselves. + local_var <- Trans.lift $ is_local_var body + -- Don't extract values that are not representable, to prevent loops with + -- inlinenonrep + repr <- isRepr body + if not local_var && repr + then do + id <- Trans.lift $ mkBinderFor body "res" + change $ Let (Rec ((id, body):binds)) (Var id) + else + return expr + +retvalsimpl c expr | all (== LambdaBody) c && not (is_lam expr) && not (is_let expr) = do + local_var <- Trans.lift $ is_local_var expr + repr <- isRepr expr if not local_var && repr then do - id <- Trans.lift $ mkBinderFor res "res" - change $ Lam bndr (Let (NonRec id res) (Var id)) + id <- Trans.lift $ mkBinderFor expr "res" + change $ Let (Rec [(id, expr)]) (Var id) else - -- If the result is already a local var or not representable, don't - -- extract it. return expr -- Leave all other expressions unchanged -lambdasimpl expr = return expr +retvalsimpl c expr = return expr -- Perform this transform everywhere -lambdasimpltop = everywhere ("lambdasimpl", lambdasimpl) +retvalsimpltop = everywhere ("retvalsimpl", retvalsimpl) -------------------------------- -- let derecursification -------------------------------- letderec, letderectop :: Transform -letderec expr@(Let (Rec binds) res) = case liftable of +letderec c expr@(Let (Rec binds) res) = case liftable of -- Nothing is liftable, just return [] -> return expr -- Something can be lifted, generate a new let expression @@ -162,37 +175,10 @@ letderec expr@(Let (Rec binds) res) = case liftable of -- single bind recursive let. canlift (bndr, e) = not $ expr_uses_binders bndrs e -- Leave all other expressions unchanged -letderec expr = return expr +letderec c expr = return expr -- Perform this transform everywhere letderectop = everywhere ("letderec", letderec) --------------------------------- --- let simplification --------------------------------- -letsimpl, letsimpltop :: Transform --- Don't simplify a let that evaluates to another let, since this is already --- normal form (and would cause infinite loops with letflat below). -letsimpl expr@(Let _ (Let _ _)) = return expr --- Put the "in ..." value of a let in its own binding, but not when the --- expression is already a local variable, or not representable (to prevent loops with inlinenonrep). -letsimpl expr@(Let binds res) = do - repr <- isRepr res - local_var <- Trans.lift $ is_local_var res - if not local_var && repr - then do - -- If the result is not a local var already (to prevent loops with - -- ourselves), extract it. - id <- Trans.lift $ mkBinderFor res "foo" - change $ Let binds (Let (NonRec id res) (Var id)) - else - -- If the result is already a local var, don't extract it. - return expr - --- Leave all other expressions unchanged -letsimpl expr = return expr --- Perform this transform everywhere -letsimpltop = everywhere ("letsimpl", letsimpl) - -------------------------------- -- let flattening -------------------------------- @@ -203,9 +189,9 @@ letsimpltop = everywhere ("letsimpl", letsimpl) -- let b' = expr' in (let b = res' in res) letflat, letflattop :: Transform -- Turn a nonrec let that binds a let into two nested lets. -letflat (Let (NonRec b (Let binds res')) res) = +letflat c (Let (NonRec b (Let binds res')) res) = change $ Let binds (Let (NonRec b res') res) -letflat (Let (Rec binds) expr) = do +letflat c (Let (Rec binds) expr) = do -- Flatten each binding. binds' <- Utils.concatM $ Monad.mapM flatbind binds -- Return the new let. We don't use change here, since possibly nothing has @@ -220,7 +206,7 @@ letflat (Let (Rec binds) expr) = do flatbind (b, Let (NonRec b' expr') expr) = change [(b, expr), (b', expr')] flatbind (b, expr) = return [(b, expr)] -- Leave all other expressions unchanged -letflat expr = return expr +letflat c expr = return expr -- Perform this transform everywhere letflattop = everywhere ("letflat", letflat) @@ -229,9 +215,9 @@ letflattop = everywhere ("letflat", letflat) -------------------------------- -- Remove empty (recursive) lets letremove, letremovetop :: Transform -letremove (Let (Rec []) res) = change res +letremove c (Let (Rec []) res) = change res -- Leave all other expressions unchanged -letremove expr = return expr +letremove c expr = return expr -- Perform this transform everywhere letremovetop = everywhere ("letremove", letremove) @@ -246,12 +232,12 @@ letremovesimpletop = everywhere ("letremovesimple", inlinebind (\(b, e) -> Trans -- Unused let binding removal -------------------------------- letremoveunused, letremoveunusedtop :: Transform -letremoveunused expr@(Let (NonRec b bound) res) = do +letremoveunused c expr@(Let (NonRec b bound) res) = do let used = expr_uses_binders [b] res if used then return expr else change res -letremoveunused expr@(Let (Rec binds) res) = do +letremoveunused c expr@(Let (Rec binds) res) = do -- Filter out all unused binds. let binds' = filter dobind binds -- Only set the changed flag if binds got removed @@ -262,7 +248,7 @@ letremoveunused expr@(Let (Rec binds) res) = do -- expressions dobind (bndr, _) = any (expr_uses_binders [bndr]) (res:bound_exprs) -- Leave all other expressions unchanged -letremoveunused expr = return expr +letremoveunused c expr = return expr letremoveunusedtop = everywhere ("letremoveunused", letremoveunused) {- @@ -273,7 +259,7 @@ letremoveunusedtop = everywhere ("letremoveunused", letremoveunused) -- TODO: We would very much like to use GHC's CSE module for this, but that -- doesn't track if something changed or not, so we can't use it properly. letmerge, letmergetop :: Transform -letmerge expr@(Let _ _) = do +letmerge c expr@(Let _ _) = do let (binds, res) = flattenLets expr binds' <- domerge binds return $ mkNonRecLets binds' res @@ -294,7 +280,7 @@ letmerge expr@(Let _ _) = do -- Different expressions? Don't change | otherwise = return (b2, e2) -- Leave all other expressions unchanged -letmerge expr = return expr +letmerge c expr = return expr letmergetop = everywhere ("letmerge", letmerge) -} @@ -318,67 +304,101 @@ inlinenonreptop = everywhere ("inlinenonrep", inlinebind ((Monad.liftM not) . is -------------------------------- -- Top level function inlining -------------------------------- --- This transformation inlines top level bindings that have been generated by --- the compiler and are really simple. Really simple currently means that the --- normalized form only contains a single binding, which catches most of the +-- This transformation inlines simple top level bindings. Simple +-- currently means that the body is only a single application (though +-- the complexity of the arguments is not currently checked) or that the +-- normalized form only contains a single binding. This should catch most of the -- cases where a top level function is created that simply calls a type class -- method with a type and dictionary argument, e.g. -- fromInteger = GHC.Num.fromInteger (SizedWord D8) $dNum -- which is later called using simply -- fromInteger (smallInteger 10) --- By inlining such calls to simple, compiler generated functions, we prevent --- huge amounts of trivial components in the VHDL output, which the user never --- wanted. We never inline user-defined functions, since we want to preserve --- all structure defined by the user. Currently this includes all functions --- that were created by funextract, since we would get loops otherwise. -- --- Note that "defined by the compiler" isn't completely watertight, since GHC --- doesn't seem to set all those names as "system names", we apply some --- guessing here. +-- These useless wrappers are created by GHC automatically. If we don't +-- inline them, we get loads of useless components cluttering the +-- generated VHDL. +-- +-- Note that the inlining could also inline simple functions defined by +-- the user, not just GHC generated functions. It turns out to be near +-- impossible to reliably determine what functions are generated and +-- what functions are user-defined. Instead of guessing (which will +-- inline less than we want) we will just inline all simple functions. +-- +-- Only functions that are actually completely applied and bound by a +-- variable in a let expression are inlined. These are the expressions +-- that will eventually generate instantiations of trivial components. +-- By not inlining any other reference, we also prevent looping problems +-- with funextract and inlinedict. inlinetoplevel, inlinetopleveltop :: Transform --- Any system name is candidate for inlining. Never inline user-defined --- functions, to preserve structure. -inlinetoplevel expr@(Var f) | not $ isUserDefined f = do - norm_maybe <- Trans.lift $ getNormalized_maybe f - case norm_maybe of - -- No body or not normalizeable. - Nothing -> return expr - Just norm -> if needsInline norm then do - -- Regenerate all uniques in the to-be-inlined expression - norm_uniqued <- Trans.lift $ genUniques norm - -- And replace the variable reference with the unique'd body. - change norm_uniqued - else - -- No need to inline - return expr +inlinetoplevel (LetBinding:_) expr | not (is_fun expr) = + case collectArgs expr of + (Var f, args) -> do + body_maybe <- needsInline f + case body_maybe of + Just body -> do + -- Regenerate all uniques in the to-be-inlined expression + body_uniqued <- Trans.lift $ genUniques body + -- And replace the variable reference with the unique'd body. + change (mkApps body_uniqued args) + -- No need to inline + Nothing -> return expr + -- This is not an application of a binder, leave it unchanged. + _ -> return expr -- Leave all other expressions unchanged -inlinetoplevel expr = return expr +inlinetoplevel c expr = return expr inlinetopleveltop = everywhere ("inlinetoplevel", inlinetoplevel) - -needsInline :: CoreExpr -> Bool -needsInline expr = case splitNormalized expr of - -- Inline any function that only has a single definition, it is probably - -- simple enough. This might inline some stuff that it shouldn't though it - -- will never inline user-defined functions (inlinetoplevel only tries - -- system names) and inlining should never break things. - (args, [bind], res) -> True - _ -> False - - + +-- | Does the given binder need to be inlined? If so, return the body to +-- be used for inlining. +needsInline :: CoreBndr -> TransformMonad (Maybe CoreExpr) +needsInline f = do + body_maybe <- Trans.lift $ getGlobalBind f + case body_maybe of + -- No body available? + Nothing -> return Nothing + Just body -> case CoreSyn.collectArgs body of + -- The body is some (top level) binder applied to 0 or more + -- arguments. That should be simple enough to inline. + (Var f, args) -> return $ Just body + -- Body is more complicated, try normalizing it + _ -> do + norm_maybe <- Trans.lift $ getNormalized_maybe f + case norm_maybe of + -- Noth normalizeable + Nothing -> return Nothing + Just norm -> case splitNormalized norm of + -- The function has just a single binding, so that's simple + -- enough to inline. + (args, [bind], res) -> return $ Just norm + -- More complicated function, don't inline + _ -> return Nothing + -------------------------------- -- Dictionary inlining -------------------------------- --- Inline all top level dictionaries, so we can use them to resolve --- class methods based on the dictionary passed. -inlinedict expr@(Var f) | Id.isDictId f = do - body_maybe <- Trans.lift $ getGlobalBind f +-- Inline all top level dictionaries, that are in a position where +-- classopresolution can actually resolve them. This makes this +-- transformation look similar to classoperesolution below, but we'll +-- keep them separated for clarity. By not inlining other dictionaries, +-- we prevent expression sizes exploding when huge type level integer +-- dictionaries are inlined which can never be expanded (in casts, for +-- example). +inlinedict c expr@(App (App (Var sel) ty) (Var dict)) | not is_builtin && is_classop = do + body_maybe <- Trans.lift $ getGlobalBind dict case body_maybe of + -- No body available (no source available, or a local variable / + -- argument) Nothing -> return expr - Just body -> change body + Just body -> change (App (App (Var sel) ty) body) + where + -- Is this a builtin function / method? + is_builtin = elem (Name.getOccString sel) builtinIds + -- Are we dealing with a class operation selector? + is_classop = Maybe.isJust (Id.isClassOpId_maybe sel) -- Leave all other expressions unchanged -inlinedict expr = return expr +inlinedict c expr = return expr inlinedicttop = everywhere ("inlinedict", inlinedict) -------------------------------- @@ -409,20 +429,26 @@ inlinedicttop = everywhere ("inlinedict", inlinedict) -- argument) correspond exactly to this list, we then look up baz in -- that list and replace the entire expression by the corresponding -- argument to D:Baz. +-- +-- We don't resolve methods that have a builtin translation (such as +-- ==), since the actual implementation is not always (easily) +-- translateable. For example, when deriving ==, GHC generates code +-- using $con2tag functions to translate a datacon to an int and compare +-- that with GHC.Prim.==# . Better to avoid that for now. classopresolution, classopresolutiontop :: Transform -classopresolution expr@(App (App (Var sel) ty) dict) = +classopresolution c expr@(App (App (Var sel) ty) dict) | not is_builtin = case Id.isClassOpId_maybe sel of -- Not a class op selector Nothing -> return expr Just cls -> case collectArgs dict of (_, []) -> return expr -- Dict is not an application (e.g., not inlined yet) (Var dictdc, (ty':selectors)) | not (Maybe.isJust (Id.isDataConId_maybe dictdc)) -> return expr -- Dictionary is not a datacon yet (but e.g., a top level binder) - | tyargs_neq ty ty' -> error $ "Applying class selector to dictionary without matching type?\n" ++ pprString expr + | tyargs_neq ty ty' -> error $ "Normalize.classopresolution: Applying class selector to dictionary without matching type?\n" ++ pprString expr | otherwise -> let selector_ids = Class.classSelIds cls in -- Find the selector used in the class' list of selectors case List.elemIndex sel selector_ids of - Nothing -> error $ "Selector not found in class' selector list? This should not happen!\nExpression: " ++ pprString expr ++ "\nClass: " ++ show cls ++ "\nSelectors: " ++ show selector_ids + Nothing -> error $ "Normalize.classopresolution: Selector not found in class' selector list? This should not happen!\nExpression: " ++ pprString expr ++ "\nClass: " ++ show cls ++ "\nSelectors: " ++ show selector_ids -- Get the corresponding argument from the dictionary Just n -> change (selectors!!n) (_, _) -> return expr -- Not applying a variable? Don't touch @@ -431,9 +457,11 @@ classopresolution expr@(App (App (Var sel) ty) dict) = -- equal tyargs_neq (Type ty1) (Type ty2) = not $ Type.coreEqType ty1 ty2 tyargs_neq _ _ = True + -- Is this a builtin function / method? + is_builtin = elem (Name.getOccString sel) builtinIds -- Leave all other expressions unchanged -classopresolution expr = return expr +classopresolution c expr = return expr -- Perform this transform everywhere classopresolutiontop = everywhere ("classopresolution", classopresolution) @@ -442,12 +470,12 @@ classopresolutiontop = everywhere ("classopresolution", classopresolution) -------------------------------- scrutsimpl,scrutsimpltop :: Transform -- Don't touch scrutinees that are already simple -scrutsimpl expr@(Case (Var _) _ _ _) = return expr +scrutsimpl c expr@(Case (Var _) _ _ _) = return expr -- Replace all other cases with a let that binds the scrutinee and a new -- simple scrutinee, but only when the scrutinee is representable (to prevent -- loops with inlinenonrep, though I don't think a non-representable scrutinee -- will be supported anyway...) -scrutsimpl expr@(Case scrut b ty alts) = do +scrutsimpl c expr@(Case scrut b ty alts) = do repr <- isRepr scrut if repr then do @@ -456,7 +484,7 @@ scrutsimpl expr@(Case scrut b ty alts) = do else return expr -- Leave all other expressions unchanged -scrutsimpl expr = return expr +scrutsimpl c expr = return expr -- Perform this transform everywhere scrutsimpltop = everywhere ("scrutsimpl", scrutsimpl) @@ -471,18 +499,18 @@ scrutsimpltop = everywhere ("scrutsimpl", scrutsimpl) scrutbndrremove, scrutbndrremovetop :: Transform -- If the scrutinee is already simple, and the bndr is not wild yet, replace -- all occurences of the binder with the scrutinee variable. -scrutbndrremove (Case (Var scrut) bndr ty alts) | bndr_used = do +scrutbndrremove c (Case (Var scrut) bndr ty alts) | bndr_used = do alts' <- mapM subs_bndr alts change $ Case (Var scrut) wild ty alts' where is_used (_, _, expr) = expr_uses_binders [bndr] expr bndr_used = or $ map is_used alts subs_bndr (con, bndrs, expr) = do - expr' <- substitute bndr (Var scrut) expr + expr' <- substitute bndr (Var scrut) c expr return (con, bndrs, expr') wild = MkCore.mkWildBinder (Id.idType bndr) -- Leave all other expressions unchanged -scrutbndrremove expr = return expr +scrutbndrremove c expr = return expr scrutbndrremovetop = everywhere ("scrutbndrremove", scrutbndrremove) -------------------------------- @@ -492,14 +520,14 @@ casesimpl, casesimpltop :: Transform -- This is already a selector case (or, if x does not appear in bndrs, a very -- simple case statement that will be removed by caseremove below). Just leave -- it be. -casesimpl expr@(Case scrut b ty [(con, bndrs, Var x)]) = return expr +casesimpl c expr@(Case scrut b ty [(con, bndrs, Var x)]) = return expr -- Make sure that all case alternatives have only wild binders and simple -- expressions. -- This is done by creating a new let binding for each non-wild binder, which -- is bound to a new simple selector case statement and for each complex -- expression. We do this only for representable types, to prevent loops with -- inlinenonrep. -casesimpl expr@(Case scrut bndr ty alts) | not bndr_used = do +casesimpl c expr@(Case scrut bndr ty alts) | not bndr_used = do (bindingss, alts') <- (Monad.liftM unzip) $ mapM doalt alts let bindings = concat bindingss -- Replace the case with a let with bindings and a case @@ -581,7 +609,7 @@ casesimpl expr@(Case scrut bndr ty alts) | not bndr_used = do -- Don't simplify anything else return (Nothing, expr) -- Leave all other expressions unchanged -casesimpl expr = return expr +casesimpl c expr = return expr -- Perform this transform everywhere casesimpltop = everywhere ("casesimpl", casesimpl) @@ -592,11 +620,11 @@ casesimpltop = everywhere ("casesimpl", casesimpl) -- binders. caseremove, caseremovetop :: Transform -- Replace a useless case by the value of its single alternative -caseremove (Case scrut b ty [(con, bndrs, expr)]) | not usesvars = change expr +caseremove c (Case scrut b ty [(con, bndrs, expr)]) | not usesvars = change expr -- Find if any of the binders are used by expr where usesvars = (not . VarSet.isEmptyVarSet . (CoreFVs.exprSomeFreeVars (`elem` b:bndrs))) expr -- Leave all other expressions unchanged -caseremove expr = return expr +caseremove c expr = return expr -- Perform this transform everywhere caseremovetop = everywhere ("caseremove", caseremove) @@ -607,7 +635,7 @@ caseremovetop = everywhere ("caseremove", caseremove) appsimpl, appsimpltop :: Transform -- Simplify all representable arguments. Do this by introducing a new Let -- that binds the argument and passing the new binder in the application. -appsimpl expr@(App f arg) = do +appsimpl c expr@(App f arg) = do -- Check runtime representability repr <- isRepr arg local_var <- Trans.lift $ is_local_var arg @@ -618,7 +646,7 @@ appsimpl expr@(App f arg) = do else -- Leave non-representable arguments unchanged return expr -- Leave all other expressions unchanged -appsimpl expr = return expr +appsimpl c expr = return expr -- Perform this transform everywhere appsimpltop = everywhere ("appsimpl", appsimpl) @@ -632,7 +660,7 @@ argprop, argproptop :: Transform -- Transform any application of a named function (i.e., skip applications of -- lambda's). Also skip applications that have arguments with free type -- variables, since we can't inline those. -argprop expr@(App _ _) | is_var fexpr = do +argprop c expr@(App _ _) | is_var fexpr = do -- Find the body of the function called body_maybe <- Trans.lift $ getGlobalBind f case body_maybe of @@ -714,7 +742,7 @@ argprop expr@(App _ _) | is_var fexpr = do -- to a new id and just pass that new id to the old function body. return ([arg], [id], mkReferenceTo id) -- Leave all other expressions unchanged -argprop expr = return expr +argprop c expr = return expr -- Perform this transform everywhere argproptop = everywhere ("argprop", argprop) @@ -727,7 +755,7 @@ argproptop = everywhere ("argprop", argprop) -- apply map to a lambda expression This will not conflict with inlinenonrep, -- since that only inlines local let bindings, not top level bindings. funextract, funextracttop :: Transform -funextract expr@(App _ _) | is_var fexpr = do +funextract c expr@(App _ _) | is_var fexpr = do body_maybe <- Trans.lift $ getGlobalBind f case body_maybe of -- We don't have a function body for f, so we can perform this transform. @@ -765,29 +793,10 @@ funextract expr@(App _ _) | is_var fexpr = do doarg arg = return arg -- Leave all other expressions unchanged -funextract expr = return expr +funextract c expr = return expr -- Perform this transform everywhere funextracttop = everywhere ("funextract", funextract) --------------------------------- --- Ensure that a function that just returns another function (or rather, --- another top-level binder) is still properly normalized. This is a temporary --- solution, we should probably integrate this pass with lambdasimpl and --- letsimpl instead. --------------------------------- -simplrestop expr@(Lam _ _) = return expr -simplrestop expr@(Let _ _) = return expr -simplrestop expr = do - local_var <- Trans.lift $ is_local_var expr - -- Don't extract values that are not representable, to prevent loops with - -- inlinenonrep - repr <- isRepr expr - if local_var || not repr - then - return expr - else do - id <- Trans.lift $ mkBinderFor expr "res" - change $ Let (NonRec id expr) (Var id) -------------------------------- -- End of transformations -------------------------------- @@ -796,7 +805,7 @@ simplrestop expr = do -- What transforms to run? -transforms = [inlinedicttop, inlinetopleveltop, classopresolutiontop, argproptop, funextracttop, etatop, betatop, castproptop, letremovesimpletop, letderectop, letremovetop, letsimpltop, letflattop, scrutsimpltop, scrutbndrremovetop, casesimpltop, caseremovetop, inlinenonreptop, appsimpltop, letremoveunusedtop, castsimpltop, lambdasimpltop, simplrestop] +transforms = [inlinedicttop, inlinetopleveltop, classopresolutiontop, argproptop, funextracttop, etatop, betatop, castproptop, letremovesimpletop, letderectop, letremovetop, retvalsimpltop, letflattop, scrutsimpltop, scrutbndrremovetop, casesimpltop, caseremovetop, inlinenonreptop, appsimpltop, letremoveunusedtop, castsimpltop] -- | Returns the normalized version of the given function, or an error -- if it is not a known global binder. @@ -841,11 +850,14 @@ normalizeExpr :: -> TranslatorSession CoreSyn.CoreExpr -- ^ The normalized expression normalizeExpr what expr = do + startcount <- MonadState.get tsTransformCounter expr_uniqued <- genUniques expr -- Normalize this expression trace (what ++ " before normalization:\n\n" ++ showSDoc ( ppr expr_uniqued ) ++ "\n") $ return () expr' <- dotransforms transforms expr_uniqued + endcount <- MonadState.get tsTransformCounter trace ("\n" ++ what ++ " after normalization:\n\n" ++ showSDoc ( ppr expr')) $ return () + trace ("\nNeeded " ++ show (endcount - startcount) ++ " transformations to normalize " ++ what) $ return () return expr' -- | Split a normalized expression into the argument binders, top level