X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=055137abe41c5abb102e22d1aababaa1760b72a8;hb=0a21de62e274acc8e8e260298da4f6c1ee18ecc2;hp=21d6bf527beedd110f853e7a6187a5e52ce97c5e;hpb=d67fef668b20b479c91ef133d48a5cc857c79a34;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 21d6bf5..055137a 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -3,156 +3,266 @@ where #include "HsVersions.h" +import VectMonad +import VectUtils +import VectType +import VectCore + import DynFlags import HscTypes -import CoreLint ( showPass, endPass ) +import CoreLint ( showPass, endPass ) +import CoreSyn +import CoreUtils +import CoreFVs +import SimplMonad ( SimplCount, zeroSimplCount ) +import Rules ( RuleBase ) +import DataCon import TyCon +import Type +import FamInstEnv ( extendFamInstEnvList ) +import InstEnv ( extendInstEnvList ) import Var import VarEnv +import VarSet +import Name ( mkSysTvName, getName ) import NameEnv +import Id +import MkId ( unwrapFamInstScrut ) +import OccName -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 ( liftM, liftM2, 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 +vectModule :: ModGuts -> VM ModGuts +vectModule guts + = do + (types', fam_insts, pa_insts) <- vectTypeEnv (mg_types guts) + + let insts = map painstInstance pa_insts + fam_inst_env' = extendFamInstEnvList (mg_fam_inst_env guts) fam_insts + inst_env' = extendInstEnvList (mg_inst_env guts) insts + updGEnv (setInstEnvs inst_env' fam_inst_env') + + dicts <- mapM buildPADict pa_insts + binds' <- mapM vectTopBind (mg_binds guts) + return $ guts { mg_types = types' + , mg_binds = Rec (concat dicts) : binds' + , mg_inst_env = inst_env' + , mg_fam_inst_env = fam_inst_env' + , mg_insts = mg_insts guts ++ insts + , mg_fam_insts = mg_fam_insts guts ++ fam_insts + } + +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 expr + = do + lc <- newLocalVar FSLIT("lc") intPrimTy + closedV . liftM vectorised + $ vectPolyExpr lc (freeVars expr) + +-- ---------------------------------------------------------------------------- +-- Bindings + +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) + +vectBndrsIn :: [Var] -> VM a -> VM ([VVar], a) +vectBndrsIn vs p + = localV + $ do + vvs <- mapM vectBndr vs + x <- p + return (vvs, x) + -- ---------------------------------------------------------------------------- --- 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 +-- Expressions + +capply :: VExpr -> VExpr -> VM VExpr +capply (vfn, lfn) (varg, larg) = 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' } + 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 - info' = info { - vectInfoCCVar = vect_exported_vars env - , vectInfoCCTyCon = tc_env - } + fn_ty = exprType vfn + (arg_ty, res_ty) = splitClosureTy fn_ty - info = mg_vect_info guts - tyenv = mg_types guts +vectVar :: Var -> Var -> VM VExpr +vectVar lc v + = do + r <- lookupVar v + case r of + Local (vv,lv) -> return (Var vv, Var lv) + Global vv -> do + let vexpr = Var vv + lexpr <- replicatePA vexpr (Var lc) + return (vexpr, lexpr) - tc_env = mkNameEnv [(tc_name, (tc,tc')) | tc <- typeEnvTyCons tyenv - , let tc_name = tyConName tc - , Just tc' <- [lookupNameEnv (vect_tycons env) tc_name]] +vectPolyVar :: Var -> Var -> [Type] -> VM VExpr +vectPolyVar lc 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 <- replicatePA vexpr (Var lc) + return (vexpr, lexpr) + +vectLiteral :: Var -> Literal -> VM VExpr +vectLiteral lc lit + = do + lexpr <- replicatePA (Lit lit) (Var lc) + return (Lit lit, lexpr) + +vectPolyExpr :: Var -> CoreExprWithFVs -> VM VExpr +vectPolyExpr lc expr + = polyAbstract tvs $ \abstract -> + -- FIXME: shadowing (tvs in lc) + do + mono' <- vectExpr lc mono + return $ mapVect abstract mono' + where + (tvs, mono) = collectAnnTypeBinders expr + +vectExpr :: Var -> CoreExprWithFVs -> VM VExpr +vectExpr lc (_, AnnType ty) + = liftM vType (vectType ty) -newtype VM a = VM { runVM :: Builtins -> VEnv -> DsM (VEnv, a) } +vectExpr lc (_, AnnVar v) = vectVar lc v -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' +vectExpr lc (_, AnnLit lit) = vectLiteral lc lit -builtin :: (Builtins -> a) -> VM a -builtin f = VM $ \bi env -> return (env, f bi) +vectExpr lc (_, AnnNote note expr) + = liftM (vNote note) (vectExpr lc expr) -readEnv :: (VEnv -> a) -> VM a -readEnv f = VM $ \bi env -> return (env, f env) +vectExpr lc e@(_, AnnApp _ arg) + | isAnnTypeArg arg + = vectTyAppExpr lc fn tys + where + (fn, tys) = collectAnnTypeArgs e -setEnv :: VEnv -> VM () -setEnv env = VM $ \_ _ -> return (env, ()) +vectExpr lc (_, AnnApp fn arg) + = do + fn' <- vectExpr lc fn + arg' <- vectExpr lc arg + capply fn' arg' -updEnv :: (VEnv -> VEnv) -> VM () -updEnv f = VM $ \_ env -> return (f env, ()) +vectExpr lc (_, AnnCase expr bndr ty alts) + = panic "vectExpr: case" +vectExpr lc (_, AnnLet (AnnNonRec bndr rhs) body) + = do + vrhs <- vectPolyExpr lc rhs + (vbndr, vbody) <- vectBndrIn bndr (vectExpr lc body) + return $ vLet (vNonRec vbndr vrhs) vbody -lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readEnv $ \env -> lookupNameEnv (vect_tycons env) (tyConName tc) +vectExpr lc (_, AnnLet (AnnRec bs) body) + = do + (vbndrs, (vrhss, vbody)) <- vectBndrsIn bndrs + $ liftM2 (,) + (mapM (vectExpr lc) rhss) + (vectPolyExpr lc body) + return $ vLet (vRec vbndrs vrhss) vbody + where + (bndrs, rhss) = unzip bs --- ---------------------------------------------------------------------------- --- Bindings +vectExpr lc e@(_, AnnLam bndr body) + | isTyVar bndr = pprPanic "vectExpr" (ppr $ deAnnotate e) -vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts -vectoriseModule info guts +vectExpr lc (fvs, AnnLam bndr body) = do - builtins <- initBuiltins - env <- initVEnv info - (env', guts') <- runVM (vectModule guts) builtins env - return $ updVectInfo env' guts' + tyvars <- localTyVars + (vs, vvs) <- readLEnv $ \env -> + unzip [(var, vv) | var <- varSetElems fvs + , Just vv <- [lookupVarEnv (local_vars env) var]] -vectModule :: ModGuts -> VM ModGuts -vectModule guts = return guts + arg_ty <- vectType (idType bndr) + res_ty <- vectType (exprType $ deAnnotate body) + buildClosure tyvars lc vvs arg_ty res_ty + . hoistPolyVExpr FSLIT("fn") tyvars + $ do + new_lc <- newLocalVar FSLIT("lc") intPrimTy + (vbndrs, vbody) <- vectBndrsIn (vs ++ [bndr]) + (vectExpr new_lc body) + return $ vLams new_lc vbndrs vbody + +vectTyAppExpr :: Var -> CoreExprWithFVs -> [Type] -> VM (CoreExpr, CoreExpr) +vectTyAppExpr lc (_, AnnVar v) tys = vectPolyVar lc v tys +vectTyAppExpr lc e tys = pprPanic "vectTyAppExpr" (ppr $ deAnnotate e)