X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectBuiltIn.hs;h=374c670b8fe21acf7f11e276a2b276371ab5dd45;hb=03c36c77b15308f93cd80f2631303190eb23778a;hp=05b1289ee83703677dae1f45a1afd55d9a3eefc6;hpb=f64384c40b3db4fddb8fad5463da39464e52ab13;p=ghc-hetmet.git diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs index 05b1289..374c670 100644 --- a/compiler/vectorise/VectBuiltIn.hs +++ b/compiler/vectorise/VectBuiltIn.hs @@ -1,6 +1,15 @@ +{-# OPTIONS -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings +-- for details + module VectBuiltIn ( - Builtins(..), sumTyCon, prodTyCon, - initBuiltins, initBuiltinTyCons, initBuiltinPAs, initBuiltinPRs, + Builtins(..), sumTyCon, prodTyCon, combinePAVar, + initBuiltins, initBuiltinVars, initBuiltinTyCons, initBuiltinDataCons, + initBuiltinPAs, initBuiltinPRs, + initBuiltinBoxedTyCons, primMethod, primPArray ) where @@ -11,7 +20,7 @@ import DsMonad import IfaceEnv ( lookupOrig ) import Module ( Module ) -import DataCon ( DataCon ) +import DataCon ( DataCon, dataConName, dataConWorkId ) import TyCon ( TyCon, tyConName, tyConDataCons ) import Var ( Var ) import Id ( mkSysLocal ) @@ -22,9 +31,14 @@ import OccName import TypeRep ( funTyCon ) import Type ( Type ) import TysPrim -import TysWiredIn ( unitTyCon, tupleTyCon, intTyConName ) -import Module ( Module, mkModule, mkModuleNameFS ) -import PackageConfig ( ndpPackageId ) +import TysWiredIn ( unitTyCon, unitDataCon, + tupleTyCon, + intTyCon, intTyConName, + doubleTyCon, doubleTyConName, + boolTyCon, boolTyConName, trueDataCon, falseDataCon, + parrTyCon, parrTyConName ) +import PrelNames ( gHC_PARR ) +import Module import BasicTypes ( Boxity(..) ) import FastString @@ -32,6 +46,7 @@ import Outputable import Data.Array import Control.Monad ( liftM, zipWithM ) +import Data.List ( unzip4 ) mAX_NDP_PROD :: Int mAX_NDP_PROD = 3 @@ -39,14 +54,22 @@ mAX_NDP_PROD = 3 mAX_NDP_SUM :: Int mAX_NDP_SUM = 3 +mAX_NDP_COMBINE :: Int +mAX_NDP_COMBINE = 2 + mkNDPModule :: FastString -> Module mkNDPModule m = mkModule ndpPackageId (mkModuleNameFS m) nDP_PARRAY = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.PArray") nDP_REPR = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Repr") nDP_CLOSURE = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Closure") -nDP_PRIM = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Prim") +nDP_UNBOXED = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Unboxed") nDP_INSTANCES = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Instances") +nDP_COMBINATORS = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Combinators") + +nDP_PRELUDE_PARR = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.Base.PArr") +nDP_PRELUDE_INT = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.Base.Int") +nDP_PRELUDE_DOUBLE = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.Base.Double") data Builtins = Builtins { parrayTyCon :: TyCon @@ -56,8 +79,10 @@ data Builtins = Builtins { , prTyCon :: TyCon , prDataCon :: DataCon , parrayIntPrimTyCon :: TyCon + , parrayBoolPrimTyCon :: TyCon , voidTyCon :: TyCon , wrapTyCon :: TyCon + , enumerationTyCon :: TyCon , sumTyCons :: Array Int TyCon , closureTyCon :: TyCon , voidVar :: Var @@ -68,11 +93,13 @@ data Builtins = Builtins { , applyClosurePVar :: Var , replicatePAIntPrimVar :: Var , upToPAIntPrimVar :: Var + , selectPAIntPrimVar :: Var + , truesPABoolPrimVar :: Var , lengthPAVar :: Var , replicatePAVar :: Var , emptyPAVar :: Var - -- , packPAVar :: Var - -- , combinePAVar :: Var + , packPAVar :: Var + , combinePAVars :: Array Int Var , liftingContext :: Var } @@ -87,6 +114,11 @@ prodTyCon n bi | n >= 0 && n <= mAX_NDP_PROD = tupleTyCon Boxed n | otherwise = pprPanic "prodTyCon" (ppr n) +combinePAVar :: Int -> Builtins -> Var +combinePAVar n bi + | n >= 2 && n <= mAX_NDP_COMBINE = combinePAVars bi ! n + | otherwise = pprPanic "combinePAVar" (ppr n) + initBuiltins :: DsM Builtins initBuiltins = do @@ -96,11 +128,13 @@ initBuiltins preprTyCon <- externalTyCon nDP_PARRAY FSLIT("PRepr") prTyCon <- externalTyCon nDP_PARRAY FSLIT("PR") let [prDataCon] = tyConDataCons prTyCon - parrayIntPrimTyCon <- externalTyCon nDP_PRIM FSLIT("PArray_Int#") + parrayIntPrimTyCon <- externalTyCon nDP_UNBOXED FSLIT("PArray_Int#") + parrayBoolPrimTyCon <- externalTyCon nDP_UNBOXED FSLIT("PArray_Bool#") closureTyCon <- externalTyCon nDP_CLOSURE FSLIT(":->") voidTyCon <- externalTyCon nDP_REPR FSLIT("Void") wrapTyCon <- externalTyCon nDP_REPR FSLIT("Wrap") + enumerationTyCon <- externalTyCon nDP_REPR FSLIT("Enumeration") sum_tcs <- mapM (externalTyCon nDP_REPR) [mkFastString ("Sum" ++ show i) | i <- [2..mAX_NDP_SUM]] @@ -112,13 +146,19 @@ initBuiltins applyClosureVar <- externalVar nDP_CLOSURE FSLIT("$:") mkClosurePVar <- externalVar nDP_CLOSURE FSLIT("mkClosureP") applyClosurePVar <- externalVar nDP_CLOSURE FSLIT("$:^") - replicatePAIntPrimVar <- externalVar nDP_PRIM FSLIT("replicatePA_Int#") - upToPAIntPrimVar <- externalVar nDP_PRIM FSLIT("upToPA_Int#") - lengthPAVar <- externalVar nDP_PARRAY FSLIT("lengthPA") - replicatePAVar <- externalVar nDP_PARRAY FSLIT("replicatePA") + replicatePAIntPrimVar <- externalVar nDP_UNBOXED FSLIT("replicatePA_Int#") + upToPAIntPrimVar <- externalVar nDP_UNBOXED FSLIT("upToPA_Int#") + selectPAIntPrimVar <- externalVar nDP_UNBOXED FSLIT("selectPA_Int#") + truesPABoolPrimVar <- externalVar nDP_UNBOXED FSLIT("truesPA_Bool#") + lengthPAVar <- externalVar nDP_PARRAY FSLIT("lengthPA#") + replicatePAVar <- externalVar nDP_PARRAY FSLIT("replicatePA#") emptyPAVar <- externalVar nDP_PARRAY FSLIT("emptyPA") - -- packPAVar <- dsLookupGlobalId packPAName - -- combinePAVar <- dsLookupGlobalId combinePAName + packPAVar <- externalVar nDP_PARRAY FSLIT("packPA#") + + combines <- mapM (externalVar nDP_PARRAY) + [mkFastString ("combine" ++ show i ++ "PA#") + | i <- [2..mAX_NDP_COMBINE]] + let combinePAVars = listArray (2, mAX_NDP_COMBINE) combines liftingContext <- liftM (\u -> mkSysLocal FSLIT("lc") u intPrimTy) newUnique @@ -131,8 +171,10 @@ initBuiltins , prTyCon = prTyCon , prDataCon = prDataCon , parrayIntPrimTyCon = parrayIntPrimTyCon + , parrayBoolPrimTyCon = parrayBoolPrimTyCon , voidTyCon = voidTyCon , wrapTyCon = wrapTyCon + , enumerationTyCon = enumerationTyCon , sumTyCons = sumTyCons , closureTyCon = closureTyCon , voidVar = voidVar @@ -143,16 +185,89 @@ initBuiltins , applyClosurePVar = applyClosurePVar , replicatePAIntPrimVar = replicatePAIntPrimVar , upToPAIntPrimVar = upToPAIntPrimVar + , selectPAIntPrimVar = selectPAIntPrimVar + , truesPABoolPrimVar = truesPABoolPrimVar , lengthPAVar = lengthPAVar , replicatePAVar = replicatePAVar , emptyPAVar = emptyPAVar - -- , packPAVar = packPAVar - -- , combinePAVar = combinePAVar + , packPAVar = packPAVar + , combinePAVars = combinePAVars , liftingContext = liftingContext } -initBuiltinTyCons :: Builtins -> [(Name, TyCon)] -initBuiltinTyCons bi = [(tyConName funTyCon, closureTyCon bi)] +initBuiltinVars :: Builtins -> DsM [(Var, Var)] +initBuiltinVars bi + = do + uvars <- zipWithM externalVar umods ufs + vvars <- zipWithM externalVar vmods vfs + return $ [(v,v) | v <- map dataConWorkId defaultDataConWorkers] + ++ zip uvars vvars + where + (umods, ufs, vmods, vfs) = unzip4 preludeVars + +defaultDataConWorkers :: [DataCon] +defaultDataConWorkers = [trueDataCon, falseDataCon, unitDataCon] + +preludeVars :: [(Module, FastString, Module, FastString)] +preludeVars + = [ + mk gHC_PARR FSLIT("mapP") nDP_COMBINATORS FSLIT("mapPA") + , mk gHC_PARR FSLIT("zipWithP") nDP_COMBINATORS FSLIT("zipWithPA") + , mk gHC_PARR FSLIT("zipP") nDP_COMBINATORS FSLIT("zipPA") + , mk gHC_PARR FSLIT("filterP") nDP_COMBINATORS FSLIT("filterPA") + , mk gHC_PARR FSLIT("lengthP") nDP_COMBINATORS FSLIT("lengthPA") + , mk gHC_PARR FSLIT("replicateP") nDP_COMBINATORS FSLIT("replicatePA") + , mk gHC_PARR FSLIT("!:") nDP_COMBINATORS FSLIT("indexPA") + , mk gHC_PARR FSLIT("crossMapP") nDP_COMBINATORS FSLIT("crossMapPA") + , mk gHC_PARR FSLIT("singletonP") nDP_COMBINATORS FSLIT("singletonPA") + , mk gHC_PARR FSLIT("concatP") nDP_COMBINATORS FSLIT("concatPA") + + , mk nDP_PRELUDE_INT FSLIT("plus") nDP_PRELUDE_INT FSLIT("plusV") + , mk nDP_PRELUDE_INT FSLIT("minus") nDP_PRELUDE_INT FSLIT("minusV") + , mk nDP_PRELUDE_INT FSLIT("mult") nDP_PRELUDE_INT FSLIT("multV") + , mk nDP_PRELUDE_INT FSLIT("sumP") nDP_PRELUDE_INT FSLIT("sumPA") + , mk nDP_PRELUDE_INT FSLIT("upToP") nDP_PRELUDE_INT FSLIT("upToPA") + + , mk nDP_PRELUDE_DOUBLE FSLIT("plus") nDP_PRELUDE_DOUBLE FSLIT("plusV") + , mk nDP_PRELUDE_DOUBLE FSLIT("minus") nDP_PRELUDE_DOUBLE FSLIT("minusV") + , mk nDP_PRELUDE_DOUBLE FSLIT("mult") nDP_PRELUDE_DOUBLE FSLIT("multV") + , mk nDP_PRELUDE_DOUBLE FSLIT("sumP") nDP_PRELUDE_DOUBLE FSLIT("sumPA") + + , mk nDP_PRELUDE_DOUBLE FSLIT("eq") nDP_PRELUDE_DOUBLE FSLIT("eqV") + , mk nDP_PRELUDE_DOUBLE FSLIT("neq") nDP_PRELUDE_DOUBLE FSLIT("neqV") + , mk nDP_PRELUDE_DOUBLE FSLIT("le") nDP_PRELUDE_DOUBLE FSLIT("leV") + , mk nDP_PRELUDE_DOUBLE FSLIT("lt") nDP_PRELUDE_DOUBLE FSLIT("ltV") + , mk nDP_PRELUDE_DOUBLE FSLIT("ge") nDP_PRELUDE_DOUBLE FSLIT("geV") + , mk nDP_PRELUDE_DOUBLE FSLIT("gt") nDP_PRELUDE_DOUBLE FSLIT("gtV") + + -- FIXME: temporary + , mk nDP_PRELUDE_PARR FSLIT("fromPArrayP") nDP_PRELUDE_PARR FSLIT("fromPArrayPA") + , mk nDP_PRELUDE_PARR FSLIT("toPArrayP") nDP_PRELUDE_PARR FSLIT("toPArrayPA") + , mk nDP_PRELUDE_PARR FSLIT("fromNestedPArrayP") nDP_PRELUDE_PARR FSLIT("fromNestedPArrayPA") + ] + where + mk = (,,,) + +initBuiltinTyCons :: Builtins -> DsM [(Name, TyCon)] +initBuiltinTyCons bi + = do + -- parr <- externalTyCon nDP_PRELUDE_PARR FSLIT("PArr") + return $ (tyConName funTyCon, closureTyCon bi) + : (parrTyConName, parrayTyCon bi) + + -- FIXME: temporary + : (tyConName $ parrayTyCon bi, parrayTyCon bi) + + : [(tyConName tc, tc) | tc <- defaultTyCons] + +defaultTyCons :: [TyCon] +defaultTyCons = [intTyCon, boolTyCon, doubleTyCon] + +initBuiltinDataCons :: Builtins -> [(Name, DataCon)] +initBuiltinDataCons bi = [(dataConName dc, dc)| dc <- defaultDataCons] + +defaultDataCons :: [DataCon] +defaultDataCons = [trueDataCon, falseDataCon, unitDataCon] initBuiltinDicts :: [(Name, Module, FastString)] -> DsM [(Name, Var)] initBuiltinDicts ps @@ -169,9 +284,12 @@ builtinPAs bi = [ mk (tyConName $ closureTyCon bi) nDP_CLOSURE FSLIT("dPA_Clo") , mk (tyConName $ voidTyCon bi) nDP_REPR FSLIT("dPA_Void") + , mk (tyConName $ parrayTyCon bi) nDP_INSTANCES FSLIT("dPA_PArray") , mk unitTyConName nDP_INSTANCES FSLIT("dPA_Unit") , mk intTyConName nDP_INSTANCES FSLIT("dPA_Int") + , mk doubleTyConName nDP_INSTANCES FSLIT("dPA_Double") + , mk boolTyConName nDP_INSTANCES FSLIT("dPA_Bool") ] ++ tups where @@ -190,10 +308,12 @@ builtinPRs bi = mk (tyConName unitTyCon) nDP_REPR FSLIT("dPR_Unit") , mk (tyConName $ voidTyCon bi) nDP_REPR FSLIT("dPR_Void") , mk (tyConName $ wrapTyCon bi) nDP_REPR FSLIT("dPR_Wrap") + , mk (tyConName $ enumerationTyCon bi) nDP_REPR FSLIT("dPR_Enumeration") , mk (tyConName $ closureTyCon bi) nDP_CLOSURE FSLIT("dPR_Clo") -- temporary , mk intTyConName nDP_INSTANCES FSLIT("dPR_Int") + , mk doubleTyConName nDP_INSTANCES FSLIT("dPR_Double") ] ++ map mk_sum [2..mAX_NDP_SUM] @@ -207,6 +327,13 @@ builtinPRs bi = mk_prod n = (tyConName $ prodTyCon n bi, nDP_REPR, mkFastString ("dPR_" ++ show n)) +initBuiltinBoxedTyCons :: Builtins -> DsM [(Name, TyCon)] +initBuiltinBoxedTyCons = return . builtinBoxedTyCons + +builtinBoxedTyCons :: Builtins -> [(Name, TyCon)] +builtinBoxedTyCons bi = + [(tyConName intPrimTyCon, intTyCon)] + externalVar :: Module -> FastString -> DsM Var externalVar mod fs = dsLookupGlobalId =<< lookupOrig mod (mkVarOccFS fs) @@ -222,7 +349,7 @@ primMethod :: TyCon -> String -> DsM (Maybe Var) primMethod tycon method | Just suffix <- lookupNameEnv prim_ty_cons (tyConName tycon) = liftM Just - $ dsLookupGlobalId =<< lookupOrig nDP_PRIM (mkVarOcc $ method ++ suffix) + $ dsLookupGlobalId =<< lookupOrig nDP_UNBOXED (mkVarOcc $ method ++ suffix) | otherwise = return Nothing @@ -230,7 +357,7 @@ primPArray :: TyCon -> DsM (Maybe TyCon) primPArray tycon | Just suffix <- lookupNameEnv prim_ty_cons (tyConName tycon) = liftM Just - $ dsLookupTyCon =<< lookupOrig nDP_PRIM (mkOccName tcName $ "PArray" ++ suffix) + $ dsLookupTyCon =<< lookupOrig nDP_UNBOXED (mkOccName tcName $ "PArray" ++ suffix) | otherwise = return Nothing