X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fvectorise%2FVectorise%2FBuiltins%2FInitialise.hs;h=b37f559f50551fe98651ef36404b35d25e319f2a;hb=31b9ba54b309b7ad8043a7dade7dddb71d184b8b;hp=5f4735c0db86cd1d5969b2eea1d439e3cfa048fd;hpb=a2230234bcf8c1a40c68c32f0d64d66fdc442073;p=ghc-hetmet.git

diff --git a/compiler/vectorise/Vectorise/Builtins/Initialise.hs b/compiler/vectorise/Vectorise/Builtins/Initialise.hs
index 5f4735c..b37f559 100644
--- a/compiler/vectorise/Vectorise/Builtins/Initialise.hs
+++ b/compiler/vectorise/Vectorise/Builtins/Initialise.hs
@@ -41,30 +41,49 @@ initBuiltins pkg
  = do mapM_ load dph_Orphans
 
       -- From dph-common:Data.Array.Parallel.PArray.PData
-      --   PData is a type family that maps an element type onto the type
-      --   we use to hold an array of those elements.
-      pdataTyCon	<- externalTyCon	dph_PData	(fsLit "PData")
+      --     PData is a type family that maps an element type onto the type
+      --     we use to hold an array of those elements.
+      pdataTyCon	<- externalTyCon	dph_PArray_PData  (fsLit "PData")
 
-      --   PR is a type class that holds the primitive operators we can 
-      --   apply to array data. Its functions take arrays in terms of PData types.
-      prClass           <- externalClass        dph_PData      (fsLit "PR")
+      --     PR is a type class that holds the primitive operators we can 
+      --     apply to array data. Its functions take arrays in terms of PData types.
+      prClass           <- externalClass        dph_PArray_PData  (fsLit "PR")
       let prTyCon     = classTyCon prClass
           [prDataCon] = tyConDataCons prTyCon
 
+
+      -- From dph-common:Data.Array.Parallel.PArray.PRepr
+      preprTyCon	<- externalTyCon 	dph_PArray_PRepr  (fsLit "PRepr")
+      paClass           <- externalClass        dph_PArray_PRepr  (fsLit "PA")
+      let paTyCon     = classTyCon paClass
+          [paDataCon] = tyConDataCons paTyCon
+          paPRSel     = classSCSelId paClass 0
+
+      replicatePDVar    <- externalVar          dph_PArray_PRepr  (fsLit "replicatePD")
+      emptyPDVar        <- externalVar          dph_PArray_PRepr  (fsLit "emptyPD")
+      packByTagPDVar    <- externalVar          dph_PArray_PRepr  (fsLit "packByTagPD")
+      combines 		<- mapM (externalVar dph_PArray_PRepr)
+                       		[mkFastString ("combine" ++ show i ++ "PD")
+                          		| i <- [2..mAX_DPH_COMBINE]]
+
+      let combinePDVars = listArray (2, mAX_DPH_COMBINE) combines
+
+
+      -- From dph-common:Data.Array.Parallel.PArray.Scalar
+      --     Scalar is the class of scalar values. 
+      --     The dictionary contains functions to coerce U.Arrays of scalars
+      --     to and from the PData representation.
+      scalarClass 	<- externalClass        dph_PArray_Scalar (fsLit "Scalar")
+
+
       -- From dph-common:Data.Array.Parallel.Lifted.PArray
       --   A PArray (Parallel Array) holds the array length and some array elements
       --   represented by the PData type family.
       parrayTyCon	<- externalTyCon	dph_PArray	(fsLit "PArray")
       let [parrayDataCon] = tyConDataCons parrayTyCon
 
-      paClass           <- externalClass        dph_PArray      (fsLit "PA")
-      let paTyCon     = classTyCon paClass
-          [paDataCon] = tyConDataCons paTyCon
-          paPRSel     = classSCSelId paClass 0
-
-      preprTyCon	<- externalTyCon 	dph_PArray	(fsLit "PRepr")
 
-      closureTyCon	<- externalTyCon dph_Closure		(fsLit ":->")
+      closureTyCon	<- externalTyCon dph_Closure		 (fsLit ":->")
 
       -- From dph-common:Data.Array.Parallel.Lifted.Repr
       voidTyCon		<- externalTyCon	dph_Repr	(fsLit "Void")
@@ -105,16 +124,7 @@ initBuiltins pkg
       applyVar         <- externalVar dph_Closure	(fsLit "$:")
       liftedClosureVar <- externalVar dph_Closure	(fsLit "liftedClosure")
       liftedApplyVar   <- externalVar dph_Closure	(fsLit "liftedApply")
-      replicatePDVar   <- externalVar dph_PArray	(fsLit "replicatePD")
-      emptyPDVar       <- externalVar dph_PArray	(fsLit "emptyPD")
-      packByTagPDVar   <- externalVar dph_PArray	(fsLit "packByTagPD")
-
-      combines 		<- mapM (externalVar dph_PArray)
-                       		[mkFastString ("combine" ++ show i ++ "PD")
-                          		| i <- [2..mAX_DPH_COMBINE]]
-      let combinePDVars = listArray (2, mAX_DPH_COMBINE) combines
 
-      scalarClass 	<- externalClass dph_PArray	(fsLit "Scalar")
       scalar_map	<- externalVar	dph_Scalar	(fsLit "scalar_map")
       scalar_zip2	<- externalVar	dph_Scalar	(fsLit "scalar_zipWith")
       scalar_zips	<- mapM (externalVar dph_Scalar)
@@ -175,12 +185,14 @@ initBuiltins pkg
     -- These are the modules from the DPH base library that contain
     --  the primitive array types and functions that vectorised code uses.
     mods@(Modules 
-                { dph_PArray    = dph_PArray
-                , dph_PData     = dph_PData
-                , dph_Repr      = dph_Repr
-                , dph_Closure   = dph_Closure
-                , dph_Scalar    = dph_Scalar
-                , dph_Unboxed   = dph_Unboxed
+                { dph_PArray            = dph_PArray
+                , dph_PArray_Scalar     = dph_PArray_Scalar
+                , dph_PArray_PRepr      = dph_PArray_PRepr
+                , dph_PArray_PData      = dph_PArray_PData
+                , dph_Repr              = dph_Repr
+                , dph_Closure           = dph_Closure
+                , dph_Scalar            = dph_Scalar
+                , dph_Unboxed           = dph_Unboxed
                 })
       = dph_Modules pkg
 
@@ -261,13 +273,13 @@ initBuiltinDataCons _
 -- | Get the names of all buildin instance functions for the PA class.
 initBuiltinPAs :: Builtins -> (InstEnv, InstEnv) -> DsM [(Name, Var)]
 initBuiltinPAs (Builtins { dphModules = mods }) insts
-  = liftM (initBuiltinDicts insts) (externalClass (dph_PArray mods) (fsLit "PA"))
+  = liftM (initBuiltinDicts insts) (externalClass (dph_PArray_PRepr mods) (fsLit "PA"))
 
 
 -- | Get the names of all builtin instance functions for the PR class.
 initBuiltinPRs :: Builtins -> (InstEnv, InstEnv) -> DsM [(Name, Var)]
 initBuiltinPRs (Builtins { dphModules = mods }) insts
-  = liftM (initBuiltinDicts insts) (externalClass (dph_PData mods) (fsLit "PR"))
+  = liftM (initBuiltinDicts insts) (externalClass (dph_PArray_PData mods) (fsLit "PR"))
 
 
 -- | Get the names of all DPH instance functions for this class.