mkPADictType, mkPArrayType,
paDictArgType, paDictOfType,
paMethod, lengthPA, replicatePA, emptyPA,
- polyAbstract, polyApply,
+ polyAbstract, polyApply, polyVApply,
lookupPArrayFamInst,
- hoistExpr, takeHoisted
+ hoistExpr, hoistPolyVExpr, takeHoisted,
+ buildClosure
) where
#include "HsVersions.h"
+import VectCore
import VectMonad
import DsUtils
emptyPA :: Type -> VM CoreExpr
emptyPA = paMethod emptyPAVar
+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
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])
env { global_bindings = (var, expr) : global_bindings env }
return var
-hoistPolyExpr :: FastString -> [TyVar] -> CoreExpr -> VM CoreExpr
-hoistPolyExpr fs tvs expr
+hoistVExpr :: FastString -> VExpr -> VM VVar
+hoistVExpr fs (ve, le)
= do
- poly_expr <- closedV . polyAbstract tvs $ \abstract -> return (abstract expr)
- fn <- hoistExpr fs poly_expr
- polyApply (Var fn) (mkTyVarTys tvs)
+ vv <- hoistExpr ('v' `consFS` fs) ve
+ lv <- hoistExpr ('l' `consFS` fs) le
+ return (vv, lv)
+
+hoistPolyVExpr :: FastString -> [TyVar] -> VM VExpr -> VM VExpr
+hoistPolyVExpr fs tvs p
+ = do
+ expr <- closedV . polyAbstract tvs $ \abstract ->
+ liftM (mapVect abstract) p
+ fn <- hoistVExpr fs expr
+ polyVApply (vVar fn) (mkTyVarTys tvs)
takeHoisted :: VM [(Var, CoreExpr)]
takeHoisted
return $ global_bindings env
-mkClosure :: Type -> Type -> Type -> CoreExpr -> CoreExpr -> CoreExpr -> CoreExpr -> VM CoreExpr
-mkClosure arg_ty res_ty env_ty pa_dict vfn lfn env
- = do
- mk <- builtin mkClosureVar
- return $ Var mk `mkTyApps` [arg_ty, res_ty, env_ty] `mkApps` [pa_dict, vfn, lfn, env]
-
-mkClosureP :: Type -> Type -> Type -> CoreExpr -> CoreExpr -> CoreExpr -> CoreExpr -> VM CoreExpr
-mkClosureP arg_ty res_ty env_ty pa_dict vfn lfn env
+mkClosure :: Type -> Type -> Type -> VExpr -> VExpr -> VM VExpr
+mkClosure arg_ty res_ty env_ty (vfn,lfn) (venv,lenv)
= do
- mk <- builtin mkClosurePVar
- return $ Var mk `mkTyApps` [arg_ty, res_ty, env_ty] `mkApps` [pa_dict, vfn, lfn, env]
+ 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])
-- (clo <x1,...,xn> <f,f^>, aclo (Arr lc xs1 ... xsn) <f,f^>)
-- where
-- f = \env v -> case env of <x1,...,xn> -> e x1 ... xn v
-- f^ = \env v -> case env of Arr l xs1 ... xsn -> e^ l x1 ... xn v
-buildClosure :: [TyVar] -> [(Var,Var)] -> (Var,Var) -> Var -> CoreExpr -> CoreExpr -> VM (CoreExpr, CoreExpr)
-buildClosure tvs env (varg, larg) lv vbody lbody
+buildClosure :: [TyVar] -> Var -> [VVar] -> Type -> Type -> VM VExpr -> VM VExpr
+buildClosure tvs lv vars arg_ty res_ty mk_body
= do
- let (venv_ty, venv, bind_venv) = mkVectEnv tys vs
- (lenv, bind_lenv) <- mkLiftEnv (Var lv) tys ls
- lenv_ty <- mkPArrayType venv_ty
+ (env_ty, env, bind) <- buildEnv lv vars
+ env_bndr <- newLocalVVar FSLIT("env") env_ty
+ arg_bndr <- newLocalVVar FSLIT("arg") arg_ty
- venv_bndr <- newLocalVar FSLIT("env") venv_ty
- lenv_bndr <- newLocalVar FSLIT("env") lenv_ty
+ fn <- hoistPolyVExpr FSLIT("fn") tvs
+ $ do
+ body <- mk_body
+ body' <- bind (vVar env_bndr)
+ (vVarApps lv body (vars ++ [arg_bndr]))
+ return (vLamsWithoutLC [env_bndr, arg_bndr] body')
- let mono_vfn = mkLams [venv_bndr, varg]
- . bind_venv (Var venv_bndr)
- $ vbody `mkVarApps` vs `mkVarApps` [varg]
- mono_lfn = mkLams [lenv_bndr, larg]
- . bind_lenv (Var lenv_bndr) lv
- $ lbody `mkVarApps` (lv:ls) `mkVarApps` [larg]
-
- vfn <- hoistPolyExpr FSLIT("vfn") tvs mono_vfn
- lfn <- hoistPolyExpr FSLIT("lfn") tvs mono_lfn
-
- pa_dict <- paDictOfType venv_ty
-
- vclo <- mkClosure arg_ty res_ty venv_ty pa_dict vfn lfn venv
- lclo <- mkClosureP arg_ty res_ty venv_ty pa_dict vfn lfn lenv
-
- return (vclo, lclo)
+ mkClosure arg_ty res_ty env_ty fn env
+buildEnv :: Var -> [VVar] -> VM (Type, VExpr, VExpr -> VExpr -> VM VExpr)
+buildEnv lv vvs
+ = do
+ let (ty, venv, vbind) = mkVectEnv tys vs
+ (lenv, lbind) <- mkLiftEnv lv 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 = map fst env
- ls = map snd env
- tys = map idType vs
+ (vs,ls) = unzip vvs
+ tys = map idType vs
- arg_ty = idType varg
- res_ty = exprType vbody
-
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)
where
ty = mkCoreTupTy tys
-mkLiftEnv :: CoreExpr -> [Type] -> [Var]
- -> VM (CoreExpr, CoreExpr -> Var -> CoreExpr -> CoreExpr)
-mkLiftEnv lc [ty] [v]
- = do
- len <- lengthPA (Var v)
- return (Var v, \env lv body -> Let (NonRec v env)
- $ Case len lv (exprType body) [(DEFAULT, [], body)])
+mkLiftEnv :: Var -> [Type] -> [Var] -> VM (CoreExpr, CoreExpr -> CoreExpr -> VM CoreExpr)
+mkLiftEnv lv [ty] [v]
+ = return (Var v, \env body ->
+ do
+ len <- lengthPA (Var v)
+ return . Let (NonRec v env)
+ $ Case len lv (exprType body) [(DEFAULT, [], body)])
-- NOTE: this transparently deals with empty environments
-mkLiftEnv lc tys vs
+mkLiftEnv lv tys vs
= do
(env_tc, env_tyargs) <- lookupPArrayFamInst vty
let [env_con] = tyConDataCons env_tc
env = Var (dataConWrapId env_con)
- `mkTyApps` env_tyargs
- `mkApps` (lc : map Var vs)
-
- bind env lv body = let scrut = unwrapFamInstScrut env_tc env_tyargs env
- in
- Case scrut (mkWildId (exprType scrut)) (exprType body)
- [(DataAlt env_con, lv : vs, body)]
+ `mkTyApps` env_tyargs
+ `mkVarApps` (lv : vs)
+
+ bind env body = let scrut = unwrapFamInstScrut env_tc env_tyargs env
+ in
+ return $ Case scrut (mkWildId (exprType scrut))
+ (exprType body)
+ [(DataAlt env_con, lv : bndrs, body)]
return (env, bind)
where
vty = mkCoreTupTy tys
+ bndrs | null vs = [mkWildId unitTy]
+ | otherwise = vs
+
projects / ghc-hetmet.git / blobdiff