X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=85f4e4612ae160320170206aeb6cca3606fae93c;hp=d5b78f14daf5a6af639ddc3badfb26c7e339aee6;hb=21d9b432b676af304dff8d7f4e1e31e1678bcae3;hpb=3aff16171d3bd0c27826c8947edf8fff7d07fef2 diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index d5b78f1..85f4e46 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -5,6 +5,8 @@ where import VectMonad import VectUtils +import VectType +import VectCore import DynFlags import HscTypes @@ -18,19 +20,22 @@ 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, getName ) +import Name ( Name, mkSysTvName, getName ) import NameEnv import Id import MkId ( unwrapFamInstScrut ) import OccName +import Module ( Module ) import DsMonad hiding (mapAndUnzipM) import DsUtils ( mkCoreTup, mkCoreTupTy ) +import Literal ( Literal ) import PrelNames import TysWiredIn import TysPrim ( intPrimTy ) @@ -38,8 +43,7 @@ import BasicTypes ( Boxity(..) ) import Outputable import FastString -import Control.Monad ( liftM, liftM2, mapAndUnzipM, zipWithM_ ) -import Data.Maybe ( maybeToList ) +import Control.Monad ( liftM, liftM2, zipWithM, mapAndUnzipM ) vectorise :: HscEnv -> UniqSupply -> RuleBase -> ModGuts -> IO (SimplCount, ModGuts) @@ -57,14 +61,25 @@ vectorise hsc_env _ _ guts vectModule :: ModGuts -> VM ModGuts vectModule guts = do - binds' <- mapM vectTopBind (mg_binds guts) - return $ guts { mg_binds = binds' } + (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 expr + expr' <- vectTopRhs var expr hs <- takeHoisted return . Rec $ (var, expr) : (var', expr') : hs `orElseV` @@ -73,7 +88,7 @@ vectTopBind b@(NonRec var expr) vectTopBind b@(Rec bs) = do vars' <- mapM vectTopBinder vars - exprs' <- mapM vectTopRhs exprs + exprs' <- zipWithM vectTopRhs vars exprs hs <- takeHoisted return . Rec $ bs ++ zip vars' exprs' ++ hs `orElseV` @@ -84,20 +99,22 @@ vectTopBind b@(Rec 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 + vty <- vectType (idType var) + var' <- cloneId mkVectOcc var vty defGlobalVar var var' return var' -vectTopRhs :: CoreExpr -> VM CoreExpr -vectTopRhs = liftM fst . closedV . vectPolyExpr (panic "Empty lifting context") . freeVars +vectTopRhs :: Var -> CoreExpr -> VM CoreExpr +vectTopRhs var expr + = do + closedV . liftM vectorised + . inBind var + $ vectPolyExpr (freeVars expr) -- ---------------------------------------------------------------------------- -- Bindings -vectBndr :: Var -> VM (Var, Var) +vectBndr :: Var -> VM VVar vectBndr v = do vty <- vectType (idType v) @@ -107,354 +124,193 @@ 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 :: Var -> VM a -> VM (VVar, a) vectBndrIn v p = localV $ do - (vv, lv) <- vectBndr v + vv <- vectBndr v x <- p - return (vv, lv, x) + 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 ([Var], [Var], a) +vectBndrsIn :: [Var] -> VM a -> VM ([VVar], a) vectBndrsIn vs p = localV $ do - (vvs, lvs) <- mapAndUnzipM vectBndr vs + vvs <- mapM vectBndr vs x <- p - return (vvs, lvs, x) + return (vvs, x) -- ---------------------------------------------------------------------------- -- 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 - 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 - -vectVar :: CoreExpr -> Var -> VM (CoreExpr, CoreExpr) -vectVar lc v +vectVar :: Var -> VM VExpr +vectVar v = do r <- lookupVar v case r of - Local es -> return es - Global vexpr -> do - lexpr <- replicateP vexpr lc - return (vexpr, lexpr) - -vectPolyVar :: CoreExpr -> Var -> [Type] -> VM (CoreExpr, CoreExpr) -vectPolyVar lc v tys + 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 (vexpr, lexpr) -> liftM2 (,) (mk_app vexpr) (mk_app lexpr) - Global poly -> do - 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 + 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 - 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 + lexpr <- liftPA (Lit lit) + return (Lit lit, lexpr) - 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]] - - -vectPolyExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) -vectPolyExpr lc expr - = localV - . abstractOverTyVars tvs $ \mk_lams -> - -- FIXME: shadowing (tvs in lc) +vectPolyExpr :: CoreExprWithFVs -> VM VExpr +vectPolyExpr expr + = polyAbstract tvs $ \abstract -> do - (vmono, lmono) <- vectExpr lc mono - return $ (mk_lams vmono, mk_lams lmono) + mono' <- vectExpr mono + return $ mapVect abstract mono' where (tvs, mono) = collectAnnTypeBinders expr -vectExpr :: CoreExpr -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) -vectExpr lc (_, AnnType ty) - = do - vty <- vectType ty - return (Type vty, Type vty) +vectExpr :: CoreExprWithFVs -> VM VExpr +vectExpr (_, AnnType ty) + = liftM vType (vectType ty) -vectExpr lc (_, AnnVar v) = vectVar lc v +vectExpr (_, AnnVar v) = vectVar v -vectExpr lc (_, AnnLit lit) - = do - let vexpr = Lit lit - lexpr <- replicateP vexpr lc - return (vexpr, lexpr) +vectExpr (_, AnnLit lit) = vectLiteral lit -vectExpr lc (_, AnnNote note expr) - = do - (vexpr, lexpr) <- vectExpr lc expr - return (Note note vexpr, Note note lexpr) +vectExpr (_, AnnNote note expr) + = liftM (vNote note) (vectExpr expr) -vectExpr lc e@(_, AnnApp _ arg) +vectExpr e@(_, AnnApp _ arg) | isAnnTypeArg arg - = vectTyAppExpr lc fn tys + = vectTyAppExpr fn tys where (fn, tys) = collectAnnTypeArgs e -vectExpr lc (_, AnnApp fn arg) +vectExpr (_, 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" + fn' <- vectExpr fn + arg' <- vectExpr arg + mkClosureApp fn' arg' -vectExpr lc (_, AnnLet (AnnNonRec bndr rhs) body) - = do - (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) - -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) +vectExpr (_, AnnCase scrut bndr ty alts) + | isAlgType scrut_ty + = vectAlgCase scrut bndr ty alts where - (bndrs, rhss) = unzip prs - - vect = do - (vrhss, lrhss) <- mapAndUnzipM (vectExpr lc) rhss - (vbody, lbody) <- vectPolyExpr lc body - return (vrhss, vbody, lrhss, lbody) + scrut_ty = exprType (deAnnotate scrut) -vectExpr lc e@(_, AnnLam bndr body) - | isTyVar bndr = pprPanic "vectExpr" (ppr $ deAnnotate e) +vectExpr (_, AnnCase expr bndr ty alts) + = panic "vectExpr: case" -vectExpr lc (fvs, AnnLam bndr body) +vectExpr (_, AnnLet (AnnNonRec bndr rhs) body) = do - let tyvars = filter isTyVar (varSetElems fvs) - info <- mkCEnvInfo fvs bndr body - (poly_vfn, poly_lfn) <- mkClosureFns info tyvars bndr body - - vfn_var <- hoistExpr FSLIT("vfn") poly_vfn - lfn_var <- hoistExpr FSLIT("lfn") poly_lfn - - let (venv, lenv) = mkClosureEnvs info lc - - let env_ty = cenv_vty info - - pa_dict <- paDictOfType env_ty - - arg_ty <- vectType (varType bndr) - 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) + vrhs <- localV . inBind bndr $ vectPolyExpr rhs + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vLet (vNonRec vbndr vrhs) vbody - mk_clo <- builtin mkClosureVar - mk_cloP <- builtin mkClosurePVar - - let vclo = Var mk_clo `mkTyApps` [arg_ty, res_ty, env_ty] - `mkApps` [pa_dict, mono_vfn, mono_lfn, venv] - - lclo = Var mk_cloP `mkTyApps` [arg_ty, res_ty, env_ty] - `mkApps` [pa_dict, mono_vfn, mono_lfn, lenv] - - return (vclo, lclo) - - -data CEnvInfo = CEnvInfo { - cenv_vars :: [Var] - , cenv_values :: [(CoreExpr, CoreExpr)] - , cenv_vty :: Type - , cenv_lty :: Type - , cenv_repr_tycon :: TyCon - , cenv_repr_tyargs :: [Type] - , cenv_repr_datacon :: DataCon - } - -mkCEnvInfo :: VarSet -> Var -> CoreExprWithFVs -> VM CEnvInfo -mkCEnvInfo fvs arg body +vectExpr (_, AnnLet (AnnRec bs) body) = do - locals <- readLEnv local_vars - let - (vars, vals) = unzip - [(var, val) | var <- varSetElems fvs - , Just val <- [lookupVarEnv locals var]] - vtys <- mapM (vectType . varType) vars - - (vty, repr_tycon, repr_tyargs, repr_datacon) <- mk_env_ty vtys - lty <- mkPArrayType vty - - return $ CEnvInfo { - cenv_vars = vars - , cenv_values = vals - , cenv_vty = vty - , cenv_lty = lty - , cenv_repr_tycon = repr_tycon - , cenv_repr_tyargs = repr_tyargs - , cenv_repr_datacon = repr_datacon - } + (vbndrs, (vrhss, vbody)) <- vectBndrsIn bndrs + $ liftM2 (,) + (zipWithM vect_rhs bndrs rhss) + (vectPolyExpr body) + return $ vLet (vRec vbndrs vrhss) vbody where - mk_env_ty [vty] - = return (vty, error "absent cinfo_repr_tycon" - , error "absent cinfo_repr_tyargs" - , error "absent cinfo_repr_datacon") - - mk_env_ty vtys - = do - let ty = mkCoreTupTy vtys - (repr_tc, repr_tyargs) <- lookupPArrayFamInst ty - let [repr_con] = tyConDataCons repr_tc - return (ty, repr_tc, repr_tyargs, repr_con) + (bndrs, rhss) = unzip bs - + vect_rhs bndr rhs = localV + . inBind bndr + $ vectExpr rhs -mkClosureEnvs :: CEnvInfo -> CoreExpr -> (CoreExpr, CoreExpr) -mkClosureEnvs info lc - | [] <- vals - = (Var unitDataConId, mkApps (Var $ dataConWrapId (cenv_repr_datacon info)) - [lc, Var unitDataConId]) - - | [(vval, lval)] <- vals - = (vval, lval) - - | otherwise - = (mkCoreTup vvals, Var (dataConWrapId $ cenv_repr_datacon info) - `mkTyApps` cenv_repr_tyargs info - `mkApps` (lc : lvals)) - - where - vals = cenv_values info - (vvals, lvals) = unzip vals - -mkClosureFns :: CEnvInfo -> [TyVar] -> Var -> CoreExprWithFVs - -> VM (CoreExpr, CoreExpr) -mkClosureFns info tyvars arg body - = closedV - . abstractOverTyVars tyvars - $ \mk_tlams -> - do - (vfn, lfn) <- mkClosureMonoFns info arg body - return (mk_tlams vfn, mk_tlams lfn) - -mkClosureMonoFns :: CEnvInfo -> Var -> CoreExprWithFVs -> VM (CoreExpr, CoreExpr) -mkClosureMonoFns info arg body - = do - lc_bndr <- newLocalVar FSLIT("lc") intPrimTy - (varg : vbndrs, larg : lbndrs, (vbody, lbody)) - <- vectBndrsIn (arg : cenv_vars info) - (vectExpr (Var lc_bndr) body) - - venv_bndr <- newLocalVar FSLIT("env") vty - lenv_bndr <- newLocalVar FSLIT("env") lty - - let vcase = bind_venv (Var venv_bndr) vbody vbndrs - lcase <- bind_lenv (Var lenv_bndr) lbody lc_bndr lbndrs - return (mkLams [venv_bndr, varg] vcase, mkLams [lenv_bndr, larg] lcase) +vectExpr e@(fvs, AnnLam bndr _) + | not (isId bndr) = pprPanic "vectExpr" (ppr $ deAnnotate e) + | otherwise = vectLam fvs bs body where - vty = cenv_vty info - lty = cenv_lty info - - arity = length (cenv_vars info) - - bind_venv venv vbody [] = vbody - bind_venv venv vbody [vbndr] = Let (NonRec vbndr venv) vbody - bind_venv venv vbody vbndrs - = Case venv (mkWildId vty) (exprType vbody) - [(DataAlt (tupleCon Boxed arity), vbndrs, vbody)] - - bind_lenv lenv lbody lc_bndr [lbndr] - = do - lengthPA <- builtin lengthPAVar - return . Let (NonRec lbndr lenv) - $ Case (mkApps (Var lengthPA) [Type vty, (Var lbndr)]) - lc_bndr - (exprType lbody) - [(DEFAULT, [], lbody)] - - bind_lenv lenv lbody lc_bndr lbndrs - = 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)] - -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) + (bs,body) = collectAnnValBinders 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) +vectLam :: VarSet -> [Var] -> CoreExprWithFVs -> VM VExpr +vectLam fvs bs body = 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) + 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 + vscrut <- vectExpr scrut + vty <- vectType ty + lty <- mkPArrayType vty + (vbndr, vbody) <- vectBndrIn bndr (vectExpr body) + return $ vCaseDEFAULT vscrut vbndr vty lty vbody +vectAlgCase scrut bndr ty [(DataAlt dc, bndrs, body)] + = do + 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