X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectMonad.hs;h=0500dc7467bd06dcbee00d4f04a1f560f577fbd0;hb=0bf8c8c73099e927a71e7cb95646648d8a6f0f14;hp=1beb550150ec10ea0ab5797e24e15e088fa085b7;hpb=f36b5cd4d09843a1c7b5245547e95cc7d8f30792;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index 1beb550..0500dc7 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -2,15 +2,15 @@ module VectMonad ( Scope(..), VM, - noV, tryV, maybeV, orElseV, fixV, localV, closedV, initV, + noV, tryV, maybeV, traceMaybeV, orElseV, fixV, localV, closedV, initV, cloneName, cloneId, newExportedVar, newLocalVar, newDummyVar, newTyVar, - Builtins(..), paDictTyCon, paDictDataCon, + Builtins(..), builtin, GlobalEnv(..), - setInstEnvs, + setFamInstEnv, readGEnv, setGEnv, updGEnv, LocalEnv(..), @@ -21,16 +21,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 +41,8 @@ import OccName import Name import NameEnv import TysPrim ( intPrimTy ) +import Module +import IfaceEnv import DsMonad import PrelNames @@ -53,7 +55,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 +64,13 @@ data Scope a b = Global a | Local b data Builtins = Builtins { parrayTyCon :: TyCon - , paClass :: Class + , paTyCon :: TyCon + , paDataCon :: DataCon + , reprTyCon :: TyCon + , embedTyCon :: TyCon + , embedDataCon :: DataCon + , crossTyCon :: TyCon + , plusTyCon :: TyCon , closureTyCon :: TyCon , mkClosureVar :: Var , applyClosureVar :: Var @@ -71,20 +79,23 @@ 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 = case tyConDataCons paTyCon of [dc] -> dc + reprTyCon <- dsLookupTyCon reprTyConName + embedTyCon <- dsLookupTyCon embedTyConName + let embedDataCon = case tyConDataCons embedTyCon of [dc] -> dc + crossTyCon <- dsLookupTyCon crossTyConName + plusTyCon <- dsLookupTyCon plusTyConName closureTyCon <- dsLookupTyCon closureTyConName mkClosureVar <- dsLookupGlobalId mkClosureName @@ -94,13 +105,22 @@ 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 + , reprTyCon = reprTyCon + , embedTyCon = embedTyCon + , embedDataCon = embedDataCon + , crossTyCon = crossTyCon + , plusTyCon = plusTyCon , closureTyCon = closureTyCon , mkClosureVar = mkClosureVar , applyClosureVar = applyClosureVar @@ -109,6 +129,9 @@ initBuiltins , lengthPAVar = lengthPAVar , replicatePAVar = replicatePAVar , emptyPAVar = emptyPAVar + -- , packPAVar = packPAVar + -- , combinePAVar = combinePAVar + , intEqPAVar = intEqPAVar , liftingContext = liftingContext } @@ -131,6 +154,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 -- @@ -163,7 +190,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 @@ -172,17 +200,17 @@ initGlobalEnv info instEnvs famInstEnvs bi (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 = [] } -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 @@ -198,6 +226,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)) @@ -298,6 +327,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 @@ -377,6 +411,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 @@ -404,6 +460,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 @@ -420,6 +477,7 @@ lookupInst cls tys where isRight (Left _) = False isRight (Right _) = True +-} -- Look up the representation tycon of a family instance. -- @@ -465,7 +523,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)