X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=37dbecb446d79a5e4f10c9f2a412c03a2b36dd12;hb=02c988e586dedff6d252ef59ef487dd4a8f567aa;hp=e5084241d61784106054345b76a82b76d47ebcc4;hpb=cfccfa67393fcf8cb43aaa465d421b67c7117580;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index e508424..37dbecb 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -11,22 +11,24 @@ module VectUtils ( pdataReprTyCon, pdataReprDataCon, mkVScrut, prDictOfType, prDFunOfTyCon, paDictArgType, paDictOfType, paDFunType, - paMethod, wrapPR, replicatePD, emptyPD, packPD, packByTagPD, + paMethod, wrapPR, replicatePD, emptyPD, packByTagPD, combinePD, liftPD, zipScalars, scalarClosure, - polyAbstract, polyApply, polyVApply, + polyAbstract, polyApply, polyVApply, polyArity, + Inline(..), addInlineArity, inlineMe, hoistBinding, hoistExpr, hoistPolyVExpr, takeHoisted, buildClosure, buildClosures, mkClosureApp ) where - -import VectCore import VectMonad +import Vectorise.Env +import Vectorise.Vect -import MkCore ( mkCoreTup, mkCoreTupTy, mkWildCase ) +import MkCore ( mkCoreTup, mkWildCase ) import CoreSyn import CoreUtils +import CoreUnfold ( mkInlineRule ) import Coercion import Type import TypeRep @@ -34,16 +36,17 @@ import TyCon import DataCon import Var import MkId ( unwrapFamInstScrut ) +import Id ( setIdUnfolding ) import TysWiredIn -import BasicTypes ( Boxity(..) ) +import BasicTypes ( Boxity(..), Arity ) import Literal ( Literal, mkMachInt ) + import Outputable import FastString import Control.Monad - collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type]) collectAnnTypeArgs expr = go expr [] where @@ -161,6 +164,7 @@ prDFunOfTyCon tycon . maybeCantVectoriseM "No PR dictionary for tycon" (ppr tycon) $ lookupTyConPR tycon + paDictArgType :: TyVar -> VM (Maybe Type) paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) where @@ -181,25 +185,39 @@ paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) go _ _ = return Nothing -paDictOfType :: Type -> VM CoreExpr -paDictOfType ty = paDictOfTyApp ty_fn ty_args + +-- | Get the PA dictionary for some type, or `Nothing` if there isn't one. +paDictOfType :: Type -> VM (Maybe CoreExpr) +paDictOfType ty + = paDictOfTyApp ty_fn ty_args where (ty_fn, ty_args) = splitAppTys ty -paDictOfTyApp :: Type -> [Type] -> VM CoreExpr -paDictOfTyApp ty_fn ty_args - | Just ty_fn' <- coreView ty_fn = paDictOfTyApp ty_fn' ty_args -paDictOfTyApp (TyVarTy tv) ty_args - = do - dfun <- maybeV (lookupTyVarPA tv) - paDFunApply dfun ty_args -paDictOfTyApp (TyConApp tc _) ty_args - = do - dfun <- maybeCantVectoriseM "No PA dictionary for tycon" (ppr tc) - $ lookupTyConPA tc - paDFunApply (Var dfun) ty_args -paDictOfTyApp ty _ - = cantVectorise "Can't construct PA dictionary for type" (ppr ty) + paDictOfTyApp :: Type -> [Type] -> VM (Maybe CoreExpr) + paDictOfTyApp ty_fn ty_args + | Just ty_fn' <- coreView ty_fn + = paDictOfTyApp ty_fn' ty_args + + paDictOfTyApp (TyVarTy tv) ty_args + = do dfun <- maybeV (lookupTyVarPA tv) + liftM Just $ paDFunApply dfun ty_args + + paDictOfTyApp (TyConApp tc _) ty_args + = do mdfun <- lookupTyConPA tc + case mdfun of + Nothing + -> pprTrace "VectUtils.paDictOfType" + (vcat [ text "No PA dictionary" + , text "for tycon: " <> ppr tc + , text "in type: " <> ppr ty]) + $ return Nothing + + Just dfun -> liftM Just $ paDFunApply (Var dfun) ty_args + + paDictOfTyApp ty _ + = cantVectorise "Can't construct PA dictionary for type" (ppr ty) + + paDFunType :: TyCon -> VM Type paDFunType tc @@ -214,10 +232,10 @@ paDFunType tc paDFunApply :: CoreExpr -> [Type] -> VM CoreExpr paDFunApply dfun tys - = do - dicts <- mapM paDictOfType tys + = do Just dicts <- liftM sequence $ mapM paDictOfType tys return $ mkApps (mkTyApps dfun tys) dicts + paMethod :: (Builtins -> Var) -> String -> Type -> VM CoreExpr paMethod _ name ty | Just tycon <- splitPrimTyCon ty @@ -227,8 +245,8 @@ paMethod _ name ty paMethod method _ ty = do - fn <- builtin method - dict <- paDictOfType ty + fn <- builtin method + Just dict <- paDictOfType ty return $ mkApps (Var fn) [Type ty, dict] prDictOfType :: Type -> VM CoreExpr @@ -254,8 +272,8 @@ prDFunApply dfun tys wrapPR :: Type -> VM CoreExpr wrapPR ty = do - pa_dict <- paDictOfType ty - pr_dfun <- prDFunOfTyCon =<< builtin wrapTyCon + Just pa_dict <- paDictOfType ty + pr_dfun <- prDFunOfTyCon =<< builtin wrapTyCon return $ mkApps pr_dfun [Type ty, pa_dict] replicatePD :: CoreExpr -> CoreExpr -> VM CoreExpr @@ -265,10 +283,6 @@ replicatePD len x = liftM (`mkApps` [len,x]) emptyPD :: Type -> VM CoreExpr emptyPD = paMethod emptyPDVar "emptyPD" -packPD :: Type -> CoreExpr -> CoreExpr -> CoreExpr -> VM CoreExpr -packPD ty xs len sel = liftM (`mkApps` [xs, len, sel]) - (paMethod packPDVar "packPD" ty) - packByTagPD :: Type -> CoreExpr -> CoreExpr -> CoreExpr -> CoreExpr -> VM CoreExpr packByTagPD ty xs len tags t @@ -283,6 +297,7 @@ combinePD ty len sel xs where n = length xs +-- | Like `replicatePD` but use the lifting context in the vectoriser state. liftPD :: CoreExpr -> VM CoreExpr liftPD x = do @@ -302,8 +317,8 @@ zipScalars arg_tys res_ty scalarClosure :: [Type] -> Type -> CoreExpr -> CoreExpr -> VM CoreExpr scalarClosure arg_tys res_ty scalar_fun array_fun = do - ctr <- builtin (closureCtrFun $ length arg_tys) - pas <- mapM paDictOfType (init arg_tys) + ctr <- builtin (closureCtrFun $ length arg_tys) + Just pas <- liftM sequence $ mapM paDictOfType (init arg_tys) return $ Var ctr `mkTyApps` (arg_tys ++ [res_ty]) `mkApps` (pas ++ [scalar_fun, array_fun]) @@ -315,13 +330,14 @@ newLocalVVar fs vty lv <- newLocalVar fs lty return (vv,lv) -polyAbstract :: [TyVar] -> ((CoreExpr -> CoreExpr) -> VM a) -> VM a +polyAbstract :: [TyVar] -> ([Var] -> VM a) -> VM a polyAbstract tvs p = localV $ do mdicts <- mapM mk_dict_var tvs - zipWithM_ (\tv -> maybe (defLocalTyVar tv) (defLocalTyVarWithPA tv . Var)) tvs mdicts - p (mk_lams mdicts) + zipWithM_ (\tv -> maybe (defLocalTyVar tv) + (defLocalTyVarWithPA tv . Var)) tvs mdicts + p (mk_args mdicts) where mk_dict_var tv = do r <- paDictArgType tv @@ -329,45 +345,71 @@ polyAbstract tvs p Just ty -> liftM Just (newLocalVar (fsLit "dPA") ty) Nothing -> return Nothing - mk_lams mdicts = mkLams (tvs ++ [dict | Just dict <- mdicts]) + mk_args mdicts = [dict | Just dict <- mdicts] + +polyArity :: [TyVar] -> VM Int +polyArity tvs = do + tys <- mapM paDictArgType tvs + return $ length [() | Just _ <- tys] polyApply :: CoreExpr -> [Type] -> VM CoreExpr polyApply expr tys - = do - dicts <- mapM paDictOfType tys + = do Just dicts <- liftM sequence $ mapM paDictOfType tys return $ expr `mkTyApps` tys `mkApps` dicts polyVApply :: VExpr -> [Type] -> VM VExpr polyVApply expr tys - = do - dicts <- mapM paDictOfType tys - return $ mapVect (\e -> e `mkTyApps` tys `mkApps` dicts) expr + = do Just dicts <- liftM sequence $ mapM paDictOfType tys + return $ mapVect (\e -> e `mkTyApps` tys `mkApps` dicts) expr + +-- Inline --------------------------------------------------------------------- +-- | Records whether we should inline a particular binding. +data Inline + = Inline Arity + | DontInline + +-- | Add to the arity contained within an `Inline`, if any. +addInlineArity :: Inline -> Int -> Inline +addInlineArity (Inline m) n = Inline (m+n) +addInlineArity DontInline _ = DontInline + +-- | Says to always inline a binding. +inlineMe :: Inline +inlineMe = Inline 0 + +-- Hoising -------------------------------------------------------------------- hoistBinding :: Var -> CoreExpr -> VM () hoistBinding v e = updGEnv $ \env -> env { global_bindings = (v,e) : global_bindings env } -hoistExpr :: FastString -> CoreExpr -> VM Var -hoistExpr fs expr +hoistExpr :: FastString -> CoreExpr -> Inline -> VM Var +hoistExpr fs expr inl = do - var <- newLocalVar fs (exprType expr) + var <- mk_inline `liftM` newLocalVar fs (exprType expr) hoistBinding var expr return var + where + mk_inline var = case inl of + Inline arity -> var `setIdUnfolding` + mkInlineRule expr (Just arity) + DontInline -> var -hoistVExpr :: VExpr -> VM VVar -hoistVExpr (ve, le) +hoistVExpr :: VExpr -> Inline -> VM VVar +hoistVExpr (ve, le) inl = do fs <- getBindName - vv <- hoistExpr ('v' `consFS` fs) ve - lv <- hoistExpr ('l' `consFS` fs) le + vv <- hoistExpr ('v' `consFS` fs) ve inl + lv <- hoistExpr ('l' `consFS` fs) le (addInlineArity inl 1) return (vv, lv) -hoistPolyVExpr :: [TyVar] -> VM VExpr -> VM VExpr -hoistPolyVExpr tvs p +hoistPolyVExpr :: [TyVar] -> Inline -> VM VExpr -> VM VExpr +hoistPolyVExpr tvs inline p = do - expr <- closedV . polyAbstract tvs $ \abstract -> - liftM (mapVect abstract) p - fn <- hoistVExpr expr + inline' <- liftM (addInlineArity inline) (polyArity tvs) + expr <- closedV . polyAbstract tvs $ \args -> + liftM (mapVect (mkLams $ tvs ++ args)) p + fn <- hoistVExpr expr inline' polyVApply (vVar fn) (mkTyVarTys tvs) takeHoisted :: VM [(Var, CoreExpr)] @@ -391,36 +433,38 @@ boxExpr ty (vexpr, lexpr) Nothing -> return (vexpr, lexpr) -} +-- Closures ------------------------------------------------------------------- mkClosure :: Type -> Type -> Type -> VExpr -> VExpr -> VM VExpr mkClosure arg_ty res_ty env_ty (vfn,lfn) (venv,lenv) - = do - dict <- paDictOfType env_ty - mkv <- builtin closureVar - mkl <- builtin liftedClosureVar + = do Just dict <- paDictOfType env_ty + mkv <- builtin closureVar + mkl <- builtin liftedClosureVar return (Var mkv `mkTyApps` [arg_ty, res_ty, env_ty] `mkApps` [dict, vfn, lfn, venv], Var mkl `mkTyApps` [arg_ty, res_ty, env_ty] `mkApps` [dict, vfn, lfn, lenv]) + mkClosureApp :: Type -> Type -> VExpr -> VExpr -> VM VExpr mkClosureApp arg_ty res_ty (vclo, lclo) (varg, larg) - = do - vapply <- builtin applyVar + = do vapply <- builtin applyVar lapply <- builtin liftedApplyVar lc <- builtin liftingContext return (Var vapply `mkTyApps` [arg_ty, res_ty] `mkApps` [vclo, varg], Var lapply `mkTyApps` [arg_ty, res_ty] `mkApps` [Var lc, lclo, larg]) + buildClosures :: [TyVar] -> [VVar] -> [Type] -> Type -> VM VExpr -> VM VExpr buildClosures _ _ [] _ mk_body = mk_body buildClosures tvs vars [arg_ty] res_ty mk_body - = liftM vInlineMe (buildClosure tvs vars arg_ty res_ty mk_body) + = -- liftM vInlineMe $ + buildClosure tvs vars arg_ty res_ty mk_body buildClosures tvs vars (arg_ty : arg_tys) res_ty mk_body = do res_ty' <- mkClosureTypes arg_tys res_ty arg <- newLocalVVar (fsLit "x") arg_ty - liftM vInlineMe - . buildClosure tvs vars arg_ty res_ty' - . hoistPolyVExpr tvs + -- liftM vInlineMe + buildClosure tvs vars arg_ty res_ty' + . hoistPolyVExpr tvs (Inline (length vars + 1)) $ do lc <- builtin liftingContext clo <- buildClosures tvs (vars ++ [arg]) arg_tys res_ty mk_body @@ -438,17 +482,19 @@ buildClosure tvs vars arg_ty res_ty mk_body env_bndr <- newLocalVVar (fsLit "env") env_ty arg_bndr <- newLocalVVar (fsLit "arg") arg_ty - fn <- hoistPolyVExpr tvs + fn <- hoistPolyVExpr tvs (Inline 2) $ do lc <- builtin liftingContext body <- mk_body - return . vInlineMe + return -- . vInlineMe . vLams lc [env_bndr, arg_bndr] $ bind (vVar env_bndr) (vVarApps lc body (vars ++ [arg_bndr])) mkClosure arg_ty res_ty env_ty fn env + +-- Environments --------------------------------------------------------------- buildEnv :: [VVar] -> VM (Type, VExpr, VExpr -> VExpr -> VExpr) buildEnv [] = do ty <- voidType @@ -488,5 +534,5 @@ buildEnv vs where (vvs, lvs) = unzip vs tys = map vVarType vs - ty = mkCoreTupTy tys + ty = mkBoxedTupleTy tys