X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=85f4e4612ae160320170206aeb6cca3606fae93c;hp=6f9db0aef58738cfbcd8fe8b027396d0d8151483;hb=21d9b432b676af304dff8d7f4e1e31e1678bcae3;hpb=5e979164079ae89ca01483131149b8727dd82686 diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 6f9db0a..85f4e46 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -5,6 +5,8 @@ where import VectMonad import VectUtils +import VectType +import VectCore import DynFlags import HscTypes @@ -13,44 +15,106 @@ 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 FamInstEnv ( extendFamInstEnvList ) +import InstEnv ( extendInstEnvList ) import Var import VarEnv -import Name ( mkSysTvName ) +import VarSet +import Name ( Name, mkSysTvName, getName ) import NameEnv import Id +import MkId ( unwrapFamInstScrut ) +import OccName +import Module ( Module ) import DsMonad hiding (mapAndUnzipM) +import DsUtils ( mkCoreTup, mkCoreTupTy ) +import Literal ( Literal ) import PrelNames +import TysWiredIn +import TysPrim ( intPrimTy ) +import BasicTypes ( Boxity(..) ) import Outputable import FastString -import Control.Monad ( liftM, liftM2, mapAndUnzipM ) +import Control.Monad ( liftM, liftM2, zipWithM, mapAndUnzipM ) -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 + (types', fam_insts, tc_binds) <- vectTypeEnv (mg_types guts) + + let fam_inst_env' = extendFamInstEnvList (mg_fam_inst_env guts) fam_insts + updGEnv (setFamInstEnv fam_inst_env') + + -- dicts <- mapM buildPADict pa_insts + -- workers <- mapM vectDataConWorkers pa_insts + binds' <- mapM vectTopBind (mg_binds guts) + return $ guts { mg_types = types' + , mg_binds = Rec tc_binds : binds' + , mg_fam_inst_env = fam_inst_env' + , mg_fam_insts = mg_fam_insts guts ++ fam_insts + } + +vectTopBind :: CoreBind -> VM CoreBind +vectTopBind b@(NonRec var expr) + = do + var' <- vectTopBinder var + expr' <- vectTopRhs var expr + hs <- takeHoisted + return . Rec $ (var, expr) : (var', expr') : hs + `orElseV` + return b + +vectTopBind b@(Rec bs) + = do + vars' <- mapM vectTopBinder vars + exprs' <- zipWithM vectTopRhs vars 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) + var' <- cloneId mkVectOcc var vty + defGlobalVar var var' + return var' + +vectTopRhs :: Var -> CoreExpr -> VM CoreExpr +vectTopRhs var expr + = do + closedV . liftM vectorised + . inBind var + $ vectPolyExpr (freeVars expr) -- ---------------------------------------------------------------------------- -- Bindings -vectBndr :: Var -> VM (Var, Var) +vectBndr :: Var -> VM VVar vectBndr v = do vty <- vectType (idType v) @@ -60,141 +124,193 @@ vectBndr v updLEnv (mapTo vv lv) return (vv, lv) where - mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (Var vv, Var lv) } + mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (vv, lv) } -vectBndrIn :: Var -> VM a -> VM (Var, Var, a) +vectBndrIn :: Var -> VM a -> VM (VVar, a) vectBndrIn v p = localV $ do - (vv, lv) <- vectBndr v + vv <- vectBndr v x <- p - return (vv, lv, x) + return (vv, x) + +vectBndrIn' :: Var -> (VVar -> VM a) -> VM (VVar, a) +vectBndrIn' v p + = localV + $ do + vv <- vectBndr v + x <- p vv + return (vv, x) -vectBndrsIn :: [Var] -> VM a -> VM ([Var], [Var], a) +vectBndrsIn :: [Var] -> VM a -> VM ([VVar], a) vectBndrsIn vs p = localV $ do - (vvs, lvs) <- mapAndUnzipM vectBndr vs + vvs <- mapM vectBndr vs x <- p - return (vvs, lvs, x) + return (vvs, x) -- ---------------------------------------------------------------------------- -- Expressions -replicateP :: CoreExpr -> CoreExpr -> VM CoreExpr -replicateP expr len +vectVar :: Var -> VM VExpr +vectVar v = do - dict <- paDictOfType ty - rep <- builtin replicatePAVar - return $ mkApps (Var rep) [Type ty, dict, expr, len] - where - ty = exprType expr + r <- lookupVar v + case r of + Local (vv,lv) -> return (Var vv, Var lv) + Global vv -> do + let vexpr = Var vv + lexpr <- liftPA vexpr + return (vexpr, lexpr) -capply :: (CoreExpr, CoreExpr) -> (CoreExpr, CoreExpr) -> VM (CoreExpr, CoreExpr) -capply (vfn, lfn) (varg, larg) +vectPolyVar :: Var -> [Type] -> VM VExpr +vectPolyVar v tys = do - 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 + vtys <- mapM vectType tys + r <- lookupVar v + case r of + Local (vv, lv) -> liftM2 (,) (polyApply (Var vv) vtys) + (polyApply (Var lv) vtys) + Global poly -> do + vexpr <- polyApply (Var poly) vtys + lexpr <- liftPA vexpr + return (vexpr, lexpr) + +vectLiteral :: Literal -> VM VExpr +vectLiteral lit + = do + lexpr <- liftPA (Lit lit) + return (Lit lit, lexpr) -vectVar :: CoreExpr -> Var -> VM (CoreExpr, CoreExpr) -vectVar lc v = local v `orElseV` global v +vectPolyExpr :: CoreExprWithFVs -> VM VExpr +vectPolyExpr expr + = polyAbstract tvs $ \abstract -> + do + mono' <- vectExpr mono + return $ mapVect abstract mono' 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) + (tvs, mono) = collectAnnTypeBinders expr -vectExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) -vectExpr lc (_, AnnType ty) +vectExpr :: CoreExprWithFVs -> VM VExpr +vectExpr (_, AnnType ty) + = liftM vType (vectType ty) + +vectExpr (_, AnnVar v) = vectVar v + +vectExpr (_, AnnLit lit) = vectLiteral lit + +vectExpr (_, AnnNote note expr) + = liftM (vNote note) (vectExpr expr) + +vectExpr e@(_, AnnApp _ arg) + | isAnnTypeArg arg + = vectTyAppExpr fn tys + where + (fn, tys) = collectAnnTypeArgs e + +vectExpr (_, AnnApp fn arg) = 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) + fn' <- vectExpr fn + arg' <- vectExpr arg + mkClosureApp fn' arg' + +vectExpr (_, AnnCase scrut bndr ty alts) + | isAlgType scrut_ty + = vectAlgCase scrut bndr ty alts + where + scrut_ty = exprType (deAnnotate scrut) + +vectExpr (_, AnnCase expr bndr ty alts) = panic "vectExpr: case" -vectExpr lc (_, AnnLet (AnnNonRec bndr rhs) body) + +vectExpr (_, 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) + vrhs <- localV . inBind bndr $ vectPolyExpr rhs + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vLet (vNonRec vbndr vrhs) vbody + +vectExpr (_, AnnLet (AnnRec bs) 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)) + (vbndrs, (vrhss, vbody)) <- vectBndrsIn bndrs + $ liftM2 (,) + (zipWithM vect_rhs bndrs rhss) + (vectPolyExpr body) + return $ vLet (vRec vbndrs vrhss) vbody 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) + (bndrs, rhss) = unzip bs --- ---------------------------------------------------------------------------- --- 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') + vect_rhs bndr rhs = localV + . inBind bndr + $ vectExpr rhs + +vectExpr e@(fvs, AnnLam bndr _) + | not (isId bndr) = pprPanic "vectExpr" (ppr $ deAnnotate e) + | otherwise = vectLam fvs bs body where - wrap Nothing = id - wrap (Just pa_ty) = FunTy pa_ty + (bs,body) = collectAnnValBinders e -vectType ty = pprPanic "vectType:" (ppr ty) +vectLam :: VarSet -> [Var] -> CoreExprWithFVs -> VM VExpr +vectLam fvs bs body + = do + tyvars <- localTyVars + (vs, vvs) <- readLEnv $ \env -> + unzip [(var, vv) | var <- varSetElems fvs + , Just vv <- [lookupVarEnv (local_vars env) var]] + + arg_tys <- mapM (vectType . idType) bs + res_ty <- vectType (exprType $ deAnnotate body) + + buildClosures tyvars vvs arg_tys res_ty + . hoistPolyVExpr tyvars + $ do + lc <- builtin liftingContext + (vbndrs, vbody) <- vectBndrsIn (vs ++ bs) + (vectExpr body) + return $ vLams lc vbndrs vbody + +vectTyAppExpr :: CoreExprWithFVs -> [Type] -> VM VExpr +vectTyAppExpr (_, AnnVar v) tys = vectPolyVar v tys +vectTyAppExpr e tys = pprPanic "vectTyAppExpr" (ppr $ deAnnotate e) + +type CoreAltWithFVs = AnnAlt Id VarSet + +-- We convert +-- +-- case e :: t of v { ... } +-- +-- to +-- +-- V: let v = e in case v of _ { ... } +-- L: let v = e in case v `cast` ... of _ { ... } +-- +-- When lifting, we have to do it this way because v must have the type +-- [:V(T):] but the scrutinee must be cast to the representation type. +-- + +-- FIXME: this is too lazy +vectAlgCase scrut bndr ty [(DEFAULT, [], body)] + = do + vscrut <- vectExpr scrut + vty <- vectType ty + lty <- mkPArrayType vty + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vCaseDEFAULT vscrut vbndr vty lty vbody + +vectAlgCase scrut bndr ty [(DataAlt dc, bndrs, body)] + = do + vty <- vectType ty + lty <- mkPArrayType vty + vexpr <- vectExpr scrut + (vbndr, (vbndrs, vbody)) <- vectBndrIn bndr + . vectBndrsIn bndrs + $ vectExpr body + (vscrut, arr_tc, arg_tys) <- mkVScrut (vVar vbndr) + vect_dc <- maybeV (lookupDataCon dc) + let [arr_dc] = tyConDataCons arr_tc + let shape_tys = take (dataConRepArity arr_dc - length bndrs) + (dataConRepArgTys arr_dc) + shape_bndrs <- mapM (newLocalVar FSLIT("s")) shape_tys + return . vLet (vNonRec vbndr vexpr) + $ vCaseProd vscrut vty lty vect_dc arr_dc shape_bndrs vbndrs vbody