X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise.hs;h=a73e7051e49bd450f4dbeadc74cac7a1a438443c;hb=10c6e54de5f6b4ebd3183d8184941e1915edf6cf;hp=67bacc79724f6dcf5178d84b3bf221dbdc288fd7;hpb=7cbc80db7535303f025fbcb61ac371c52d0be493;p=ghc-hetmet.git diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 67bacc7..a73e705 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -3,6 +3,9 @@ where #include "HsVersions.h" +import VectMonad +import VectUtils + import DynFlags import HscTypes @@ -10,220 +13,117 @@ 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 Var import VarEnv -import Name ( mkSysTvName ) +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 PrelNames +import TysWiredIn +import TysPrim ( intPrimTy ) +import BasicTypes ( Boxity(..) ) 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 - | 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 --- ---------------------------------------------------------------------------- --- 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 +vectModule :: ModGuts -> VM ModGuts +vectModule guts = 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 - } + binds' <- mapM vectTopBind (mg_binds guts) + return $ guts { mg_binds = binds' } -data GlobalEnv = GlobalEnv { - -- Mapping from global variables to their vectorised versions. - -- - global_vars :: VarEnv CoreExpr - - -- Exported variables which have a vectorised version - -- - , global_exported_vars :: VarEnv (Var, Var) - - -- Mapping from TyCons to their vectorised versions. - -- TyCons which do not have to be vectorised are mapped to - -- themselves. - -- - , global_tycons :: NameEnv TyCon - - -- Mapping from TyCons to their PA dictionaries - -- - , global_tycon_pa :: NameEnv CoreExpr - } - -data LocalEnv = LocalEnv { - -- Mapping from local variables to their vectorised and - -- lifted versions - -- - local_vars :: VarEnv (CoreExpr, CoreExpr) - - -- Mapping from tyvars to their PA dictionaries - , local_tyvar_pa :: VarEnv CoreExpr - } - - -initGlobalEnv :: VectInfo -> GlobalEnv -initGlobalEnv info - = GlobalEnv { - global_vars = mapVarEnv (Var . snd) $ vectInfoCCVar info - , global_exported_vars = emptyVarEnv - , global_tycons = mapNameEnv snd $ vectInfoCCTyCon info - , global_tycon_pa = emptyNameEnv - } - -emptyLocalEnv = LocalEnv { - local_vars = emptyVarEnv - , local_tyvar_pa = emptyVarEnv - } - --- FIXME -updVectInfo :: GlobalEnv -> ModGuts -> ModGuts -updVectInfo env guts = guts { mg_vect_info = info' } +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 - info' = info { - vectInfoCCVar = global_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 (global_tycons env) tc_name]] - -data VResult a = Yes GlobalEnv LocalEnv a | No - -newtype VM a = VM { runVM :: Builtins -> GlobalEnv -> LocalEnv -> DsM (VResult a) } - -instance Monad VM where - return x = VM $ \bi genv lenv -> return (Yes genv lenv x) - VM p >>= f = VM $ \bi genv lenv -> do - r <- p bi genv lenv - case r of - Yes genv' lenv' x -> runVM (f x) bi genv' lenv' - No -> return No - -noV :: VM a -noV = VM $ \_ _ _ -> return No - -tryV :: VM a -> VM (Maybe a) -tryV (VM p) = VM $ \bi genv lenv -> - do - r <- p bi genv lenv - case r of - Yes genv' lenv' x -> return (Yes genv' lenv' (Just x)) - No -> return (Yes genv lenv Nothing) - -maybeV :: VM (Maybe a) -> VM a -maybeV p = maybe noV return =<< p - -orElseV :: VM a -> VM a -> VM a -orElseV p q = maybe q return =<< tryV p - -liftDs :: DsM a -> VM a -liftDs p = VM $ \bi genv lenv -> do { x <- p; return (Yes genv lenv x) } - -builtin :: (Builtins -> a) -> VM a -builtin f = VM $ \bi genv lenv -> return (Yes genv lenv (f bi)) + (vars, exprs) = unzip bs -readGEnv :: (GlobalEnv -> a) -> VM a -readGEnv f = VM $ \bi genv lenv -> return (Yes genv lenv (f genv)) - -setGEnv :: GlobalEnv -> VM () -setGEnv genv = VM $ \_ _ lenv -> return (Yes genv lenv ()) - -updGEnv :: (GlobalEnv -> GlobalEnv) -> VM () -updGEnv f = VM $ \_ genv lenv -> return (Yes (f genv) lenv ()) - -readLEnv :: (LocalEnv -> a) -> VM a -readLEnv f = VM $ \bi genv lenv -> return (Yes genv lenv (f lenv)) - -setLEnv :: LocalEnv -> VM () -setLEnv lenv = VM $ \_ genv _ -> return (Yes genv lenv ()) - -updLEnv :: (LocalEnv -> LocalEnv) -> VM () -updLEnv f = VM $ \_ genv lenv -> return (Yes genv (f lenv) ()) - -newTyVar :: FastString -> Kind -> VM Var -newTyVar fs k +vectTopBinder :: Var -> VM Var +vectTopBinder var = do - u <- liftDs newUnique - return $ mkTyVar (mkSysTvName u fs) k - -lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readGEnv $ \env -> lookupNameEnv (global_tycons env) (tyConName tc) + 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 -vectoriseModule :: VectInfo -> ModGuts -> DsM ModGuts -vectoriseModule info guts +vectBndr :: Var -> VM (Var, Var) +vectBndr v = do - builtins <- initBuiltins - r <- runVM (vectModule guts) builtins (initGlobalEnv info) emptyLocalEnv - case r of - Yes genv _ guts' -> return $ updVectInfo genv guts' - No -> return 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) -- ---------------------------------------------------------------------------- -- Expressions @@ -231,9 +131,9 @@ vectModule guts = return guts replicateP :: CoreExpr -> CoreExpr -> VM CoreExpr replicateP expr len = do - pa <- paOfType ty - rep <- builtin replicatePAVar - return $ mkApps (Var rep) [Type ty, pa, expr, len] + dict <- paDictOfType ty + rep <- builtin replicatePAVar + return $ mkApps (Var rep) [Type ty, dict, expr, len] where ty = exprType expr @@ -249,91 +149,277 @@ 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 +vectVar lc 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 + = do + 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 + = 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 (tvs ++ [dict | Just dict <- mdicts]) + +applyToTypes :: CoreExpr -> [Type] -> VM CoreExpr +applyToTypes expr tys + = do + dicts <- mapM paDictOfType tys + return $ expr `mkTyApps` tys `mkApps` dicts + +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 - 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) + (tvs, mono) = collectAnnTypeBinders expr 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 (vexpr, lexpr) <- vectExpr lc expr return (Note note vexpr, Note note lexpr) + +vectExpr lc e@(_, AnnApp _ arg) + | isAnnTypeArg arg + = vectTyAppExpr lc fn tys + where + (fn, tys) = collectAnnTypeArgs e + vectExpr lc (_, AnnApp fn arg) = do fn' <- vectExpr lc fn arg' <- vectExpr lc arg capply fn' arg' --- ---------------------------------------------------------------------------- --- PA dictionaries - -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 +vectExpr lc (fvs, AnnLam bndr body) = do - r <- paArgType ty k - case r of - Just ty' -> return ty' - Nothing -> pprPanic "paArgType'" (ppr ty) + 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) -paOfTyCon :: TyCon -> VM CoreExpr --- FIXME: just for now -paOfTyCon tc = maybeV (readGEnv $ \env -> lookupNameEnv (global_tycon_pa env) (tyConName tc)) + mk_clo <- builtin mkClosureVar + mk_cloP <- builtin mkClosurePVar -paOfType :: Type -> VM CoreExpr -paOfType ty | Just ty' <- coreView ty = paOfType ty' + 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] -paOfType (TyVarTy tv) = maybeV (readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv) -paOfType (AppTy ty1 ty2) + 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 = do - e1 <- paOfType ty1 - e2 <- paOfType ty2 - return $ mkApps e1 [Type ty2, e2] -paOfType (TyConApp tc tys) + 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 + } + 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) + + + +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 - e <- paOfTyCon tc - es <- mapM paOfType tys - return $ mkApps e [arg | (t,e) <- zip tys es, arg <- [Type t, e]] -paOfType (FunTy ty1 ty2) = paOfType (TyConApp funTyCon [ty1,ty2]) -paOfType t@(ForAllTy tv ty) = pprPanic "paOfType:" (ppr t) -paOfType ty = pprPanic "paOfType:" (ppr ty) - + 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) + 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) -- ---------------------------------------------------------------------------- -- Types @@ -352,28 +438,19 @@ vectTyCon tc Nothing -> pprTrace "ccTyCon:" (ppr tc) $ return tc vectType :: Type -> VM Type -vectType ty | Just ty' <- coreView ty = vectType ty +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) +vectType ty@(ForAllTy _ _) = do - r <- paArgType (TyVarTy tv) (tyVarKind tv) - ty' <- vectType ty - return . ForAllTy tv $ case r of { Just paty -> FunTy paty ty'; Nothing -> ty' } + mdicts <- mapM paDictArgType tyvars + mono_ty' <- vectType mono_ty + return $ tyvars `mkForAllTys` ([dict | Just dict <- mdicts] `mkFunTys` mono_ty') + where + (tyvars, mono_ty) = splitForAllTys ty vectType ty = pprPanic "vectType:" (ppr ty) -isClosureTyCon :: TyCon -> Bool -isClosureTyCon tc = tyConUnique tc == closureTyConKey - -splitClosureTy :: Type -> (Type, Type) -splitClosureTy ty - | Just (tc, [arg_ty, res_ty]) <- splitTyConApp_maybe ty - , isClosureTyCon tc - = (arg_ty, res_ty) - - | otherwise = pprPanic "splitClosureTy" (ppr ty) -