X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=0789688c43ed8c7b976c9c77f13080a63da84550;hp=d6569e70cd8892e5bbf55dccd04520588b5a5205;hb=9396c0736a7e7d73c2a13f1a18104e0c43b924b0;hpb=ce39c447ab47ac1616cea079210c7651f486f425 diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index d6569e7..0789688 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -1,14 +1,17 @@ module VectUtils ( collectAnnTypeBinders, collectAnnTypeArgs, isAnnTypeArg, collectAnnValBinders, + mkDataConTag, splitClosureTy, - mkPADictType, mkPArrayType, - paDictArgType, paDictOfType, - paMethod, lengthPA, replicatePA, emptyPA, + mkPRepr, mkToPRepr, mkFromPRepr, + mkPADictType, mkPArrayType, mkPReprType, + parrayReprTyCon, parrayReprDataCon, mkVScrut, + paDictArgType, paDictOfType, paDFunType, + paMethod, lengthPA, replicatePA, emptyPA, liftPA, polyAbstract, polyApply, polyVApply, - lookupPArrayFamInst, - hoistExpr, hoistPolyVExpr, takeHoisted, - buildClosure, buildClosures + hoistBinding, hoistExpr, hoistPolyVExpr, takeHoisted, + buildClosure, buildClosures, + mkClosureApp ) where #include "HsVersions.h" @@ -22,10 +25,11 @@ import CoreUtils import Type import TypeRep import TyCon -import DataCon ( dataConWrapId ) +import DataCon ( DataCon, dataConWrapId, dataConTag ) import Var import Id ( mkWildId ) import MkId ( unwrapFamInstScrut ) +import Name ( Name ) import PrelNames import TysWiredIn import BasicTypes ( Boxity(..) ) @@ -33,7 +37,7 @@ import BasicTypes ( Boxity(..) ) import Outputable import FastString -import Control.Monad ( liftM, zipWithM_ ) +import Control.Monad ( liftM, liftM2, zipWithM_ ) collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type]) collectAnnTypeArgs expr = go expr [] @@ -57,53 +61,205 @@ isAnnTypeArg :: AnnExpr b ann -> Bool isAnnTypeArg (_, AnnType t) = True isAnnTypeArg _ = False -isClosureTyCon :: TyCon -> Bool -isClosureTyCon tc = tyConName tc == closureTyConName +mkDataConTag :: DataCon -> CoreExpr +mkDataConTag dc = mkConApp intDataCon [mkIntLitInt $ dataConTag dc] -splitClosureTy :: Type -> (Type, Type) -splitClosureTy ty - | Just (tc, [arg_ty, res_ty]) <- splitTyConApp_maybe ty - , isClosureTyCon tc - = (arg_ty, res_ty) +splitUnTy :: String -> Name -> Type -> Type +splitUnTy s name ty + | Just (tc, [ty']) <- splitTyConApp_maybe ty + , tyConName tc == name + = ty' + + | otherwise = pprPanic s (ppr ty) + +splitBinTy :: String -> Name -> Type -> (Type, Type) +splitBinTy s name ty + | Just (tc, [ty1, ty2]) <- splitTyConApp_maybe ty + , tyConName tc == name + = (ty1, ty2) + + | otherwise = pprPanic s (ppr ty) + +splitCrossTy :: Type -> (Type, Type) +splitCrossTy = splitBinTy "splitCrossTy" ndpCrossTyConName - | otherwise = pprPanic "splitClosureTy" (ppr ty) +splitPlusTy :: Type -> (Type, Type) +splitPlusTy = splitBinTy "splitSumTy" ndpPlusTyConName -isPArrayTyCon :: TyCon -> Bool -isPArrayTyCon tc = tyConName tc == parrayTyConName +splitEmbedTy :: Type -> Type +splitEmbedTy = splitUnTy "splitEmbedTy" embedTyConName + +splitClosureTy :: Type -> (Type, Type) +splitClosureTy = splitBinTy "splitClosureTy" closureTyConName splitPArrayTy :: Type -> Type -splitPArrayTy ty - | Just (tc, [arg_ty]) <- splitTyConApp_maybe ty - , isPArrayTyCon tc - = arg_ty +splitPArrayTy = splitUnTy "splitPArrayTy" parrayTyConName - | otherwise = pprPanic "splitPArrayTy" (ppr ty) +mkBuiltinTyConApp :: (Builtins -> TyCon) -> [Type] -> VM Type +mkBuiltinTyConApp get_tc tys + = do + tc <- builtin get_tc + return $ mkTyConApp tc tys -mkClosureType :: Type -> Type -> VM Type -mkClosureType arg_ty res_ty +mkBuiltinTyConApps :: (Builtins -> TyCon) -> [Type] -> Type -> VM Type +mkBuiltinTyConApps get_tc tys ty = do - tc <- builtin closureTyCon - return $ mkTyConApp tc [arg_ty, res_ty] + tc <- builtin get_tc + return $ foldr (mk tc) ty tys + where + mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] -mkClosureTypes :: [Type] -> Type -> VM Type -mkClosureTypes arg_tys res_ty +mkBuiltinTyConApps1 :: (Builtins -> TyCon) -> Type -> [Type] -> VM Type +mkBuiltinTyConApps1 get_tc dft [] = return dft +mkBuiltinTyConApps1 get_tc dft tys = do - tc <- builtin closureTyCon - return $ foldr (mk tc) res_ty arg_tys + tc <- builtin get_tc + case tys of + [] -> pprPanic "mkBuiltinTyConApps1" (ppr tc) + _ -> return $ foldr1 (mk tc) tys where - mk tc arg_ty res_ty = mkTyConApp tc [arg_ty, res_ty] + mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] -mkPADictType :: Type -> VM Type -mkPADictType ty +mkPRepr :: [[Type]] -> VM Type +mkPRepr [] = return unitTy +mkPRepr tys + = do + embed <- builtin embedTyCon + cross <- builtin crossTyCon + plus <- builtin plusTyCon + + let mk_embed ty = mkTyConApp embed [ty] + mk_cross ty1 ty2 = mkTyConApp cross [ty1, ty2] + mk_plus ty1 ty2 = mkTyConApp plus [ty1, ty2] + + mk_tup [] = unitTy + mk_tup tys = foldr1 mk_cross tys + + mk_sum [] = unitTy + mk_sum tys = foldr1 mk_plus tys + + return . mk_sum + . map (mk_tup . map mk_embed) + $ tys + +mkToPRepr :: [[CoreExpr]] -> VM ([CoreExpr], Type) +mkToPRepr ess + = do + embed_tc <- builtin embedTyCon + embed_dc <- builtin embedDataCon + cross_tc <- builtin crossTyCon + cross_dc <- builtin crossDataCon + plus_tc <- builtin plusTyCon + left_dc <- builtin leftDataCon + right_dc <- builtin rightDataCon + + let mk_embed (expr, ty, pa) + = (mkConApp embed_dc [Type ty, pa, expr], + mkTyConApp embed_tc [ty]) + + mk_cross (expr1, ty1) (expr2, ty2) + = (mkConApp cross_dc [Type ty1, Type ty2, expr1, expr2], + mkTyConApp cross_tc [ty1, ty2]) + + mk_tup [] = (Var unitDataConId, unitTy) + mk_tup es = foldr1 mk_cross es + + mk_sum [] = ([Var unitDataConId], unitTy) + mk_sum [(expr, ty)] = ([expr], ty) + mk_sum ((expr, lty) : es) + = let (alts, rty) = mk_sum es + in + (mkConApp left_dc [Type lty, Type rty, expr] + : [mkConApp right_dc [Type lty, Type rty, alt] | alt <- alts], + mkTyConApp plus_tc [lty, rty]) + + liftM (mk_sum . map (mk_tup . map mk_embed)) + (mapM (mapM init) ess) + where + init expr = let ty = exprType expr + in do + pa <- paDictOfType ty + return (expr, ty, pa) + +mkFromPRepr :: CoreExpr -> Type -> [([Var], CoreExpr)] -> VM CoreExpr +mkFromPRepr scrut res_ty alts = do - tc <- builtin paDictTyCon - return $ TyConApp tc [ty] + embed_dc <- builtin embedDataCon + cross_dc <- builtin crossDataCon + left_dc <- builtin leftDataCon + right_dc <- builtin rightDataCon + pa_tc <- builtin paTyCon + + let un_embed expr ty var res + = do + pa <- newLocalVar FSLIT("pa") (mkTyConApp pa_tc [idType var]) + return $ Case expr (mkWildId ty) res_ty + [(DataAlt embed_dc, [pa, var], res)] + + un_cross expr ty var1 var2 res + = Case expr (mkWildId ty) res_ty + [(DataAlt cross_dc, [var1, var2], res)] + + un_tup expr ty [] res = return res + un_tup expr ty [var] res = un_embed expr ty var res + un_tup expr ty (var : vars) res + = do + lv <- newLocalVar FSLIT("x") lty + rv <- newLocalVar FSLIT("y") rty + liftM (un_cross expr ty lv rv) + (un_embed (Var lv) lty var + =<< un_tup (Var rv) rty vars res) + where + (lty, rty) = splitCrossTy ty + + un_plus expr ty var1 var2 res1 res2 + = Case expr (mkWildId ty) res_ty + [(DataAlt left_dc, [var1], res1), + (DataAlt right_dc, [var2], res2)] + + un_sum expr ty [(vars, res)] = un_tup expr ty vars res + un_sum expr ty ((vars, res) : alts) + = do + lv <- newLocalVar FSLIT("l") lty + rv <- newLocalVar FSLIT("r") rty + liftM2 (un_plus expr ty lv rv) + (un_tup (Var lv) lty vars res) + (un_sum (Var rv) rty alts) + where + (lty, rty) = splitPlusTy ty + + un_sum scrut (exprType scrut) alts + +mkClosureType :: Type -> Type -> VM Type +mkClosureType arg_ty res_ty = mkBuiltinTyConApp closureTyCon [arg_ty, res_ty] + +mkClosureTypes :: [Type] -> Type -> VM Type +mkClosureTypes = mkBuiltinTyConApps closureTyCon + +mkPReprType :: Type -> VM Type +mkPReprType ty = mkBuiltinTyConApp preprTyCon [ty] + +mkPADictType :: Type -> VM Type +mkPADictType ty = mkBuiltinTyConApp paTyCon [ty] mkPArrayType :: Type -> VM Type -mkPArrayType ty +mkPArrayType ty = mkBuiltinTyConApp parrayTyCon [ty] + +parrayReprTyCon :: Type -> VM (TyCon, [Type]) +parrayReprTyCon ty = builtin parrayTyCon >>= (`lookupFamInst` [ty]) + +parrayReprDataCon :: Type -> VM (DataCon, [Type]) +parrayReprDataCon ty = do - tc <- builtin parrayTyCon - return $ TyConApp tc [ty] + (tc, arg_tys) <- parrayReprTyCon ty + let [dc] = tyConDataCons tc + return (dc, arg_tys) + +mkVScrut :: VExpr -> VM (VExpr, TyCon, [Type]) +mkVScrut (ve, le) + = do + (tc, arg_tys) <- parrayReprTyCon (exprType ve) + return ((ve, unwrapFamInstScrut tc arg_tys le), tc, arg_tys) paDictArgType :: TyVar -> VM (Maybe Type) paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) @@ -139,11 +295,21 @@ paDictOfTyApp (TyVarTy tv) ty_args paDFunApply dfun ty_args paDictOfTyApp (TyConApp tc _) ty_args = do - pa_class <- builtin paClass - (dfun, ty_args') <- lookupInst pa_class [TyConApp tc ty_args] - paDFunApply (Var dfun) ty_args' + dfun <- traceMaybeV "paDictOfTyApp" (ppr tc) (lookupTyConPA tc) + paDFunApply (Var dfun) ty_args paDictOfTyApp ty ty_args = pprPanic "paDictOfTyApp" (ppr ty) +paDFunType :: TyCon -> VM Type +paDFunType tc + = do + margs <- mapM paDictArgType tvs + res <- mkPADictType (mkTyConApp tc arg_tys) + return . mkForAllTys tvs + $ mkFunTys [arg | Just arg <- margs] res + where + tvs = tyConTyVars tc + arg_tys = mkTyVarTys tvs + paDFunApply :: CoreExpr -> [Type] -> VM CoreExpr paDFunApply dfun tys = do @@ -169,6 +335,12 @@ replicatePA len x = liftM (`mkApps` [len,x]) emptyPA :: Type -> VM CoreExpr emptyPA = paMethod emptyPAVar +liftPA :: CoreExpr -> VM CoreExpr +liftPA x + = do + lc <- builtin liftingContext + replicatePA (Var lc) x + newLocalVVar :: FastString -> Type -> VM VVar newLocalVVar fs vty = do @@ -205,15 +377,15 @@ polyVApply expr tys dicts <- mapM paDictOfType tys return $ mapVect (\e -> e `mkTyApps` tys `mkApps` dicts) expr -lookupPArrayFamInst :: Type -> VM (TyCon, [Type]) -lookupPArrayFamInst ty = builtin parrayTyCon >>= (`lookupFamInst` [ty]) +hoistBinding :: Var -> CoreExpr -> VM () +hoistBinding v e = updGEnv $ \env -> + env { global_bindings = (v,e) : global_bindings env } hoistExpr :: FastString -> CoreExpr -> VM Var hoistExpr fs expr = do var <- newLocalVar fs (exprType expr) - updGEnv $ \env -> - env { global_bindings = (var, expr) : global_bindings env } + hoistBinding var expr return var hoistVExpr :: VExpr -> VM VVar @@ -239,7 +411,6 @@ takeHoisted setGEnv $ env { global_bindings = [] } return $ global_bindings env - mkClosure :: Type -> Type -> Type -> VExpr -> VExpr -> VM VExpr mkClosure arg_ty res_ty env_ty (vfn,lfn) (venv,lenv) = do @@ -249,17 +420,30 @@ mkClosure arg_ty res_ty env_ty (vfn,lfn) (venv,lenv) return (Var mkv `mkTyApps` [arg_ty, res_ty, env_ty] `mkApps` [dict, vfn, lfn, venv], Var mkl `mkTyApps` [arg_ty, res_ty, env_ty] `mkApps` [dict, vfn, lfn, lenv]) -buildClosures :: [TyVar] -> Var -> [VVar] -> [Type] -> Type -> VM VExpr -> VM VExpr -buildClosures tvs lc vars [arg_ty] res_ty mk_body - = buildClosure tvs lc vars arg_ty res_ty mk_body -buildClosures tvs lc vars (arg_ty : arg_tys) res_ty mk_body +mkClosureApp :: VExpr -> VExpr -> VM VExpr +mkClosureApp (vclo, lclo) (varg, larg) + = do + vapply <- builtin applyClosureVar + lapply <- builtin applyClosurePVar + return (Var vapply `mkTyApps` [arg_ty, res_ty] `mkApps` [vclo, varg], + Var lapply `mkTyApps` [arg_ty, res_ty] `mkApps` [lclo, larg]) + where + (arg_ty, res_ty) = splitClosureTy (exprType vclo) + +buildClosures :: [TyVar] -> [VVar] -> [Type] -> Type -> VM VExpr -> VM VExpr +buildClosures tvs vars [] res_ty mk_body + = mk_body +buildClosures tvs vars [arg_ty] res_ty mk_body + = buildClosure tvs vars arg_ty res_ty mk_body +buildClosures tvs vars (arg_ty : arg_tys) res_ty mk_body = do res_ty' <- mkClosureTypes arg_tys res_ty arg <- newLocalVVar FSLIT("x") arg_ty - buildClosure tvs lc vars arg_ty res_ty' + buildClosure tvs vars arg_ty res_ty' . hoistPolyVExpr tvs $ do - clo <- buildClosures tvs lc (vars ++ [arg]) arg_tys res_ty mk_body + lc <- builtin liftingContext + clo <- buildClosures tvs (vars ++ [arg]) arg_tys res_ty mk_body return $ vLams lc (vars ++ [arg]) clo -- (clo , aclo (Arr lc xs1 ... xsn) ) @@ -267,27 +451,29 @@ buildClosures tvs lc vars (arg_ty : arg_tys) res_ty mk_body -- f = \env v -> case env of -> e x1 ... xn v -- f^ = \env v -> case env of Arr l xs1 ... xsn -> e^ l x1 ... xn v -- -buildClosure :: [TyVar] -> Var -> [VVar] -> Type -> Type -> VM VExpr -> VM VExpr -buildClosure tvs lv vars arg_ty res_ty mk_body +buildClosure :: [TyVar] -> [VVar] -> Type -> Type -> VM VExpr -> VM VExpr +buildClosure tvs vars arg_ty res_ty mk_body = do - (env_ty, env, bind) <- buildEnv lv vars + (env_ty, env, bind) <- buildEnv vars env_bndr <- newLocalVVar FSLIT("env") env_ty arg_bndr <- newLocalVVar FSLIT("arg") arg_ty fn <- hoistPolyVExpr tvs $ do + lc <- builtin liftingContext body <- mk_body body' <- bind (vVar env_bndr) - (vVarApps lv body (vars ++ [arg_bndr])) + (vVarApps lc body (vars ++ [arg_bndr])) return (vLamsWithoutLC [env_bndr, arg_bndr] body') mkClosure arg_ty res_ty env_ty fn env -buildEnv :: Var -> [VVar] -> VM (Type, VExpr, VExpr -> VExpr -> VM VExpr) -buildEnv lv vvs +buildEnv :: [VVar] -> VM (Type, VExpr, VExpr -> VExpr -> VM VExpr) +buildEnv vvs = do + lc <- builtin liftingContext let (ty, venv, vbind) = mkVectEnv tys vs - (lenv, lbind) <- mkLiftEnv lv tys ls + (lenv, lbind) <- mkLiftEnv lc tys ls return (ty, (venv, lenv), \(venv,lenv) (vbody,lbody) -> do @@ -308,28 +494,28 @@ mkVectEnv tys vs = (ty, mkCoreTup (map Var vs), ty = mkCoreTupTy tys mkLiftEnv :: Var -> [Type] -> [Var] -> VM (CoreExpr, CoreExpr -> CoreExpr -> VM CoreExpr) -mkLiftEnv lv [ty] [v] +mkLiftEnv lc [ty] [v] = return (Var v, \env body -> do len <- lengthPA (Var v) return . Let (NonRec v env) - $ Case len lv (exprType body) [(DEFAULT, [], body)]) + $ Case len lc (exprType body) [(DEFAULT, [], body)]) -- NOTE: this transparently deals with empty environments -mkLiftEnv lv tys vs +mkLiftEnv lc tys vs = do - (env_tc, env_tyargs) <- lookupPArrayFamInst vty + (env_tc, env_tyargs) <- parrayReprTyCon vty let [env_con] = tyConDataCons env_tc env = Var (dataConWrapId env_con) `mkTyApps` env_tyargs - `mkVarApps` (lv : vs) + `mkVarApps` (lc : vs) bind env body = let scrut = unwrapFamInstScrut env_tc env_tyargs env in return $ Case scrut (mkWildId (exprType scrut)) (exprType body) - [(DataAlt env_con, lv : bndrs, body)] + [(DataAlt env_con, lc : bndrs, body)] return (env, bind) where vty = mkCoreTupTy tys