X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=0727c947ce67527cd041f1d423c458d0b0145dc9;hb=8bae351221fbd5eabe562641499c14d379816875;hp=7b0e4af4e12ba37c128e216ac784b4b8ca5f2dd3;hpb=86193bcfc847f1a1f844508224489456f08d6b83;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index 7b0e4af..0727c94 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -1,25 +1,35 @@ module VectUtils ( collectAnnTypeBinders, collectAnnTypeArgs, isAnnTypeArg, + collectAnnValBinders, splitClosureTy, mkPADictType, mkPArrayType, paDictArgType, paDictOfType, - paMethod, lengthPA, replicatePA, emptyPA, - polyAbstract, polyApply, + paMethod, lengthPA, replicatePA, emptyPA, liftPA, + polyAbstract, polyApply, polyVApply, lookupPArrayFamInst, - hoistExpr, takeHoisted + hoistExpr, hoistPolyVExpr, takeHoisted, + buildClosure, buildClosures, + mkClosureApp ) where #include "HsVersions.h" +import VectCore import VectMonad +import DsUtils import CoreSyn import CoreUtils import Type import TypeRep import TyCon +import DataCon ( dataConWrapId ) import Var +import Id ( mkWildId ) +import MkId ( unwrapFamInstScrut ) import PrelNames +import TysWiredIn +import BasicTypes ( Boxity(..) ) import Outputable import FastString @@ -38,6 +48,12 @@ collectAnnTypeBinders expr = go [] expr go bs (_, AnnLam b e) | isTyVar b = go (b:bs) e go bs e = (reverse bs, e) +collectAnnValBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann) +collectAnnValBinders expr = go [] expr + where + go bs (_, AnnLam b e) | isId b = go (b:bs) e + go bs e = (reverse bs, e) + isAnnTypeArg :: AnnExpr b ann -> Bool isAnnTypeArg (_, AnnType t) = True isAnnTypeArg _ = False @@ -64,6 +80,20 @@ splitPArrayTy ty | otherwise = pprPanic "splitPArrayTy" (ppr ty) +mkClosureType :: Type -> Type -> VM Type +mkClosureType arg_ty res_ty + = do + tc <- builtin closureTyCon + return $ mkTyConApp tc [arg_ty, res_ty] + +mkClosureTypes :: [Type] -> Type -> VM Type +mkClosureTypes arg_tys res_ty + = do + tc <- builtin closureTyCon + return $ foldr (mk tc) res_ty arg_tys + where + mk tc arg_ty res_ty = mkTyConApp tc [arg_ty, res_ty] + mkPADictType :: Type -> VM Type mkPADictType ty = do @@ -140,6 +170,20 @@ replicatePA len x = liftM (`mkApps` [len,x]) emptyPA :: Type -> VM CoreExpr emptyPA = paMethod emptyPAVar +liftPA :: CoreExpr -> VM CoreExpr +liftPA x + = do + lc <- builtin liftingContext + replicatePA (Var lc) x + +newLocalVVar :: FastString -> Type -> VM VVar +newLocalVVar fs vty + = do + lty <- mkPArrayType vty + vv <- newLocalVar fs vty + lv <- newLocalVar fs lty + return (vv,lv) + polyAbstract :: [TyVar] -> ((CoreExpr -> CoreExpr) -> VM a) -> VM a polyAbstract tvs p = localV @@ -162,6 +206,12 @@ polyApply expr tys dicts <- 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 + lookupPArrayFamInst :: Type -> VM (TyCon, [Type]) lookupPArrayFamInst ty = builtin parrayTyCon >>= (`lookupFamInst` [ty]) @@ -173,6 +223,22 @@ hoistExpr fs expr env { global_bindings = (var, expr) : global_bindings env } return var +hoistVExpr :: VExpr -> VM VVar +hoistVExpr (ve, le) + = do + fs <- getBindName + vv <- hoistExpr ('v' `consFS` fs) ve + lv <- hoistExpr ('l' `consFS` fs) le + return (vv, lv) + +hoistPolyVExpr :: [TyVar] -> VM VExpr -> VM VExpr +hoistPolyVExpr tvs p + = do + expr <- closedV . polyAbstract tvs $ \abstract -> + liftM (mapVect abstract) p + fn <- hoistVExpr expr + polyVApply (vVar fn) (mkTyVarTys tvs) + takeHoisted :: VM [(Var, CoreExpr)] takeHoisted = do @@ -180,3 +246,113 @@ takeHoisted setGEnv $ env { global_bindings = [] } return $ global_bindings env +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 mkClosureVar + mkl <- builtin mkClosurePVar + 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 :: VExpr -> VExpr -> VM VExpr +mkClosureApp (vclo, lclo) (varg, larg) + = do + vapply <- builtin applyClosureVar + lapply <- builtin applyClosurePVar + return (Var vapply `mkTyApps` [arg_ty, res_ty] `mkApps` [vclo, varg], + Var lapply `mkTyApps` [arg_ty, res_ty] `mkApps` [lclo, larg]) + where + (arg_ty, res_ty) = splitClosureTy (exprType vclo) + +buildClosures :: [TyVar] -> [VVar] -> [Type] -> Type -> VM VExpr -> VM VExpr +buildClosures tvs vars [arg_ty] res_ty mk_body + = 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 + buildClosure tvs vars arg_ty res_ty' + . hoistPolyVExpr tvs + $ do + lc <- builtin liftingContext + clo <- buildClosures tvs (vars ++ [arg]) arg_tys res_ty mk_body + return $ vLams lc (vars ++ [arg]) clo + +-- (clo , aclo (Arr lc xs1 ... xsn) ) +-- where +-- f = \env v -> case env of -> e x1 ... xn v +-- f^ = \env v -> case env of Arr l xs1 ... xsn -> e^ l x1 ... xn v +-- +buildClosure :: [TyVar] -> [VVar] -> Type -> Type -> VM VExpr -> VM VExpr +buildClosure tvs vars arg_ty res_ty mk_body + = do + (env_ty, env, bind) <- buildEnv vars + env_bndr <- newLocalVVar FSLIT("env") env_ty + arg_bndr <- newLocalVVar FSLIT("arg") arg_ty + + fn <- hoistPolyVExpr tvs + $ do + lc <- builtin liftingContext + body <- mk_body + body' <- bind (vVar env_bndr) + (vVarApps lc body (vars ++ [arg_bndr])) + return (vLamsWithoutLC [env_bndr, arg_bndr] body') + + mkClosure arg_ty res_ty env_ty fn env + +buildEnv :: [VVar] -> VM (Type, VExpr, VExpr -> VExpr -> VM VExpr) +buildEnv vvs + = do + lc <- builtin liftingContext + let (ty, venv, vbind) = mkVectEnv tys vs + (lenv, lbind) <- mkLiftEnv lc tys ls + return (ty, (venv, lenv), + \(venv,lenv) (vbody,lbody) -> + do + let vbody' = vbind venv vbody + lbody' <- lbind lenv lbody + return (vbody', lbody')) + where + (vs,ls) = unzip vvs + tys = map idType vs + +mkVectEnv :: [Type] -> [Var] -> (Type, CoreExpr, CoreExpr -> CoreExpr -> CoreExpr) +mkVectEnv [] [] = (unitTy, Var unitDataConId, \env body -> body) +mkVectEnv [ty] [v] = (ty, Var v, \env body -> Let (NonRec v env) body) +mkVectEnv tys vs = (ty, mkCoreTup (map Var vs), + \env body -> Case env (mkWildId ty) (exprType body) + [(DataAlt (tupleCon Boxed (length vs)), vs, body)]) + where + ty = mkCoreTupTy tys + +mkLiftEnv :: Var -> [Type] -> [Var] -> VM (CoreExpr, CoreExpr -> CoreExpr -> VM CoreExpr) +mkLiftEnv lc [ty] [v] + = return (Var v, \env body -> + do + len <- lengthPA (Var v) + return . Let (NonRec v env) + $ Case len lc (exprType body) [(DEFAULT, [], body)]) + +-- NOTE: this transparently deals with empty environments +mkLiftEnv lc tys vs + = do + (env_tc, env_tyargs) <- lookupPArrayFamInst vty + let [env_con] = tyConDataCons env_tc + + env = Var (dataConWrapId env_con) + `mkTyApps` env_tyargs + `mkVarApps` (lc : vs) + + bind env body = let scrut = unwrapFamInstScrut env_tc env_tyargs env + in + return $ Case scrut (mkWildId (exprType scrut)) + (exprType body) + [(DataAlt env_con, lc : bndrs, body)] + return (env, bind) + where + vty = mkCoreTupTy tys + + bndrs | null vs = [mkWildId unitTy] + | otherwise = vs +