X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=5f24741af04069ce7ea68cae9277a105c93f76d2;hb=f8bfbc444dc77d9d8c5f19ff33e198da43c7a8f0;hp=20f19b6037022c299e98211b10ccde2900389866;hpb=abaea16d603c0cc167df4c873e0e7e57697ba736;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 20f19b6..5f24741 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -5,6 +5,7 @@ where import VectMonad import VectUtils +import VectType import DynFlags import HscTypes @@ -13,40 +14,84 @@ import CoreLint ( showPass, endPass ) import CoreSyn import CoreUtils import CoreFVs +import SimplMonad ( SimplCount, zeroSimplCount ) +import Rules ( RuleBase ) +import DataCon import TyCon import Type -import TypeRep import Var import VarEnv -import Name ( mkSysTvName ) +import VarSet +import Name ( mkSysTvName, getName ) import NameEnv import Id +import MkId ( unwrapFamInstScrut ) +import OccName import DsMonad hiding (mapAndUnzipM) +import DsUtils ( mkCoreTup, mkCoreTupTy ) import PrelNames +import TysWiredIn +import TysPrim ( intPrimTy ) +import BasicTypes ( Boxity(..) ) import Outputable import FastString import Control.Monad ( liftM, liftM2, mapAndUnzipM, zipWithM_ ) -import Data.Maybe ( maybeToList ) -vectorise :: HscEnv -> ModGuts -> IO ModGuts -vectorise hsc_env guts - | not (Opt_Vectorise `dopt` dflags) = return guts - | otherwise +vectorise :: HscEnv -> UniqSupply -> RuleBase -> ModGuts + -> IO (SimplCount, ModGuts) +vectorise hsc_env _ _ guts = do showPass dflags "Vectorisation" eps <- hscEPS hsc_env let info = hptVectInfo hsc_env `plusVectInfo` eps_vect_info eps Just (info', guts') <- initV hsc_env guts info (vectModule guts) endPass dflags "Vectorisation" Opt_D_dump_vect (mg_binds guts') - return $ guts' { mg_vect_info = info' } + return (zeroSimplCount dflags, guts' { mg_vect_info = info' }) where dflags = hsc_dflags hsc_env vectModule :: ModGuts -> VM ModGuts -vectModule guts = return guts +vectModule guts + = do + binds' <- mapM vectTopBind (mg_binds guts) + return $ guts { mg_binds = binds' } + +vectTopBind :: CoreBind -> VM CoreBind +vectTopBind b@(NonRec var expr) + = do + var' <- vectTopBinder var + expr' <- vectTopRhs expr + hs <- takeHoisted + return . Rec $ (var, expr) : (var', expr') : hs + `orElseV` + return b + +vectTopBind b@(Rec bs) + = do + vars' <- mapM vectTopBinder vars + exprs' <- mapM vectTopRhs exprs + hs <- takeHoisted + return . Rec $ bs ++ zip vars' exprs' ++ hs + `orElseV` + return b + where + (vars, exprs) = unzip bs + +vectTopBinder :: Var -> VM Var +vectTopBinder var + = do + vty <- vectType (idType var) + name <- cloneName mkVectOcc (getName var) + let var' | isExportedId var = Id.mkExportedLocalId name vty + | otherwise = Id.mkLocalId name vty + defGlobalVar var var' + return var' + +vectTopRhs :: CoreExpr -> VM CoreExpr +vectTopRhs = liftM fst . closedV . vectPolyExpr (panic "Empty lifting context") . freeVars -- ---------------------------------------------------------------------------- -- Bindings @@ -103,26 +148,25 @@ capply (vfn, lfn) (varg, larg) (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) +vectVar lc v + = do + r <- lookupVar v + case r of + Local es -> return es + Global vexpr -> do + lexpr <- replicateP vexpr lc + return (vexpr, lexpr) vectPolyVar :: CoreExpr -> Var -> [Type] -> VM (CoreExpr, CoreExpr) vectPolyVar lc v tys = do - r <- readLEnv $ \env -> lookupVarEnv (local_vars env) v + r <- lookupVar v case r of - Just (vexpr, lexpr) -> liftM2 (,) (mk_app vexpr) (mk_app lexpr) - Nothing -> - do - poly <- maybeV (readGEnv $ \env -> lookupVarEnv (global_vars env) v) - vexpr <- mk_app poly - lexpr <- replicateP vexpr lc - return (vexpr, lexpr) + Local (vexpr, lexpr) -> liftM2 (,) (mk_app vexpr) (mk_app lexpr) + Global poly -> do + vexpr <- mk_app poly + lexpr <- replicateP vexpr lc + return (vexpr, lexpr) where mk_app e = applyToTypes e =<< mapM vectType tys @@ -130,7 +174,7 @@ abstractOverTyVars :: [TyVar] -> ((CoreExpr -> CoreExpr) -> VM a) -> VM a abstractOverTyVars tvs p = do mdicts <- mapM mk_dict_var tvs - zipWithM_ (\tv -> maybe (deleteTyVarPA tv) (extendTyVarPA tv . Var)) tvs mdicts + zipWithM_ (\tv -> maybe (defLocalTyVar tv) (defLocalTyVarWithPA tv . Var)) tvs mdicts p (mk_lams mdicts) where mk_dict_var tv = do @@ -139,16 +183,13 @@ abstractOverTyVars tvs p Just ty -> liftM Just (newLocalVar FSLIT("dPA") ty) Nothing -> return Nothing - mk_lams mdicts = mkLams [arg | (tv, mdict) <- zip tvs mdicts - , arg <- tv : maybeToList mdict] + mk_lams mdicts = mkLams (tvs ++ [dict | Just dict <- mdicts]) applyToTypes :: CoreExpr -> [Type] -> VM CoreExpr applyToTypes expr tys = do dicts <- mapM paDictOfType tys - return $ mkApps expr [arg | (ty, dict) <- zip tys dicts - , arg <- [Type ty, dict]] - + return $ expr `mkTyApps` tys `mkApps` dicts vectPolyExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) vectPolyExpr lc expr @@ -218,41 +259,165 @@ vectExpr lc (_, AnnLet (AnnRec prs) body) vectExpr lc e@(_, AnnLam bndr body) | isTyVar bndr = pprPanic "vectExpr" (ppr $ deAnnotate e) -vectTyAppExpr :: CoreExpr -> CoreExprWithFVs -> [Type] -> VM (CoreExpr, CoreExpr) -vectTyAppExpr lc (_, AnnVar v) tys = vectPolyVar lc v tys -vectTyAppExpr lc e tys = pprPanic "vectTyAppExpr" (ppr $ deAnnotate e) +vectExpr lc (fvs, AnnLam bndr body) + = do + tyvars <- localTyVars + info <- mkCEnvInfo fvs bndr body + (poly_vfn, poly_lfn) <- mkClosureFns info tyvars bndr body --- ---------------------------------------------------------------------------- --- 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) + vfn_var <- hoistExpr FSLIT("vfn") poly_vfn + lfn_var <- hoistExpr FSLIT("lfn") poly_lfn + + let (venv, lenv) = mkClosureEnvs info lc + + let env_ty = cenv_vty info + + pa_dict <- paDictOfType env_ty + + arg_ty <- vectType (varType bndr) + res_ty <- vectType (exprType $ deAnnotate body) + + -- FIXME: move the functions to the top level + mono_vfn <- applyToTypes (Var vfn_var) (mkTyVarTys tyvars) + mono_lfn <- applyToTypes (Var lfn_var) (mkTyVarTys tyvars) + + mk_clo <- builtin mkClosureVar + mk_cloP <- builtin mkClosurePVar + + let vclo = Var mk_clo `mkTyApps` [arg_ty, res_ty, env_ty] + `mkApps` [pa_dict, mono_vfn, mono_lfn, venv] + + lclo = Var mk_cloP `mkTyApps` [arg_ty, res_ty, env_ty] + `mkApps` [pa_dict, mono_vfn, mono_lfn, lenv] + + return (vclo, lclo) + + +data CEnvInfo = CEnvInfo { + cenv_vars :: [Var] + , cenv_values :: [(CoreExpr, CoreExpr)] + , cenv_vty :: Type + , cenv_lty :: Type + , cenv_repr_tycon :: TyCon + , cenv_repr_tyargs :: [Type] + , cenv_repr_datacon :: DataCon + } + +mkCEnvInfo :: VarSet -> Var -> CoreExprWithFVs -> VM CEnvInfo +mkCEnvInfo fvs arg body = do - r <- paDictArgType tv - ty' <- vectType ty - return $ ForAllTy tv (wrap r ty') + locals <- readLEnv local_vars + let + (vars, vals) = unzip + [(var, val) | var <- varSetElems fvs + , Just val <- [lookupVarEnv locals var]] + vtys <- mapM (vectType . varType) vars + + (vty, repr_tycon, repr_tyargs, repr_datacon) <- mk_env_ty vtys + lty <- mkPArrayType vty + + return $ CEnvInfo { + cenv_vars = vars + , cenv_values = vals + , cenv_vty = vty + , cenv_lty = lty + , cenv_repr_tycon = repr_tycon + , cenv_repr_tyargs = repr_tyargs + , cenv_repr_datacon = repr_datacon + } where - wrap Nothing = id - wrap (Just pa_ty) = FunTy pa_ty + mk_env_ty [vty] + = return (vty, error "absent cinfo_repr_tycon" + , error "absent cinfo_repr_tyargs" + , error "absent cinfo_repr_datacon") + + mk_env_ty vtys + = do + let ty = mkCoreTupTy vtys + (repr_tc, repr_tyargs) <- lookupPArrayFamInst ty + let [repr_con] = tyConDataCons repr_tc + return (ty, repr_tc, repr_tyargs, repr_con) + + + +mkClosureEnvs :: CEnvInfo -> CoreExpr -> (CoreExpr, CoreExpr) +mkClosureEnvs info lc + | [] <- vals + = (Var unitDataConId, mkApps (Var $ dataConWrapId (cenv_repr_datacon info)) + [lc, Var unitDataConId]) + + | [(vval, lval)] <- vals + = (vval, lval) -vectType ty = pprPanic "vectType:" (ppr ty) + | otherwise + = (mkCoreTup vvals, Var (dataConWrapId $ cenv_repr_datacon info) + `mkTyApps` cenv_repr_tyargs info + `mkApps` (lc : lvals)) + + where + vals = cenv_values info + (vvals, lvals) = unzip vals + +mkClosureFns :: CEnvInfo -> [TyVar] -> Var -> CoreExprWithFVs + -> VM (CoreExpr, CoreExpr) +mkClosureFns info tyvars arg body + = closedV + . abstractOverTyVars tyvars + $ \mk_tlams -> + do + (vfn, lfn) <- mkClosureMonoFns info arg body + return (mk_tlams vfn, mk_tlams lfn) + +mkClosureMonoFns :: CEnvInfo -> Var -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) +mkClosureMonoFns info arg body + = do + lc_bndr <- newLocalVar FSLIT("lc") intPrimTy + (varg : vbndrs, larg : lbndrs, (vbody, lbody)) + <- vectBndrsIn (arg : cenv_vars info) + (vectExpr (Var lc_bndr) body) + + venv_bndr <- newLocalVar FSLIT("env") vty + lenv_bndr <- newLocalVar FSLIT("env") lty + + let vcase = bind_venv (Var venv_bndr) vbody vbndrs + lcase <- bind_lenv (Var lenv_bndr) lbody lc_bndr lbndrs + return (mkLams [venv_bndr, varg] vcase, mkLams [lenv_bndr, larg] lcase) + where + vty = cenv_vty info + lty = cenv_lty info + + arity = length (cenv_vars info) + + bind_venv venv vbody [] = vbody + bind_venv venv vbody [vbndr] = Let (NonRec vbndr venv) vbody + bind_venv venv vbody vbndrs + = Case venv (mkWildId vty) (exprType vbody) + [(DataAlt (tupleCon Boxed arity), vbndrs, vbody)] + + bind_lenv lenv lbody lc_bndr [lbndr] + = do + lengthPA <- builtin lengthPAVar + pa_dict <- paDictOfType vty + return . Let (NonRec lbndr lenv) + $ Case (mkApps (Var lengthPA) [Type vty, pa_dict, (Var lbndr)]) + lc_bndr + (exprType lbody) + [(DEFAULT, [], lbody)] + + bind_lenv lenv lbody lc_bndr lbndrs + = let scrut = unwrapFamInstScrut (cenv_repr_tycon info) + (cenv_repr_tyargs info) + lenv + lbndrs' | null lbndrs = [mkWildId unitTy] + | otherwise = lbndrs + in + return + $ Case scrut + (mkWildId (exprType scrut)) + (exprType lbody) + [(DataAlt (cenv_repr_datacon info), lc_bndr : lbndrs', lbody)] + +vectTyAppExpr :: CoreExpr -> CoreExprWithFVs -> [Type] -> VM (CoreExpr, CoreExpr) +vectTyAppExpr lc (_, AnnVar v) tys = vectPolyVar lc v tys +vectTyAppExpr lc e tys = pprPanic "vectTyAppExpr" (ppr $ deAnnotate e)