X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=6207acdc111ccf7e60050f3116b7981ef35b538d;hp=b9c4597c0a29bfe4d91856d614ca3314ee49c4b3;hb=fb6d198f498d4e325a540f28aaa6e1d1530839c3;hpb=de6c394e89bb6cb7e628eb43bf155f3e205561bf diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index b9c4597..6207acd 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -1,49 +1,50 @@ module VectUtils ( collectAnnTypeBinders, collectAnnTypeArgs, isAnnTypeArg, collectAnnValBinders, - mkDataConTag, - splitClosureTy, + dataConTagZ, mkDataConTag, mkDataConTagLit, - mkBuiltinCo, - mkPADictType, mkPArrayType, mkPReprType, + newLocalVVar, - parrayReprTyCon, parrayReprDataCon, mkVScrut, - prDFunOfTyCon, + mkBuiltinCo, voidType, mkWrapType, + mkPADictType, mkPArrayType, mkPDataType, mkPReprType, mkPArray, + + pdataReprTyCon, pdataReprDataCon, mkVScrut, + prDictOfType, prDFunOfTyCon, paDictArgType, paDictOfType, paDFunType, - paMethod, mkPR, lengthPA, replicatePA, emptyPA, liftPA, - polyAbstract, polyApply, polyVApply, + paMethod, wrapPR, replicatePD, emptyPD, packPD, packByTagPD, + combinePD, + liftPD, + zipScalars, scalarClosure, + polyAbstract, polyApply, polyVApply, polyArity, + Inline(..), addInlineArity, inlineMe, hoistBinding, hoistExpr, hoistPolyVExpr, takeHoisted, buildClosure, buildClosures, mkClosureApp ) where -#include "HsVersions.h" - import VectCore import VectMonad -import DsUtils +import MkCore ( mkCoreTup, mkWildCase ) import CoreSyn import CoreUtils +import CoreUnfold ( mkInlineRule ) import Coercion import Type import TypeRep import TyCon import DataCon import Var -import Id ( mkWildId ) import MkId ( unwrapFamInstScrut ) -import Name ( Name ) -import PrelNames +import Id ( setIdUnfolding ) import TysWiredIn -import TysPrim ( intPrimTy ) import BasicTypes ( Boxity(..) ) +import Literal ( Literal, mkMachInt ) import Outputable import FastString -import Data.List ( zipWith4 ) -import Control.Monad ( liftM, liftM2, zipWithM_ ) +import Control.Monad collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type]) collectAnnTypeArgs expr = go expr [] @@ -64,41 +65,17 @@ collectAnnValBinders expr = go [] expr go bs e = (reverse bs, e) isAnnTypeArg :: AnnExpr b ann -> Bool -isAnnTypeArg (_, AnnType t) = True +isAnnTypeArg (_, AnnType _) = True isAnnTypeArg _ = False -mkDataConTag :: DataCon -> CoreExpr -mkDataConTag dc = mkConApp intDataCon [mkIntLitInt $ dataConTag dc] - -splitUnTy :: String -> Name -> Type -> Type -splitUnTy s name ty - | Just (tc, [ty']) <- splitTyConApp_maybe ty - , tyConName tc == name - = ty' - - | otherwise = pprPanic s (ppr ty) - -splitBinTy :: String -> Name -> Type -> (Type, Type) -splitBinTy s name ty - | Just (tc, [ty1, ty2]) <- splitTyConApp_maybe ty - , tyConName tc == name - = (ty1, ty2) - - | otherwise = pprPanic s (ppr ty) - -splitFixedTyConApp :: TyCon -> Type -> [Type] -splitFixedTyConApp tc ty - | Just (tc', tys) <- splitTyConApp_maybe ty - , tc == tc' - = tys +dataConTagZ :: DataCon -> Int +dataConTagZ con = dataConTag con - fIRST_TAG - | otherwise = pprPanic "splitFixedTyConApp" (ppr tc <+> ppr ty) +mkDataConTagLit :: DataCon -> Literal +mkDataConTagLit = mkMachInt . toInteger . dataConTagZ -splitClosureTy :: Type -> (Type, Type) -splitClosureTy = splitBinTy "splitClosureTy" closureTyConName - -splitPArrayTy :: Type -> Type -splitPArrayTy = splitUnTy "splitPArrayTy" parrayTyConName +mkDataConTag :: DataCon -> CoreExpr +mkDataConTag = mkIntLitInt . dataConTagZ splitPrimTyCon :: Type -> Maybe TyCon splitPrimTyCon ty @@ -122,19 +99,11 @@ mkBuiltinTyConApps get_tc tys ty where mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] -mkBuiltinTyConApps1 :: (Builtins -> TyCon) -> Type -> [Type] -> VM Type -mkBuiltinTyConApps1 get_tc dft [] = return dft -mkBuiltinTyConApps1 get_tc dft tys - = do - tc <- builtin get_tc - case tys of - [] -> pprPanic "mkBuiltinTyConApps1" (ppr tc) - _ -> return $ foldr1 (mk tc) tys - where - mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] +voidType :: VM Type +voidType = mkBuiltinTyConApp VectMonad.voidTyCon [] -mkClosureType :: Type -> Type -> VM Type -mkClosureType arg_ty res_ty = mkBuiltinTyConApp closureTyCon [arg_ty, res_ty] +mkWrapType :: Type -> VM Type +mkWrapType ty = mkBuiltinTyConApp wrapTyCon [ty] mkClosureTypes :: [Type] -> Type -> VM Type mkClosureTypes = mkBuiltinTyConApps closureTyCon @@ -149,36 +118,50 @@ mkPArrayType :: Type -> VM Type mkPArrayType ty | Just tycon <- splitPrimTyCon ty = do - arr <- traceMaybeV "mkPArrayType" (ppr tycon) - $ lookupPrimPArray tycon - return $ mkTyConApp arr [] + r <- lookupPrimPArray tycon + case r of + Just arr -> return $ mkTyConApp arr [] + Nothing -> cantVectorise "Primitive tycon not vectorised" (ppr tycon) mkPArrayType ty = mkBuiltinTyConApp parrayTyCon [ty] +mkPDataType :: Type -> VM Type +mkPDataType ty = mkBuiltinTyConApp pdataTyCon [ty] + +mkPArray :: Type -> CoreExpr -> CoreExpr -> VM CoreExpr +mkPArray ty len dat = do + tc <- builtin parrayTyCon + let [dc] = tyConDataCons tc + return $ mkConApp dc [Type ty, len, dat] + mkBuiltinCo :: (Builtins -> TyCon) -> VM Coercion mkBuiltinCo get_tc = do tc <- builtin get_tc return $ mkTyConApp tc [] -parrayReprTyCon :: Type -> VM (TyCon, [Type]) -parrayReprTyCon ty = builtin parrayTyCon >>= (`lookupFamInst` [ty]) +pdataReprTyCon :: Type -> VM (TyCon, [Type]) +pdataReprTyCon ty = builtin pdataTyCon >>= (`lookupFamInst` [ty]) -parrayReprDataCon :: Type -> VM (DataCon, [Type]) -parrayReprDataCon ty +pdataReprDataCon :: Type -> VM (DataCon, [Type]) +pdataReprDataCon ty = do - (tc, arg_tys) <- parrayReprTyCon ty + (tc, arg_tys) <- pdataReprTyCon ty let [dc] = tyConDataCons tc return (dc, arg_tys) -mkVScrut :: VExpr -> VM (VExpr, TyCon, [Type]) +mkVScrut :: VExpr -> VM (CoreExpr, CoreExpr, TyCon, [Type]) mkVScrut (ve, le) = do - (tc, arg_tys) <- parrayReprTyCon (exprType ve) - return ((ve, unwrapFamInstScrut tc arg_tys le), tc, arg_tys) + (tc, arg_tys) <- pdataReprTyCon ty + return (ve, unwrapFamInstScrut tc arg_tys le, tc, arg_tys) + where + ty = exprType ve prDFunOfTyCon :: TyCon -> VM CoreExpr prDFunOfTyCon tycon - = liftM Var (traceMaybeV "prDictOfTyCon" (ppr tycon) (lookupTyConPR tycon)) + = liftM Var + . maybeCantVectoriseM "No PR dictionary for tycon" (ppr tycon) + $ lookupTyConPR tycon paDictArgType :: TyVar -> VM (Maybe Type) paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) @@ -186,7 +169,7 @@ paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) go ty k | Just k' <- kindView k = go ty k' go ty (FunTy k1 k2) = do - tv <- newTyVar FSLIT("a") k1 + tv <- newTyVar (fsLit "a") k1 mty1 <- go (TyVarTy tv) k1 case mty1 of Just ty1 -> do @@ -198,7 +181,7 @@ paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) | isLiftedTypeKind k = liftM Just (mkPADictType ty) - go ty k = return Nothing + go _ _ = return Nothing paDictOfType :: Type -> VM CoreExpr paDictOfType ty = paDictOfTyApp ty_fn ty_args @@ -214,9 +197,11 @@ paDictOfTyApp (TyVarTy tv) ty_args paDFunApply dfun ty_args paDictOfTyApp (TyConApp tc _) ty_args = do - dfun <- traceMaybeV "paDictOfTyApp" (ppr tc) (lookupTyConPA tc) + dfun <- maybeCantVectoriseM "No PA dictionary for tycon" (ppr tc) + $ lookupTyConPA tc paDFunApply (Var dfun) ty_args -paDictOfTyApp ty ty_args = pprPanic "paDictOfTyApp" (ppr ty) +paDictOfTyApp ty _ + = cantVectorise "Can't construct PA dictionary for type" (ppr ty) paDFunType :: TyCon -> VM Type paDFunType tc @@ -235,74 +220,124 @@ paDFunApply dfun tys dicts <- mapM paDictOfType tys return $ mkApps (mkTyApps dfun tys) dicts -type PAMethod = (Builtins -> Var, String) - -pa_length = (lengthPAVar, "lengthPA") -pa_replicate = (replicatePAVar, "replicatePA") -pa_empty = (emptyPAVar, "emptyPA") - -paMethod :: PAMethod -> Type -> VM CoreExpr -paMethod (method, name) ty +paMethod :: (Builtins -> Var) -> String -> Type -> VM CoreExpr +paMethod _ name ty | Just tycon <- splitPrimTyCon ty - = do - fn <- traceMaybeV "paMethod" (ppr tycon <+> text name) - $ lookupPrimMethod tycon name - return (Var fn) + = liftM Var + . maybeCantVectoriseM "No PA method" (text name <+> text "for" <+> ppr tycon) + $ lookupPrimMethod tycon name -paMethod (method, name) ty +paMethod method _ ty = do fn <- builtin method dict <- paDictOfType ty return $ mkApps (Var fn) [Type ty, dict] -mkPR :: Type -> VM CoreExpr -mkPR ty - = do - fn <- builtin mkPRVar - dict <- paDictOfType ty - return $ mkApps (Var fn) [Type ty, dict] - -lengthPA :: CoreExpr -> VM CoreExpr -lengthPA x = liftM (`App` x) (paMethod pa_length ty) +prDictOfType :: Type -> VM CoreExpr +prDictOfType ty = prDictOfTyApp ty_fn ty_args where - ty = splitPArrayTy (exprType x) + (ty_fn, ty_args) = splitAppTys ty -replicatePA :: CoreExpr -> CoreExpr -> VM CoreExpr -replicatePA len x = liftM (`mkApps` [len,x]) - (paMethod pa_replicate (exprType x)) +prDictOfTyApp :: Type -> [Type] -> VM CoreExpr +prDictOfTyApp ty_fn ty_args + | Just ty_fn' <- coreView ty_fn = prDictOfTyApp ty_fn' ty_args +prDictOfTyApp (TyConApp tc _) ty_args + = do + dfun <- liftM Var $ maybeV (lookupTyConPR tc) + prDFunApply dfun ty_args +prDictOfTyApp _ _ = noV -emptyPA :: Type -> VM CoreExpr -emptyPA = paMethod pa_empty +prDFunApply :: CoreExpr -> [Type] -> VM CoreExpr +prDFunApply dfun tys + = do + dicts <- mapM prDictOfType tys + return $ mkApps (mkTyApps dfun tys) dicts -liftPA :: CoreExpr -> VM CoreExpr -liftPA x +wrapPR :: Type -> VM CoreExpr +wrapPR ty + = do + pa_dict <- paDictOfType ty + pr_dfun <- prDFunOfTyCon =<< builtin wrapTyCon + return $ mkApps pr_dfun [Type ty, pa_dict] + +replicatePD :: CoreExpr -> CoreExpr -> VM CoreExpr +replicatePD len x = liftM (`mkApps` [len,x]) + (paMethod replicatePDVar "replicatePD" (exprType 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 + = liftM (`mkApps` [xs, len, tags, t]) + (paMethod packByTagPDVar "packByTagPD" ty) + +combinePD :: Type -> CoreExpr -> CoreExpr -> [CoreExpr] + -> VM CoreExpr +combinePD ty len sel xs + = liftM (`mkApps` (len : sel : xs)) + (paMethod (combinePDVar n) ("combine" ++ show n ++ "PD") ty) + where + n = length xs + +liftPD :: CoreExpr -> VM CoreExpr +liftPD x = do lc <- builtin liftingContext - replicatePA (Var lc) x + replicatePD (Var lc) x + +zipScalars :: [Type] -> Type -> VM CoreExpr +zipScalars arg_tys res_ty + = do + scalar <- builtin scalarClass + (dfuns, _) <- mapAndUnzipM (\ty -> lookupInst scalar [ty]) ty_args + zipf <- builtin (scalarZip $ length arg_tys) + return $ Var zipf `mkTyApps` ty_args `mkApps` map Var dfuns + where + ty_args = 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) + return $ Var ctr `mkTyApps` (arg_tys ++ [res_ty]) + `mkApps` (pas ++ [scalar_fun, array_fun]) newLocalVVar :: FastString -> Type -> VM VVar newLocalVVar fs vty = do - lty <- mkPArrayType vty + lty <- mkPDataType vty vv <- newLocalVar 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 case r of - Just ty -> liftM Just (newLocalVar FSLIT("dPA") ty) + 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 @@ -316,31 +351,48 @@ polyVApply expr tys dicts <- mapM paDictOfType tys return $ mapVect (\e -> e `mkTyApps` tys `mkApps` dicts) expr + +data Inline = Inline Int -- arity + | DontInline + +addInlineArity :: Inline -> Int -> Inline +addInlineArity (Inline m) n = Inline (m+n) +addInlineArity DontInline _ = DontInline + +inlineMe :: Inline +inlineMe = Inline 0 + 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 InlSat expr 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)] @@ -350,36 +402,51 @@ takeHoisted setGEnv $ env { global_bindings = [] } return $ global_bindings env +{- +boxExpr :: Type -> VExpr -> VM VExpr +boxExpr ty (vexpr, lexpr) + | Just (tycon, []) <- splitTyConApp_maybe ty + , isUnLiftedTyCon tycon + = do + r <- lookupBoxedTyCon tycon + case r of + Just tycon' -> let [dc] = tyConDataCons tycon' + in + return (mkConApp dc [vexpr], lexpr) + Nothing -> return (vexpr, lexpr) +-} + 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 + 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 :: VExpr -> VExpr -> VM VExpr -mkClosureApp (vclo, lclo) (varg, larg) +mkClosureApp :: Type -> Type -> VExpr -> VExpr -> VM VExpr +mkClosureApp arg_ty res_ty (vclo, lclo) (varg, larg) = do - vapply <- builtin applyClosureVar - lapply <- builtin applyClosurePVar + 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` [lclo, larg]) - where - (arg_ty, res_ty) = splitClosureTy (exprType vclo) + Var lapply `mkTyApps` [arg_ty, res_ty] `mkApps` [Var lc, lclo, larg]) buildClosures :: [TyVar] -> [VVar] -> [Type] -> Type -> VM VExpr -> VM VExpr -buildClosures tvs vars [] res_ty mk_body +buildClosures _ _ [] _ mk_body = mk_body buildClosures tvs vars [arg_ty] res_ty mk_body - = 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 + arg <- newLocalVVar (fsLit "x") arg_ty + -- liftM vInlineMe buildClosure tvs vars arg_ty res_ty' - . hoistPolyVExpr tvs + . hoistPolyVExpr tvs (Inline (length vars + 1)) $ do lc <- builtin liftingContext clo <- buildClosures tvs (vars ++ [arg]) arg_tys res_ty mk_body @@ -394,71 +461,58 @@ 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 + 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 - body' <- bind (vVar env_bndr) + return -- . vInlineMe + . vLams lc [env_bndr, arg_bndr] + $ 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 +buildEnv :: [VVar] -> VM (Type, VExpr, VExpr -> VExpr -> VExpr) +buildEnv [] = do + ty <- voidType + void <- builtin voidVar + pvoid <- builtin pvoidVar + return (ty, vVar (void, pvoid), \_ body -> body) + +buildEnv [v] = return (vVarType v, vVar v, + \env body -> vLet (vNonRec v env) body) + +buildEnv vs = do - (env_tc, env_tyargs) <- parrayReprTyCon 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 + + (lenv_tc, lenv_tyargs) <- pdataReprTyCon ty + + let venv_con = tupleCon Boxed (length vs) + [lenv_con] = tyConDataCons lenv_tc + + venv = mkCoreTup (map Var vvs) + lenv = Var (dataConWrapId lenv_con) + `mkTyApps` lenv_tyargs + `mkApps` map Var lvs + + vbind env body = mkWildCase env ty (exprType body) + [(DataAlt venv_con, vvs, body)] - bndrs | null vs = [mkWildId unitTy] - | otherwise = vs + lbind env body = + let scrut = unwrapFamInstScrut lenv_tc lenv_tyargs env + in + mkWildCase scrut (exprType scrut) (exprType body) + [(DataAlt lenv_con, lvs, body)] + + bind (venv, lenv) (vbody, lbody) = (vbind venv vbody, + lbind lenv lbody) + + return (ty, (venv, lenv), bind) + where + (vvs, lvs) = unzip vs + tys = map vVarType vs + ty = mkBoxedTupleTy tys