diff options
Diffstat (limited to 'compiler/vectorise')
| -rw-r--r-- | compiler/vectorise/VectMonad.hs | 651 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Monad/InstEnv.hs | 2 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Type/Env.hs | 4 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Type/PData.hs | 1 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Type/PRepr.hs | 1 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 | ||||
| -rw-r--r-- | compiler/vectorise/Vectorise/Utils.hs | 2 |
7 files changed, 659 insertions, 3 deletions
diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs new file mode 100644 index 0000000000..65a348919b --- /dev/null +++ b/compiler/vectorise/VectMonad.hs @@ -0,0 +1,651 @@ +{-# LANGUAGE NamedFieldPuns #-} + +-- | The Vectorisation monad. +module VectMonad ( + VM, + + noV, traceNoV, ensureV, traceEnsureV, tryV, maybeV, traceMaybeV, orElseV, + onlyIfV, fixV, localV, closedV, + initV, cantVectorise, maybeCantVectorise, maybeCantVectoriseM, + liftDs, + cloneName, cloneId, cloneVar, + newExportedVar, newLocalVar, newLocalVars, newDummyVar, newTyVar, + + Builtins(..), sumTyCon, prodTyCon, prodDataCon, + selTy, selReplicate, selPick, selTags, selElements, + combinePDVar, scalarZip, closureCtrFun, + builtin, builtins, + + setFamInstEnv, + readGEnv, setGEnv, updGEnv, + + readLEnv, setLEnv, updLEnv, + + getBindName, inBind, + + lookupVar, defGlobalVar, globalScalars, + lookupTyCon, defTyCon, + lookupDataCon, defDataCon, + lookupTyConPA, defTyConPA, defTyConPAs, + lookupTyConPR, + lookupBoxedTyCon, + lookupPrimMethod, lookupPrimPArray, + lookupTyVarPA, defLocalTyVar, defLocalTyVarWithPA, localTyVars, + + lookupInst, lookupFamInst +) where + +#include "HsVersions.h" + +import VectBuiltIn +import Vectorise.Env + +import HscTypes hiding ( MonadThings(..) ) +import Module ( PackageId ) +import CoreSyn +import Class +import TyCon +import DataCon +import Type +import Var +import VarSet +import VarEnv +import Id +import Name +import NameEnv + +import DsMonad + +import InstEnv +import FamInstEnv + +import Outputable +import FastString +import SrcLoc ( noSrcSpan ) + +import Control.Monad + +-- | Indicates what scope something (a variable) is in. +data Scope a b = Global a | Local b + + +-- | The global environment. +data GlobalEnv = GlobalEnv { + -- | Mapping from global variables to their vectorised versions. + -- + global_vars :: VarEnv Var + + -- | Purely scalar variables. Code which mentions only these + -- variables doesn't have to be lifted. + , global_scalars :: VarSet + + -- | Exported variables which have a vectorised version + -- + , global_exported_vars :: VarEnv (Var, Var) + + -- | Mapping from TyCons to their vectorised versions. + -- TyCons which do not have to be vectorised are mapped to + -- themselves. + -- + , global_tycons :: NameEnv TyCon + + -- | Mapping from DataCons to their vectorised versions + -- + , global_datacons :: NameEnv DataCon + + -- | Mapping from TyCons to their PA dfuns + -- + , global_pa_funs :: NameEnv Var + + -- | Mapping from TyCons to their PR dfuns + , global_pr_funs :: NameEnv Var + + -- | Mapping from unboxed TyCons to their boxed versions + , global_boxed_tycons :: NameEnv TyCon + + -- | External package inst-env & home-package inst-env for class + -- instances + -- + , global_inst_env :: (InstEnv, InstEnv) + + -- | External package inst-env & home-package inst-env for family + -- instances + -- + , global_fam_inst_env :: FamInstEnvs + + -- | Hoisted bindings + , global_bindings :: [(Var, CoreExpr)] + } + +-- | The local environment. +data LocalEnv = LocalEnv { + -- Mapping from local variables to their vectorised and + -- lifted versions + -- + local_vars :: VarEnv (Var, Var) + + -- In-scope type variables + -- + , local_tyvars :: [TyVar] + + -- Mapping from tyvars to their PA dictionaries + , local_tyvar_pa :: VarEnv CoreExpr + + -- Local binding name + , local_bind_name :: FastString + } + + +-- | Create an initial global environment +initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> GlobalEnv +initGlobalEnv info instEnvs famInstEnvs + = GlobalEnv { + global_vars = mapVarEnv snd $ vectInfoVar info + , global_scalars = emptyVarSet + , global_exported_vars = emptyVarEnv + , global_tycons = mapNameEnv snd $ vectInfoTyCon info + , global_datacons = mapNameEnv snd $ vectInfoDataCon info + , global_pa_funs = mapNameEnv snd $ vectInfoPADFun info + , global_pr_funs = emptyNameEnv + , global_boxed_tycons = emptyNameEnv + , global_inst_env = instEnvs + , global_fam_inst_env = famInstEnvs + , global_bindings = [] + } + + +-- Operators on Global Environments ------------------------------------------- +extendImportedVarsEnv :: [(Var, Var)] -> GlobalEnv -> GlobalEnv +extendImportedVarsEnv ps genv + = genv { global_vars = extendVarEnvList (global_vars genv) ps } + +extendScalars :: [Var] -> GlobalEnv -> GlobalEnv +extendScalars vs genv + = genv { global_scalars = extendVarSetList (global_scalars genv) vs } + +setFamInstEnv :: FamInstEnv -> GlobalEnv -> GlobalEnv +setFamInstEnv l_fam_inst genv + = genv { global_fam_inst_env = (g_fam_inst, l_fam_inst) } + where + (g_fam_inst, _) = global_fam_inst_env genv + +extendTyConsEnv :: [(Name, TyCon)] -> GlobalEnv -> GlobalEnv +extendTyConsEnv ps genv + = genv { global_tycons = extendNameEnvList (global_tycons genv) ps } + +extendDataConsEnv :: [(Name, DataCon)] -> GlobalEnv -> GlobalEnv +extendDataConsEnv ps genv + = genv { global_datacons = extendNameEnvList (global_datacons genv) ps } + +extendPAFunsEnv :: [(Name, Var)] -> GlobalEnv -> GlobalEnv +extendPAFunsEnv ps genv + = genv { global_pa_funs = extendNameEnvList (global_pa_funs genv) ps } + +setPRFunsEnv :: [(Name, Var)] -> GlobalEnv -> GlobalEnv +setPRFunsEnv ps genv + = genv { global_pr_funs = mkNameEnv ps } + +setBoxedTyConsEnv :: [(Name, TyCon)] -> GlobalEnv -> GlobalEnv +setBoxedTyConsEnv ps genv + = genv { global_boxed_tycons = mkNameEnv ps } + + +-- | Create an empty local environment. +emptyLocalEnv :: LocalEnv +emptyLocalEnv = LocalEnv { + local_vars = emptyVarEnv + , local_tyvars = [] + , local_tyvar_pa = emptyVarEnv + , local_bind_name = fsLit "fn" + } + +-- FIXME +updVectInfo :: GlobalEnv -> TypeEnv -> VectInfo -> VectInfo +updVectInfo env tyenv info + = info { + vectInfoVar = global_exported_vars env + , vectInfoTyCon = mk_env typeEnvTyCons global_tycons + , vectInfoDataCon = mk_env typeEnvDataCons global_datacons + , vectInfoPADFun = mk_env typeEnvTyCons global_pa_funs + } + where + mk_env :: NamedThing from => + (TypeEnv -> [from]) + -> (GlobalEnv -> NameEnv to) + -> NameEnv (from,to) + mk_env from_tyenv from_env = mkNameEnv [(name, (from,to)) + | from <- from_tyenv tyenv + , let name = getName from + , Just to <- [lookupNameEnv (from_env env) name]] + +-- The Vectorisation Monad ---------------------------------------------------- + +-- Vectorisation can either succeed with new envionment and a value, +-- or return with failure. +-- +data VResult a = Yes GlobalEnv LocalEnv a | No + +newtype VM a = VM { runVM :: Builtins -> GlobalEnv -> LocalEnv -> DsM (VResult a) } + +instance Monad VM where + return x = VM $ \_ genv lenv -> return (Yes genv lenv x) + VM p >>= f = VM $ \bi genv lenv -> do + r <- p bi genv lenv + case r of + Yes genv' lenv' x -> runVM (f x) bi genv' lenv' + No -> return No + + +-- | Throw an error saying we can't vectorise something +cantVectorise :: String -> SDoc -> a +cantVectorise s d = pgmError + . showSDocDump + $ vcat [text "*** Vectorisation error ***", + nest 4 $ sep [text s, nest 4 d]] + +maybeCantVectorise :: String -> SDoc -> Maybe a -> a +maybeCantVectorise s d Nothing = cantVectorise s d +maybeCantVectorise _ _ (Just x) = x + +maybeCantVectoriseM :: Monad m => String -> SDoc -> m (Maybe a) -> m a +maybeCantVectoriseM s d p + = do + r <- p + case r of + Just x -> return x + Nothing -> cantVectorise s d + + +-- Control -------------------------------------------------------------------- +-- | Return some result saying we've failed. +noV :: VM a +noV = VM $ \_ _ _ -> return No + +traceNoV :: String -> SDoc -> VM a +traceNoV s d = pprTrace s d noV + + +-- | If True then carry on, otherwise fail. +ensureV :: Bool -> VM () +ensureV False = noV +ensureV True = return () + + +-- | If True then return the first argument, otherwise fail. +onlyIfV :: Bool -> VM a -> VM a +onlyIfV b p = ensureV b >> p + +traceEnsureV :: String -> SDoc -> Bool -> VM () +traceEnsureV s d False = traceNoV s d +traceEnsureV _ _ True = return () + + +-- | Try some vectorisation computaton. +-- If it succeeds then return Just the result, +-- otherwise return Nothing. +tryV :: VM a -> VM (Maybe a) +tryV (VM p) = VM $ \bi genv lenv -> + do + r <- p bi genv lenv + case r of + Yes genv' lenv' x -> return (Yes genv' lenv' (Just x)) + No -> return (Yes genv lenv Nothing) + + +maybeV :: VM (Maybe a) -> VM a +maybeV p = maybe noV return =<< p + +traceMaybeV :: String -> SDoc -> VM (Maybe a) -> VM a +traceMaybeV s d p = maybe (traceNoV s d) return =<< p + +orElseV :: VM a -> VM a -> VM a +orElseV p q = maybe q return =<< tryV p + +fixV :: (a -> VM a) -> VM a +fixV f = VM (\bi genv lenv -> fixDs $ \r -> runVM (f (unYes r)) bi genv lenv ) + where + -- NOTE: It is essential that we are lazy in r above so do not replace + -- calls to this function by an explicit case. + unYes (Yes _ _ x) = x + unYes No = panic "VectMonad.fixV: no result" + + +-- Local Environments --------------------------------------------------------- +-- | Perform a computation in its own local environment. +-- This does not alter the environment of the current state. +localV :: VM a -> VM a +localV p = do + env <- readLEnv id + x <- p + setLEnv env + return x + +-- | Perform a computation in an empty local environment. +closedV :: VM a -> VM a +closedV p = do + env <- readLEnv id + setLEnv (emptyLocalEnv { local_bind_name = local_bind_name env }) + x <- p + setLEnv env + return x + +-- Lifting -------------------------------------------------------------------- +-- | Lift a desugaring computation into the vectorisation monad. +liftDs :: DsM a -> VM a +liftDs p = VM $ \_ genv lenv -> do { x <- p; return (Yes genv lenv x) } + + + +-- Builtins ------------------------------------------------------------------- +-- Operations on Builtins +liftBuiltinDs :: (Builtins -> DsM a) -> VM a +liftBuiltinDs p = VM $ \bi genv lenv -> do { x <- p bi; return (Yes genv lenv x)} + + +-- | Project something from the set of builtins. +builtin :: (Builtins -> a) -> VM a +builtin f = VM $ \bi genv lenv -> return (Yes genv lenv (f bi)) + +builtins :: (a -> Builtins -> b) -> VM (a -> b) +builtins f = VM $ \bi genv lenv -> return (Yes genv lenv (`f` bi)) + + +-- Environments --------------------------------------------------------------- +-- | Project something from the global environment. +readGEnv :: (GlobalEnv -> a) -> VM a +readGEnv f = VM $ \_ genv lenv -> return (Yes genv lenv (f genv)) + +setGEnv :: GlobalEnv -> VM () +setGEnv genv = VM $ \_ _ lenv -> return (Yes genv lenv ()) + +updGEnv :: (GlobalEnv -> GlobalEnv) -> VM () +updGEnv f = VM $ \_ genv lenv -> return (Yes (f genv) lenv ()) + + +-- | Project something from the local environment. +readLEnv :: (LocalEnv -> a) -> VM a +readLEnv f = VM $ \_ genv lenv -> return (Yes genv lenv (f lenv)) + +-- | Set the local environment. +setLEnv :: LocalEnv -> VM () +setLEnv lenv = VM $ \_ genv _ -> return (Yes genv lenv ()) + +-- | Update the enviroment using a provided function. +updLEnv :: (LocalEnv -> LocalEnv) -> VM () +updLEnv f = VM $ \_ genv lenv -> return (Yes genv (f lenv) ()) + + +-- InstEnv -------------------------------------------------------------------- +getInstEnv :: VM (InstEnv, InstEnv) +getInstEnv = readGEnv global_inst_env + +getFamInstEnv :: VM FamInstEnvs +getFamInstEnv = readGEnv global_fam_inst_env + + +-- Names ---------------------------------------------------------------------- +-- | Get the name of the local binding currently being vectorised. +getBindName :: VM FastString +getBindName = readLEnv local_bind_name + +inBind :: Id -> VM a -> VM a +inBind id p + = do updLEnv $ \env -> env { local_bind_name = occNameFS (getOccName id) } + p + +cloneName :: (OccName -> OccName) -> Name -> VM Name +cloneName mk_occ name = liftM make (liftDs newUnique) + where + occ_name = mk_occ (nameOccName name) + + make u | isExternalName name = mkExternalName u (nameModule name) + occ_name + (nameSrcSpan name) + | otherwise = mkSystemName u occ_name + +cloneId :: (OccName -> OccName) -> Id -> Type -> VM Id +cloneId mk_occ id ty + = do + name <- cloneName mk_occ (getName id) + let id' | isExportedId id = Id.mkExportedLocalId name ty + | otherwise = Id.mkLocalId name ty + return id' + +-- Make a fresh instance of this var, with a new unique. +cloneVar :: Var -> VM Var +cloneVar var = liftM (setIdUnique var) (liftDs newUnique) + +newExportedVar :: OccName -> Type -> VM Var +newExportedVar occ_name ty + = do + mod <- liftDs getModuleDs + u <- liftDs newUnique + + let name = mkExternalName u mod occ_name noSrcSpan + + return $ Id.mkExportedLocalId name ty + +newLocalVar :: FastString -> Type -> VM Var +newLocalVar fs ty + = do + u <- liftDs newUnique + return $ mkSysLocal fs u ty + +newLocalVars :: FastString -> [Type] -> VM [Var] +newLocalVars fs = mapM (newLocalVar fs) + +newDummyVar :: Type -> VM Var +newDummyVar = newLocalVar (fsLit "vv") + +newTyVar :: FastString -> Kind -> VM Var +newTyVar fs k + = do + u <- liftDs newUnique + return $ mkTyVar (mkSysTvName u fs) k + + +-- | Add a mapping between a global var and its vectorised version to the state. +defGlobalVar :: Var -> Var -> VM () +defGlobalVar v v' = updGEnv $ \env -> + env { global_vars = extendVarEnv (global_vars env) v v' + , global_exported_vars = upd (global_exported_vars env) + } + where + upd env | isExportedId v = extendVarEnv env v (v, v') + | otherwise = env + +-- Var ------------------------------------------------------------------------ +-- | Lookup the vectorised and\/or lifted versions of this variable. +-- If it's in the global environment we get the vectorised version. +-- If it's in the local environment we get both the vectorised and lifted version. +-- +lookupVar :: Var -> VM (Scope Var (Var, Var)) +lookupVar v + = do r <- readLEnv $ \env -> lookupVarEnv (local_vars env) v + case r of + Just e -> return (Local e) + Nothing -> liftM Global + . maybeCantVectoriseVarM v + . readGEnv $ \env -> lookupVarEnv (global_vars env) v + +maybeCantVectoriseVarM :: Monad m => Var -> m (Maybe Var) -> m Var +maybeCantVectoriseVarM v p + = do r <- p + case r of + Just x -> return x + Nothing -> dumpVar v + +dumpVar :: Var -> a +dumpVar var + | Just _ <- isClassOpId_maybe var + = cantVectorise "ClassOpId not vectorised:" (ppr var) + + | otherwise + = cantVectorise "Variable not vectorised:" (ppr var) + +------------------------------------------------------------------------------- +globalScalars :: VM VarSet +globalScalars = readGEnv global_scalars + +lookupTyCon :: TyCon -> VM (Maybe TyCon) +lookupTyCon tc + | isUnLiftedTyCon tc || isTupleTyCon tc = return (Just tc) + + | otherwise = readGEnv $ \env -> lookupNameEnv (global_tycons env) (tyConName tc) + +defTyCon :: TyCon -> TyCon -> VM () +defTyCon tc tc' = updGEnv $ \env -> + env { global_tycons = extendNameEnv (global_tycons env) (tyConName tc) tc' } + +lookupDataCon :: DataCon -> VM (Maybe DataCon) +lookupDataCon dc + | isTupleTyCon (dataConTyCon dc) = return (Just dc) + | otherwise = readGEnv $ \env -> lookupNameEnv (global_datacons env) (dataConName dc) + +defDataCon :: DataCon -> DataCon -> VM () +defDataCon dc dc' = updGEnv $ \env -> + env { global_datacons = extendNameEnv (global_datacons env) (dataConName dc) dc' } + +lookupPrimPArray :: TyCon -> VM (Maybe TyCon) +lookupPrimPArray = liftBuiltinDs . primPArray + +lookupPrimMethod :: TyCon -> String -> VM (Maybe Var) +lookupPrimMethod tycon = liftBuiltinDs . primMethod tycon + +lookupTyConPA :: TyCon -> VM (Maybe Var) +lookupTyConPA tc = readGEnv $ \env -> lookupNameEnv (global_pa_funs env) (tyConName tc) + +defTyConPA :: TyCon -> Var -> VM () +defTyConPA tc pa = updGEnv $ \env -> + env { global_pa_funs = extendNameEnv (global_pa_funs env) (tyConName tc) pa } + +defTyConPAs :: [(TyCon, Var)] -> VM () +defTyConPAs ps = updGEnv $ \env -> + env { global_pa_funs = extendNameEnvList (global_pa_funs env) + [(tyConName tc, pa) | (tc, pa) <- ps] } + +lookupTyVarPA :: Var -> VM (Maybe CoreExpr) +lookupTyVarPA tv = readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv + +lookupTyConPR :: TyCon -> VM (Maybe Var) +lookupTyConPR tc = readGEnv $ \env -> lookupNameEnv (global_pr_funs env) (tyConName tc) + +lookupBoxedTyCon :: TyCon -> VM (Maybe TyCon) +lookupBoxedTyCon tc = readGEnv $ \env -> lookupNameEnv (global_boxed_tycons env) + (tyConName tc) + +defLocalTyVar :: TyVar -> VM () +defLocalTyVar tv = updLEnv $ \env -> + env { local_tyvars = tv : local_tyvars env + , local_tyvar_pa = local_tyvar_pa env `delVarEnv` tv + } + +defLocalTyVarWithPA :: TyVar -> CoreExpr -> VM () +defLocalTyVarWithPA tv pa = updLEnv $ \env -> + env { local_tyvars = tv : local_tyvars env + , local_tyvar_pa = extendVarEnv (local_tyvar_pa env) tv pa + } + +localTyVars :: VM [TyVar] +localTyVars = readLEnv (reverse . local_tyvars) + +-- Look up the dfun of a class instance. +-- +-- The match must be unique - ie, match exactly one instance - but the +-- type arguments used for matching may be more specific than those of +-- the class instance declaration. The found class instances must not have +-- any type variables in the instance context that do not appear in the +-- instances head (i.e., no flexi vars); for details for what this means, +-- see the docs at InstEnv.lookupInstEnv. +-- +lookupInst :: Class -> [Type] -> VM (DFunId, [Type]) +lookupInst cls tys + = do { instEnv <- getInstEnv + ; case lookupInstEnv instEnv cls tys of + ([(inst, inst_tys)], _) + | noFlexiVar -> return (instanceDFunId inst, inst_tys') + | otherwise -> pprPanic "VectMonad.lookupInst: flexi var: " + (ppr $ mkTyConApp (classTyCon cls) tys) + where + inst_tys' = [ty | Right ty <- inst_tys] + noFlexiVar = all isRight inst_tys + _other -> + pprPanic "VectMonad.lookupInst: not found " (ppr cls <+> ppr tys) + } + where + isRight (Left _) = False + isRight (Right _) = True + +-- Look up the representation tycon of a family instance. +-- +-- The match must be unique - ie, match exactly one instance - but the +-- type arguments used for matching may be more specific than those of +-- the family instance declaration. +-- +-- Return the instance tycon and its type instance. For example, if we have +-- +-- lookupFamInst 'T' '[Int]' yields (':R42T', 'Int') +-- +-- then we have a coercion (ie, type instance of family instance coercion) +-- +-- :Co:R42T Int :: T [Int] ~ :R42T Int +-- +-- which implies that :R42T was declared as 'data instance T [a]'. +-- +lookupFamInst :: TyCon -> [Type] -> VM (TyCon, [Type]) +lookupFamInst tycon tys + = ASSERT( isFamilyTyCon tycon ) + do { instEnv <- getFamInstEnv + ; case lookupFamInstEnv instEnv tycon tys of + [(fam_inst, rep_tys)] -> return (famInstTyCon fam_inst, rep_tys) + _other -> + pprPanic "VectMonad.lookupFamInst: not found: " + (ppr $ mkTyConApp tycon tys) + } + + +-- | Run a vectorisation computation. +initV :: PackageId -> HscEnv -> ModGuts -> VectInfo -> VM a -> IO (Maybe (VectInfo, a)) +initV pkg hsc_env guts info p + = do + -- XXX: ignores error messages and warnings, check that this is + -- indeed ok (the use of "Just r" suggests so) + (_,Just r) <- initDs hsc_env (mg_module guts) + (mg_rdr_env guts) + (mg_types guts) + go + return r + where + + go = + do + builtins <- initBuiltins pkg + builtin_vars <- initBuiltinVars builtins + builtin_tycons <- initBuiltinTyCons builtins + let builtin_datacons = initBuiltinDataCons builtins + builtin_boxed <- initBuiltinBoxedTyCons builtins + builtin_scalars <- initBuiltinScalars builtins + + eps <- liftIO $ hscEPS hsc_env + let famInstEnvs = (eps_fam_inst_env eps, mg_fam_inst_env guts) + instEnvs = (eps_inst_env eps, mg_inst_env guts) + + builtin_prs <- initBuiltinPRs builtins instEnvs + builtin_pas <- initBuiltinPAs builtins instEnvs + + let genv = extendImportedVarsEnv builtin_vars + . extendScalars builtin_scalars + . extendTyConsEnv builtin_tycons + . extendDataConsEnv builtin_datacons + . extendPAFunsEnv builtin_pas + . setPRFunsEnv builtin_prs + . setBoxedTyConsEnv builtin_boxed + $ initGlobalEnv info instEnvs famInstEnvs + + r <- runVM p builtins genv emptyLocalEnv + case r of + Yes genv _ x -> return $ Just (new_info genv, x) + No -> return Nothing + + new_info genv = updVectInfo genv (mg_types guts) info + diff --git a/compiler/vectorise/Vectorise/Monad/InstEnv.hs b/compiler/vectorise/Vectorise/Monad/InstEnv.hs index 7bfdc23fe9..2fc94d8f4a 100644 --- a/compiler/vectorise/Vectorise/Monad/InstEnv.hs +++ b/compiler/vectorise/Vectorise/Monad/InstEnv.hs @@ -70,7 +70,7 @@ lookupInst cls tys -- lookupFamInst :: TyCon -> [Type] -> VM (TyCon, [Type]) lookupFamInst tycon tys - = ASSERT( isOpenTyCon tycon ) + = ASSERT( isFamilyTyCon tycon ) do { instEnv <- getFamInstEnv ; case lookupFamInstEnv instEnv tycon tys of [(fam_inst, rep_tys)] -> return (famInstTyCon fam_inst, rep_tys) diff --git a/compiler/vectorise/Vectorise/Type/Env.hs b/compiler/vectorise/Vectorise/Type/Env.hs index 851fb79174..18de832019 100644 --- a/compiler/vectorise/Vectorise/Type/Env.hs +++ b/compiler/vectorise/Vectorise/Type/Env.hs @@ -1,4 +1,6 @@ -{-# OPTIONS -fno-warn-missing-signatures #-} +{-# OPTIONS_GHC -XNoMonoLocalBinds -fno-warn-missing-signatures #-} +-- Roman likes local bindings +-- If this module lives on I'd like to get rid of this flag in due course module Vectorise.Type.Env ( vectTypeEnv, diff --git a/compiler/vectorise/Vectorise/Type/PData.hs b/compiler/vectorise/Vectorise/Type/PData.hs index 34c9bec1c1..332344bdc2 100644 --- a/compiler/vectorise/Vectorise/Type/PData.hs +++ b/compiler/vectorise/Vectorise/Type/PData.hs @@ -33,6 +33,7 @@ buildPDataTyCon orig_tc vect_tc repr = fixV $ \repr_tc -> rec_flag -- FIXME: is this ok? False -- FIXME: no generics False -- not GADT syntax + NoParentTyCon (Just $ mk_fam_inst pdata vect_tc) where orig_name = tyConName orig_tc diff --git a/compiler/vectorise/Vectorise/Type/PRepr.hs b/compiler/vectorise/Vectorise/Type/PRepr.hs index 81edaab2f8..1556626690 100644 --- a/compiler/vectorise/Vectorise/Type/PRepr.hs +++ b/compiler/vectorise/Vectorise/Type/PRepr.hs @@ -41,6 +41,7 @@ buildPReprTyCon orig_tc vect_tc repr tyvars (SynonymTyCon rhs_ty) (typeKind rhs_ty) + NoParentTyCon (Just $ mk_fam_inst prepr_tc vect_tc) where tyvars = tyConTyVars vect_tc diff --git a/compiler/vectorise/Vectorise/Type/TyConDecl.hs b/compiler/vectorise/Vectorise/Type/TyConDecl.hs index 34ce559e51..0fa8482d6b 100644 --- a/compiler/vectorise/Vectorise/Type/TyConDecl.hs +++ b/compiler/vectorise/Vectorise/Type/TyConDecl.hs @@ -84,6 +84,7 @@ vectTyConDecl tycon rec_flag -- FIXME: is this ok? False -- FIXME: no generics False -- not GADT syntax + NoParentTyCon Nothing -- not a family instance -- some other crazy thing that we don't handle. diff --git a/compiler/vectorise/Vectorise/Utils.hs b/compiler/vectorise/Vectorise/Utils.hs index 31bb508811..3dd5425631 100644 --- a/compiler/vectorise/Vectorise/Utils.hs +++ b/compiler/vectorise/Vectorise/Utils.hs @@ -49,7 +49,7 @@ collectAnnTypeArgs expr = go expr [] 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 (_, AnnLam b e) | isTyCoVar b = go (b:bs) e go bs e = (reverse bs, e) collectAnnValBinders :: AnnExpr Var ann -> ([Var], AnnExpr Var ann) |