X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=6f9db0aef58738cfbcd8fe8b027396d0d8151483;hb=5e979164079ae89ca01483131149b8727dd82686;hp=0bf4f662eb664527a033f041aa5cf7efc1cefd10;hpb=2c0188fca52f73de0d97a7f03bc42f133807126f;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 0bf4f66..6f9db0a 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -3,10 +3,16 @@ where #include "HsVersions.h" +import VectMonad +import VectUtils + import DynFlags import HscTypes import CoreLint ( showPass, endPass ) +import CoreSyn +import CoreUtils +import CoreFVs import TyCon import Type import TypeRep @@ -14,14 +20,15 @@ import Var import VarEnv import Name ( mkSysTvName ) import NameEnv +import Id -import DsMonad +import DsMonad hiding (mapAndUnzipM) import PrelNames import Outputable import FastString -import Control.Monad ( liftM2 ) +import Control.Monad ( liftM, liftM2, mapAndUnzipM ) vectorise :: HscEnv -> ModGuts -> IO ModGuts vectorise hsc_env guts @@ -31,176 +38,134 @@ vectorise hsc_env guts 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 $ 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' } - 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]] - -newtype VM a = VM { runVM :: Builtins -> VEnv -> DsM (VEnv, a) } - -instance Monad VM where - return x = VM $ \bi env -> return (env, x) - VM p >>= f = VM $ \bi env -> do - (env', x) <- p bi env - runVM (f x) bi env' - -liftDs :: DsM a -> VM a -liftDs p = VM $ \bi env -> do { x <- p; return (env, x) } - -builtin :: (Builtins -> a) -> VM a -builtin f = VM $ \bi env -> return (env, f bi) - -readEnv :: (VEnv -> a) -> VM a -readEnv f = VM $ \bi env -> return (env, f env) - -setEnv :: VEnv -> VM () -setEnv env = VM $ \_ _ -> return (env, ()) - -updEnv :: (VEnv -> VEnv) -> VM () -updEnv f = VM $ \_ env -> return (f env, ()) - -newTyVar :: FastString -> Kind -> VM Var -newTyVar fs k - = do - u <- liftDs newUnique - return $ mkTyVar (mkSysTvName u fs) k - -lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readEnv $ \env -> lookupNameEnv (vect_tycons env) (tyConName tc) +vectModule :: ModGuts -> VM ModGuts +vectModule guts = return guts -- ---------------------------------------------------------------------------- -- Bindings -vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts -vectoriseModule info guts +vectBndr :: Var -> VM (Var, Var) +vectBndr v = do - builtins <- initBuiltins - env <- initVEnv info - (env', guts') <- runVM (vectModule guts) builtins env - return $ updVectInfo env' guts' - -vectModule :: ModGuts -> VM ModGuts -vectModule guts = return guts + 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 (Var vv, Var lv) } + +vectBndrIn :: Var -> VM a -> VM (Var, Var, a) +vectBndrIn v p + = localV + $ do + (vv, lv) <- vectBndr v + x <- p + return (vv, lv, x) + +vectBndrsIn :: [Var] -> VM a -> VM ([Var], [Var], a) +vectBndrsIn vs p + = localV + $ do + (vvs, lvs) <- mapAndUnzipM vectBndr vs + x <- p + return (vvs, lvs, x) -- ---------------------------------------------------------------------------- --- Types - -paArgType :: Type -> Kind -> VM (Maybe Type) -paArgType ty k - | Just k' <- kindView k = paArgType ty k' +-- Expressions --- 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) +replicateP :: CoreExpr -> CoreExpr -> VM CoreExpr +replicateP expr len = 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) + dict <- paDictOfType ty + rep <- builtin replicatePAVar + return $ mkApps (Var rep) [Type ty, dict, expr, len] + where + ty = exprType expr -paArgType ty k - | isLiftedTypeKind k +capply :: (CoreExpr, CoreExpr) -> (CoreExpr, CoreExpr) -> VM (CoreExpr, CoreExpr) +capply (vfn, lfn) (varg, larg) = do - tc <- builtin paTyCon - return . Just $ TyConApp tc [ty] - - | otherwise - = return Nothing + 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 -paArgType' :: Type -> Kind -> VM Type -paArgType' ty k +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) + +vectExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) +vectExpr lc (_, AnnType ty) + = 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 - r <- paArgType ty k - case r of - Just ty' -> return ty' - Nothing -> pprPanic "paArgType'" (ppr ty) + (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) + = panic "vectExpr: case" +vectExpr lc (_, 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) + = 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)) + 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) + +-- ---------------------------------------------------------------------------- +-- Types vectTyCon :: TyCon -> VM TyCon vectTyCon tc @@ -224,9 +189,12 @@ vectType (FunTy ty1 ty2) = liftM2 TyConApp (builtin closureTyCon) (mapM vectType [ty1,ty2]) vectType (ForAllTy tv ty) = do - r <- paArgType (TyVarTy tv) (tyVarKind tv) + r <- paDictArgType tv ty' <- vectType ty - return . ForAllTy tv $ case r of { Just paty -> FunTy paty ty'; Nothing -> ty' } + return $ ForAllTy tv (wrap r ty') + where + wrap Nothing = id + wrap (Just pa_ty) = FunTy pa_ty vectType ty = pprPanic "vectType:" (ppr ty)