X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectMonad.hs;h=a991b8c4f902567eb1aaa856905f51a7b0eee2ac;hb=8bae351221fbd5eabe562641499c14d379816875;hp=c6267a5620c50814c37e697f3cd338e45bbeda6b;hpb=8adf1ec28fe3a1549e39401e705d013f29da6ef6;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index c6267a5..a991b8c 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -2,20 +2,24 @@ module VectMonad ( Scope(..), VM, - noV, tryV, maybeV, orElseV, localV, closedV, initV, - cloneName, newLocalVar, newTyVar, + noV, tryV, maybeV, orElseV, fixV, localV, closedV, initV, + cloneName, newExportedVar, newLocalVar, newDummyVar, newTyVar, - Builtins(..), paDictTyCon, + Builtins(..), paDictTyCon, paDictDataCon, builtin, GlobalEnv(..), + setInstEnvs, readGEnv, setGEnv, updGEnv, LocalEnv(..), readLEnv, setLEnv, updLEnv, - defGlobalVar, lookupVar, - lookupTyCon, + getBindName, inBind, + + lookupVar, defGlobalVar, + lookupTyCon, defTyCon, + lookupDataCon, defDataCon, lookupTyVarPA, defLocalTyVar, defLocalTyVarWithPA, localTyVars, lookupInst, lookupFamInst @@ -27,6 +31,7 @@ import HscTypes import CoreSyn import Class import TyCon +import DataCon import Type import Var import VarEnv @@ -34,6 +39,7 @@ import Id import OccName import Name import NameEnv +import TysPrim ( intPrimTy ) import DsMonad import PrelNames @@ -44,6 +50,7 @@ import FamInstEnv import Panic import Outputable import FastString +import SrcLoc ( noSrcSpan ) import Control.Monad ( liftM ) @@ -62,11 +69,16 @@ data Builtins = Builtins { , applyClosurePVar :: Var , lengthPAVar :: Var , replicatePAVar :: Var + , emptyPAVar :: Var + , liftingContext :: Var } paDictTyCon :: Builtins -> TyCon paDictTyCon = classTyCon . paClass +paDictDataCon :: Builtins -> DataCon +paDictDataCon = classDataCon . paClass + initBuiltins :: DsM Builtins initBuiltins = do @@ -80,6 +92,10 @@ initBuiltins applyClosurePVar <- dsLookupGlobalId applyClosurePName lengthPAVar <- dsLookupGlobalId lengthPAName replicatePAVar <- dsLookupGlobalId replicatePAName + emptyPAVar <- dsLookupGlobalId emptyPAName + + liftingContext <- liftM (\u -> mkSysLocal FSLIT("lc") u intPrimTy) + newUnique return $ Builtins { parrayTyCon = parrayTyCon @@ -91,12 +107,14 @@ initBuiltins , applyClosurePVar = applyClosurePVar , lengthPAVar = lengthPAVar , replicatePAVar = replicatePAVar + , emptyPAVar = emptyPAVar + , 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 +126,9 @@ data GlobalEnv = GlobalEnv { -- , global_tycons :: NameEnv TyCon - -- Mapping from TyCons to their PA dictionaries + -- Mapping from DataCons to their vectorised versions -- - , global_tycon_pa :: NameEnv CoreExpr + , global_datacons :: NameEnv DataCon -- External package inst-env & home-package inst-env for class -- instances @@ -130,7 +148,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 +156,53 @@ 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_inst_env = instEnvs , global_fam_inst_env = famInstEnvs , global_bindings = [] } +setInstEnvs :: InstEnv -> FamInstEnv -> GlobalEnv -> GlobalEnv +setInstEnvs l_inst l_fam_inst genv + | (g_inst, _) <- global_inst_env genv + , (g_fam_inst, _) <- global_fam_inst_env genv + = genv { global_inst_env = (g_inst, l_inst) + , global_fam_inst_env = (g_fam_inst, l_fam_inst) } + 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 } 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 +219,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,9 +233,17 @@ 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 +fixV :: (a -> VM a) -> VM a +fixV f = VM (\bi genv lenv -> fixDs $ \r -> runVM (f (unYes r)) bi genv lenv ) + where + unYes (Yes _ _ x) = x + localV :: VM a -> VM a localV p = do env <- readLEnv id @@ -211,7 +254,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 @@ -246,6 +289,14 @@ 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 + cloneName :: (OccName -> OccName) -> Name -> VM Name cloneName mk_occ name = liftM make (liftDs newUnique) where @@ -256,12 +307,25 @@ cloneName mk_occ name = liftM make (liftDs newUnique) (nameSrcSpan name) | otherwise = mkSystemName u occ_name +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 @@ -270,24 +334,39 @@ 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' } lookupTyVarPA :: Var -> VM (Maybe CoreExpr) lookupTyVarPA tv = readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv @@ -327,7 +406,7 @@ 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 @@ -377,7 +456,7 @@ 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)