X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=20f19b6037022c299e98211b10ccde2900389866;hb=abaea16d603c0cc167df4c873e0e7e57697ba736;hp=648f0ab4ccc9855647146b4be2227cb65eb24c0f;hpb=bdd99c8989d84373439b667e1ef26c471f78de84;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 648f0ab..20f19b6 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,16 @@ 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, zipWithM_ ) +import Data.Maybe ( maybeToList ) vectorise :: HscEnv -> ModGuts -> IO ModGuts vectorise hsc_env guts @@ -31,180 +39,197 @@ 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 +vectModule :: ModGuts -> VM ModGuts +vectModule guts = return guts + -- ---------------------------------------------------------------------------- --- 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 +-- Bindings + +vectBndr :: Var -> VM (Var, Var) +vectBndr v = 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' } + 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 - 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]] + 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) -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' +-- ---------------------------------------------------------------------------- +-- Expressions -liftDs :: DsM a -> VM a -liftDs p = VM $ \bi env -> do { x <- p; return (env, x) } +replicateP :: CoreExpr -> CoreExpr -> VM CoreExpr +replicateP expr len + = do + dict <- paDictOfType ty + rep <- builtin replicatePAVar + return $ mkApps (Var rep) [Type ty, dict, expr, len] + where + ty = exprType expr -builtin :: (Builtins -> a) -> VM a -builtin f = VM $ \bi env -> return (env, f bi) +capply :: (CoreExpr, CoreExpr) -> (CoreExpr, CoreExpr) -> VM (CoreExpr, CoreExpr) +capply (vfn, lfn) (varg, larg) + = 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 -readEnv :: (VEnv -> a) -> VM a -readEnv f = VM $ \bi env -> return (env, f env) +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) + +vectPolyVar :: CoreExpr -> Var -> [Type] -> VM (CoreExpr, CoreExpr) +vectPolyVar lc v tys + = do + r <- readLEnv $ \env -> lookupVarEnv (local_vars env) 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) + where + mk_app e = applyToTypes e =<< mapM vectType tys -setEnv :: VEnv -> VM () -setEnv env = VM $ \_ _ -> return (env, ()) +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 + p (mk_lams mdicts) + where + mk_dict_var tv = do + r <- paDictArgType tv + case r of + Just ty -> liftM Just (newLocalVar FSLIT("dPA") ty) + Nothing -> return Nothing -updEnv :: (VEnv -> VEnv) -> VM () -updEnv f = VM $ \_ env -> return (f env, ()) + mk_lams mdicts = mkLams [arg | (tv, mdict) <- zip tvs mdicts + , arg <- tv : maybeToList mdict] -newTyVar :: FastString -> Kind -> VM Var -newTyVar fs k +applyToTypes :: CoreExpr -> [Type] -> VM CoreExpr +applyToTypes expr tys = do - u <- liftDs newUnique - return $ mkTyVar (mkSysTvName u fs) k + dicts <- mapM paDictOfType tys + return $ mkApps expr [arg | (ty, dict) <- zip tys dicts + , arg <- [Type ty, dict]] + + +vectPolyExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) +vectPolyExpr lc expr + = localV + . abstractOverTyVars tvs $ \mk_lams -> + -- FIXME: shadowing (tvs in lc) + do + (vmono, lmono) <- vectExpr lc mono + return $ (mk_lams vmono, mk_lams lmono) + where + (tvs, mono) = collectAnnTypeBinders expr + +vectExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) +vectExpr lc (_, AnnType ty) + = do + vty <- vectType ty + return (Type vty, Type vty) -lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readEnv $ \env -> lookupNameEnv (vect_tycons env) (tyConName tc) +vectExpr lc (_, AnnVar v) = vectVar lc v --- ---------------------------------------------------------------------------- --- Bindings +vectExpr lc (_, AnnLit lit) + = do + let vexpr = Lit lit + lexpr <- replicateP vexpr lc + return (vexpr, lexpr) -vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts -vectoriseModule info guts +vectExpr lc (_, AnnNote note expr) = do - builtins <- initBuiltins - env <- initVEnv info - (env', guts') <- runVM (vectModule guts) builtins env - return $ updVectInfo env' guts' + (vexpr, lexpr) <- vectExpr lc expr + return (Note note vexpr, Note note lexpr) -vectModule :: ModGuts -> VM ModGuts -vectModule guts = return guts +vectExpr lc e@(_, AnnApp _ arg) + | isAnnTypeArg arg + = vectTyAppExpr lc fn tys + where + (fn, tys) = collectAnnTypeArgs e --- ---------------------------------------------------------------------------- --- Types +vectExpr lc (_, AnnApp fn arg) + = do + fn' <- vectExpr lc fn + arg' <- vectExpr lc arg + capply fn' arg' -paArgType :: Type -> Kind -> VM (Maybe Type) -paArgType ty k - | Just k' <- kindView k = paArgType ty k' +vectExpr lc (_, AnnCase expr bndr ty alts) + = panic "vectExpr: case" --- 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) +vectExpr lc (_, AnnLet (AnnNonRec bndr rhs) 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) + (vrhs, lrhs) <- vectPolyExpr lc rhs + (vbndr, lbndr, (vbody, lbody)) <- vectBndrIn bndr (vectExpr lc body) + return (Let (NonRec vbndr vrhs) vbody, + Let (NonRec lbndr lrhs) lbody) -paArgType ty k - | isLiftedTypeKind k +vectExpr lc (_, AnnLet (AnnRec prs) body) = do - tc <- builtin paTyCon - return . Just $ TyConApp tc [ty] + (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) <- vectPolyExpr lc body + return (vrhss, vbody, lrhss, lbody) - | otherwise - = return Nothing +vectExpr lc e@(_, AnnLam bndr body) + | isTyVar bndr = pprPanic "vectExpr" (ppr $ deAnnotate e) -paArgType' :: Type -> Kind -> VM Type -paArgType' ty k - = do - r <- paArgType ty k - case r of - Just ty' -> return ty' - Nothing -> pprPanic "paArgType'" (ppr ty) +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) + +-- ---------------------------------------------------------------------------- +-- Types vectTyCon :: TyCon -> VM TyCon vectTyCon tc - | isFunTyCon tc = builtin closureTyCon + | isFunTyCon tc = builtin closureTyCon + | isBoxedTupleTyCon tc = return tc + | isUnLiftedTyCon tc = return tc | otherwise = do r <- lookupTyCon tc case r of @@ -222,9 +247,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)