X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectType.hs;h=69a93f8ad8a042ce028b6c35c877006892d3296c;hb=86193bcfc847f1a1f844508224489456f08d6b83;hp=ebf1797ead1614474836331378ac2017fd840bfa;hpb=b7d4252cd20ed2fcb9f62a7f75bb65de9971b4c7;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index ebf1797..69a93f8 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.hs @@ -1,4 +1,5 @@ -module VectType ( vectTyCon, vectType, vectTypeEnv ) +module VectType ( vectTyCon, vectType, vectTypeEnv, + PAInstance, painstInstance, buildPADict ) where #include "HsVersions.h" @@ -7,15 +8,24 @@ import VectMonad import VectUtils import HscTypes ( TypeEnv, extendTypeEnvList, typeEnvTyCons ) +import CoreSyn +import CoreUtils import DataCon import TyCon import Type import TypeRep +import Coercion +import FamInstEnv ( FamInst, mkLocalFamInst ) +import InstEnv ( Instance, mkLocalInstance, instanceDFunId ) import OccName import MkId -import BasicTypes ( StrictnessMark(..), boolToRecFlag ) +import BasicTypes ( StrictnessMark(..), OverlapFlag(..), boolToRecFlag ) +import Var ( Var ) +import Id ( mkWildId ) +import Name ( Name, getOccName ) import NameEnv -import TysWiredIn +import TysWiredIn ( intTy, intDataCon ) +import TysPrim ( intPrimTy ) import Unique import UniqFM @@ -24,7 +34,8 @@ import Digraph ( SCC(..), stronglyConnComp ) import Outputable -import Control.Monad ( liftM2, zipWithM_ ) +import Control.Monad ( liftM, liftM2, zipWithM, zipWithM_ ) +import Data.List ( inits, tails ) -- ---------------------------------------------------------------------------- -- Types @@ -64,7 +75,13 @@ vectType ty = pprPanic "vectType:" (ppr ty) type TyConGroup = ([TyCon], UniqSet TyCon) -vectTypeEnv :: TypeEnv -> VM TypeEnv +data PAInstance = PAInstance { + painstInstance :: Instance + , painstVectTyCon :: TyCon + , painstArrTyCon :: TyCon + } + +vectTypeEnv :: TypeEnv -> VM (TypeEnv, [FamInst], [PAInstance]) vectTypeEnv env = do cs <- readGEnv $ mk_map . global_tycons @@ -73,9 +90,21 @@ vectTypeEnv env zipWithM_ defTyCon keep_tcs keep_tcs zipWithM_ defDataCon keep_dcs keep_dcs new_tcs <- vectTyConDecls conv_tcs - return $ extendTypeEnvList env - (map ATyCon new_tcs ++ [ADataCon dc | tc <- new_tcs - , dc <- tyConDataCons tc]) + + let orig_tcs = keep_tcs ++ conv_tcs + vect_tcs = keep_tcs ++ new_tcs + + parr_tcs <- zipWithM buildPArrayTyCon orig_tcs vect_tcs + pa_insts <- zipWithM buildPAInstance vect_tcs parr_tcs + + let all_new_tcs = new_tcs ++ parr_tcs + + let new_env = extendTypeEnvList env + (map ATyCon all_new_tcs + ++ [ADataCon dc | tc <- all_new_tcs + , dc <- tyConDataCons tc]) + + return (new_env, map mkLocalFamInst parr_tcs, pa_insts) where tycons = typeEnvTyCons env groups = tyConGroups tycons @@ -162,40 +191,251 @@ vectDataCon dc rep_arg_tys = dataConRepArgTys dc tycon = dataConTyCon dc -{- -mkPArrTyCon :: TyCon -> VM TyCon -mkPArrTyCon tc = fixV $ \repr_tc -> +data Shape = Shape { + shapeReprTys :: [Type] + , shapeStrictness :: [StrictnessMark] + , shapeLength :: [CoreExpr] -> VM CoreExpr + , shapeReplicate :: CoreExpr -> CoreExpr -> VM [CoreExpr] + } + +tyConShape :: TyCon -> VM Shape +tyConShape vect_tc + | isProductTyCon vect_tc + = return $ Shape { + shapeReprTys = [intPrimTy] + , shapeStrictness = [NotMarkedStrict] + , shapeLength = \[len] -> return len + , shapeReplicate = \len _ -> return [len] + } + + | otherwise + = do + repr_ty <- mkPArrayType intTy -- FIXME: we want to unbox this + return $ Shape { + shapeReprTys = [repr_ty] + , shapeStrictness = [MarkedStrict] + , shapeLength = \[sel] -> lengthPA sel + , shapeReplicate = \len n -> do + e <- replicatePA len n + return [e] + } + +buildPArrayTyCon :: TyCon -> TyCon -> VM TyCon +buildPArrayTyCon orig_tc vect_tc = fixV $ \repr_tc -> do --} + name' <- cloneName mkPArrayTyConOcc orig_name + parent <- buildPArrayParentInfo orig_name vect_tc repr_tc + rhs <- buildPArrayTyConRhs orig_name vect_tc repr_tc + + return $ mkAlgTyCon name' + kind + tyvars + [] -- no stupid theta + rhs + [] -- no selector ids + parent + rec_flag -- FIXME: is this ok? + False -- FIXME: no generics + False -- not GADT syntax + where + orig_name = tyConName orig_tc + name = tyConName vect_tc + kind = tyConKind vect_tc + tyvars = tyConTyVars vect_tc + rec_flag = boolToRecFlag (isRecursiveTyCon vect_tc) + -mkPArrayDataCon :: TyCon -> TyCon -> VM DataCon -mkPArrayDataCon orig_tc repr_tc +buildPArrayParentInfo :: Name -> TyCon -> TyCon -> VM TyConParent +buildPArrayParentInfo orig_name vect_tc repr_tc = do - name <- cloneName mkPArrayDataConOcc (tyConName orig_tc) - shape_ty <- mkPArrayType intTy -- FIXME: we want to unbox this! + parray_tc <- builtin parrayTyCon + co_name <- cloneName mkInstTyCoOcc (tyConName repr_tc) + + let inst_tys = [mkTyConApp vect_tc (map mkTyVarTy tyvars)] + + return . FamilyTyCon parray_tc inst_tys + $ mkFamInstCoercion co_name + tyvars + parray_tc + inst_tys + repr_tc + where + tyvars = tyConTyVars vect_tc + +buildPArrayTyConRhs :: Name -> TyCon -> TyCon -> VM AlgTyConRhs +buildPArrayTyConRhs orig_name vect_tc repr_tc + = do + data_con <- buildPArrayDataCon orig_name vect_tc repr_tc + return $ DataTyCon { data_cons = [data_con], is_enum = False } + +buildPArrayDataCon :: Name -> TyCon -> TyCon -> VM DataCon +buildPArrayDataCon orig_name vect_tc repr_tc + = do + dc_name <- cloneName mkPArrayDataConOcc orig_name + shape <- tyConShape vect_tc repr_tys <- mapM mkPArrayType types - wrk_name <- cloneName mkDataConWorkerOcc name - wrp_name <- cloneName mkDataConWrapperOcc name + wrk_name <- cloneName mkDataConWorkerOcc dc_name + wrp_name <- cloneName mkDataConWrapperOcc dc_name let ids = mkDataConIds wrp_name wrk_name data_con - data_con = mkDataCon name + data_con = mkDataCon dc_name False - (MarkedStrict : map (const NotMarkedStrict) repr_tys) + (shapeStrictness shape ++ map (const NotMarkedStrict) repr_tys) [] - (tyConTyVars orig_tc) + (tyConTyVars vect_tc) [] [] [] - repr_tys + (shapeReprTys shape ++ repr_tys) repr_tc [] ids return data_con where - types = [ty | dc <- tyConDataCons orig_tc + types = [ty | dc <- tyConDataCons vect_tc , ty <- dataConRepArgTys dc] +buildPAInstance :: TyCon -> TyCon -> VM PAInstance +buildPAInstance vect_tc arr_tc + = do + pa <- builtin paClass + let inst_ty = mkForAllTys tvs + . (mkFunTys $ mkPredTys [ClassP pa [ty] | ty <- arg_tys]) + $ mkPredTy (ClassP pa [mkTyConApp vect_tc arg_tys]) + + dfun <- newExportedVar (mkPADFunOcc $ getOccName vect_tc) inst_ty + + return $ PAInstance { + painstInstance = mkLocalInstance dfun NoOverlap + , painstVectTyCon = vect_tc + , painstArrTyCon = arr_tc + } + where + tvs = tyConTyVars arr_tc + arg_tys = mkTyVarTys tvs + +buildPADict :: PAInstance -> VM [(Var, CoreExpr)] +buildPADict (PAInstance { + painstInstance = inst + , painstVectTyCon = vect_tc + , painstArrTyCon = arr_tc }) + = polyAbstract (tyConTyVars arr_tc) $ \abstract -> + do + shape <- tyConShape vect_tc + meth_binds <- mapM (mk_method shape) paMethods + let meth_exprs = map (Var . fst) meth_binds + + pa_dc <- builtin paDictDataCon + let dict = mkConApp pa_dc (Type (mkTyConApp vect_tc arg_tys) : meth_exprs) + body = Let (Rec meth_binds) dict + return [(instanceDFunId inst, mkInlineMe $ abstract body)] + where + tvs = tyConTyVars arr_tc + arg_tys = mkTyVarTys tvs + + mk_method shape (name, build) + = localV + $ do + body <- build shape vect_tc arr_tc + var <- newLocalVar name (exprType body) + return (var, mkInlineMe body) + +paMethods = [(FSLIT("lengthPA"), buildLengthPA), + (FSLIT("replicatePA"), buildReplicatePA)] + +buildLengthPA :: Shape -> TyCon -> TyCon -> VM CoreExpr +buildLengthPA shape vect_tc arr_tc + = do + parr_ty <- mkPArrayType (mkTyConApp vect_tc arg_tys) + arg <- newLocalVar FSLIT("xs") parr_ty + shapes <- mapM (newLocalVar FSLIT("sh")) shape_tys + wilds <- mapM newDummyVar repr_tys + let scrut = unwrapFamInstScrut arr_tc arg_tys (Var arg) + scrut_ty = exprType scrut + + body <- shapeLength shape (map Var shapes) + + return . Lam arg + $ Case scrut (mkWildId scrut_ty) intPrimTy + [(DataAlt repr_dc, shapes ++ wilds, body)] + where + arg_tys = mkTyVarTys $ tyConTyVars arr_tc + [repr_dc] = tyConDataCons arr_tc + + shape_tys = shapeReprTys shape + repr_tys = drop (length shape_tys) (dataConRepArgTys repr_dc) + +-- data T = C0 t1 ... tm +-- ... +-- Ck u1 ... un +-- +-- data [:T:] = A ![:Int:] [:t1:] ... [:un:] +-- +-- replicatePA :: Int# -> T -> [:T:] +-- replicatePA n# t +-- = let c = case t of +-- C0 _ ... _ -> 0 +-- ... +-- Ck _ ... _ -> k +-- +-- xs1 = case t of +-- C0 x1 _ ... _ -> replicatePA @t1 n# x1 +-- _ -> emptyPA @t1 +-- +-- ... +-- +-- ysn = case t of +-- Ck _ ... _ yn -> replicatePA @un n# yn +-- _ -> emptyPA @un +-- in +-- A (replicatePA @Int n# c) xs1 ... ysn +-- +-- + +buildReplicatePA :: Shape -> TyCon -> TyCon -> VM CoreExpr +buildReplicatePA shape vect_tc arr_tc + = do + len_var <- newLocalVar FSLIT("n") intPrimTy + val_var <- newLocalVar FSLIT("x") val_ty + + let len = Var len_var + val = Var val_var + + shape_reprs <- shapeReplicate shape len (ctr_num val) + reprs <- liftM concat $ mapM (mk_comp_arrs len val) vect_dcs + + return . mkLams [len_var, val_var] + . wrapFamInstBody arr_tc arg_tys + $ mkConApp arr_dc (map Type arg_tys ++ shape_reprs ++ reprs) + where + arg_tys = mkTyVarTys (tyConTyVars arr_tc) + val_ty = mkTyConApp vect_tc arg_tys + wild = mkWildId val_ty + vect_dcs = tyConDataCons vect_tc + [arr_dc] = tyConDataCons arr_tc + + ctr_num val = Case val wild intTy (zipWith ctr_num_alt vect_dcs [0..]) + ctr_num_alt dc i = (DataAlt dc, map mkWildId (dataConRepArgTys dc), + mkConApp intDataCon [mkIntLitInt i]) + + + mk_comp_arrs len val dc = let tys = dataConRepArgTys dc + wilds = map mkWildId tys + in + sequence (zipWith3 (mk_comp_arr len val dc) + tys (inits wilds) (tails wilds)) + + mk_comp_arr len val dc ty pre (_:post) + = do + var <- newLocalVar FSLIT("x") ty + rep <- replicatePA len (Var var) + empty <- emptyPA ty + arr_ty <- mkPArrayType ty + + return $ Case val wild arr_ty + [(DEFAULT, [], empty), (DataAlt dc, pre ++ (var : post), rep)] + -- | Split the given tycons into two sets depending on whether they have to be -- converted (first list) or not (second list). The first argument contains -- information about the conversion status of external tycons: