X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectUtils.hs;h=acbbe45b9aa64955447aed57d832dfce42459a8a;hb=3b962ce87e2dbf6bdc1f3d1e083a74e5a9467665;hp=cb1aa3e10d4f24a5959583c35dbc4eacd3c72db6;hpb=d0e5514448562cb59852baacb8f433cd88c3370d;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index cb1aa3e..acbbe45 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -3,9 +3,10 @@ module VectUtils ( collectAnnValBinders, mkDataConTag, splitClosureTy, - mkPRepr, mkToPRepr, mkFromPRepr, + mkPRepr, 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,6 +23,7 @@ import VectMonad import DsUtils import CoreSyn import CoreUtils +import Coercion import Type import TypeRep import TyCon @@ -37,6 +39,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,11 +83,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 + | otherwise = pprPanic "splitFixedTyConApp" (ppr tc <+> ppr ty) splitEmbedTy :: Type -> Type splitEmbedTy = splitUnTy "splitEmbedTy" embedTyConName @@ -121,25 +126,24 @@ mkBuiltinTyConApps1 get_tc dft tys mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] 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) @@ -147,82 +151,118 @@ 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 - = (mkConApp embed_dc [Type ty, expr], - mkTyConApp embed_tc [ty]) + 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 + (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 + + mk_embed expr = (mkConApp embed_dc [Type ty, expr], + mkTyConApp embed_tc [ty]) where ty = exprType expr - mk_cross (expr1, ty1) (expr2, ty2) - = (mkConApp cross_dc [Type ty1, Type ty2, expr1, expr2], - mkTyConApp cross_tc [ty1, ty2]) + return . mk_sum $ map (mk_prod . map mk_embed) ess - mk_tup [] = (Var unitDataConId, unitTy) - mk_tup es = foldr1 mk_cross es +mkToArrPRepr :: CoreExpr -> CoreExpr -> [[CoreExpr]] -> VM CoreExpr +mkToArrPRepr len sel ess + = do + embed_tc <- builtin embedTyCon + (embed_rtc, _) <- parrayReprTyCon (mkTyConApp embed_tc [unitTy]) + let [embed_rdc] = tyConDataCons embed_rtc - 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]) + let mk_sum [(expr, ty)] = return (expr, ty) + mk_sum es + = do + sum_tc <- builtin . sumTyCon $ length es + (sum_rtc, _) <- parrayReprTyCon (mkTyConApp sum_tc tys) + let [sum_rdc] = tyConDataCons sum_rtc + + return (mkConApp sum_rdc (map Type tys ++ (len : sel : exprs)), + mkTyConApp sum_tc tys) + where + (exprs, tys) = unzip es + + mk_prod [(expr, ty)] = return (expr, ty) + mk_prod es + = do + prod_tc <- builtin . prodTyCon $ length es + (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 + (exprs, tys) = unzip es + + mk_embed expr = (mkConApp embed_rdc [Type ty, expr], + mkTyConApp embed_tc [ty]) + where ty = splitPArrayTy (exprType expr) - return . mk_sum $ map (mk_tup . map mk_embed) ess + liftM fst (mk_sum =<< mapM (mk_prod . map mk_embed) ess) 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 + sum_tcs <- builtins sumTyCon + prod_tcs <- builtins prodTyCon - let un_embed expr ty var res - = Case expr (mkWildId ty) res_ty - [(DataAlt embed_dc, [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 = return $ un_embed expr ty var res - un_tup expr ty (var : vars) res + let un_sum expr ty [(vars, res)] = un_prod expr ty vars res + un_sum expr ty bs = 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) + 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 - (lty, rty) = splitCrossTy ty + (vars, rs) = unzip bs + tys = splitFixedTyConApp sum_tc ty + sum_tc = sum_tcs $ length bs + sum_dcs = tyConDataCons sum_tc - un_plus expr ty var1 var2 res1 res2 - = Case expr (mkWildId ty) res_ty - [(DataAlt left_dc, [var1], res1), - (DataAlt right_dc, [var2], res2)] + mk_alt dc p body = (DataAlt dc, [p], body) - un_sum expr ty [(vars, res)] = un_tup expr ty vars res - un_sum expr ty ((vars, res) : alts) + 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 - 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) + 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 - (lty, rty) = splitPlusTy ty + tys = splitFixedTyConApp prod_tc ty + prod_tc = prod_tcs $ length vars + [prod_dc] = tyConDataCons prod_tc + + un_embed expr ty var r + = Case expr (mkWildId ty) res_ty + [(DataAlt embed_dc, [var], r)] 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] @@ -238,6 +278,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]) @@ -254,6 +305,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