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

diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index 2fc9bbe..682d451 100644
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -33,6 +33,7 @@ import Type            ( Type )
 import TysPrim
 import TysWiredIn      ( unitTyCon, tupleTyCon,
                          intTyCon, intTyConName,
+                         doubleTyCon, doubleTyConName,
                          boolTyCon, boolTyConName, trueDataCon, falseDataCon,
                          parrTyCon, parrTyConName )
 import PrelNames       ( gHC_PARR )
@@ -67,6 +68,7 @@ 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
@@ -147,13 +149,13 @@ initBuiltins
       upToPAIntPrimVar <- externalVar nDP_PRIM FSLIT("upToPA_Int#")
       selectPAIntPrimVar <- externalVar nDP_PRIM FSLIT("selectPA_Int#")
       truesPABoolPrimVar <- externalVar nDP_PRIM FSLIT("truesPA_Bool#")
-      lengthPAVar      <- externalVar nDP_PARRAY FSLIT("lengthPA")
-      replicatePAVar   <- externalVar nDP_PARRAY FSLIT("replicatePA")
+      lengthPAVar      <- externalVar nDP_PARRAY FSLIT("lengthPA#")
+      replicatePAVar   <- externalVar nDP_PARRAY FSLIT("replicatePA#")
       emptyPAVar       <- externalVar nDP_PARRAY FSLIT("emptyPA")
-      packPAVar        <- externalVar nDP_PARRAY FSLIT("packPA")
+      packPAVar        <- externalVar nDP_PARRAY FSLIT("packPA#")
 
       combines <- mapM (externalVar nDP_PARRAY)
-                       [mkFastString ("combine" ++ show i ++ "PA")
+                       [mkFastString ("combine" ++ show i ++ "PA#")
                           | i <- [2..mAX_NDP_COMBINE]]
       let combinePAVars = listArray (2, mAX_NDP_COMBINE) combines
 
@@ -210,11 +212,18 @@ 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("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")
+
     -- FIXME: temporary
     , mk nDP_PRELUDE_PARR FSLIT("fromPArrayP") nDP_PRELUDE_PARR FSLIT("fromPArrayPA")
     ]
@@ -234,7 +243,7 @@ initBuiltinTyCons bi
              : [(tyConName tc, tc) | tc <- defaultTyCons]
 
 defaultTyCons :: [TyCon]
-defaultTyCons = [intTyCon, boolTyCon]
+defaultTyCons = [intTyCon, boolTyCon, doubleTyCon]
 
 initBuiltinDataCons :: Builtins -> [(Name, DataCon)]
 initBuiltinDataCons bi = [(dataConName dc, dc)| dc <- defaultDataCons]
@@ -261,6 +270,7 @@ builtinPAs bi
     , 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
@@ -285,6 +295,7 @@ builtinPRs bi =
 
     -- temporary
   , mk intTyConName          nDP_INSTANCES FSLIT("dPR_Int")
+  , mk doubleTyConName       nDP_INSTANCES FSLIT("dPR_Double")
   ]
 
   ++ map mk_sum  [2..mAX_NDP_SUM]