X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectMonad.hs;h=22b776e921eb001f7f564d907fec9c39075a6d0b;hp=b31d798c3e8517aba127f8eb0660ffe63be0627b;hb=5d92aec437d5868bc0f88c9debde95822d008701;hpb=c099327dd5765dfefccb01302ef8ea8369728cbf diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index b31d798..22b776e 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -2,15 +2,16 @@ module VectMonad ( Scope(..), VM, - noV, tryV, maybeV, orElseV, fixV, localV, closedV, initV, + noV, tryV, maybeV, traceMaybeV, orElseV, fixV, localV, closedV, initV, + liftDs, cloneName, cloneId, newExportedVar, newLocalVar, newDummyVar, newTyVar, - Builtins(..), paDictTyCon, paDictDataCon, + Builtins(..), builtin, GlobalEnv(..), - setInstEnvs, + setFamInstEnv, readGEnv, setGEnv, updGEnv, LocalEnv(..), @@ -21,16 +22,16 @@ module VectMonad ( 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 @@ -41,6 +42,8 @@ import OccName import Name import NameEnv import TysPrim ( intPrimTy ) +import Module +import IfaceEnv import DsMonad import PrelNames @@ -53,7 +56,7 @@ import Outputable import FastString import SrcLoc ( noSrcSpan ) -import Control.Monad ( liftM ) +import Control.Monad ( liftM, zipWithM ) data Scope a b = Global a | Local b @@ -62,7 +65,16 @@ data Scope a b = Global a | Local b data Builtins = Builtins { parrayTyCon :: TyCon - , paClass :: Class + , paTyCon :: TyCon + , paDataCon :: DataCon + , preprTyCon :: TyCon + , embedTyCon :: TyCon + , embedDataCon :: DataCon + , crossTyCon :: TyCon + , crossDataCon :: DataCon + , plusTyCon :: TyCon + , leftDataCon :: DataCon + , rightDataCon :: DataCon , closureTyCon :: TyCon , mkClosureVar :: Var , applyClosureVar :: Var @@ -71,20 +83,25 @@ data Builtins = Builtins { , lengthPAVar :: Var , replicatePAVar :: Var , emptyPAVar :: Var + -- , packPAVar :: Var + -- , combinePAVar :: Var + , intEqPAVar :: Var , liftingContext :: Var } -paDictTyCon :: Builtins -> TyCon -paDictTyCon = classTyCon . paClass - -paDictDataCon :: Builtins -> DataCon -paDictDataCon = classDataCon . paClass - initBuiltins :: DsM Builtins initBuiltins = do parrayTyCon <- dsLookupTyCon parrayTyConName - paClass <- dsLookupClass paClassName + paTyCon <- dsLookupTyCon paTyConName + let [paDataCon] = tyConDataCons paTyCon + preprTyCon <- dsLookupTyCon preprTyConName + embedTyCon <- dsLookupTyCon embedTyConName + let [embedDataCon] = tyConDataCons embedTyCon + crossTyCon <- dsLookupTyCon crossTyConName + let [crossDataCon] = tyConDataCons crossTyCon + plusTyCon <- dsLookupTyCon plusTyConName + let [leftDataCon, rightDataCon] = tyConDataCons plusTyCon closureTyCon <- dsLookupTyCon closureTyConName mkClosureVar <- dsLookupGlobalId mkClosureName @@ -94,13 +111,25 @@ initBuiltins 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 + , embedTyCon = embedTyCon + , embedDataCon = embedDataCon + , crossTyCon = crossTyCon + , crossDataCon = crossDataCon + , plusTyCon = plusTyCon + , leftDataCon = leftDataCon + , rightDataCon = rightDataCon , closureTyCon = closureTyCon , mkClosureVar = mkClosureVar , applyClosureVar = applyClosureVar @@ -109,6 +138,9 @@ initBuiltins , lengthPAVar = lengthPAVar , replicatePAVar = replicatePAVar , emptyPAVar = emptyPAVar + -- , packPAVar = packPAVar + -- , combinePAVar = combinePAVar + , intEqPAVar = intEqPAVar , liftingContext = liftingContext } @@ -167,7 +199,8 @@ data LocalEnv = LocalEnv { } -initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> Builtins -> GlobalEnv +initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> Builtins + -> GlobalEnv initGlobalEnv info instEnvs famInstEnvs bi = GlobalEnv { global_vars = mapVarEnv snd $ vectInfoVar info @@ -182,12 +215,11 @@ initGlobalEnv info instEnvs famInstEnvs bi , 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) } +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 @@ -304,6 +336,11 @@ 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 @@ -383,6 +420,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] } + +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 @@ -410,6 +469,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 @@ -426,6 +486,7 @@ lookupInst cls tys where isRight (Left _) = False isRight (Right _) = True +-} -- Look up the representation tycon of a family instance. -- @@ -471,7 +532,10 @@ 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) emptyLocalEnv case r of Yes genv _ x -> return $ Just (new_info genv, x)