X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=9c50d4a4eb439bd6b67736858a40eae33db1772d;hb=b600039b007e5a1425e264cffc2ddfc74886986e;hp=37dbecb446d79a5e4f10c9f2a412c03a2b36dd12;hpb=02c988e586dedff6d252ef59ef487dd4a8f567aa;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index 37dbecb..9c50d4a 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -7,6 +7,7 @@ module VectUtils ( mkBuiltinCo, voidType, mkWrapType, mkPADictType, mkPArrayType, mkPDataType, mkPReprType, mkPArray, + mkBuiltinTyConApps, mkClosureTypes, pdataReprTyCon, pdataReprDataCon, mkVScrut, prDictOfType, prDFunOfTyCon, @@ -15,38 +16,27 @@ module VectUtils ( combinePD, liftPD, zipScalars, scalarClosure, - polyAbstract, polyApply, polyVApply, polyArity, - Inline(..), addInlineArity, inlineMe, - hoistBinding, hoistExpr, hoistPolyVExpr, takeHoisted, - buildClosure, buildClosures, - mkClosureApp + polyAbstract, polyApply, polyVApply, polyArity ) where -import VectMonad -import Vectorise.Env +import Vectorise.Monad import Vectorise.Vect +import Vectorise.Builtins -import MkCore ( mkCoreTup, mkWildCase ) import CoreSyn import CoreUtils -import CoreUnfold ( mkInlineRule ) import Coercion import Type import TypeRep import TyCon import DataCon import Var -import MkId ( unwrapFamInstScrut ) -import Id ( setIdUnfolding ) -import TysWiredIn -import BasicTypes ( Boxity(..), Arity ) -import Literal ( Literal, mkMachInt ) - - +import MkId +import Literal import Outputable import FastString - import Control.Monad + collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type]) collectAnnTypeArgs expr = go expr [] where @@ -101,11 +91,12 @@ mkBuiltinTyConApps get_tc tys ty mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] voidType :: VM Type -voidType = mkBuiltinTyConApp VectMonad.voidTyCon [] +voidType = mkBuiltinTyConApp voidTyCon [] mkWrapType :: Type -> VM Type mkWrapType ty = mkBuiltinTyConApp wrapTyCon [ty] + mkClosureTypes :: [Type] -> Type -> VM Type mkClosureTypes = mkBuiltinTyConApps closureTyCon @@ -362,62 +353,6 @@ polyVApply expr tys = do Just dicts <- liftM sequence $ mapM paDictOfType tys return $ mapVect (\e -> e `mkTyApps` tys `mkApps` dicts) expr --- Inline --------------------------------------------------------------------- --- | Records whether we should inline a particular binding. -data Inline - = Inline Arity - | DontInline - --- | Add to the arity contained within an `Inline`, if any. -addInlineArity :: Inline -> Int -> Inline -addInlineArity (Inline m) n = Inline (m+n) -addInlineArity DontInline _ = DontInline - --- | Says to always inline a binding. -inlineMe :: Inline -inlineMe = Inline 0 - - --- Hoising -------------------------------------------------------------------- -hoistBinding :: Var -> CoreExpr -> VM () -hoistBinding v e = updGEnv $ \env -> - env { global_bindings = (v,e) : global_bindings env } - -hoistExpr :: FastString -> CoreExpr -> Inline -> VM Var -hoistExpr fs expr inl - = do - 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 expr (Just arity) - DontInline -> var - -hoistVExpr :: VExpr -> Inline -> VM VVar -hoistVExpr (ve, le) inl - = do - fs <- getBindName - vv <- hoistExpr ('v' `consFS` fs) ve inl - lv <- hoistExpr ('l' `consFS` fs) le (addInlineArity inl 1) - return (vv, lv) - -hoistPolyVExpr :: [TyVar] -> Inline -> VM VExpr -> VM VExpr -hoistPolyVExpr tvs inline p - = do - 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)] -takeHoisted - = do - env <- readGEnv id - setGEnv $ env { global_bindings = [] } - return $ global_bindings env {- boxExpr :: Type -> VExpr -> VM VExpr @@ -433,106 +368,4 @@ boxExpr ty (vexpr, lexpr) Nothing -> return (vexpr, lexpr) -} --- Closures ------------------------------------------------------------------- -mkClosure :: Type -> Type -> Type -> VExpr -> VExpr -> VM VExpr -mkClosure arg_ty res_ty env_ty (vfn,lfn) (venv,lenv) - = do Just dict <- paDictOfType env_ty - 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 :: Type -> Type -> VExpr -> VExpr -> VM VExpr -mkClosureApp arg_ty res_ty (vclo, lclo) (varg, larg) - = do 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` [Var lc, lclo, larg]) - - -buildClosures :: [TyVar] -> [VVar] -> [Type] -> Type -> VM VExpr -> VM VExpr -buildClosures _ _ [] _ mk_body - = mk_body -buildClosures 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 - -- liftM vInlineMe - buildClosure tvs vars arg_ty res_ty' - . hoistPolyVExpr tvs (Inline (length vars + 1)) - $ 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 (Inline 2) - $ do - lc <- builtin liftingContext - body <- mk_body - return -- . vInlineMe - . vLams lc [env_bndr, arg_bndr] - $ bind (vVar env_bndr) - (vVarApps lc body (vars ++ [arg_bndr])) - - mkClosure arg_ty res_ty env_ty fn env - - --- Environments --------------------------------------------------------------- -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 - - (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)] - - 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