X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=0f101bd3cb11134be62a94e00728f2bff3288fba;hb=a52f14894e48d47e62b5b33f7d7f4b3f2cc88a79;hp=2757cbc590df92c5833a7d797f3bd851ca3e1dcd;hpb=e2390e76b2f1f2beecd9a0d308c4890a56ae8bca;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index 2757cbc..0f101bd 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -3,10 +3,10 @@ module VectUtils ( collectAnnValBinders, mkDataConTag, splitClosureTy, - mkPlusType, mkPlusTypes, mkCrossType, mkCrossTypes, mkEmbedType, - mkPlusAlts, mkCrosses, mkEmbed, - mkPADictType, mkPArrayType, + mkPRepr, mkToPRepr, mkFromPRepr, + mkPADictType, mkPArrayType, mkPReprType, parrayReprTyCon, parrayReprDataCon, mkVScrut, + prDictOfType, prCoerce, paDictArgType, paDictOfType, paDFunType, paMethod, lengthPA, replicatePA, emptyPA, liftPA, polyAbstract, polyApply, polyVApply, @@ -23,6 +23,7 @@ import VectMonad import DsUtils import CoreSyn import CoreUtils +import Coercion import Type import TypeRep import TyCon @@ -30,6 +31,7 @@ import DataCon ( DataCon, dataConWrapId, dataConTag ) import Var import Id ( mkWildId ) import MkId ( unwrapFamInstScrut ) +import Name ( Name ) import PrelNames import TysWiredIn import BasicTypes ( Boxity(..) ) @@ -37,7 +39,8 @@ import BasicTypes ( Boxity(..) ) import Outputable import FastString -import Control.Monad ( liftM, zipWithM_ ) +import Data.List ( zipWith4 ) +import Control.Monad ( liftM, liftM2, zipWithM_ ) collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type]) collectAnnTypeArgs expr = go expr [] @@ -64,27 +67,38 @@ isAnnTypeArg _ = False mkDataConTag :: DataCon -> CoreExpr mkDataConTag dc = mkConApp intDataCon [mkIntLitInt $ dataConTag dc] -isClosureTyCon :: TyCon -> Bool -isClosureTyCon tc = tyConName tc == closureTyConName +splitUnTy :: String -> Name -> Type -> Type +splitUnTy s name ty + | Just (tc, [ty']) <- splitTyConApp_maybe ty + , tyConName tc == name + = ty' -splitClosureTy :: Type -> (Type, Type) -splitClosureTy ty - | Just (tc, [arg_ty, res_ty]) <- splitTyConApp_maybe ty - , isClosureTyCon tc - = (arg_ty, res_ty) + | otherwise = pprPanic s (ppr ty) - | otherwise = pprPanic "splitClosureTy" (ppr ty) +splitBinTy :: String -> Name -> Type -> (Type, Type) +splitBinTy s name ty + | Just (tc, [ty1, ty2]) <- splitTyConApp_maybe ty + , tyConName tc == name + = (ty1, ty2) -isPArrayTyCon :: TyCon -> Bool -isPArrayTyCon tc = tyConName tc == parrayTyConName + | otherwise = pprPanic s (ppr ty) -splitPArrayTy :: Type -> Type -splitPArrayTy ty - | Just (tc, [arg_ty]) <- splitTyConApp_maybe ty - , isPArrayTyCon tc - = arg_ty +splitFixedTyConApp :: TyCon -> Type -> [Type] +splitFixedTyConApp tc ty + | Just (tc', tys) <- splitTyConApp_maybe ty + , tc == tc' + = tys + + | otherwise = pprPanic "splitFixedTyConApp" (ppr tc <+> ppr ty) + +splitEmbedTy :: Type -> Type +splitEmbedTy = splitUnTy "splitEmbedTy" embedTyConName - | otherwise = pprPanic "splitPArrayTy" (ppr ty) +splitClosureTy :: Type -> (Type, Type) +splitClosureTy = splitBinTy "splitClosureTy" closureTyConName + +splitPArrayTy :: Type -> Type +splitPArrayTy = splitUnTy "splitPArrayTy" parrayTyConName mkBuiltinTyConApp :: (Builtins -> TyCon) -> [Type] -> VM Type mkBuiltinTyConApp get_tc tys @@ -111,64 +125,101 @@ mkBuiltinTyConApps1 get_tc dft tys where mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] -mkBuiltinDataConApp :: (Builtins -> DataCon) -> [CoreExpr] -> VM CoreExpr -mkBuiltinDataConApp get_dc args +mkPRepr :: [[Type]] -> VM Type +mkPRepr tys = do - dc <- builtin get_dc - return $ mkConApp dc args + embed_tc <- builtin embedTyCon + sum_tcs <- builtins sumTyCon + prod_tcs <- builtins prodTyCon + + let mk_sum [] = unitTy + mk_sum [ty] = ty + mk_sum tys = mkTyConApp (sum_tcs $ length tys) tys -mkPlusType :: Type -> Type -> VM Type -mkPlusType ty1 ty2 = mkBuiltinTyConApp plusTyCon [ty1, ty2] + mk_prod [] = unitTy + mk_prod [ty] = ty + mk_prod tys = mkTyConApp (prod_tcs $ length tys) tys -mkPlusTypes :: Type -> [Type] -> VM Type -mkPlusTypes = mkBuiltinTyConApps1 plusTyCon + mk_embed ty = mkTyConApp embed_tc [ty] -mkPlusAlts :: [CoreExpr] -> VM [CoreExpr] -mkPlusAlts [] = return [] -mkPlusAlts exprs + return . mk_sum + . map (mk_prod . map mk_embed) + $ tys + +mkToPRepr :: [[CoreExpr]] -> VM ([CoreExpr], Type) +mkToPRepr ess = do - plus_tc <- builtin plusTyCon - left_dc <- builtin leftDataCon - right_dc <- builtin rightDataCon - - let go [expr] = ([expr], exprType expr) - go (expr : exprs) - | (alts, right_ty) <- go exprs - = (mkConApp left_dc [Type left_ty, Type right_ty, expr] - : [mkConApp right_dc [Type left_ty, Type right_ty, alt] - | alt <- alts], - mkTyConApp plus_tc [left_ty, right_ty]) + embed_tc <- builtin embedTyCon + embed_dc <- builtin embedDataCon + sum_tcs <- builtins sumTyCon + prod_tcs <- builtins prodTyCon + + let mk_sum [] = ([Var unitDataConId], unitTy) + mk_sum [(expr, ty)] = ([expr], ty) + mk_sum es = (zipWith mk_alt (tyConDataCons sum_tc) exprs, + mkTyConApp sum_tc tys) where - left_ty = exprType expr - - return . fst $ go exprs + (exprs, tys) = unzip es + sum_tc = sum_tcs (length es) + mk_alt dc expr = mkConApp dc (map Type tys ++ [expr]) + + mk_prod [] = (Var unitDataConId, unitTy) + mk_prod [(expr, ty)] = (expr, ty) + mk_prod es = (mkConApp prod_dc (map Type tys ++ exprs), + mkTyConApp prod_tc tys) + where + (exprs, tys) = unzip es + prod_tc = prod_tcs (length es) + [prod_dc] = tyConDataCons prod_tc -mkCrossType :: Type -> Type -> VM Type -mkCrossType ty1 ty2 = mkBuiltinTyConApp crossTyCon [ty1, ty2] + mk_embed expr = (mkConApp embed_dc [Type ty, expr], + mkTyConApp embed_tc [ty]) + where ty = exprType expr -mkCrossTypes :: Type -> [Type] -> VM Type -mkCrossTypes = mkBuiltinTyConApps1 crossTyCon + return . mk_sum $ map (mk_prod . map mk_embed) ess -mkCrosses :: [CoreExpr] -> VM CoreExpr -mkCrosses [] = return (Var unitDataConId) -mkCrosses exprs +mkFromPRepr :: CoreExpr -> Type -> [([Var], CoreExpr)] -> VM CoreExpr +mkFromPRepr scrut res_ty alts = do - cross_tc <- builtin crossTyCon - cross_dc <- builtin crossDataCon - - let mk (left, left_ty) (right, right_ty) - = (mkConApp cross_dc [Type left_ty, Type right_ty, left, right], - mkTyConApp cross_tc [left_ty, right_ty]) - - return . fst - $ foldr1 mk [(expr, exprType expr) | expr <- exprs] + embed_dc <- builtin embedDataCon + sum_tcs <- builtins sumTyCon + prod_tcs <- builtins prodTyCon + + let un_sum expr ty [(vars, res)] = un_prod expr ty vars res + un_sum expr ty bs + = do + ps <- mapM (newLocalVar FSLIT("p")) tys + bodies <- sequence + $ zipWith4 un_prod (map Var ps) tys vars rs + return . Case expr (mkWildId ty) res_ty + $ zipWith3 mk_alt sum_dcs ps bodies + where + (vars, rs) = unzip bs + tys = splitFixedTyConApp sum_tc ty + sum_tc = sum_tcs $ length bs + sum_dcs = tyConDataCons sum_tc + + mk_alt dc p body = (DataAlt dc, [p], body) + + un_prod expr ty [] r = return r + un_prod expr ty [var] r = return $ un_embed expr ty var r + un_prod expr ty vars r + = do + xs <- mapM (newLocalVar FSLIT("x")) tys + let body = foldr (\(e,t,v) r -> un_embed e t v r) r + $ zip3 (map Var xs) tys vars + return $ Case expr (mkWildId ty) res_ty + [(DataAlt prod_dc, xs, body)] + where + tys = splitFixedTyConApp prod_tc ty + prod_tc = prod_tcs $ length vars + [prod_dc] = tyConDataCons prod_tc -mkEmbedType :: Type -> VM Type -mkEmbedType ty = mkBuiltinTyConApp embedTyCon [ty] + un_embed expr ty var r + = Case expr (mkWildId ty) res_ty + [(DataAlt embed_dc, [var], r)] -mkEmbed :: CoreExpr -> VM CoreExpr -mkEmbed expr = mkBuiltinDataConApp embedDataCon - [Type $ exprType expr, expr] + un_sum scrut (exprType scrut) alts mkClosureType :: Type -> Type -> VM Type mkClosureType arg_ty res_ty = mkBuiltinTyConApp closureTyCon [arg_ty, res_ty] @@ -176,6 +227,9 @@ 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] @@ -198,6 +252,47 @@ mkVScrut (ve, le) (tc, arg_tys) <- parrayReprTyCon (exprType ve) return ((ve, unwrapFamInstScrut tc arg_tys le), tc, arg_tys) +prDictOfType :: Type -> VM CoreExpr +prDictOfType orig_ty + | Just (tycon, ty_args) <- splitTyConApp_maybe orig_ty + = do + dfun <- traceMaybeV "prDictOfType" (ppr tycon) (lookupTyConPR tycon) + prDFunApply (Var dfun) ty_args + +prDFunApply :: CoreExpr -> [Type] -> VM CoreExpr +prDFunApply dfun tys + = do + args <- mapM mkDFunArg arg_tys + return $ mkApps mono_dfun args + where + mono_dfun = mkTyApps dfun tys + (arg_tys, _) = splitFunTys (exprType mono_dfun) + +mkDFunArg :: Type -> VM CoreExpr +mkDFunArg ty + | Just (tycon, [arg]) <- splitTyConApp_maybe ty + + = let name = tyConName tycon + + get_dict | name == paTyConName = paDictOfType + | name == prTyConName = prDictOfType + | otherwise = pprPanic "mkDFunArg" (ppr ty) + + in get_dict arg + +mkDFunArg ty = pprPanic "mkDFunArg" (ppr ty) + +prCoerce :: TyCon -> [Type] -> CoreExpr -> VM CoreExpr +prCoerce repr_tc args expr + | Just arg_co <- tyConFamilyCoercion_maybe repr_tc + = do + pr_tc <- builtin prTyCon + + let co = mkAppCoercion (mkTyConApp pr_tc []) + (mkSymCoercion (mkTyConApp arg_co args)) + + return $ mkCoerce co expr + paDictArgType :: TyVar -> VM (Maybe Type) paDictArgType tv = go (TyVarTy tv) (tyVarKind tv) where