#include "HsVersions.h"
+import VectMonad
+import VectUtils
+
import DynFlags
import HscTypes
-import CoreLint ( showPass, endPass )
+import CoreLint ( showPass, endPass )
+import CoreSyn
+import CoreUtils
+import CoreFVs
import TyCon
+import Type
+import TypeRep
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 ( liftM, liftM2, mapAndUnzipM )
+
vectorise :: HscEnv -> ModGuts -> IO ModGuts
vectorise hsc_env guts
| not (Opt_Vectorise `dopt` dflags) = return guts
showPass dflags "Vectorisation"
eps <- hscEPS hsc_env
let info = hptVectInfo hsc_env `plusVectInfo` eps_vect_info eps
- Just guts' <- initDs hsc_env (mg_module guts)
- (mg_rdr_env guts)
- (mg_types guts)
- (vectoriseModule info guts)
+ Just (info', guts') <- initV hsc_env guts info (vectModule guts)
endPass dflags "Vectorisation" Opt_D_dump_vect (mg_binds guts')
- return guts'
+ return $ guts' { mg_vect_info = info' }
where
dflags = hsc_dflags hsc_env
+vectModule :: ModGuts -> VM ModGuts
+vectModule guts = return guts
+
+-- ----------------------------------------------------------------------------
+-- Bindings
+
+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)
+
-- ----------------------------------------------------------------------------
--- Vectorisation monad
-
-data Builtins = Builtins {
- parrayTyCon :: TyCon
- , paTyCon :: TyCon
- , closureTyCon :: TyCon
- , mkClosureVar :: Var
- , applyClosureVar :: Var
- , mkClosurePVar :: Var
- , applyClosurePVar :: Var
- , closurePAVar :: Var
- , lengthPAVar :: Var
- , replicatePAVar :: Var
- }
-
-initBuiltins :: DsM Builtins
-initBuiltins
+-- Expressions
+
+replicateP :: CoreExpr -> CoreExpr -> VM CoreExpr
+replicateP expr len
= do
- parrayTyCon <- dsLookupTyCon parrayTyConName
- paTyCon <- dsLookupTyCon paTyConName
- closureTyCon <- dsLookupTyCon closureTyConName
-
- mkClosureVar <- dsLookupGlobalId mkClosureName
- applyClosureVar <- dsLookupGlobalId applyClosureName
- mkClosurePVar <- dsLookupGlobalId mkClosurePName
- applyClosurePVar <- dsLookupGlobalId applyClosurePName
- closurePAVar <- dsLookupGlobalId closurePAName
- lengthPAVar <- dsLookupGlobalId lengthPAName
- replicatePAVar <- dsLookupGlobalId replicatePAName
-
- return $ Builtins {
- parrayTyCon = parrayTyCon
- , paTyCon = paTyCon
- , closureTyCon = closureTyCon
- , mkClosureVar = mkClosureVar
- , applyClosureVar = applyClosureVar
- , mkClosurePVar = mkClosurePVar
- , applyClosurePVar = applyClosurePVar
- , closurePAVar = closurePAVar
- , lengthPAVar = lengthPAVar
- , replicatePAVar = replicatePAVar
- }
-
-data VEnv = VEnv {
- -- Mapping from variables to their vectorised versions
- --
- vect_vars :: VarEnv Var
- }
-
-initVEnv :: VectInfo -> DsM VEnv
-initVEnv info
- = return $ VEnv {
- vect_vars = mapVarEnv snd $ vectInfoCCVar info
- }
-
--- FIXME
-updVectInfo :: VEnv -> VectInfo -> VectInfo
-updVectInfo env info = info
-
-newtype VM a = VM { runVM :: Builtins -> VEnv -> DsM (VEnv, a) }
-
-instance Monad VM where
- return x = VM $ \bi env -> return (env, x)
- VM p >>= f = VM $ \bi env -> do
- (env', x) <- p bi env
- runVM (f x) bi env'
-
-vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts
-vectoriseModule info guts
+ dict <- paDictOfType ty
+ rep <- builtin replicatePAVar
+ return $ mkApps (Var rep) [Type ty, dict, expr, len]
+ where
+ ty = exprType expr
+
+capply :: (CoreExpr, CoreExpr) -> (CoreExpr, CoreExpr) -> VM (CoreExpr, CoreExpr)
+capply (vfn, lfn) (varg, larg)
= do
- builtins <- initBuiltins
- env <- initVEnv info
- (env', guts') <- runVM (vectModule guts) builtins env
- return $ guts' { mg_vect_info = updVectInfo env' info }
+ 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
-vectModule :: ModGuts -> VM ModGuts
-vectModule guts = return guts
+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)
+vectExpr lc (_, AnnLam bndr body)
+ | isTyVar bndr
+ = do
+ r <- paDictArgType bndr
+ (upd_env, add_lam) <- get_upd r
+ (vbody, lbody) <- localV (upd_env >> vectExpr lc body)
+ return (Lam bndr (add_lam vbody), Lam bndr (add_lam lbody))
+ where
+ get_upd Nothing = return (deleteTyVarPA bndr, id)
+ get_upd (Just pa_ty) = do
+ pa_var <- newLocalVar FSLIT("dPA") pa_ty
+ return (extendTyVarPA bndr (Var pa_var),
+ Lam pa_var)
+
+-- ----------------------------------------------------------------------------
+-- Types
+
+vectTyCon :: TyCon -> VM TyCon
+vectTyCon tc
+ | isFunTyCon tc = builtin closureTyCon
+ | isBoxedTupleTyCon tc = return tc
+ | isUnLiftedTyCon tc = return tc
+ | otherwise = do
+ r <- lookupTyCon tc
+ case r of
+ Just tc' -> return tc'
+
+ -- FIXME: just for now
+ Nothing -> pprTrace "ccTyCon:" (ppr tc) $ return tc
+
+vectType :: Type -> VM Type
+vectType ty | Just ty' <- coreView ty = vectType ty
+vectType (TyVarTy tv) = return $ TyVarTy tv
+vectType (AppTy ty1 ty2) = liftM2 AppTy (vectType ty1) (vectType ty2)
+vectType (TyConApp tc tys) = liftM2 TyConApp (vectTyCon tc) (mapM vectType tys)
+vectType (FunTy ty1 ty2) = liftM2 TyConApp (builtin closureTyCon)
+ (mapM vectType [ty1,ty2])
+vectType (ForAllTy tv ty)
+ = do
+ r <- paDictArgType tv
+ ty' <- vectType ty
+ return $ ForAllTy tv (wrap r ty')
+ where
+ wrap Nothing = id
+ wrap (Just pa_ty) = FunTy pa_ty
+
+vectType ty = pprPanic "vectType:" (ppr ty)
+
+isClosureTyCon :: TyCon -> Bool
+isClosureTyCon tc = tyConUnique tc == closureTyConKey
+
+splitClosureTy :: Type -> (Type, Type)
+splitClosureTy ty
+ | Just (tc, [arg_ty, res_ty]) <- splitTyConApp_maybe ty
+ , isClosureTyCon tc
+ = (arg_ty, res_ty)
+
+ | otherwise = pprPanic "splitClosureTy" (ppr ty)
+
+mkPArrayTy :: Type -> VM Type
+mkPArrayTy ty = do
+ tc <- builtin parrayTyCon
+ return $ TyConApp tc [ty]
projects / ghc-hetmet.git / blobdiff