Finish breaking up vectoriser utils

compiler/ghc.cabal.in

@@ -454,23 +454,6 @@ Library
         UniqFM
         UniqSet
         Util
-        VectUtils
-        Vectorise.Var
-        Vectorise.Convert
-        Vectorise.Env
-        Vectorise.Vect
-        Vectorise.Exp
-        Vectorise.Type.Env
-        Vectorise.Type.Repr
-        Vectorise.Type.PData
-        Vectorise.Type.PRepr
-        Vectorise.Type.PADict
-        Vectorise.Type.PRDict
-        Vectorise.Type.Type
-        Vectorise.Type.TyConDecl
-        Vectorise.Type.Classify
-        Vectorise.Utils.Closure
-        Vectorise.Utils.Hoisting
         Vectorise.Builtins.Base
         Vectorise.Builtins.Initialise
         Vectorise.Builtins.Modules
@@ -482,6 +465,27 @@ Library
         Vectorise.Monad.Global
         Vectorise.Monad.InstEnv
         Vectorise.Monad
+        Vectorise.Utils.Base
+        Vectorise.Utils.Closure
+        Vectorise.Utils.Hoisting
+        Vectorise.Utils.PADict
+        Vectorise.Utils.PRDict
+        Vectorise.Utils.Poly
+        Vectorise.Utils
+        Vectorise.Type.Env
+        Vectorise.Type.Repr
+        Vectorise.Type.PData
+        Vectorise.Type.PRepr
+        Vectorise.Type.PADict
+        Vectorise.Type.PRDict
+        Vectorise.Type.Type
+        Vectorise.Type.TyConDecl
+        Vectorise.Type.Classify
+        Vectorise.Convert
+        Vectorise.Vect
+        Vectorise.Var
+        Vectorise.Env
+        Vectorise.Exp
         Vectorise
 
     -- We only need to expose more modules as some of the ncg code is used

compiler/vectorise/VectUtils.hs

