Vectorisation utilities

[ghc-hetmet.git] / compiler / vectorise / VectBuiltIn.hs

diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index 6b3790f..971fa3e 100644 (file)
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -1,8 +1,8 @@
-{-# OPTIONS_GHC -w #-}
+{-# OPTIONS -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
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module VectBuiltIn (
@@ -30,8 +30,7 @@ import TypeRep         ( funTyCon )
 import Type            ( Type )
 import TysPrim
 import TysWiredIn      ( unitTyCon, tupleTyCon, intTyConName )
-import Module          ( Module, mkModule, mkModuleNameFS )
-import PackageConfig   ( ndpPackageId )
+import Module
 import BasicTypes      ( Boxity(..) )
 
 import FastString
@@ -63,6 +62,7 @@ data Builtins = Builtins {
                 , prTyCon          :: TyCon
                 , prDataCon        :: DataCon
                 , parrayIntPrimTyCon :: TyCon
+                , parrayBoolPrimTyCon :: TyCon
                 , voidTyCon        :: TyCon
                 , wrapTyCon        :: TyCon
                 , sumTyCons        :: Array Int TyCon
@@ -75,10 +75,12 @@ data Builtins = Builtins {
                 , applyClosurePVar :: Var
                 , replicatePAIntPrimVar :: Var
                 , upToPAIntPrimVar :: Var
+                , selectPAIntPrimVar :: Var
+                , truesPABoolPrimVar :: Var
                 , lengthPAVar      :: Var
                 , replicatePAVar   :: Var
                 , emptyPAVar       :: Var
-                -- , packPAVar        :: Var
+                , packPAVar        :: Var
                 -- , combinePAVar     :: Var
                 , liftingContext   :: Var
                 }
@@ -104,6 +106,7 @@ initBuiltins
       prTyCon      <- externalTyCon nDP_PARRAY FSLIT("PR")
       let [prDataCon] = tyConDataCons prTyCon
       parrayIntPrimTyCon <- externalTyCon nDP_PRIM FSLIT("PArray_Int#")
+      parrayBoolPrimTyCon <- externalTyCon nDP_PRIM FSLIT("PArray_Bool#")
       closureTyCon <- externalTyCon nDP_CLOSURE FSLIT(":->")
 
       voidTyCon    <- externalTyCon nDP_REPR FSLIT("Void")
@@ -121,10 +124,12 @@ initBuiltins
       applyClosurePVar <- externalVar nDP_CLOSURE FSLIT("$:^")
       replicatePAIntPrimVar <- externalVar nDP_PRIM FSLIT("replicatePA_Int#")
       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")
       emptyPAVar       <- externalVar nDP_PARRAY FSLIT("emptyPA")
-      -- packPAVar        <- dsLookupGlobalId packPAName
+      packPAVar        <- externalVar nDP_PARRAY FSLIT("packPA")
       -- combinePAVar     <- dsLookupGlobalId combinePAName
 
       liftingContext <- liftM (\u -> mkSysLocal FSLIT("lc") u intPrimTy)
@@ -138,6 +143,7 @@ initBuiltins
                , prTyCon          = prTyCon
                , prDataCon        = prDataCon
                , parrayIntPrimTyCon = parrayIntPrimTyCon
+               , parrayBoolPrimTyCon = parrayBoolPrimTyCon
                , voidTyCon        = voidTyCon
                , wrapTyCon        = wrapTyCon
                , sumTyCons        = sumTyCons
@@ -150,10 +156,12 @@ initBuiltins
                , applyClosurePVar = applyClosurePVar
                , replicatePAIntPrimVar = replicatePAIntPrimVar
                , upToPAIntPrimVar = upToPAIntPrimVar
+               , selectPAIntPrimVar = selectPAIntPrimVar
+               , truesPABoolPrimVar = truesPABoolPrimVar
                , lengthPAVar      = lengthPAVar
                , replicatePAVar   = replicatePAVar
                , emptyPAVar       = emptyPAVar
-               -- , packPAVar        = packPAVar
+               , packPAVar        = packPAVar
                -- , combinePAVar     = combinePAVar
                , liftingContext   = liftingContext
                }