Inline most lifting wrappers

This results in only marginal performance gain, probably because
they are already small enough to be specialized and/or inlined
automatically, but these pragmas ensure it remains so regardless
of changes in GHC heuristics.

1 files changed, 13 insertions, 0 deletions

diff --git a/src/Data/Array/Nested/Mixed.hs b/src/Data/Array/Nested/Mixed.hs
index eb05eaa..2b5c5b6 100644
--- a/src/Data/Array/Nested/Mixed.hs
+++ b/src/Data/Array/Nested/Mixed.hs
@@ -237,11 +237,13 @@ instance Elt a => NFData (Mixed sh a) where
   rnf = mrnf
 
 
+{-# INLINE mliftNumElt1 #-}
 mliftNumElt1 :: (PrimElt a, PrimElt b)
              => (SNat (Rank sh) -> S.Array (Rank sh) a -> S.Array (Rank sh) b)
              -> Mixed sh a -> Mixed sh b
 mliftNumElt1 f (toPrimitive -> M_Primitive sh (XArray arr)) = fromPrimitive $ M_Primitive sh (XArray (f (shxRank sh) arr))
 
+{-# INLINE mliftNumElt2 #-}
 mliftNumElt2 :: (PrimElt a, PrimElt b, PrimElt c)
              => (SNat (Rank sh) -> S.Array (Rank sh) a -> S.Array (Rank sh) b -> S.Array (Rank sh) c)
              -> Mixed sh a -> Mixed sh b -> Mixed sh c
@@ -417,6 +419,7 @@ instance Storable a => Elt (Primitive a) where
     in M_Primitive sh (X.fromListOuter (ssxFromShX sh) (map (\(M_Primitive _ a) -> a) (toList l)))
   mtoListOuter (M_Primitive sh arr) = map (M_Primitive (shxTail sh)) (X.toListOuter arr)
 
+  {-# INLINE mlift #-}
   mlift :: forall sh1 sh2.
            StaticShX sh2
         -> (StaticShX '[] -> XArray (sh1 ++ '[]) a -> XArray (sh2 ++ '[]) a)
@@ -427,6 +430,7 @@ instance Storable a => Elt (Primitive a) where
     , let result = f ZKX a
     = M_Primitive (X.shape ssh2 result) result
 
+  {-# INLINE mlift2 #-}
   mlift2 :: forall sh1 sh2 sh3.
             StaticShX sh3
          -> (StaticShX '[] -> XArray (sh1 ++ '[]) a -> XArray (sh2 ++ '[]) a -> XArray (sh3 ++ '[]) a)
@@ -438,6 +442,7 @@ instance Storable a => Elt (Primitive a) where
     , let result = f ZKX a b
     = M_Primitive (X.shape ssh3 result) result
 
+  {-# INLINE mliftL #-}
   mliftL :: forall sh1 sh2.
             StaticShX sh2
          -> (forall sh' b. Storable b => StaticShX sh' -> NonEmpty (XArray (sh1 ++ sh') b) -> NonEmpty (XArray (sh2 ++ sh') b))
@@ -526,8 +531,11 @@ instance (Elt a, Elt b) => Elt (a, b) where
     M_Tup2 (mfromListOuterSN sn ((\(M_Tup2 x _) -> x) <$> l))
            (mfromListOuterSN sn ((\(M_Tup2 _ y) -> y) <$> l))
   mtoListOuter (M_Tup2 a b) = zipWith M_Tup2 (mtoListOuter a) (mtoListOuter b)
+  {-# INLINE mlift #-}
   mlift ssh2 f (M_Tup2 a b) = M_Tup2 (mlift ssh2 f a) (mlift ssh2 f b)
+  {-# INLINE mlift2 #-}
   mlift2 ssh3 f (M_Tup2 a b) (M_Tup2 x y) = M_Tup2 (mlift2 ssh3 f a x) (mlift2 ssh3 f b y)
+  {-# INLINE mliftL #-}
   mliftL ssh2 f =
     let unzipT2l [] = ([], [])
         unzipT2l (M_Tup2 a b : l) = let (l1, l2) = unzipT2l l in (a : l1, b : l2)
@@ -593,6 +601,7 @@ instance Elt a => Elt (Mixed sh' a) where
 
   mtoListOuter (M_Nest sh arr) = map (M_Nest (shxTail sh)) (mtoListOuter arr)
 
+  {-# INLINE mlift #-}
   mlift :: forall sh1 sh2.
            StaticShX sh2
         -> (forall shT b. Storable b => StaticShX shT -> XArray (sh1 ++ shT) b -> XArray (sh2 ++ shT) b)
@@ -610,6 +619,7 @@ instance Elt a => Elt (Mixed sh' a) where
         , Refl <- lemAppAssoc (Proxy @sh2) (Proxy @sh') (Proxy @shT)
         = f (ssxAppend ssh' sshT)
 
+  {-# INLINE mlift2 #-}
   mlift2 :: forall sh1 sh2 sh3.
             StaticShX sh3
          -> (forall shT b. Storable b => StaticShX shT -> XArray (sh1 ++ shT) b -> XArray (sh2 ++ shT) b -> XArray (sh3 ++ shT) b)
@@ -628,6 +638,7 @@ instance Elt a => Elt (Mixed sh' a) where
         , Refl <- lemAppAssoc (Proxy @sh3) (Proxy @sh') (Proxy @shT)
         = f (ssxAppend ssh' sshT)
 
+  {-# INLINE mliftL #-}
   mliftL :: forall sh1 sh2.
             StaticShX sh2
          -> (forall shT b. Storable b => StaticShX shT -> NonEmpty (XArray (sh1 ++ shT) b) -> NonEmpty (XArray (sh2 ++ shT) b))
@@ -1066,11 +1077,13 @@ mfromXArrayPrimP ssh arr = M_Primitive (X.shape ssh arr) arr
 mfromXArrayPrim :: PrimElt a => StaticShX sh -> XArray sh a -> Mixed sh a
 mfromXArrayPrim = (fromPrimitive .) . mfromXArrayPrimP
 
+{-# INLINE mliftPrim #-}
 mliftPrim :: (PrimElt a, PrimElt b)
           => (a -> b)
           -> Mixed sh a -> Mixed sh b
 mliftPrim f (toPrimitive -> M_Primitive sh (X.XArray arr)) = fromPrimitive $ M_Primitive sh (X.XArray (S.mapA f arr))
 
+{-# INLINE mliftPrim2 #-}
 mliftPrim2 :: (PrimElt a, PrimElt b, PrimElt c)
            => (a -> b -> c)
            -> Mixed sh a -> Mixed sh b -> Mixed sh c