-module VectUtils (
-  collectAnnTypeBinders, collectAnnTypeArgs, isAnnTypeArg,
-  collectAnnValBinders,
-  dataConTagZ, mkDataConTag, mkDataConTagLit,
-
-  newLocalVVar,
-
-  mkBuiltinCo, voidType, mkWrapType,
-  mkPADictType, mkPArrayType, mkPDataType, mkPReprType, mkPArray,
-  mkBuiltinTyConApps, mkClosureTypes,
-
-  pdataReprTyCon, pdataReprDataCon, mkVScrut,
-  prDictOfType, prDFunOfTyCon,
-  paDictArgType, paDictOfType, paDFunType,
-  paMethod, wrapPR, replicatePD, emptyPD, packByTagPD,
-  combinePD,
-  liftPD,
-  zipScalars, scalarClosure,
-  polyAbstract, polyApply, polyVApply, polyArity
-) where
-import Vectorise.Monad
-import Vectorise.Vect
-import Vectorise.Builtins
-
-import CoreSyn
-import CoreUtils
-import Coercion
-import Type
-import TypeRep
-import TyCon
-import DataCon
-import Var
-import MkId
-import Literal
-import Outputable
-import FastString
-import Control.Monad
-
-
-collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type])
-collectAnnTypeArgs expr = go expr []
-  where
-    go (_, AnnApp f (_, AnnType ty)) tys = go f (ty : tys)
-    go e                             tys = (e, tys)
-
-collectAnnTypeBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann)
-collectAnnTypeBinders expr = go [] expr
-  where
-    go bs (_, AnnLam b e) | isTyVar b = go (b:bs) e
-    go bs e                           = (reverse bs, e)
-
-collectAnnValBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann)
-collectAnnValBinders expr = go [] expr
-  where
-    go bs (_, AnnLam b e) | isId b = go (b:bs) e
-    go bs e                        = (reverse bs, e)
-
-isAnnTypeArg :: AnnExpr b ann -> Bool
-isAnnTypeArg (_, AnnType _) = True
-isAnnTypeArg _              = False
-
-dataConTagZ :: DataCon -> Int
-dataConTagZ con = dataConTag con - fIRST_TAG
-
-mkDataConTagLit :: DataCon -> Literal
-mkDataConTagLit = mkMachInt . toInteger . dataConTagZ
-
-mkDataConTag :: DataCon -> CoreExpr
-mkDataConTag = mkIntLitInt . dataConTagZ
-
-splitPrimTyCon :: Type -> Maybe TyCon
-splitPrimTyCon ty
-  | Just (tycon, []) <- splitTyConApp_maybe ty
-  , isPrimTyCon tycon
-  = Just tycon
-
-  | otherwise = Nothing
-
-mkBuiltinTyConApp :: (Builtins -> TyCon) -> [Type] -> VM Type
-mkBuiltinTyConApp get_tc tys
-  = do
-      tc <- builtin get_tc
-      return $ mkTyConApp tc tys
-
-mkBuiltinTyConApps :: (Builtins -> TyCon) -> [Type] -> Type -> VM Type
-mkBuiltinTyConApps get_tc tys ty
-  = do
-      tc <- builtin get_tc
-      return $ foldr (mk tc) ty tys
-  where
-    mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2]
-
-voidType :: VM Type
-voidType = mkBuiltinTyConApp voidTyCon []
-
-mkWrapType :: Type -> VM Type
-mkWrapType ty = mkBuiltinTyConApp wrapTyCon [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]
-
-mkPArrayType :: Type -> VM Type
-mkPArrayType ty
-  | Just tycon <- splitPrimTyCon ty
-  = do
-      r <- lookupPrimPArray tycon
-      case r of
-        Just arr -> return $ mkTyConApp arr []
-        Nothing  -> cantVectorise "Primitive tycon not vectorised" (ppr tycon)
-mkPArrayType ty = mkBuiltinTyConApp parrayTyCon [ty]
-
-mkPDataType :: Type -> VM Type
-mkPDataType ty = mkBuiltinTyConApp pdataTyCon [ty]
-
-mkPArray :: Type -> CoreExpr -> CoreExpr -> VM CoreExpr
-mkPArray ty len dat = do
-                        tc <- builtin parrayTyCon
-                        let [dc] = tyConDataCons tc
-                        return $ mkConApp dc [Type ty, len, dat]
-
-mkBuiltinCo :: (Builtins -> TyCon) -> VM Coercion
-mkBuiltinCo get_tc
-  = do
-      tc <- builtin get_tc
-      return $ mkTyConApp tc []
-
-pdataReprTyCon :: Type -> VM (TyCon, [Type])
-pdataReprTyCon ty = builtin pdataTyCon >>= (`lookupFamInst` [ty])
-
-pdataReprDataCon :: Type -> VM (DataCon, [Type])
-pdataReprDataCon ty
-  = do
-      (tc, arg_tys) <- pdataReprTyCon ty
-      let [dc] = tyConDataCons tc
-      return (dc, arg_tys)
-
-mkVScrut :: VExpr -> VM (CoreExpr, CoreExpr, TyCon, [Type])
-mkVScrut (ve, le)
-  = do
-      (tc, arg_tys) <- pdataReprTyCon ty
-      return (ve, unwrapFamInstScrut tc arg_tys le, tc, arg_tys)
-  where
-    ty = exprType ve
-
-prDFunOfTyCon :: TyCon -> VM CoreExpr
-prDFunOfTyCon tycon
-  = liftM Var
-  . maybeCantVectoriseM "No PR dictionary for tycon" (ppr tycon)
-  $ lookupTyConPR tycon
-
-
-paDictArgType :: TyVar -> VM (Maybe Type)
-paDictArgType tv = go (TyVarTy tv) (tyVarKind tv)
-  where
-    go ty k | Just k' <- kindView k = go ty k'
-    go ty (FunTy k1 k2)
-      = do
-          tv   <- newTyVar (fsLit "a") k1
-          mty1 <- go (TyVarTy tv) k1
-          case mty1 of
-            Just ty1 -> do
-                          mty2 <- go (AppTy ty (TyVarTy tv)) k2
-                          return $ fmap (ForAllTy tv . FunTy ty1) mty2
-            Nothing  -> go ty k2
-
-    go ty k
-      | isLiftedTypeKind k
-      = liftM Just (mkPADictType ty)
-
-    go _ _ = return Nothing
-
-
--- | Get the PA dictionary for some type, or `Nothing` if there isn't one.
-paDictOfType :: Type -> VM (Maybe CoreExpr)
-paDictOfType ty 
-  = paDictOfTyApp ty_fn ty_args
-  where
-    (ty_fn, ty_args) = splitAppTys ty
-
-    paDictOfTyApp :: Type -> [Type] -> VM (Maybe CoreExpr)
-    paDictOfTyApp ty_fn ty_args
-        | Just ty_fn' <- coreView ty_fn 
-        = paDictOfTyApp ty_fn' ty_args
-
-    paDictOfTyApp (TyVarTy tv) ty_args
-     = do dfun <- maybeV (lookupTyVarPA tv)
-          liftM Just $ paDFunApply dfun ty_args
-
-    paDictOfTyApp (TyConApp tc _) ty_args
-     = do mdfun <- lookupTyConPA tc
-          case mdfun of
-	    Nothing	
-	     -> pprTrace "VectUtils.paDictOfType"
-	                 (vcat [ text "No PA dictionary"
-			       , text "for tycon: " <> ppr tc
-			       , text "in type:   " <> ppr ty])
-	     $ return Nothing
-
-	    Just dfun	-> liftM Just $ paDFunApply (Var dfun) ty_args
-
-    paDictOfTyApp ty _
-     = cantVectorise "Can't construct PA dictionary for type" (ppr ty)
-
-
-
-paDFunType :: TyCon -> VM Type
-paDFunType tc
-  = do
-      margs <- mapM paDictArgType tvs
-      res   <- mkPADictType (mkTyConApp tc arg_tys)
-      return . mkForAllTys tvs
-             $ mkFunTys [arg | Just arg <- margs] res
-  where
-    tvs = tyConTyVars tc
-    arg_tys = mkTyVarTys tvs
-
-paDFunApply :: CoreExpr -> [Type] -> VM CoreExpr
-paDFunApply dfun tys
- = do Just dicts <- liftM sequence $ mapM paDictOfType tys
-      return $ mkApps (mkTyApps dfun tys) dicts
-
-
-paMethod :: (Builtins -> Var) -> String -> Type -> VM CoreExpr
-paMethod _ name ty
-  | Just tycon <- splitPrimTyCon ty
-  = liftM Var
-  . maybeCantVectoriseM "No PA method" (text name <+> text "for" <+> ppr tycon)
-  $ lookupPrimMethod tycon name
-
-paMethod method _ ty
-  = do
-      fn        <- builtin method
-      Just dict <- paDictOfType ty
-      return $ mkApps (Var fn) [Type ty, dict]
-
-prDictOfType :: Type -> VM CoreExpr
-prDictOfType ty = prDictOfTyApp ty_fn ty_args
-  where
-    (ty_fn, ty_args) = splitAppTys ty
-
-prDictOfTyApp :: Type -> [Type] -> VM CoreExpr
-prDictOfTyApp ty_fn ty_args
-  | Just ty_fn' <- coreView ty_fn = prDictOfTyApp ty_fn' ty_args
-prDictOfTyApp (TyConApp tc _) ty_args
-  = do
-      dfun <- liftM Var $ maybeV (lookupTyConPR tc)
-      prDFunApply dfun ty_args
-prDictOfTyApp _ _ = noV
-
-prDFunApply :: CoreExpr -> [Type] -> VM CoreExpr
-prDFunApply dfun tys
-  = do
-      dicts <- mapM prDictOfType tys
-      return $ mkApps (mkTyApps dfun tys) dicts
-
-wrapPR :: Type -> VM CoreExpr
-wrapPR ty
-  = do
-      Just  pa_dict <- paDictOfType ty
-      pr_dfun       <- prDFunOfTyCon =<< builtin wrapTyCon
-      return $ mkApps pr_dfun [Type ty, pa_dict]
-
-replicatePD :: CoreExpr -> CoreExpr -> VM CoreExpr
-replicatePD len x = liftM (`mkApps` [len,x])
-                          (paMethod replicatePDVar "replicatePD" (exprType x))
-
-emptyPD :: Type -> VM CoreExpr
-emptyPD = paMethod emptyPDVar "emptyPD"
-
-packByTagPD :: Type -> CoreExpr -> CoreExpr -> CoreExpr -> CoreExpr
-                 -> VM CoreExpr
-packByTagPD ty xs len tags t
-  = liftM (`mkApps` [xs, len, tags, t])
-          (paMethod packByTagPDVar "packByTagPD" ty)
-
-combinePD :: Type -> CoreExpr -> CoreExpr -> [CoreExpr]
-          -> VM CoreExpr
-combinePD ty len sel xs
-  = liftM (`mkApps` (len : sel : xs))
-          (paMethod (combinePDVar n) ("combine" ++ show n ++ "PD") ty)
-  where
-    n = length xs
-
--- | Like `replicatePD` but use the lifting context in the vectoriser state.
-liftPD :: CoreExpr -> VM CoreExpr
-liftPD x
-  = do
-      lc <- builtin liftingContext
-      replicatePD (Var lc) x
-
-zipScalars :: [Type] -> Type -> VM CoreExpr
-zipScalars arg_tys res_ty
-  = do
-      scalar <- builtin scalarClass
-      (dfuns, _) <- mapAndUnzipM (\ty -> lookupInst scalar [ty]) ty_args
-      zipf <- builtin (scalarZip $ length arg_tys)
-      return $ Var zipf `mkTyApps` ty_args `mkApps` map Var dfuns
-    where
-      ty_args = arg_tys ++ [res_ty]
-
-scalarClosure :: [Type] -> Type -> CoreExpr -> CoreExpr -> VM CoreExpr
-scalarClosure arg_tys res_ty scalar_fun array_fun
-  = do
-      ctr      <- builtin (closureCtrFun $ length arg_tys)
-      Just pas <- liftM sequence $ mapM paDictOfType (init arg_tys)
-      return $ Var ctr `mkTyApps` (arg_tys ++ [res_ty])
-                       `mkApps`   (pas ++ [scalar_fun, array_fun])
-
-newLocalVVar :: FastString -> Type -> VM VVar
-newLocalVVar fs vty
-  = do
-      lty <- mkPDataType vty
-      vv  <- newLocalVar fs vty
-      lv  <- newLocalVar fs lty
-      return (vv,lv)
-
-polyAbstract :: [TyVar] -> ([Var] -> VM a) -> VM a
-polyAbstract tvs p
-  = localV
-  $ do
-      mdicts <- mapM mk_dict_var tvs
-      zipWithM_ (\tv -> maybe (defLocalTyVar tv)
-                              (defLocalTyVarWithPA tv . Var)) tvs mdicts
-      p (mk_args mdicts)
-  where
-    mk_dict_var tv = do
-                       r <- paDictArgType tv
-                       case r of
-                         Just ty -> liftM Just (newLocalVar (fsLit "dPA") ty)
-                         Nothing -> return Nothing
-
-    mk_args mdicts = [dict | Just dict <- mdicts]
-
-polyArity :: [TyVar] -> VM Int
-polyArity tvs = do
-                  tys <- mapM paDictArgType tvs
-                  return $ length [() | Just _ <- tys]
-
-polyApply :: CoreExpr -> [Type] -> VM CoreExpr
-polyApply expr tys
- = do Just dicts <- liftM sequence $ mapM paDictOfType tys
-      return $ expr `mkTyApps` tys `mkApps` dicts
-
-polyVApply :: VExpr -> [Type] -> VM VExpr
-polyVApply expr tys
- = do Just dicts <- liftM sequence $ mapM paDictOfType tys
-      return     $ mapVect (\e -> e `mkTyApps` tys `mkApps` dicts) expr
-
-
-{-
-boxExpr :: Type -> VExpr -> VM VExpr
-boxExpr ty (vexpr, lexpr)
-  | Just (tycon, []) <- splitTyConApp_maybe ty
-  , isUnLiftedTyCon tycon
-  = do
-      r <- lookupBoxedTyCon tycon
-      case r of
-        Just tycon' -> let [dc] = tyConDataCons tycon'
-                       in
-                       return (mkConApp dc [vexpr], lexpr)
-        Nothing     -> return (vexpr, lexpr)
--}
-
-

