summaryrefslogtreecommitdiff
path: root/compiler/vectorise
diff options
context:
space:
mode:
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>2007-11-20 02:45:45 +0000
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>2007-11-20 02:45:45 +0000
commit6dddb99f31483f347dbec50d70f2f096e11f135f (patch)
tree5635d7b666ad62e2dd7f299e8a5db6ace0f5df69 /compiler/vectorise
parent5e9f04ebeaf49c3afe836b64d72508762ad19c1a (diff)
downloadhaskell-6dddb99f31483f347dbec50d70f2f096e11f135f.tar.gz
Temporary hack for passing PArrays from unvectorised to vectorised code
Diffstat (limited to 'compiler/vectorise')
-rw-r--r--compiler/vectorise/VectBuiltIn.hs8
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index f5c27ef554..ffb0490db3 100644
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -67,6 +67,7 @@ nDP_COMBINATORS = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Combinators")
nDP_PRELUDE_PARR = gHC_PARR -- mkNDPModule FSLIT("Data.Array.Parallel.Prelude.PArr")
nDP_PRELUDE_INT = mkNDPModule FSLIT("Data.Array.Parallel.Prelude.Int")
+nDP_PRELUDE = mkNDPModule FSLIT("Data.Array.Parallel.Prelude")
data Builtins = Builtins {
parrayTyCon :: TyCon
@@ -214,6 +215,9 @@ preludeVars
, 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 FSLIT("fromPArrayP") nDP_PRELUDE FSLIT("fromPArrayPA")
]
where
mk = (,,,)
@@ -224,6 +228,10 @@ initBuiltinTyCons bi
-- 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]