X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fvectorise%2FVectUtils.hs;h=9101178d71f98a95951af4fa38afc3ab7169a589;hb=255f46e120cc18f51703c79d009d76016140abcb;hp=0789688c43ed8c7b976c9c77f13080a63da84550;hpb=9396c0736a7e7d73c2a13f1a18104e0c43b924b0;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index 0789688..9101178 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -3,9 +3,13 @@ module VectUtils ( collectAnnValBinders, mkDataConTag, splitClosureTy, - mkPRepr, mkToPRepr, mkFromPRepr, + + TyConRepr(..), mkTyConRepr, + mkToPRepr, mkToArrPRepr, mkFromPRepr, mkFromArrPRepr, mkPADictType, mkPArrayType, mkPReprType, - parrayReprTyCon, parrayReprDataCon, mkVScrut, + + parrayCoerce, parrayReprTyCon, parrayReprDataCon, mkVScrut, + prDictOfType, prCoerce, paDictArgType, paDictOfType, paDFunType, paMethod, lengthPA, replicatePA, emptyPA, liftPA, polyAbstract, polyApply, polyVApply, @@ -22,10 +26,11 @@ import VectMonad import DsUtils import CoreSyn import CoreUtils +import Coercion import Type import TypeRep import TyCon -import DataCon ( DataCon, dataConWrapId, dataConTag ) +import DataCon import Var import Id ( mkWildId ) import MkId ( unwrapFamInstScrut ) @@ -37,6 +42,7 @@ import BasicTypes ( Boxity(..) ) import Outputable import FastString +import Data.List ( zipWith4 ) import Control.Monad ( liftM, liftM2, zipWithM_ ) collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type]) @@ -80,14 +86,13 @@ splitBinTy s name ty | otherwise = pprPanic s (ppr ty) -splitCrossTy :: Type -> (Type, Type) -splitCrossTy = splitBinTy "splitCrossTy" ndpCrossTyConName +splitFixedTyConApp :: TyCon -> Type -> [Type] +splitFixedTyConApp tc ty + | Just (tc', tys) <- splitTyConApp_maybe ty + , tc == tc' + = tys -splitPlusTy :: Type -> (Type, Type) -splitPlusTy = splitBinTy "splitSumTy" ndpPlusTyConName - -splitEmbedTy :: Type -> Type -splitEmbedTy = splitUnTy "splitEmbedTy" embedTyConName + | otherwise = pprPanic "splitFixedTyConApp" (ppr tc <+> ppr ty) splitClosureTy :: Type -> (Type, Type) splitClosureTy = splitBinTy "splitClosureTy" closureTyConName @@ -120,116 +125,163 @@ mkBuiltinTyConApps1 get_tc dft tys where mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] +data TyConRepr = TyConRepr { + repr_tyvars :: [TyVar] + , repr_tys :: [[Type]] + + , repr_prod_tycons :: [Maybe TyCon] + , repr_prod_tys :: [Type] + , repr_sum_tycon :: Maybe TyCon + , repr_type :: Type + } + +mkTyConRepr :: TyCon -> VM TyConRepr +mkTyConRepr vect_tc + = do + prod_tycons <- mapM (mk_tycon prodTyCon) rep_tys + let prod_tys = zipWith mk_tc_app_maybe prod_tycons rep_tys + sum_tycon <- mk_tycon sumTyCon prod_tys + + + return $ TyConRepr { + repr_tyvars = tyvars + , repr_tys = rep_tys + + , repr_prod_tycons = prod_tycons + , repr_prod_tys = prod_tys + , repr_sum_tycon = sum_tycon + , repr_type = mk_tc_app_maybe sum_tycon prod_tys + } + where + tyvars = tyConTyVars vect_tc + data_cons = tyConDataCons vect_tc + rep_tys = map dataConRepArgTys data_cons + + mk_tycon get_tc tys + | n > 1 = builtin (Just . get_tc n) + | otherwise = return Nothing + where n = length tys + + mk_tc_app_maybe Nothing [] = unitTy + mk_tc_app_maybe Nothing [ty] = ty + mk_tc_app_maybe (Just tc) tys = mkTyConApp tc tys + +{- mkPRepr :: [[Type]] -> VM Type -mkPRepr [] = return unitTy mkPRepr tys = do - embed <- builtin embedTyCon - cross <- builtin crossTyCon - plus <- builtin plusTyCon + embed_tc <- builtin embedTyCon + sum_tcs <- builtins sumTyCon + prod_tcs <- builtins prodTyCon - let mk_embed ty = mkTyConApp embed [ty] - mk_cross ty1 ty2 = mkTyConApp cross [ty1, ty2] - mk_plus ty1 ty2 = mkTyConApp plus [ty1, ty2] + let mk_sum [] = unitTy + mk_sum [ty] = ty + mk_sum tys = mkTyConApp (sum_tcs $ length tys) tys - mk_tup [] = unitTy - mk_tup tys = foldr1 mk_cross tys + mk_prod [] = unitTy + mk_prod [ty] = ty + mk_prod tys = mkTyConApp (prod_tcs $ length tys) tys - mk_sum [] = unitTy - mk_sum tys = foldr1 mk_plus tys + mk_embed ty = mkTyConApp embed_tc [ty] return . mk_sum - . map (mk_tup . map mk_embed) + . map (mk_prod . 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]) + sum_tcs <- builtins sumTyCon + prod_tcs <- builtins prodTyCon - mk_tup [] = (Var unitDataConId, unitTy) - mk_tup es = foldr1 mk_cross es - - mk_sum [] = ([Var unitDataConId], unitTy) + let 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) + mk_sum es = (zipWith mk_alt (tyConDataCons sum_tc) exprs, + mkTyConApp sum_tc tys) + where + (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] = (expr, exprType expr) + mk_prod exprs = (mkConApp prod_dc (map Type tys ++ exprs), + mkTyConApp prod_tc tys) + where + tys = map exprType exprs + prod_tc = prod_tcs (length exprs) + [prod_dc] = tyConDataCons prod_tc -mkFromPRepr :: CoreExpr -> Type -> [([Var], CoreExpr)] -> VM CoreExpr -mkFromPRepr scrut res_ty alts - = do - embed_dc <- builtin embedDataCon - cross_dc <- builtin crossDataCon - left_dc <- builtin leftDataCon - right_dc <- builtin rightDataCon - pa_tc <- builtin paTyCon + return . mk_sum . map mk_prod $ ess - let un_embed expr ty var res +mkToArrPRepr :: CoreExpr -> CoreExpr -> [[CoreExpr]] -> VM CoreExpr +mkToArrPRepr len sel ess + = do + let mk_sum [(expr, ty)] = return (expr, ty) + mk_sum es = do - pa <- newLocalVar FSLIT("pa") (mkTyConApp pa_tc [idType var]) - return $ Case expr (mkWildId ty) res_ty - [(DataAlt embed_dc, [pa, var], res)] + sum_tc <- builtin . sumTyCon $ length es + (sum_rtc, _) <- parrayReprTyCon (mkTyConApp sum_tc tys) + let [sum_rdc] = tyConDataCons sum_rtc - un_cross expr ty var1 var2 res - = Case expr (mkWildId ty) res_ty - [(DataAlt cross_dc, [var1, var2], res)] + return (mkConApp sum_rdc (map Type tys ++ (len : sel : exprs)), + mkTyConApp sum_tc tys) + where + (exprs, tys) = unzip es - 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 + mk_prod [expr] = return (expr, splitPArrayTy (exprType expr)) + mk_prod exprs = 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) + prod_tc <- builtin . prodTyCon $ length exprs + (prod_rtc, _) <- parrayReprTyCon (mkTyConApp prod_tc tys) + let [prod_rdc] = tyConDataCons prod_rtc + + return (mkConApp prod_rdc (map Type tys ++ (len : exprs)), + mkTyConApp prod_tc tys) where - (lty, rty) = splitCrossTy ty + tys = map (splitPArrayTy . exprType) exprs - un_plus expr ty var1 var2 res1 res2 - = Case expr (mkWildId ty) res_ty - [(DataAlt left_dc, [var1], res1), - (DataAlt right_dc, [var2], res2)] + liftM fst (mk_sum =<< mapM mk_prod ess) - un_sum expr ty [(vars, res)] = un_tup expr ty vars res - un_sum expr ty ((vars, res) : alts) +mkFromPRepr :: CoreExpr -> Type -> [([Var], CoreExpr)] -> VM CoreExpr +mkFromPRepr scrut res_ty alts + = do + 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 - 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) + 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 $ Let (NonRec var expr) r + un_prod expr ty vars r + = return $ Case expr (mkWildId ty) res_ty + [(DataAlt prod_dc, vars, r)] where - (lty, rty) = splitPlusTy ty + prod_tc = prod_tcs $ length vars + [prod_dc] = tyConDataCons prod_tc un_sum scrut (exprType scrut) alts +mkFromArrPRepr :: CoreExpr -> Type -> Var -> Var -> [[Var]] -> CoreExpr + -> VM CoreExpr +mkFromArrPRepr scrut res_ty len sel vars res + = return (Var unitDataConId) + mkClosureType :: Type -> Type -> VM Type mkClosureType arg_ty res_ty = mkBuiltinTyConApp closureTyCon [arg_ty, res_ty] @@ -245,6 +297,17 @@ mkPADictType ty = mkBuiltinTyConApp paTyCon [ty] mkPArrayType :: Type -> VM Type mkPArrayType ty = mkBuiltinTyConApp parrayTyCon [ty] +parrayCoerce :: TyCon -> [Type] -> CoreExpr -> VM CoreExpr +parrayCoerce repr_tc args expr + | Just arg_co <- tyConFamilyCoercion_maybe repr_tc + = do + parray <- builtin parrayTyCon + + let co = mkAppCoercion (mkTyConApp parray []) + (mkSymCoercion (mkTyConApp arg_co args)) + + return $ mkCoerce co expr + parrayReprTyCon :: Type -> VM (TyCon, [Type]) parrayReprTyCon ty = builtin parrayTyCon >>= (`lookupFamInst` [ty]) @@ -261,6 +324,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 @@ -323,6 +427,9 @@ paMethod method ty dict <- paDictOfType ty return $ mkApps (Var fn) [Type ty, dict] +mkPR :: Type -> VM CoreExpr +mkPR = paMethod mkPRVar + lengthPA :: CoreExpr -> VM CoreExpr lengthPA x = liftM (`App` x) (paMethod lengthPAVar ty) where