compiler/vectorise/Vectorise/Exp.hs

@@ -3,10 +3,8 @@
 module Vectorise.Exp
 	(vectPolyExpr)
 where
-import VectUtils
+import Vectorise.Utils
 import Vectorise.Type.Type
-import Vectorise.Utils.Closure
-import Vectorise.Utils.Hoisting
 import Vectorise.Var
 import Vectorise.Vect
 import Vectorise.Env

compiler/vectorise/Vectorise/Type/Env.hs

@@ -4,7 +4,6 @@ module Vectorise.Type.Env (
 	vectTypeEnv,
 )
 where
-import VectUtils
 import Vectorise.Env
 import Vectorise.Vect
 import Vectorise.Monad
@@ -15,8 +14,7 @@ import Vectorise.Type.PADict
 import Vectorise.Type.PData
 import Vectorise.Type.PRepr
 import Vectorise.Type.Repr
-import Vectorise.Utils.Closure
-import Vectorise.Utils.Hoisting
+import Vectorise.Utils
 
 import HscTypes
 import CoreSyn

compiler/vectorise/Vectorise/Type/PADict.hs

@@ -2,13 +2,12 @@
 module Vectorise.Type.PADict
 	(buildPADict)
 where
-import VectUtils
 import Vectorise.Monad
 import Vectorise.Builtins
 import Vectorise.Type.Repr
 import Vectorise.Type.PRepr
 import Vectorise.Type.PRDict
