X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectMonad.hs;h=9fe6755c282f2b48be23d84ea826241fec1fc532;hb=1064a48b4cb5b883c14510c0ce7cae290da14453;hp=2e076971cce92bc27e494b357a40ab4df732eb0c;hpb=d7c0802c7f6219ccbde97e9aacba1c0e4bed49d4;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index 2e07697..9fe6755 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -2,38 +2,49 @@ module VectMonad ( Scope(..), VM, - noV, tryV, maybeV, orElseV, fixV, localV, closedV, initV, - cloneName, newLocalVar, newTyVar, + noV, tryV, maybeV, traceMaybeV, orElseV, fixV, localV, closedV, initV, + liftDs, + cloneName, cloneId, + newExportedVar, newLocalVar, newDummyVar, newTyVar, - Builtins(..), paDictTyCon, + Builtins(..), builtin, GlobalEnv(..), + setFamInstEnv, readGEnv, setGEnv, updGEnv, LocalEnv(..), readLEnv, setLEnv, updLEnv, - defGlobalVar, lookupVar, - lookupTyCon, + getBindName, inBind, + + lookupVar, defGlobalVar, + lookupTyCon, defTyCon, + lookupDataCon, defDataCon, + lookupTyConPA, defTyConPA, defTyConPAs, defTyConBuiltinPAs, lookupTyVarPA, defLocalTyVar, defLocalTyVarWithPA, localTyVars, - lookupInst, lookupFamInst + {-lookupInst,-} lookupFamInst ) where #include "HsVersions.h" import HscTypes import CoreSyn -import Class import TyCon +import DataCon import Type +import Class import Var import VarEnv import Id import OccName import Name import NameEnv +import TysPrim ( intPrimTy ) +import Module +import IfaceEnv import DsMonad import PrelNames @@ -44,8 +55,9 @@ import FamInstEnv import Panic import Outputable import FastString +import SrcLoc ( noSrcSpan ) -import Control.Monad ( liftM ) +import Control.Monad ( liftM, zipWithM ) data Scope a b = Global a | Local b @@ -54,7 +66,18 @@ data Scope a b = Global a | Local b data Builtins = Builtins { parrayTyCon :: TyCon - , paClass :: Class + , paTyCon :: TyCon + , paDataCon :: DataCon + , preprTyCon :: TyCon + , prTyCon :: TyCon + , prDataCon :: DataCon + , embedTyCon :: TyCon + , embedDataCon :: DataCon + , crossTyCon :: TyCon + , crossDataCon :: DataCon + , plusTyCon :: TyCon + , leftDataCon :: DataCon + , rightDataCon :: DataCon , closureTyCon :: TyCon , mkClosureVar :: Var , applyClosureVar :: Var @@ -62,16 +85,28 @@ data Builtins = Builtins { , applyClosurePVar :: Var , lengthPAVar :: Var , replicatePAVar :: Var + , emptyPAVar :: Var + -- , packPAVar :: Var + -- , combinePAVar :: Var + , intEqPAVar :: Var + , liftingContext :: Var } -paDictTyCon :: Builtins -> TyCon -paDictTyCon = classTyCon . paClass - initBuiltins :: DsM Builtins initBuiltins = do parrayTyCon <- dsLookupTyCon parrayTyConName - paClass <- dsLookupClass paClassName + paTyCon <- dsLookupTyCon paTyConName + let [paDataCon] = tyConDataCons paTyCon + preprTyCon <- dsLookupTyCon preprTyConName + prTyCon <- dsLookupTyCon prTyConName + let [prDataCon] = tyConDataCons prTyCon + embedTyCon <- dsLookupTyCon embedTyConName + let [embedDataCon] = tyConDataCons embedTyCon + crossTyCon <- dsLookupTyCon ndpCrossTyConName + let [crossDataCon] = tyConDataCons crossTyCon + plusTyCon <- dsLookupTyCon ndpPlusTyConName + let [leftDataCon, rightDataCon] = tyConDataCons plusTyCon closureTyCon <- dsLookupTyCon closureTyConName mkClosureVar <- dsLookupGlobalId mkClosureName @@ -80,10 +115,28 @@ initBuiltins applyClosurePVar <- dsLookupGlobalId applyClosurePName lengthPAVar <- dsLookupGlobalId lengthPAName replicatePAVar <- dsLookupGlobalId replicatePAName + emptyPAVar <- dsLookupGlobalId emptyPAName + -- packPAVar <- dsLookupGlobalId packPAName + -- combinePAVar <- dsLookupGlobalId combinePAName + intEqPAVar <- dsLookupGlobalId intEqPAName + + liftingContext <- liftM (\u -> mkSysLocal FSLIT("lc") u intPrimTy) + newUnique return $ Builtins { parrayTyCon = parrayTyCon - , paClass = paClass + , paTyCon = paTyCon + , paDataCon = paDataCon + , preprTyCon = preprTyCon + , prTyCon = prTyCon + , prDataCon = prDataCon + , embedTyCon = embedTyCon + , embedDataCon = embedDataCon + , crossTyCon = crossTyCon + , crossDataCon = crossDataCon + , plusTyCon = plusTyCon + , leftDataCon = leftDataCon + , rightDataCon = rightDataCon , closureTyCon = closureTyCon , mkClosureVar = mkClosureVar , applyClosureVar = applyClosureVar @@ -91,12 +144,17 @@ initBuiltins , applyClosurePVar = applyClosurePVar , lengthPAVar = lengthPAVar , replicatePAVar = replicatePAVar + , emptyPAVar = emptyPAVar + -- , packPAVar = packPAVar + -- , combinePAVar = combinePAVar + , intEqPAVar = intEqPAVar + , liftingContext = liftingContext } data GlobalEnv = GlobalEnv { -- Mapping from global variables to their vectorised versions. -- - global_vars :: VarEnv CoreExpr + global_vars :: VarEnv Var -- Exported variables which have a vectorised version -- @@ -108,9 +166,13 @@ data GlobalEnv = GlobalEnv { -- , global_tycons :: NameEnv TyCon - -- Mapping from TyCons to their PA dictionaries + -- Mapping from DataCons to their vectorised versions + -- + , global_datacons :: NameEnv DataCon + + -- Mapping from TyCons to their PA dfuns -- - , global_tycon_pa :: NameEnv CoreExpr + , global_pa_funs :: NameEnv Var -- External package inst-env & home-package inst-env for class -- instances @@ -130,7 +192,7 @@ data LocalEnv = LocalEnv { -- Mapping from local variables to their vectorised and -- lifted versions -- - local_vars :: VarEnv (CoreExpr, CoreExpr) + local_vars :: VarEnv (Var, Var) -- In-scope type variables -- @@ -138,39 +200,55 @@ data LocalEnv = LocalEnv { -- Mapping from tyvars to their PA dictionaries , local_tyvar_pa :: VarEnv CoreExpr + + -- Local binding name + , local_bind_name :: FastString } -initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> GlobalEnv -initGlobalEnv info instEnvs famInstEnvs +initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> Builtins + -> GlobalEnv +initGlobalEnv info instEnvs famInstEnvs bi = GlobalEnv { - global_vars = mapVarEnv (Var . snd) $ vectInfoVar info + global_vars = mapVarEnv snd $ vectInfoVar info , global_exported_vars = emptyVarEnv - , global_tycons = mapNameEnv snd $ vectInfoTyCon info - , global_tycon_pa = emptyNameEnv + , global_tycons = extendNameEnv (mapNameEnv snd (vectInfoTyCon info)) + (tyConName funTyCon) (closureTyCon bi) + + , global_datacons = mapNameEnv snd $ vectInfoDataCon info + , global_pa_funs = mapNameEnv snd $ vectInfoPADFun info , global_inst_env = instEnvs , global_fam_inst_env = famInstEnvs , global_bindings = [] } +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 + 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 = tc_env + 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 - tc_env = mkNameEnv [(tc_name, (tc,tc')) - | tc <- typeEnvTyCons tyenv - , let tc_name = tyConName tc - , Just tc' <- [lookupNameEnv (global_tycons env) tc_name]] + 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]] data VResult a = Yes GlobalEnv LocalEnv a | No @@ -187,6 +265,9 @@ instance Monad VM where noV :: VM a noV = VM $ \_ _ _ -> return No +traceNoV :: String -> SDoc -> VM a +traceNoV s d = pprTrace s d noV + tryV :: VM a -> VM (Maybe a) tryV (VM p) = VM $ \bi genv lenv -> do @@ -198,6 +279,9 @@ tryV (VM p) = VM $ \bi genv lenv -> 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 @@ -216,7 +300,7 @@ localV p = do closedV :: VM a -> VM a closedV p = do env <- readLEnv id - setLEnv emptyLocalEnv + setLEnv (emptyLocalEnv { local_bind_name = local_bind_name env }) x <- p setLEnv env return x @@ -251,6 +335,19 @@ getInstEnv = readGEnv global_inst_env getFamInstEnv :: VM FamInstEnvs getFamInstEnv = readGEnv global_fam_inst_env +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 + +lookupExternalVar :: Module -> FastString -> VM Var +lookupExternalVar mod fs + = liftDs + $ dsLookupGlobalId =<< lookupOrig mod (mkVarOccFS fs) + cloneName :: (OccName -> OccName) -> Name -> VM Name cloneName mk_occ name = liftM make (liftDs newUnique) where @@ -261,12 +358,33 @@ cloneName mk_occ name = liftM make (liftDs newUnique) (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' + +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 +newDummyVar :: Type -> VM Var +newDummyVar = newLocalVar FSLIT("ds") + newTyVar :: FastString -> Kind -> VM Var newTyVar fs k = do @@ -275,24 +393,61 @@ newTyVar fs k defGlobalVar :: Var -> Var -> VM () defGlobalVar v v' = updGEnv $ \env -> - env { global_vars = extendVarEnv (global_vars env) v (Var v') + 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 -lookupVar :: Var -> VM (Scope CoreExpr (CoreExpr, CoreExpr)) +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 - $ maybeV (readGEnv $ \env -> lookupVarEnv (global_vars env) v) + $ traceMaybeV "lookupVar" (ppr v) + (readGEnv $ \env -> lookupVarEnv (global_vars env) v) lookupTyCon :: TyCon -> VM (Maybe TyCon) -lookupTyCon tc = readGEnv $ \env -> lookupNameEnv (global_tycons env) (tyConName tc) +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 = 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' } + +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] } + +defTyConBuiltinPAs :: [(Name, Module, FastString)] -> VM () +defTyConBuiltinPAs ps + = do + pas <- zipWithM lookupExternalVar mods fss + updGEnv $ \env -> + env { global_pa_funs = extendNameEnvList (global_pa_funs env) + (zip tcs pas) } + where + (tcs, mods, fss) = unzip3 ps lookupTyVarPA :: Var -> VM (Maybe CoreExpr) lookupTyVarPA tv = readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv @@ -321,6 +476,7 @@ localTyVars = readLEnv (reverse . local_tyvars) -- 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 @@ -332,11 +488,12 @@ lookupInst cls tys where inst_tys' = [ty | Right ty <- inst_tys] noFlexiVar = all isRight inst_tys - _other -> noV + _other -> traceNoV "lookupInst" (ppr cls <+> ppr tys) } where isRight (Left _) = False isRight (Right _) = True +-} -- Look up the representation tycon of a family instance. -- @@ -382,7 +539,10 @@ initV hsc_env guts info p go instEnvs famInstEnvs = do builtins <- initBuiltins - r <- runVM p builtins (initGlobalEnv info instEnvs famInstEnvs) + r <- runVM p builtins (initGlobalEnv info + instEnvs + famInstEnvs + builtins) emptyLocalEnv case r of Yes genv _ x -> return $ Just (new_info genv, x)