X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fvectorise%2FVectMonad.hs;h=aae76c93e4e12c12160b9f260f3609c0d070ef41;hb=58eb6de8922742d301a6703b4a21504dd8d623a5;hp=6da501f59d15366be1875c16f59cef179255edbd;hpb=e12e8c14196fc87d15b382ef4c0201418f83b815;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index 6da501f..aae76c9 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,17 +22,16 @@ module VectMonad ( lookupVar, defGlobalVar, lookupTyCon, defTyCon, lookupDataCon, defDataCon, - lookupTyConPA, defTyConPA, defTyConRdrPAs, + 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 @@ -42,7 +42,8 @@ import OccName import Name import NameEnv import TysPrim ( intPrimTy ) -import RdrName +import Module +import IfaceEnv import DsMonad import PrelNames @@ -55,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 @@ -64,7 +65,13 @@ 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 + , plusTyCon :: TyCon , closureTyCon :: TyCon , mkClosureVar :: Var , applyClosureVar :: Var @@ -73,20 +80,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 + preprTyCon <- dsLookupTyCon preprTyConName + embedTyCon <- dsLookupTyCon embedTyConName + let embedDataCon = case tyConDataCons embedTyCon of [dc] -> dc + crossTyCon <- dsLookupTyCon crossTyConName + plusTyCon <- dsLookupTyCon plusTyConName closureTyCon <- dsLookupTyCon closureTyConName mkClosureVar <- dsLookupGlobalId mkClosureName @@ -96,13 +106,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 + , preprTyCon = preprTyCon + , embedTyCon = embedTyCon + , embedDataCon = embedDataCon + , crossTyCon = crossTyCon + , plusTyCon = plusTyCon , closureTyCon = closureTyCon , mkClosureVar = mkClosureVar , applyClosureVar = applyClosureVar @@ -111,6 +130,9 @@ initBuiltins , lengthPAVar = lengthPAVar , replicatePAVar = replicatePAVar , emptyPAVar = emptyPAVar + -- , packPAVar = packPAVar + -- , combinePAVar = combinePAVar + , intEqPAVar = intEqPAVar , liftingContext = liftingContext } @@ -149,10 +171,6 @@ data GlobalEnv = GlobalEnv { -- Hoisted bindings , global_bindings :: [(Var, CoreExpr)] - - -- Global Rdr environment (from ModGuts) - -- - , global_rdr_env :: GlobalRdrEnv } data LocalEnv = LocalEnv { @@ -173,9 +191,9 @@ data LocalEnv = LocalEnv { } -initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> Builtins -> GlobalRdrEnv +initGlobalEnv :: VectInfo -> (InstEnv, InstEnv) -> FamInstEnvs -> Builtins -> GlobalEnv -initGlobalEnv info instEnvs famInstEnvs bi rdr_env +initGlobalEnv info instEnvs famInstEnvs bi = GlobalEnv { global_vars = mapVarEnv snd $ vectInfoVar info , global_exported_vars = emptyVarEnv @@ -187,15 +205,13 @@ initGlobalEnv info instEnvs famInstEnvs bi rdr_env , global_inst_env = instEnvs , global_fam_inst_env = famInstEnvs , global_bindings = [] - , global_rdr_env = rdr_env } -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 @@ -312,20 +328,10 @@ 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) +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) @@ -413,15 +419,20 @@ defTyConPA :: TyCon -> Var -> VM () defTyConPA tc pa = updGEnv $ \env -> env { global_pa_funs = extendNameEnv (global_pa_funs env) (tyConName tc) pa } -defTyConRdrPAs :: [(Name, RdrName)] -> VM () -defTyConRdrPAs ps +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 <- mapM lookupRdrVar rdr_names + pas <- zipWithM lookupExternalVar mods fss updGEnv $ \env -> env { global_pa_funs = extendNameEnvList (global_pa_funs env) (zip tcs pas) } where - (tcs, rdr_names) = unzip ps + (tcs, mods, fss) = unzip3 ps lookupTyVarPA :: Var -> VM (Maybe CoreExpr) lookupTyVarPA tv = readLEnv $ \env -> lookupVarEnv (local_tyvar_pa env) tv @@ -450,6 +461,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 @@ -466,6 +478,7 @@ lookupInst cls tys where isRight (Left _) = False isRight (Right _) = True +-} -- Look up the representation tycon of a family instance. -- @@ -514,8 +527,7 @@ initV hsc_env guts info p r <- runVM p builtins (initGlobalEnv info instEnvs famInstEnvs - builtins - (mg_rdr_env guts)) + builtins) emptyLocalEnv case r of Yes genv _ x -> return $ Just (new_info genv, x)