X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=607a44ce740ced0bc46baa8b3f9f391ef2ee8413;hb=704c20f11cbb01c36d13472042dc5ace9b1bb0e0;hp=6f927249f3ef64eccfcbe29a08b4b0919373cd52;hpb=d4017d782877af1cd822edc05d738842163ab04b;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 6f92724..607a44c 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -17,14 +17,15 @@ import Var import VarEnv import Name ( mkSysTvName ) import NameEnv +import Id -import DsMonad +import DsMonad hiding (mapAndUnzipM) import PrelNames import Outputable import FastString -import Control.Monad ( liftM2 ) +import Control.Monad ( liftM, liftM2, mapAndUnzipM ) vectorise :: HscEnv -> ModGuts -> IO ModGuts vectorise hsc_env guts @@ -87,52 +88,57 @@ initBuiltins , replicatePAVar = replicatePAVar } -data VEnv = VEnv { - -- Mapping from global variables to their vectorised versions. - -- - vect_global_vars :: VarEnv CoreExpr - - -- Mapping from local variables to their vectorised and lifted - -- versions. - -- - , vect_local_vars :: VarEnv (CoreExpr, CoreExpr) - - -- Exported variables which have a vectorised version - -- - , vect_exported_vars :: VarEnv (Var, Var) - - -- Mapping from TyCons to their vectorised versions. - -- TyCons which do not have to be vectorised are mapped to - -- themselves. - -- - , vect_tycons :: NameEnv TyCon - - -- Mapping from TyCons to their PA dictionaries - -- - , vect_tycon_pa :: NameEnv CoreExpr - - -- Mapping from tyvars to their PA dictionaries - -- - , vect_tyvar_pa :: VarEnv CoreExpr - } +data GlobalEnv = GlobalEnv { + -- Mapping from global variables to their vectorised versions. + -- + global_vars :: VarEnv CoreExpr + + -- Exported variables which have a vectorised version + -- + , global_exported_vars :: VarEnv (Var, Var) + + -- Mapping from TyCons to their vectorised versions. + -- TyCons which do not have to be vectorised are mapped to + -- themselves. + -- + , global_tycons :: NameEnv TyCon + + -- Mapping from TyCons to their PA dictionaries + -- + , global_tycon_pa :: NameEnv CoreExpr + } + +data LocalEnv = LocalEnv { + -- Mapping from local variables to their vectorised and + -- lifted versions + -- + local_vars :: VarEnv (CoreExpr, CoreExpr) -initVEnv :: VectInfo -> DsM VEnv -initVEnv info - = return $ VEnv { - vect_global_vars = mapVarEnv (Var . snd) $ vectInfoCCVar info - , vect_local_vars = emptyVarEnv - , vect_exported_vars = emptyVarEnv - , vect_tycons = mapNameEnv snd $ vectInfoCCTyCon info - , vect_tycon_pa = emptyNameEnv - , vect_tyvar_pa = emptyVarEnv - } + -- Mapping from tyvars to their PA dictionaries + , local_tyvar_pa :: VarEnv CoreExpr + } + + +initGlobalEnv :: VectInfo -> GlobalEnv +initGlobalEnv info + = GlobalEnv { + global_vars = mapVarEnv (Var . snd) $ vectInfoCCVar info + , global_exported_vars = emptyVarEnv + , global_tycons = mapNameEnv snd $ vectInfoCCTyCon info + , global_tycon_pa = emptyNameEnv + } + +emptyLocalEnv = LocalEnv { + local_vars = emptyVarEnv + , local_tyvar_pa = emptyVarEnv + } -- FIXME -updVectInfo :: VEnv -> ModGuts -> ModGuts +updVectInfo :: GlobalEnv -> ModGuts -> ModGuts updVectInfo env guts = guts { mg_vect_info = info' } where info' = info { - vectInfoCCVar = vect_exported_vars env + vectInfoCCVar = global_exported_vars env , vectInfoCCTyCon = tc_env } @@ -141,29 +147,30 @@ updVectInfo env guts = guts { mg_vect_info = info' } tc_env = mkNameEnv [(tc_name, (tc,tc')) | tc <- typeEnvTyCons tyenv , let tc_name = tyConName tc - , Just tc' <- [lookupNameEnv (vect_tycons env) tc_name]] + , Just tc' <- [lookupNameEnv (global_tycons env) tc_name]] -data VResult a = Yes VEnv a | No +data VResult a = Yes GlobalEnv LocalEnv a | No -newtype VM a = VM { runVM :: Builtins -> VEnv -> DsM (VResult a) } +newtype VM a = VM { runVM :: Builtins -> GlobalEnv -> LocalEnv -> DsM (VResult a) } instance Monad VM where - return x = VM $ \bi env -> return (Yes env x) - VM p >>= f = VM $ \bi env -> do - r <- p bi env - case r of - Yes env' x -> runVM (f x) bi env' - No -> return No + return x = VM $ \bi genv lenv -> return (Yes genv lenv x) + VM p >>= f = VM $ \bi genv lenv -> do + r <- p bi genv lenv + case r of + Yes genv' lenv' x -> runVM (f x) bi genv' lenv' + No -> return No noV :: VM a -noV = VM $ \bi env -> return No +noV = VM $ \_ _ _ -> return No tryV :: VM a -> VM (Maybe a) -tryV (VM p) = VM $ \bi env -> do - r <- p bi env - case r of - Yes env' x -> return (Yes env' (Just x)) - No -> return (Yes env Nothing) +tryV (VM p) = VM $ \bi genv lenv -> + do + r <- p bi genv lenv + case r of + Yes genv' lenv' x -> return (Yes genv' lenv' (Just x)) + No -> return (Yes genv lenv Nothing) maybeV :: VM (Maybe a) -> VM a maybeV p = maybe noV return =<< p @@ -171,20 +178,36 @@ maybeV p = maybe noV return =<< p orElseV :: VM a -> VM a -> VM a orElseV p q = maybe q return =<< tryV p +localV :: VM a -> VM a +localV p = do + env <- readLEnv id + x <- p + setLEnv env + return x + liftDs :: DsM a -> VM a -liftDs p = VM $ \bi env -> do { x <- p; return (Yes env x) } +liftDs p = VM $ \bi genv lenv -> do { x <- p; return (Yes genv lenv x) } builtin :: (Builtins -> a) -> VM a -builtin f = VM $ \bi env -> return (Yes env (f bi)) +builtin f = VM $ \bi genv lenv -> return (Yes genv lenv (f bi)) + +readGEnv :: (GlobalEnv -> a) -> VM a +readGEnv f = VM $ \bi genv lenv -> return (Yes genv lenv (f genv)) -readEnv :: (VEnv -> a) -> VM a -readEnv f = VM $ \bi env -> return (Yes env (f env)) +setGEnv :: GlobalEnv -> VM () +setGEnv genv = VM $ \_ _ lenv -> return (Yes genv lenv ()) -setEnv :: VEnv -> VM () -setEnv env = VM $ \_ _ -> return (Yes env ()) +updGEnv :: (GlobalEnv -> GlobalEnv) -> VM () +updGEnv f = VM $ \_ genv lenv -> return (Yes (f genv) lenv ()) -updEnv :: (VEnv -> VEnv) -> VM () -updEnv f = VM $ \_ env -> return (Yes (f env) ()) +readLEnv :: (LocalEnv -> a) -> VM a +readLEnv f = VM $ \bi genv lenv -> return (Yes genv lenv (f lenv)) + +setLEnv :: LocalEnv -> VM () +setLEnv lenv = VM $ \_ genv _ -> return (Yes genv lenv ()) + +updLEnv :: (LocalEnv -> LocalEnv) -> VM () +updLEnv f = VM $ \_ genv lenv -> return (Yes genv (f lenv) ()) newTyVar :: FastString -> Kind -> VM Var newTyVar fs k @@ -192,11 +215,8 @@ newTyVar fs k u <- liftDs newUnique return $ mkTyVar (mkSysTvName u fs) k -lookupVar :: Var -> VM CoreExpr -lookupVar v = maybeV . readEnv $ \env -> lookupVarEnv (vect_vars env) v - lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readEnv $ \env -> lookupNameEnv (vect_tycons env) (tyConName tc) +lookupTyCon tc = readGEnv $ \env -> lookupNameEnv (global_tycons env) (tyConName tc) -- ---------------------------------------------------------------------------- -- Bindings @@ -205,17 +225,119 @@ vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts vectoriseModule info guts = do builtins <- initBuiltins - env <- initVEnv info - r <- runVM (vectModule guts) builtins env + r <- runVM (vectModule guts) builtins (initGlobalEnv info) emptyLocalEnv case r of - Yes env' guts' -> return $ updVectInfo env' guts' - No -> return guts + Yes genv _ guts' -> return $ updVectInfo genv guts' + No -> return guts vectModule :: ModGuts -> VM ModGuts vectModule guts = return guts + + +vectBndr :: Var -> VM (Var, Var) +vectBndr v + = do + vty <- vectType (idType v) + lty <- mkPArrayTy vty + let vv = v `Id.setIdType` vty + lv = v `Id.setIdType` lty + updLEnv (mapTo vv lv) + return (vv, lv) + where + mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (Var vv, Var lv) } + +vectBndrIn :: Var -> VM a -> VM (Var, Var, a) +vectBndrIn v p + = localV + $ do + (vv, lv) <- vectBndr v + x <- p + return (vv, lv, x) + +vectBndrsIn :: [Var] -> VM a -> VM ([Var], [Var], a) +vectBndrsIn vs p + = localV + $ do + (vvs, lvs) <- mapAndUnzipM vectBndr vs + x <- p + return (vvs, lvs, x) + -- ---------------------------------------------------------------------------- --- Types +-- Expressions + +replicateP :: CoreExpr -> CoreExpr -> VM CoreExpr +replicateP expr len + = do + pa <- paOfType ty + rep <- builtin replicatePAVar + return $ mkApps (Var rep) [Type ty, pa, expr, len] + where + ty = exprType expr + +capply :: (CoreExpr, CoreExpr) -> (CoreExpr, CoreExpr) -> VM (CoreExpr, CoreExpr) +capply (vfn, lfn) (varg, larg) + = do + apply <- builtin applyClosureVar + applyP <- builtin applyClosurePVar + return (mkApps (Var apply) [Type arg_ty, Type res_ty, vfn, varg], + mkApps (Var applyP) [Type arg_ty, Type res_ty, lfn, larg]) + where + fn_ty = exprType vfn + (arg_ty, res_ty) = splitClosureTy fn_ty + +vectVar :: CoreExpr -> Var -> VM (CoreExpr, CoreExpr) +vectVar lc v = local v `orElseV` global v + where + local v = maybeV (readLEnv $ \env -> lookupVarEnv (local_vars env) v) + global v = do + vexpr <- maybeV (readGEnv $ \env -> lookupVarEnv (global_vars env) v) + lexpr <- replicateP vexpr lc + return (vexpr, lexpr) + +vectExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) +vectExpr lc (_, AnnType ty) + = do + vty <- vectType ty + return (Type vty, Type vty) +vectExpr lc (_, AnnVar v) = vectVar lc v +vectExpr lc (_, AnnLit lit) + = do + let vexpr = Lit lit + lexpr <- replicateP vexpr lc + return (vexpr, lexpr) +vectExpr lc (_, AnnNote note expr) + = do + (vexpr, lexpr) <- vectExpr lc expr + return (Note note vexpr, Note note lexpr) +vectExpr lc (_, AnnApp fn arg) + = do + fn' <- vectExpr lc fn + arg' <- vectExpr lc arg + capply fn' arg' +vectExpr lc (_, AnnCase expr bndr ty alts) + = panic "vectExpr: case" +vectExpr lc (_, AnnLet (AnnNonRec bndr rhs) body) + = do + (vrhs, lrhs) <- vectExpr lc rhs + (vbndr, lbndr, (vbody, lbody)) <- vectBndrIn bndr (vectExpr lc body) + return (Let (NonRec vbndr vrhs) vbody, + Let (NonRec lbndr lrhs) lbody) +vectExpr lc (_, AnnLet (AnnRec prs) body) + = do + (vbndrs, lbndrs, (vrhss, vbody, lrhss, lbody)) <- vectBndrsIn bndrs vect + return (Let (Rec (zip vbndrs vrhss)) vbody, + Let (Rec (zip lbndrs lrhss)) lbody) + where + (bndrs, rhss) = unzip prs + + vect = do + (vrhss, lrhss) <- mapAndUnzipM (vectExpr lc) rhss + (vbody, lbody) <- vectExpr lc body + return (vrhss, vbody, lrhss, lbody) + +-- ---------------------------------------------------------------------------- +-- PA dictionaries paArgType :: Type -> Kind -> VM (Maybe Type) paArgType ty k @@ -247,6 +369,33 @@ paArgType' ty k Just ty' -> return ty' Nothing -> pprPanic "paArgType'" (ppr ty) +paOfTyCon :: TyCon -> VM CoreExpr +-- FIXME: just for now +paOfTyCon tc = maybeV (readGEnv $ \env -> lookupNameEnv (global_tycon_pa env) (tyConName tc)) + +paOfType :: Type -> VM CoreExpr +paOfType ty | Just ty' <- coreView ty = paOfType ty' + +paOfType (TyVarTy tv) = maybeV (readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv) +paOfType (AppTy ty1 ty2) + = do + e1 <- paOfType ty1 + e2 <- paOfType ty2 + return $ mkApps e1 [Type ty2, e2] +paOfType (TyConApp tc tys) + = do + e <- paOfTyCon tc + es <- mapM paOfType tys + return $ mkApps e [arg | (t,e) <- zip tys es, arg <- [Type t, e]] +paOfType (FunTy ty1 ty2) = paOfType (TyConApp funTyCon [ty1,ty2]) +paOfType t@(ForAllTy tv ty) = pprPanic "paOfType:" (ppr t) +paOfType ty = pprPanic "paOfType:" (ppr ty) + + + +-- ---------------------------------------------------------------------------- +-- Types + vectTyCon :: TyCon -> VM TyCon vectTyCon tc | isFunTyCon tc = builtin closureTyCon @@ -286,3 +435,8 @@ splitClosureTy ty | otherwise = pprPanic "splitClosureTy" (ppr ty) +mkPArrayTy :: Type -> VM Type +mkPArrayTy ty = do + tc <- builtin parrayTyCon + return $ TyConApp tc [ty] +