X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=85f4e4612ae160320170206aeb6cca3606fae93c;hp=ed77f9ae21900065538ccfb478a95bebac5505f2;hb=21d9b432b676af304dff8d7f4e1e31e1678bcae3;hpb=3ccad9ff2d9a774258253056ae99f42b886791cc diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index ed77f9a..85f4e46 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -3,246 +3,314 @@ where #include "HsVersions.h" +import VectMonad +import VectUtils +import VectType +import VectCore + import DynFlags import HscTypes 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 +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 ( liftM2 ) +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 guts' <- initDs hsc_env (mg_module guts) - (mg_rdr_env guts) - (mg_types guts) - (vectoriseModule info guts) + Just (info', guts') <- initV hsc_env guts info (vectModule guts) endPass dflags "Vectorisation" Opt_D_dump_vect (mg_binds guts') - return guts' + return (zeroSimplCount dflags, guts' { mg_vect_info = info' }) where dflags = hsc_dflags hsc_env --- ---------------------------------------------------------------------------- --- Vectorisation monad - -data Builtins = Builtins { - parrayTyCon :: TyCon - , paTyCon :: TyCon - , closureTyCon :: TyCon - , mkClosureVar :: Var - , applyClosureVar :: Var - , mkClosurePVar :: Var - , applyClosurePVar :: Var - , closurePAVar :: Var - , lengthPAVar :: Var - , replicatePAVar :: Var - } - -initBuiltins :: DsM Builtins -initBuiltins - = do - parrayTyCon <- dsLookupTyCon parrayTyConName - paTyCon <- dsLookupTyCon paTyConName - closureTyCon <- dsLookupTyCon closureTyConName - - mkClosureVar <- dsLookupGlobalId mkClosureName - applyClosureVar <- dsLookupGlobalId applyClosureName - mkClosurePVar <- dsLookupGlobalId mkClosurePName - applyClosurePVar <- dsLookupGlobalId applyClosurePName - closurePAVar <- dsLookupGlobalId closurePAName - lengthPAVar <- dsLookupGlobalId lengthPAName - replicatePAVar <- dsLookupGlobalId replicatePAName - - return $ Builtins { - parrayTyCon = parrayTyCon - , paTyCon = paTyCon - , closureTyCon = closureTyCon - , mkClosureVar = mkClosureVar - , applyClosureVar = applyClosureVar - , mkClosurePVar = mkClosurePVar - , applyClosurePVar = applyClosurePVar - , closurePAVar = closurePAVar - , lengthPAVar = lengthPAVar - , replicatePAVar = replicatePAVar - } - -data VEnv = VEnv { - -- Mapping from variables to their vectorised versions - -- - vect_vars :: VarEnv Var - - -- Exported variables which have a vectorised version - -- - , vect_exported_vars :: VarEnv (Var, Var) - - -- Mapping from TyCons to their vectorised versions. - -- TyCons which do not have to be vectorised are mapped to - -- themselves. - , vect_tycons :: NameEnv TyCon - } - -initVEnv :: VectInfo -> DsM VEnv -initVEnv info - = return $ VEnv { - vect_vars = mapVarEnv snd $ vectInfoCCVar info - , vect_exported_vars = emptyVarEnv - , vect_tycons = mapNameEnv snd $ vectInfoCCTyCon info - } - --- FIXME -updVectInfo :: VEnv -> ModGuts -> ModGuts -updVectInfo env guts = guts { mg_vect_info = info' } +vectModule :: ModGuts -> VM ModGuts +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 - info' = info { - vectInfoCCVar = vect_exported_vars env - , vectInfoCCTyCon = tc_env - } - - info = mg_vect_info guts - tyenv = mg_types guts - - tc_env = mkNameEnv [(tc_name, (tc,tc')) | tc <- typeEnvTyCons tyenv - , let tc_name = tyConName tc - , Just tc' <- [lookupNameEnv (vect_tycons env) tc_name]] - -data VResult a = Yes VEnv a | No + (vars, exprs) = unzip bs -newtype VM a = VM { runVM :: Builtins -> VEnv -> DsM (VResult a) } +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) -instance Monad VM where - return x = VM $ \bi env -> return (Yes env x) - VM p >>= f = VM $ \bi env -> do - r <- p bi env - case r of - Yes env' x -> runVM (f x) bi env' - No -> return No +-- ---------------------------------------------------------------------------- +-- Bindings -noV :: VM a -noV = VM $ \bi env -> return No +vectBndr :: Var -> VM VVar +vectBndr v + = do + vty <- vectType (idType v) + lty <- mkPArrayType vty + let vv = v `Id.setIdType` vty + lv = v `Id.setIdType` lty + updLEnv (mapTo vv lv) + return (vv, lv) + where + mapTo vv lv env = env { local_vars = extendVarEnv (local_vars env) v (vv, lv) } + +vectBndrIn :: Var -> VM a -> VM (VVar, a) +vectBndrIn v p + = localV + $ do + vv <- vectBndr v + x <- p + 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 ([VVar], a) +vectBndrsIn vs p + = localV + $ do + vvs <- mapM vectBndr vs + x <- p + return (vvs, x) -tryV :: VM a -> VM (Maybe a) -tryV (VM p) = VM $ \bi env -> do - r <- p bi env - case r of - Yes env' x -> return (Yes env' (Just x)) - No -> return (Yes env Nothing) +-- ---------------------------------------------------------------------------- +-- Expressions -liftDs :: DsM a -> VM a -liftDs p = VM $ \bi env -> do { x <- p; return (Yes env x) } +vectVar :: Var -> VM VExpr +vectVar v + = do + 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) + +vectPolyVar :: Var -> [Type] -> VM VExpr +vectPolyVar v tys + = do + 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) + +vectPolyExpr :: CoreExprWithFVs -> VM VExpr +vectPolyExpr expr + = polyAbstract tvs $ \abstract -> + do + mono' <- vectExpr mono + return $ mapVect abstract mono' + where + (tvs, mono) = collectAnnTypeBinders expr + +vectExpr :: CoreExprWithFVs -> VM VExpr +vectExpr (_, AnnType ty) + = liftM vType (vectType ty) -builtin :: (Builtins -> a) -> VM a -builtin f = VM $ \bi env -> return (Yes env (f bi)) +vectExpr (_, AnnVar v) = vectVar v -readEnv :: (VEnv -> a) -> VM a -readEnv f = VM $ \bi env -> return (Yes env (f env)) +vectExpr (_, AnnLit lit) = vectLiteral lit -setEnv :: VEnv -> VM () -setEnv env = VM $ \_ _ -> return (Yes env ()) +vectExpr (_, AnnNote note expr) + = liftM (vNote note) (vectExpr expr) -updEnv :: (VEnv -> VEnv) -> VM () -updEnv f = VM $ \_ env -> return (Yes (f env) ()) +vectExpr e@(_, AnnApp _ arg) + | isAnnTypeArg arg + = vectTyAppExpr fn tys + where + (fn, tys) = collectAnnTypeArgs e -newTyVar :: FastString -> Kind -> VM Var -newTyVar fs k +vectExpr (_, AnnApp fn arg) = do - u <- liftDs newUnique - return $ mkTyVar (mkSysTvName u fs) k + fn' <- vectExpr fn + arg' <- vectExpr arg + mkClosureApp fn' arg' -lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readEnv $ \env -> lookupNameEnv (vect_tycons env) (tyConName tc) +vectExpr (_, AnnCase scrut bndr ty alts) + | isAlgType scrut_ty + = vectAlgCase scrut bndr ty alts + where + scrut_ty = exprType (deAnnotate scrut) --- ---------------------------------------------------------------------------- --- Bindings +vectExpr (_, AnnCase expr bndr ty alts) + = panic "vectExpr: case" -vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts -vectoriseModule info guts +vectExpr (_, AnnLet (AnnNonRec bndr rhs) body) = do - builtins <- initBuiltins - env <- initVEnv info - r <- runVM (vectModule guts) builtins env - case r of - Yes env' guts' -> return $ updVectInfo env' guts' - No -> return guts + vrhs <- localV . inBind bndr $ vectPolyExpr rhs + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vLet (vNonRec vbndr vrhs) vbody -vectModule :: ModGuts -> VM ModGuts -vectModule guts = return guts +vectExpr (_, AnnLet (AnnRec bs) body) + = do + (vbndrs, (vrhss, vbody)) <- vectBndrsIn bndrs + $ liftM2 (,) + (zipWithM vect_rhs bndrs rhss) + (vectPolyExpr body) + return $ vLet (vRec vbndrs vrhss) vbody + where + (bndrs, rhss) = unzip bs --- ---------------------------------------------------------------------------- --- Types + vect_rhs bndr rhs = localV + . inBind bndr + $ vectExpr rhs -paArgType :: Type -> Kind -> VM (Maybe Type) -paArgType ty k - | Just k' <- kindView k = paArgType ty k' +vectExpr e@(fvs, AnnLam bndr _) + | not (isId bndr) = pprPanic "vectExpr" (ppr $ deAnnotate e) + | otherwise = vectLam fvs bs body + where + (bs,body) = collectAnnValBinders e --- Here, we assume that for a kind (k1 -> k2) to be valid, k1 and k2 can only --- be made up of * and (->), i.e., they can't be coercion kinds or #. -paArgType ty (FunTy k1 k2) +vectLam :: VarSet -> [Var] -> CoreExprWithFVs -> VM VExpr +vectLam fvs bs body = do - tv <- newTyVar FSLIT("a") k1 - ty1 <- paArgType' (TyVarTy tv) k1 - ty2 <- paArgType' (AppTy ty (TyVarTy tv)) k2 - return . Just $ ForAllTy tv (FunTy ty1 ty2) - -paArgType ty k - | isLiftedTypeKind k + 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 - tc <- builtin paTyCon - return . Just $ TyConApp tc [ty] - - | otherwise - = return Nothing + vscrut <- vectExpr scrut + vty <- vectType ty + lty <- mkPArrayType vty + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vCaseDEFAULT vscrut vbndr vty lty vbody -paArgType' :: Type -> Kind -> VM Type -paArgType' ty k +vectAlgCase scrut bndr ty [(DataAlt dc, bndrs, body)] = do - r <- paArgType ty k - case r of - Just ty' -> return ty' - Nothing -> pprPanic "paArgType'" (ppr ty) - -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 <- paArgType (TyVarTy tv) (tyVarKind tv) - ty' <- vectType ty - return . ForAllTy tv $ case r of { Just paty -> FunTy paty ty'; Nothing -> ty' } - -vectType ty = pprPanic "vectType:" (ppr ty) - + 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