-import Vectorise.Utils.Hoisting
+import Vectorise.Utils
 
 import BasicTypes
 import CoreSyn

compiler/vectorise/Vectorise/Type/PData.hs

@@ -2,10 +2,10 @@
 module Vectorise.Type.PData
 	(buildPDataTyCon)
 where
-import VectUtils
 import Vectorise.Monad
 import Vectorise.Builtins
 import Vectorise.Type.Repr
+import Vectorise.Utils
 
 import BasicTypes
 import BuildTyCl

compiler/vectorise/Vectorise/Type/PRDict.hs

@@ -2,7 +2,7 @@
 module Vectorise.Type.PRDict 
 	(buildPRDict)
 where
-import VectUtils
+import Vectorise.Utils
 import Vectorise.Monad
 import Vectorise.Builtins
 import Vectorise.Type.Repr

compiler/vectorise/Vectorise/Type/PRepr.hs

@@ -6,7 +6,7 @@ module Vectorise.Type.PRepr
 	, buildToArrPRepr
 	, buildFromArrPRepr)
 where
-import VectUtils
+import Vectorise.Utils
 import Vectorise.Monad
 import Vectorise.Builtins
 import Vectorise.Type.Repr

compiler/vectorise/Vectorise/Type/Repr.hs

@@ -12,7 +12,7 @@ module Vectorise.Type.Repr
 	, compReprType
 	, compOrigType)
 where
