Add vectorisation built-ins

diff --git a/compiler/vectorise/VectBuiltIn.hs b/compiler/vectorise/VectBuiltIn.hs
index cea139d..971fa3e 100644 (file)
--- a/compiler/vectorise/VectBuiltIn.hs
+++ b/compiler/vectorise/VectBuiltIn.hs
@@ -62,6 +62,7 @@ data Builtins = Builtins {
                 , prTyCon          :: TyCon
                 , prDataCon        :: DataCon
                 , parrayIntPrimTyCon :: TyCon
+                , parrayBoolPrimTyCon :: TyCon
                 , voidTyCon        :: TyCon
                 , wrapTyCon        :: TyCon
                 , sumTyCons        :: Array Int TyCon
@@ -74,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
                 }
@@ -103,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")
@@ -120,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)
@@ -137,6 +143,7 @@ initBuiltins
                , prTyCon          = prTyCon
                , prDataCon        = prDataCon
                , parrayIntPrimTyCon = parrayIntPrimTyCon
+               , parrayBoolPrimTyCon = parrayBoolPrimTyCon
                , voidTyCon        = voidTyCon
                , wrapTyCon        = wrapTyCon
                , sumTyCons        = sumTyCons
@@ -149,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
                }

diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs
index 83b482a..ebb2718 100644 (file)
--- a/compiler/vectorise/VectUtils.hs
+++ b/compiler/vectorise/VectUtils.hs
@@ -16,7 +16,7 @@ module VectUtils (
   parrayReprTyCon, parrayReprDataCon, mkVScrut,
   prDFunOfTyCon,
   paDictArgType, paDictOfType, paDFunType,
-  paMethod, mkPR, lengthPA, replicatePA, emptyPA, liftPA,
+  paMethod, mkPR, lengthPA, replicatePA, emptyPA, packPA, liftPA,
   polyAbstract, polyApply, polyVApply,
   hoistBinding, hoistExpr, hoistPolyVExpr, takeHoisted,
   buildClosure, buildClosures,
@@ -221,6 +221,7 @@ type PAMethod = (Builtins -> Var, String)
 pa_length    = (lengthPAVar,    "lengthPA")
 pa_replicate = (replicatePAVar, "replicatePA")
 pa_empty     = (emptyPAVar,     "emptyPA")
+pa_pack      = (packPAVar,      "packPA")
 
 paMethod :: PAMethod -> Type -> VM CoreExpr
 paMethod (method, name) ty
@@ -253,6 +254,10 @@ replicatePA len x = liftM (`mkApps` [len,x])
 emptyPA :: Type -> VM CoreExpr
 emptyPA = paMethod pa_empty
 
+packPA :: Type -> CoreExpr -> CoreExpr -> CoreExpr -> VM CoreExpr
+packPA ty xs len sel = liftM (`mkApps` [len, sel])
+                             (paMethod pa_pack ty)
+
 liftPA :: CoreExpr -> VM CoreExpr
 liftPA x
   = do