X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectType.hs;h=e28b66ffa02e779cf19db9a7b4b9d62423616fe6;hp=08a8067561d40040c0141b6849eb38a1071ada59;hb=58eb6de8922742d301a6703b4a21504dd8d623a5;hpb=020f85464387244a063acad967e88132ba715982 diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index 08a8067..e28b66f 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.hs @@ -1,27 +1,32 @@ -module VectType ( vectTyCon, vectType, vectTypeEnv ) +module VectType ( vectTyCon, vectType, vectTypeEnv, + PAInstance, buildPADict ) where #include "HsVersions.h" import VectMonad import VectUtils +import VectCore import HscTypes ( TypeEnv, extendTypeEnvList, typeEnvTyCons ) import CoreSyn +import CoreUtils +import BuildTyCl import DataCon import TyCon import Type import TypeRep import Coercion import FamInstEnv ( FamInst, mkLocalFamInst ) -import InstEnv ( Instance ) +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 ) +import Name ( Name, getOccName ) import NameEnv -import TysWiredIn ( intTy, intDataCon ) +import TysWiredIn ( unitTy, intTy, intDataCon ) import TysPrim ( intPrimTy ) import Unique @@ -32,7 +37,7 @@ import Digraph ( SCC(..), stronglyConnComp ) import Outputable import Control.Monad ( liftM, liftM2, zipWithM, zipWithM_ ) -import Data.List ( inits, tails ) +import Data.List ( inits, tails, zipWith4 ) -- ---------------------------------------------------------------------------- -- Types @@ -72,7 +77,14 @@ vectType ty = pprPanic "vectType:" (ppr ty) type TyConGroup = ([TyCon], UniqSet TyCon) -vectTypeEnv :: TypeEnv -> VM (TypeEnv, [FamInst], [Instance]) +data PAInstance = PAInstance { + painstDFun :: Var + , painstOrigTyCon :: TyCon + , painstVectTyCon :: TyCon + , painstArrTyCon :: TyCon + } + +vectTypeEnv :: TypeEnv -> VM (TypeEnv, [FamInst], [(Var, CoreExpr)]) vectTypeEnv env = do cs <- readGEnv $ mk_map . global_tycons @@ -80,17 +92,25 @@ vectTypeEnv env keep_dcs = concatMap tyConDataCons keep_tcs zipWithM_ defTyCon keep_tcs keep_tcs zipWithM_ defDataCon keep_dcs keep_dcs - vect_tcs <- vectTyConDecls conv_tcs - parr_tcs1 <- zipWithM buildPArrayTyCon keep_tcs keep_tcs - parr_tcs2 <- zipWithM buildPArrayTyCon conv_tcs vect_tcs - let new_tcs = vect_tcs ++ parr_tcs1 ++ parr_tcs2 + new_tcs <- vectTyConDecls conv_tcs + + let orig_tcs = keep_tcs ++ conv_tcs + vect_tcs = keep_tcs ++ new_tcs + + repr_tcs <- zipWithM buildPReprTyCon orig_tcs vect_tcs + parr_tcs <- zipWithM buildPArrayTyCon orig_tcs vect_tcs + dfuns <- mapM mkPADFun vect_tcs + defTyConPAs (zip vect_tcs dfuns) + binds <- sequence (zipWith4 buildTyConBindings orig_tcs vect_tcs parr_tcs dfuns) + + let all_new_tcs = new_tcs ++ repr_tcs ++ parr_tcs let new_env = extendTypeEnvList env - (map ATyCon new_tcs - ++ [ADataCon dc | tc <- new_tcs + (map ATyCon all_new_tcs + ++ [ADataCon dc | tc <- all_new_tcs , dc <- tyConDataCons tc]) - return (new_env, map mkLocalFamInst (parr_tcs1 ++ parr_tcs2), []) + return (new_env, map mkLocalFamInst (repr_tcs ++ parr_tcs), concat binds) where tycons = typeEnvTyCons env groups = tyConGroups tycons @@ -117,19 +137,16 @@ vectTyConDecl tc name' <- cloneName mkVectTyConOcc name rhs' <- vectAlgTyConRhs (algTyConRhs tc) - return $ mkAlgTyCon name' - kind - tyvars - [] -- no stupid theta - rhs' - [] -- no selector ids - NoParentTyCon -- FIXME - rec_flag -- FIXME: is this ok? - False -- FIXME: no generics - False -- not GADT syntax + liftDs $ buildAlgTyCon name' + tyvars + [] -- no stupid theta + rhs' + rec_flag -- FIXME: is this ok? + False -- FIXME: no generics + False -- not GADT syntax + Nothing -- not a family instance where name = tyConName tc - kind = tyConKind tc tyvars = tyConTyVars tc rec_flag = boolToRecFlag (isRecursiveTyCon tc) @@ -153,72 +170,83 @@ vectDataCon dc name' <- cloneName mkVectDataConOcc name tycon' <- vectTyCon tycon arg_tys <- mapM vectType rep_arg_tys - wrk_name <- cloneName mkDataConWorkerOcc name' - - let ids = mkDataConIds (panic "vectDataCon: wrapper id") - wrk_name - data_con - data_con = mkDataCon name' - False -- not infix - (map (const NotMarkedStrict) arg_tys) - [] -- no labelled fields - univ_tvs - [] -- no existential tvs for now - [] -- no eq spec for now - [] -- no theta - arg_tys - tycon' - [] -- no stupid theta - ids - return data_con + + liftDs $ buildDataCon name' + False -- not infix + (map (const NotMarkedStrict) arg_tys) + [] -- no labelled fields + univ_tvs + [] -- no existential tvs for now + [] -- no eq spec for now + [] -- no context + arg_tys + tycon' where name = dataConName dc univ_tvs = dataConUnivTyVars dc rep_arg_tys = dataConRepArgTys dc tycon = dataConTyCon dc +mk_fam_inst :: TyCon -> TyCon -> (TyCon, [Type]) +mk_fam_inst fam_tc arg_tc + = (fam_tc, [mkTyConApp arg_tc . mkTyVarTys $ tyConTyVars arg_tc]) + +mkSumOfProdRepr :: [[Type]] -> VM Type +mkSumOfProdRepr [] = panic "mkSumOfProdRepr" +mkSumOfProdRepr tys + = do + embed <- builtin embedTyCon + plus <- builtin plusTyCon + cross <- builtin crossTyCon + + return . foldr1 (mk_bin plus) + . map (mkprod cross) + . map (map (mk_un embed)) + $ tys + where + mkprod cross [] = unitTy + mkprod cross tys = foldr1 (mk_bin cross) tys + + mk_un tc ty = mkTyConApp tc [ty] + mk_bin tc ty1 ty2 = mkTyConApp tc [ty1,ty2] + +buildPReprTyCon :: TyCon -> TyCon -> VM TyCon +buildPReprTyCon orig_tc vect_tc + = do + name <- cloneName mkPReprTyConOcc (tyConName orig_tc) + rhs_ty <- buildPReprRhsTy vect_tc + prepr_tc <- builtin preprTyCon + liftDs $ buildSynTyCon name + tyvars + (SynonymTyCon rhs_ty) + (Just $ mk_fam_inst prepr_tc vect_tc) + where + tyvars = tyConTyVars vect_tc + +buildPReprRhsTy :: TyCon -> VM Type +buildPReprRhsTy = mkSumOfProdRepr . map dataConRepArgTys . tyConDataCons + 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 + parray <- builtin parrayTyCon + + liftDs $ buildAlgTyCon name' + tyvars + [] -- no stupid theta + rhs + rec_flag -- FIXME: is this ok? + False -- FIXME: no generics + False -- not GADT syntax + (Just $ mk_fam_inst parray vect_tc) where orig_name = tyConName orig_tc - name = tyConName vect_tc - kind = tyConKind vect_tc tyvars = tyConTyVars vect_tc rec_flag = boolToRecFlag (isRecursiveTyCon vect_tc) -buildPArrayParentInfo :: Name -> TyCon -> TyCon -> VM TyConParent -buildPArrayParentInfo orig_name vect_tc repr_tc - = do - 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 @@ -229,44 +257,163 @@ buildPArrayDataCon :: Name -> TyCon -> TyCon -> VM DataCon buildPArrayDataCon orig_name vect_tc repr_tc = do dc_name <- cloneName mkPArrayDataConOcc orig_name - shape_ty <- mkPArrayType intTy -- FIXME: we want to unbox this! + shape <- tyConShape vect_tc repr_tys <- mapM mkPArrayType types - wrk_name <- cloneName mkDataConWorkerOcc dc_name - wrp_name <- cloneName mkDataConWrapperOcc dc_name - - let ids = mkDataConIds wrp_name wrk_name data_con - data_con = mkDataCon dc_name - False - (MarkedStrict : map (const NotMarkedStrict) repr_tys) - [] - (tyConTyVars vect_tc) - [] - [] - [] - (shape_ty : repr_tys) - repr_tc - [] - ids - - return data_con + + liftDs $ buildDataCon dc_name + False -- not infix + (shapeStrictness shape ++ map (const NotMarkedStrict) repr_tys) + [] -- no field labels + (tyConTyVars vect_tc) + [] -- no existentials + [] -- no eq spec + [] -- no context + (shapeReprTys shape ++ repr_tys) + repr_tc where types = [ty | dc <- tyConDataCons vect_tc , ty <- dataConRepArgTys dc] -buildLengthPA :: TyCon -> VM CoreExpr -buildLengthPA repr_tc +mkPADFun :: TyCon -> VM Var +mkPADFun vect_tc + = newExportedVar (mkPADFunOcc $ getOccName vect_tc) =<< paDFunType vect_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 - arg <- newLocalVar FSLIT("xs") arg_ty - shape <- newLocalVar FSLIT("sel") shape_ty - body <- lengthPA (Var shape) - return . Lam arg - $ Case (Var arg) (mkWildId arg_ty) intPrimTy - [(DataAlt repr_dc, shape : map mkWildId repr_tys, body)] + 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] + } + +buildTyConBindings :: TyCon -> TyCon -> TyCon -> Var -> VM [(Var, CoreExpr)] +buildTyConBindings orig_tc vect_tc arr_tc dfun + = do + shape <- tyConShape vect_tc + sequence_ (zipWith4 (vectDataConWorker shape vect_tc arr_tc arr_dc) + orig_dcs + vect_dcs + (inits repr_tys) + (tails repr_tys)) + dict <- buildPADict shape vect_tc arr_tc dfun + binds <- takeHoisted + return $ (dfun, dict) : binds + where + orig_dcs = tyConDataCons orig_tc + vect_dcs = tyConDataCons vect_tc + [arr_dc] = tyConDataCons arr_tc + + repr_tys = map dataConRepArgTys vect_dcs + +vectDataConWorker :: Shape -> TyCon -> TyCon -> DataCon + -> DataCon -> DataCon -> [[Type]] -> [[Type]] + -> VM () +vectDataConWorker shape vect_tc arr_tc arr_dc orig_dc vect_dc pre (dc_tys : post) + = do + clo <- closedV + . inBind orig_worker + . polyAbstract tvs $ \abstract -> + liftM (abstract . vectorised) + $ buildClosures tvs [] dc_tys res_ty (liftM2 (,) mk_vect mk_lift) + + worker <- cloneId mkVectOcc orig_worker (exprType clo) + hoistBinding worker clo + defGlobalVar orig_worker worker + return () + where + tvs = tyConTyVars vect_tc + arg_tys = mkTyVarTys tvs + res_ty = mkTyConApp vect_tc arg_tys + + orig_worker = dataConWorkId orig_dc + + mk_vect = return . mkConApp vect_dc $ map Type arg_tys + mk_lift = do + len <- newLocalVar FSLIT("n") intPrimTy + arr_tys <- mapM mkPArrayType dc_tys + args <- mapM (newLocalVar FSLIT("xs")) arr_tys + shapes <- shapeReplicate shape + (Var len) + (mkDataConTag vect_dc) + + empty_pre <- mapM emptyPA (concat pre) + empty_post <- mapM emptyPA (concat post) + + return . mkLams (len : args) + . wrapFamInstBody arr_tc arg_tys + . mkConApp arr_dc + $ map Type arg_tys ++ shapes + ++ empty_pre + ++ map Var args + ++ empty_post + +buildPADict :: Shape -> TyCon -> TyCon -> Var -> VM CoreExpr +buildPADict shape vect_tc arr_tc dfun + = polyAbstract tvs $ \abstract -> + do + meth_binds <- mapM (mk_method shape) paMethods + let meth_exprs = map (Var . fst) meth_binds + + pa_dc <- builtin paDataCon + let dict = mkConApp pa_dc (Type (mkTyConApp vect_tc arg_tys) : meth_exprs) + body = Let (Rec meth_binds) dict + return . mkInlineMe $ abstract body where - arg_ty = mkTyConApp repr_tc . mkTyVarTys $ tyConTyVars repr_tc - [repr_dc] = tyConDataCons repr_tc - shape_ty : repr_tys = dataConRepArgTys repr_dc + 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 -- ... @@ -295,8 +442,8 @@ buildLengthPA repr_tc -- -- -buildReplicatePA :: TyCon -> TyCon -> VM CoreExpr -buildReplicatePA vect_tc arr_tc +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 @@ -304,14 +451,16 @@ buildReplicatePA vect_tc arr_tc let len = Var len_var val = Var val_var - shape <- replicatePA len (ctr_num val) + 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] - $ mkConApp arr_dc (map (Type . TyVarTy) (tyConTyVars arr_tc) ++ (shape : reprs)) + . wrapFamInstBody arr_tc arg_tys + $ mkConApp arr_dc (map Type arg_tys ++ shape_reprs ++ reprs) where - val_ty = mkTyConApp vect_tc . mkTyVarTys $ tyConTyVars arr_tc - wild = mkWildId val_ty + 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 @@ -334,7 +483,7 @@ buildReplicatePA vect_tc arr_tc arr_ty <- mkPArrayType ty return $ Case val wild arr_ty - [(DataAlt dc, pre ++ (var : post), rep), (DEFAULT, [], empty)] + [(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