-import VectUtils
+import Vectorise.Utils
 import Vectorise.Monad
 import Vectorise.Builtins
 

compiler/vectorise/Vectorise/Type/Type.hs

@@ -4,7 +4,7 @@ module Vectorise.Type.Type
 	, vectAndLiftType
 	, vectType)
 where
-import VectUtils
+import Vectorise.Utils
 import Vectorise.Monad
 import Vectorise.Builtins
 import TypeRep

compiler/vectorise/Vectorise/Utils.hs

+
+module Vectorise.Utils (
+  module Vectorise.Utils.Base,
+  module Vectorise.Utils.Closure,
+  module Vectorise.Utils.Hoisting,
+  module Vectorise.Utils.PADict,
+  module Vectorise.Utils.PRDict,
+  module Vectorise.Utils.Poly,
+
+  -- * Annotated Exprs
+  collectAnnTypeArgs,
+  collectAnnTypeBinders,
+  collectAnnValBinders,
+  isAnnTypeArg,
+
+  -- * PD Functions
+  replicatePD, emptyPD, packByTagPD,
+  combinePD, liftPD,
+
+  -- * Scalars
+  zipScalars, scalarClosure,
+
+  -- * Naming
+  newLocalVar
+) 
+where
+import Vectorise.Utils.Base
+import Vectorise.Utils.Closure
+import Vectorise.Utils.Hoisting
+import Vectorise.Utils.PADict
+import Vectorise.Utils.PRDict
+import Vectorise.Utils.Poly
+import Vectorise.Monad
+import Vectorise.Builtins
+import CoreSyn
+import CoreUtils
+import Type
+import Var
+import Control.Monad
+
+
+-- Annotated Exprs ------------------------------------------------------------
+collectAnnTypeArgs :: AnnExpr b ann -> (AnnExpr b ann, [Type])
+collectAnnTypeArgs expr = go expr []
+  where
+    go (_, AnnApp f (_, AnnType ty)) tys = go f (ty : tys)
+    go e                             tys = (e, tys)
+
+collectAnnTypeBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann)
+collectAnnTypeBinders expr = go [] expr
+  where
+    go bs (_, AnnLam b e) | isTyVar b = go (b:bs) e
+    go bs e                           = (reverse bs, e)
+
+collectAnnValBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann)
+collectAnnValBinders expr = go [] expr
+  where
+    go bs (_, AnnLam b e) | isId b = go (b:bs) e
+    go bs e                        = (reverse bs, e)
+
+isAnnTypeArg :: AnnExpr b ann -> Bool
+isAnnTypeArg (_, AnnType _) = True
+isAnnTypeArg _              = False
+
+
+-- PD Functions ---------------------------------------------------------------
+replicatePD :: CoreExpr -> CoreExpr -> VM CoreExpr
+replicatePD len x = liftM (`mkApps` [len,x])
+                          (paMethod replicatePDVar "replicatePD" (exprType x))
+
+emptyPD :: Type -> VM CoreExpr
+emptyPD = paMethod emptyPDVar "emptyPD"
+
+
+packByTagPD :: Type -> CoreExpr -> CoreExpr -> CoreExpr -> CoreExpr -> VM CoreExpr
+packByTagPD ty xs len tags t
+  = liftM (`mkApps` [xs, len, tags, t])
+          (paMethod packByTagPDVar "packByTagPD" ty)
+
+
+combinePD :: Type -> CoreExpr -> CoreExpr -> [CoreExpr] -> VM CoreExpr
+combinePD ty len sel xs
+  = liftM (`mkApps` (len : sel : xs))
+          (paMethod (combinePDVar n) ("combine" ++ show n ++ "PD") ty)
+  where
+    n = length xs