X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectBuiltIn.hs;h=2fc9bbeac6b40b5fc0bfc06a583ee9d35eb52938;hb=f7b0bddc293f35c0a1d86b1e399b418221c9020c;hp=a9134672f9405c09743ba1bde067be9e223d6d60;hpb=a9192907a271905c4ec1a37b1737ce119ac48905;p=ghc-hetmet.git

diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index a913467..2fc9bbe 100644
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -33,7 +33,9 @@ import Type            ( Type )
 import TysPrim
 import TysWiredIn      ( unitTyCon, tupleTyCon,
                          intTyCon, intTyConName,
-                         boolTyCon, boolTyConName, trueDataCon, falseDataCon )
+                         boolTyCon, boolTyConName, trueDataCon, falseDataCon,
+                         parrTyCon, parrTyConName )
+import PrelNames       ( gHC_PARR )
 import Module
 import BasicTypes      ( Boxity(..) )
 
@@ -42,6 +44,7 @@ import Outputable
 
 import Data.Array
 import Control.Monad   ( liftM, zipWithM )
+import Data.List       ( unzip4 )
 
 mAX_NDP_PROD :: Int
 mAX_NDP_PROD = 3
@@ -60,6 +63,10 @@ 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_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")
 
 data Builtins = Builtins {
                   parrayTyCon      :: TyCon
@@ -185,15 +192,46 @@ initBuiltins
                , liftingContext   = liftingContext
                }
 
-initBuiltinVars :: Builtins -> [(Var, Var)]
-initBuiltinVars bi = [(v,v) | v <- map dataConWorkId defaultDataConWorkers]
+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]
 
-initBuiltinTyCons :: Builtins -> [(Name, TyCon)]
-initBuiltinTyCons bi = (tyConName funTyCon, closureTyCon bi)
-                     : [(tyConName tc, tc) | tc <- defaultTyCons]
+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 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("sumP")  nDP_PRELUDE_INT FSLIT("sumPA")
+    , mk nDP_PRELUDE_INT  FSLIT("upToP") nDP_PRELUDE_INT FSLIT("upToPA")
+
+    -- FIXME: temporary
+    , mk nDP_PRELUDE_PARR FSLIT("fromPArrayP") nDP_PRELUDE_PARR FSLIT("fromPArrayPA")
+    ]
+  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]
@@ -219,6 +257,7 @@ 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")