X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=83f048046026d79614da646eccc8c4ee8037a6cd;hb=d23792e484bb086ec45f13527b7cdb34ebcaba4c;hp=c9df41b44bd1801ea640ea81ab678eef41696287;hpb=35380dd876960a2e88e8743545615040f08b4f27;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index c9df41b..83f0480 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -5,6 +5,7 @@ where import VectMonad import VectUtils +import VectType import DynFlags import HscTypes @@ -13,46 +14,100 @@ 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 VarSet -import Name ( mkSysTvName ) +import Name ( mkSysTvName, getName ) import NameEnv import Id import MkId ( unwrapFamInstScrut ) +import OccName import DsMonad hiding (mapAndUnzipM) import DsUtils ( mkCoreTup, mkCoreTupTy ) import PrelNames import TysWiredIn +import TysPrim ( intPrimTy ) import BasicTypes ( Boxity(..) ) import Outputable import FastString -import Control.Monad ( liftM, liftM2, mapAndUnzipM, zipWithM_ ) -import Data.Maybe ( maybeToList ) +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 (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, 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 = liftM fst . closedV . vectPolyExpr (panic "Empty lifting context") . freeVars -- ---------------------------------------------------------------------------- -- Bindings @@ -67,7 +122,7 @@ 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 v p @@ -88,15 +143,6 @@ vectBndrsIn vs p -- ---------------------------------------------------------------------------- -- Expressions -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 - capply :: (CoreExpr, CoreExpr) -> (CoreExpr, CoreExpr) -> VM (CoreExpr, CoreExpr) capply (vfn, lfn) (varg, larg) = do @@ -109,57 +155,32 @@ capply (vfn, lfn) (varg, larg) (arg_ty, res_ty) = splitClosureTy fn_ty 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) +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 lc + return (vexpr, lexpr) vectPolyVar :: CoreExpr -> Var -> [Type] -> VM (CoreExpr, CoreExpr) vectPolyVar lc v tys = do - r <- readLEnv $ \env -> lookupVarEnv (local_vars env) v + vtys <- mapM vectType tys + r <- lookupVar 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 - -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 - - mk_lams mdicts = mkLams [arg | (tv, mdict) <- zip tvs mdicts - , arg <- tv : maybeToList mdict] - -applyToTypes :: CoreExpr -> [Type] -> VM CoreExpr -applyToTypes expr tys - = do - dicts <- mapM paDictOfType tys - return $ mkApps expr [arg | (ty, dict) <- zip tys dicts - , arg <- [Type ty, dict]] - + Local (vv, lv) -> liftM2 (,) (polyApply (Var vv) vtys) + (polyApply (Var lv) vtys) + Global poly -> do + vexpr <- polyApply (Var poly) vtys + lexpr <- replicatePA vexpr lc + return (vexpr, lexpr) vectPolyExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) vectPolyExpr lc expr - = localV - . abstractOverTyVars tvs $ \mk_lams -> + = polyAbstract tvs $ \mk_lams -> -- FIXME: shadowing (tvs in lc) do (vmono, lmono) <- vectExpr lc mono @@ -178,7 +199,7 @@ vectExpr lc (_, AnnVar v) = vectVar lc v vectExpr lc (_, AnnLit lit) = do let vexpr = Lit lit - lexpr <- replicateP vexpr lc + lexpr <- replicatePA vexpr lc return (vexpr, lexpr) vectExpr lc (_, AnnNote note expr) @@ -226,7 +247,7 @@ vectExpr lc e@(_, AnnLam bndr body) vectExpr lc (fvs, AnnLam bndr body) = do - let tyvars = filter isTyVar (varSetElems fvs) + tyvars <- localTyVars info <- mkCEnvInfo fvs bndr body (poly_vfn, poly_lfn) <- mkClosureFns info tyvars bndr body @@ -243,8 +264,8 @@ vectExpr lc (fvs, AnnLam bndr body) res_ty <- vectType (exprType $ deAnnotate body) -- FIXME: move the functions to the top level - mono_vfn <- applyToTypes (Var vfn_var) (map TyVarTy tyvars) - mono_lfn <- applyToTypes (Var lfn_var) (map TyVarTy tyvars) + mono_vfn <- polyApply (Var vfn_var) (mkTyVarTys tyvars) + mono_lfn <- polyApply (Var lfn_var) (mkTyVarTys tyvars) mk_clo <- builtin mkClosureVar mk_cloP <- builtin mkClosurePVar @@ -256,7 +277,6 @@ vectExpr lc (fvs, AnnLam bndr body) `mkApps` [pa_dict, mono_vfn, mono_lfn, lenv] return (vclo, lclo) - data CEnvInfo = CEnvInfo { cenv_vars :: [Var] @@ -274,8 +294,8 @@ mkCEnvInfo fvs arg body locals <- readLEnv local_vars let (vars, vals) = unzip - [(var, val) | var <- varSetElems fvs - , Just val <- [lookupVarEnv locals var]] + [(var, (Var v, Var v')) | var <- varSetElems fvs + , Just (v,v') <- [lookupVarEnv locals var]] vtys <- mapM (vectType . varType) vars (vty, repr_tycon, repr_tyargs, repr_datacon) <- mk_env_ty vtys @@ -327,7 +347,7 @@ mkClosureFns :: CEnvInfo -> [TyVar] -> Var -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) mkClosureFns info tyvars arg body = closedV - . abstractOverTyVars tyvars + . polyAbstract tyvars $ \mk_tlams -> do (vfn, lfn) <- mkClosureMonoFns info arg body @@ -336,7 +356,7 @@ mkClosureFns info tyvars arg body mkClosureMonoFns :: CEnvInfo -> Var -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) mkClosureMonoFns info arg body = do - lc_bndr <- newLocalVar FSLIT("lc") intTy + lc_bndr <- newLocalVar FSLIT("lc") intPrimTy (varg : vbndrs, larg : lbndrs, (vbody, lbody)) <- vectBndrsIn (arg : cenv_vars info) (vectExpr (Var lc_bndr) body) @@ -361,57 +381,27 @@ mkClosureMonoFns info arg body bind_lenv lenv lbody lc_bndr [lbndr] = do - lengthPA <- builtin lengthPAVar + len <- lengthPA (Var lbndr) return . Let (NonRec lbndr lenv) - $ Case (mkApps (Var lengthPA) [Type vty, (Var lbndr)]) + $ Case len lc_bndr - intTy + (exprType lbody) [(DEFAULT, [], lbody)] bind_lenv lenv lbody lc_bndr lbndrs - = return - $ Case (unwrapFamInstScrut (cenv_repr_tycon info) - (cenv_repr_tyargs info) - lenv) - (mkWildId lty) + = let scrut = unwrapFamInstScrut (cenv_repr_tycon info) + (cenv_repr_tyargs info) + lenv + lbndrs' | null lbndrs = [mkWildId unitTy] + | otherwise = lbndrs + in + return + $ Case scrut + (mkWildId (exprType scrut)) (exprType lbody) - [(DataAlt (cenv_repr_datacon info), lc_bndr : lbndrs, lbody)] + [(DataAlt (cenv_repr_datacon info), lc_bndr : lbndrs', lbody)] 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 - | 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') - where - wrap Nothing = id - wrap (Just pa_ty) = FunTy pa_ty - -vectType ty = pprPanic "vectType:" (ppr ty) -