X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fvectorise%2FVectBuiltIn.hs;h=6b3790fef72a2f6714f97d649b243f9f94c0e9f8;hp=4f27b1e5c5b8ab2a1fd2529d4e6aecc8da7bccbb;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hpb=e78adae754d3db1ec4175b66604bd633c8bb16e3

diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index 4f27b1e..6b3790f 100644
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS_GHC -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/WorkingConventions#Warnings
+-- for details
+
 module VectBuiltIn (
   Builtins(..), sumTyCon, prodTyCon,
   initBuiltins, initBuiltinTyCons, initBuiltinPAs, initBuiltinPRs,
@@ -23,7 +30,8 @@ import TypeRep         ( funTyCon )
 import Type            ( Type )
 import TysPrim
 import TysWiredIn      ( unitTyCon, tupleTyCon, intTyConName )
-import PrelNames
+import Module          ( Module, mkModule, mkModuleNameFS )
+import PackageConfig   ( ndpPackageId )
 import BasicTypes      ( Boxity(..) )
 
 import FastString
@@ -38,6 +46,15 @@ mAX_NDP_PROD = 3
 mAX_NDP_SUM :: Int
 mAX_NDP_SUM = 3
 
+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_INSTANCES   = mkNDPModule FSLIT("Data.Array.Parallel.Lifted.Instances")
+
 data Builtins = Builtins {
                   parrayTyCon      :: TyCon
                 , paTyCon          :: TyCon
@@ -80,33 +97,33 @@ prodTyCon n bi
 initBuiltins :: DsM Builtins
 initBuiltins
   = do
-      parrayTyCon  <- dsLookupTyCon parrayTyConName
-      paTyCon      <- dsLookupTyCon paTyConName
+      parrayTyCon  <- externalTyCon nDP_PARRAY FSLIT("PArray")
+      paTyCon      <- externalTyCon nDP_PARRAY FSLIT("PA")
       let [paDataCon] = tyConDataCons paTyCon
-      preprTyCon   <- dsLookupTyCon preprTyConName
-      prTyCon      <- dsLookupTyCon prTyConName
+      preprTyCon   <- externalTyCon nDP_PARRAY FSLIT("PRepr")
+      prTyCon      <- externalTyCon nDP_PARRAY FSLIT("PR")
       let [prDataCon] = tyConDataCons prTyCon
-      parrayIntPrimTyCon <- dsLookupTyCon parrayIntPrimTyConName
-      closureTyCon <- dsLookupTyCon closureTyConName
+      parrayIntPrimTyCon <- externalTyCon nDP_PRIM FSLIT("PArray_Int#")
+      closureTyCon <- externalTyCon nDP_CLOSURE FSLIT(":->")
 
-      voidTyCon    <- lookupExternalTyCon nDP_REPR FSLIT("Void")
-      wrapTyCon    <- lookupExternalTyCon nDP_REPR FSLIT("Wrap")
-      sum_tcs <- mapM (lookupExternalTyCon nDP_REPR)
+      voidTyCon    <- externalTyCon nDP_REPR FSLIT("Void")
+      wrapTyCon    <- externalTyCon nDP_REPR FSLIT("Wrap")
+      sum_tcs <- mapM (externalTyCon nDP_REPR)
                       [mkFastString ("Sum" ++ show i) | i <- [2..mAX_NDP_SUM]]
 
       let sumTyCons = listArray (2, mAX_NDP_SUM) sum_tcs
 
-      voidVar          <- lookupExternalVar nDP_REPR FSLIT("void")
-      mkPRVar          <- dsLookupGlobalId mkPRName
-      mkClosureVar     <- dsLookupGlobalId mkClosureName
-      applyClosureVar  <- dsLookupGlobalId applyClosureName
-      mkClosurePVar    <- dsLookupGlobalId mkClosurePName
-      applyClosurePVar <- dsLookupGlobalId applyClosurePName
-      replicatePAIntPrimVar <- dsLookupGlobalId replicatePAIntPrimName
-      upToPAIntPrimVar <- dsLookupGlobalId upToPAIntPrimName
-      lengthPAVar      <- dsLookupGlobalId lengthPAName
-      replicatePAVar   <- dsLookupGlobalId replicatePAName
-      emptyPAVar       <- dsLookupGlobalId emptyPAName
+      voidVar          <- externalVar nDP_REPR FSLIT("void")
+      mkPRVar          <- externalVar nDP_PARRAY FSLIT("mkPR")
+      mkClosureVar     <- externalVar nDP_CLOSURE FSLIT("mkClosure")
+      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")
+      emptyPAVar       <- externalVar nDP_PARRAY FSLIT("emptyPA")
       -- packPAVar        <- dsLookupGlobalId packPAName
       -- combinePAVar     <- dsLookupGlobalId combinePAName
 
@@ -141,21 +158,13 @@ initBuiltins
                , liftingContext   = liftingContext
                }
 
-initBuiltinTyCons :: DsM [(Name, TyCon)]
-initBuiltinTyCons
-  = do
-      vects <- sequence vs
-      return (zip origs vects)
-  where
-    (origs, vs) = unzip builtinTyCons
-
-builtinTyCons :: [(Name, DsM TyCon)]
-builtinTyCons = [(tyConName funTyCon, dsLookupTyCon closureTyConName)]
+initBuiltinTyCons :: Builtins -> [(Name, TyCon)]
+initBuiltinTyCons bi = [(tyConName funTyCon, closureTyCon bi)]
 
 initBuiltinDicts :: [(Name, Module, FastString)] -> DsM [(Name, Var)]
 initBuiltinDicts ps
   = do
-      dicts <- zipWithM lookupExternalVar mods fss
+      dicts <- zipWithM externalVar mods fss
       return $ zip tcs dicts
   where
     (tcs, mods, fss) = unzip3 ps
@@ -165,11 +174,11 @@ initBuiltinPAs = initBuiltinDicts . builtinPAs
 builtinPAs :: Builtins -> [(Name, Module, FastString)]
 builtinPAs bi
   = [
-      mk closureTyConName  nDP_CLOSURE       FSLIT("dPA_Clo")
-    , mk (tyConName $ voidTyCon bi) nDP_REPR FSLIT("dPA_Void")
-    , mk unitTyConName     nDP_INSTANCES     FSLIT("dPA_Unit")
+      mk (tyConName $ closureTyCon bi)  nDP_CLOSURE     FSLIT("dPA_Clo")
+    , mk (tyConName $ voidTyCon bi)     nDP_REPR        FSLIT("dPA_Void")
+    , mk unitTyConName                  nDP_INSTANCES   FSLIT("dPA_Unit")
 
-    , mk intTyConName      nDP_INSTANCES FSLIT("dPA_Int")
+    , mk intTyConName                   nDP_INSTANCES   FSLIT("dPA_Int")
     ]
     ++ tups
   where
@@ -185,10 +194,10 @@ initBuiltinPRs = initBuiltinDicts . builtinPRs
 builtinPRs :: Builtins -> [(Name, Module, FastString)]
 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 closureTyConName      nDP_CLOSURE   FSLIT("dPR_Clo")
+    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 $ closureTyCon bi)  nDP_CLOSURE   FSLIT("dPR_Clo")
 
     -- temporary
   , mk intTyConName          nDP_INSTANCES FSLIT("dPR_Int")
@@ -205,12 +214,12 @@ builtinPRs bi =
     mk_prod n = (tyConName $ prodTyCon n bi, nDP_REPR,
                  mkFastString ("dPR_" ++ show n))
 
-lookupExternalVar :: Module -> FastString -> DsM Var
-lookupExternalVar mod fs
+externalVar :: Module -> FastString -> DsM Var
+externalVar mod fs
   = dsLookupGlobalId =<< lookupOrig mod (mkVarOccFS fs)
 
-lookupExternalTyCon :: Module -> FastString -> DsM TyCon
-lookupExternalTyCon mod fs
+externalTyCon :: Module -> FastString -> DsM TyCon
+externalTyCon mod fs
   = dsLookupTyCon =<< lookupOrig mod (mkOccNameFS tcName fs)
 
 unitTyConName = tyConName unitTyCon