X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectMonad.hs;h=7bd753881eb0ccd940d89a1976daebd1efd23dcc;hb=f2704299116dba4fa25c9c920c4a5150d6a4da34;hp=f6f81392fcb1577b031439e31f78cd439a828c6a;hpb=e7eb4e16c90e7c0f17637d036879439873bec18d;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index f6f8139..7bd7538 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -2,31 +2,35 @@ module VectMonad ( Scope(..), VM, - noV, tryV, maybeV, orElseV, fixV, localV, closedV, initV, - cloneName, newLocalVar, newTyVar, + noV, tryV, maybeV, traceMaybeV, orElseV, fixV, localV, closedV, initV, + cloneName, cloneId, + newExportedVar, newLocalVar, newDummyVar, newTyVar, - Builtins(..), paDictTyCon, + Builtins(..), builtin, GlobalEnv(..), + setFamInstEnv, readGEnv, setGEnv, updGEnv, LocalEnv(..), readLEnv, setLEnv, updLEnv, + getBindName, inBind, + lookupVar, defGlobalVar, lookupTyCon, defTyCon, lookupDataCon, defDataCon, + lookupTyConPA, defTyConPA, defTyConPAs, defTyConRdrPAs, lookupTyVarPA, defLocalTyVar, defLocalTyVarWithPA, localTyVars, - lookupInst, lookupFamInst + {-lookupInst,-} lookupFamInst ) where #include "HsVersions.h" import HscTypes import CoreSyn -import Class import TyCon import DataCon import Type @@ -36,6 +40,8 @@ import Id import OccName import Name import NameEnv +import TysPrim ( intPrimTy ) +import RdrName import DsMonad import PrelNames @@ -46,6 +52,7 @@ import FamInstEnv import Panic import Outputable import FastString +import SrcLoc ( noSrcSpan ) import Control.Monad ( liftM ) @@ -56,7 +63,8 @@ data Scope a b = Global a | Local b data Builtins = Builtins { parrayTyCon :: TyCon - , paClass :: Class + , paTyCon :: TyCon + , paDataCon :: DataCon , closureTyCon :: TyCon , mkClosureVar :: Var , applyClosureVar :: Var @@ -64,16 +72,19 @@ 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 = case tyConDataCons paTyCon of [dc] -> dc closureTyCon <- dsLookupTyCon closureTyConName mkClosureVar <- dsLookupGlobalId mkClosureName @@ -82,10 +93,18 @@ 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 , closureTyCon = closureTyCon , mkClosureVar = mkClosureVar , applyClosureVar = applyClosureVar @@ -93,12 +112,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 -- @@ -114,6 +138,10 @@ data GlobalEnv = GlobalEnv { -- , global_datacons :: NameEnv DataCon + -- Mapping from TyCons to their PA dfuns + -- + , global_pa_funs :: NameEnv Var + -- External package inst-env & home-package inst-env for class -- instances -- @@ -126,13 +154,17 @@ data GlobalEnv = GlobalEnv { -- Hoisted bindings , global_bindings :: [(Var, CoreExpr)] + + -- Global Rdr environment (from ModGuts) + -- + , global_rdr_env :: GlobalRdrEnv } 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 -- @@ -140,27 +172,40 @@ 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 -> Builtins -> GlobalEnv -initGlobalEnv info instEnvs famInstEnvs bi +initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> Builtins -> GlobalRdrEnv + -> GlobalEnv +initGlobalEnv info instEnvs famInstEnvs bi rdr_env = GlobalEnv { - global_vars = mapVarEnv (Var . snd) $ vectInfoVar info + global_vars = mapVarEnv snd $ vectInfoVar info , global_exported_vars = emptyVarEnv , 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 = [] + , global_rdr_env = rdr_env } +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 @@ -170,6 +215,7 @@ updVectInfo env tyenv 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 from_tyenv from_env = mkNameEnv [(name, (from,to)) @@ -192,6 +238,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 @@ -203,6 +252,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 @@ -221,7 +273,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 @@ -256,6 +308,29 @@ 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 + +lookupRdrName :: RdrName -> VM Name +lookupRdrName rdr_name + = do + rdr_env <- readGEnv global_rdr_env + case lookupGRE_RdrName rdr_name rdr_env of + [gre] -> return (gre_name gre) + [] -> pprPanic "VectMonad.lookupRdrName: not found" (ppr rdr_name) + _ -> pprPanic "VectMonad.lookupRdrName: ambiguous" (ppr rdr_name) + +lookupRdrVar :: RdrName -> VM Var +lookupRdrVar rdr_name + = do + name <- lookupRdrName rdr_name + liftDs (dsLookupGlobalId name) + cloneName :: (OccName -> OccName) -> Name -> VM Name cloneName mk_occ name = liftM make (liftDs newUnique) where @@ -266,12 +341,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 @@ -280,24 +376,28 @@ 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 -> @@ -310,6 +410,28 @@ 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] } + +defTyConRdrPAs :: [(Name, RdrName)] -> VM () +defTyConRdrPAs ps + = do + pas <- mapM lookupRdrVar rdr_names + updGEnv $ \env -> + env { global_pa_funs = extendNameEnvList (global_pa_funs env) + (zip tcs pas) } + where + (tcs, rdr_names) = unzip ps + lookupTyVarPA :: Var -> VM (Maybe CoreExpr) lookupTyVarPA tv = readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv @@ -337,6 +459,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 @@ -348,11 +471,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. -- @@ -398,7 +522,11 @@ initV hsc_env guts info p go instEnvs famInstEnvs = do builtins <- initBuiltins - r <- runVM p builtins (initGlobalEnv info instEnvs famInstEnvs builtins) + r <- runVM p builtins (initGlobalEnv info + instEnvs + famInstEnvs + builtins + (mg_rdr_env guts)) emptyLocalEnv case r of Yes genv _ x -> return $ Just (new_info genv, x)