diff --git a/bench/Main.hs b/bench/Main.hs --- a/bench/Main.hs +++ b/bench/Main.hs @@ -4,7 +4,6 @@ import Criterion.Main import Data.Char import Data.List -import Data.Semigroup ((<>)) import Data.Word import HaskellWorks.Data.Vector.AsVector64s @@ -17,29 +16,25 @@ import qualified HaskellWorks.Data.Simd.Logical.Stock as STOCK import qualified System.Directory as IO -runCmpEqWord8sAvx2 :: FilePath -> IO [DVS.Vector Word64] -runCmpEqWord8sAvx2 filePath = do - bs <- LBS.readFile filePath +runCmpEqWord8sAvx2 :: LBS.ByteString -> IO [DVS.Vector Word64] +runCmpEqWord8sAvx2 bs = do let vs = asVector64s 64 bs return $ if CAP.avx2Enabled then AVX2.cmpEqWord8s (fromIntegral (ord '8')) <$> vs else [] -runCmpEqWord8sStock :: FilePath -> IO [DVS.Vector Word64] -runCmpEqWord8sStock filePath = do - bs <- LBS.readFile filePath +runCmpEqWord8sStock :: LBS.ByteString -> IO [DVS.Vector Word64] +runCmpEqWord8sStock bs = do let vs = asVector64s 64 bs return $ STOCK.cmpEqWord8s (fromIntegral (ord '8')) <$> vs -runAndBitsAvx2 :: FilePath -> IO [DVS.Vector Word64] -runAndBitsAvx2 filePath = do - bs <- LBS.readFile filePath +runAndBitsAvx2 :: LBS.ByteString -> IO [DVS.Vector Word64] +runAndBitsAvx2 bs = do let vs = asVector64s 64 bs return $ (\v -> AVX2.andBits v v) <$> vs -runAndBitsStock :: FilePath -> IO [DVS.Vector Word64] -runAndBitsStock filePath = do - bs <- LBS.readFile filePath +runAndBitsStock :: LBS.ByteString -> IO [DVS.Vector Word64] +runAndBitsStock bs = do let vs = asVector64s 64 bs return $ (\v -> STOCK.andBits v v) <$> vs @@ -47,18 +42,24 @@ benchcmpEqWord8s = do entries <- IO.listDirectory "data/bench" let files = ("data/bench/" ++) <$> (".csv" `isSuffixOf`) `filter` entries - benchmarks <- forM files $ \file -> return $ mempty - <> [bench ("hw-simd/cmpEqWord8s/avx2/" <> file) (nfIO (runCmpEqWord8sAvx2 file))] - <> [bench ("hw-simd/cmpEqWord8s/stock/" <> file) (nfIO (runCmpEqWord8sStock file))] + benchmarks <- forM files $ \file -> return $ + [ env (LBS.readFile file) $ \bs -> bgroup file + [ bench ("hw-simd/cmpEqWord8s/avx2/" <> file) (nfIO (runCmpEqWord8sAvx2 bs)) + , bench ("hw-simd/cmpEqWord8s/stock/" <> file) (nfIO (runCmpEqWord8sStock bs)) + ] + ] return (join benchmarks) benchAndBits :: IO [Benchmark] benchAndBits = do entries <- IO.listDirectory "data/bench" let files = ("data/bench/" ++) <$> (".csv" `isSuffixOf`) `filter` entries - benchmarks <- forM files $ \file -> return $ mempty - <> [bench ("hw-simd/andBits/avx2/" <> file) (nfIO (runAndBitsAvx2 file))] - <> [bench ("hw-simd/andBits/stock/" <> file) (nfIO (runAndBitsStock file))] + benchmarks <- forM files $ \file -> return $ + [ env (LBS.readFile file) $ \bs -> bgroup file + [ bench ("hw-simd/andBits/avx2/" <> file) (nfIO (runAndBitsAvx2 bs)) + , bench ("hw-simd/andBits/stock/" <> file) (nfIO (runAndBitsStock bs)) + ] + ] return (join benchmarks) main :: IO () diff --git a/doctest/DoctestDriver.hs b/doctest/DoctestDriver.hs new file mode 100644 --- /dev/null +++ b/doctest/DoctestDriver.hs @@ -0,0 +1,12 @@ +{-# LANGUAGE CPP #-} + +#if MIN_VERSION_GLASGOW_HASKELL(8,4,4,0) +{-# OPTIONS_GHC -F -pgmF doctest-discover #-} +#else +module Main where + +import qualified System.IO as IO + +main :: IO () +main = IO.putStrLn "WARNING: doctest will not run on GHC versions earlier than 8.4.4" +#endif diff --git a/hw-simd.cabal b/hw-simd.cabal --- a/hw-simd.cabal +++ b/hw-simd.cabal @@ -1,24 +1,24 @@ -cabal-version: 2.2 -name: hw-simd -version: 0.1.1.5 -synopsis: SIMD library -description: Please see the README on Github at -category: Data, Bit, SIMD -homepage: https://github.com/haskell-works/hw-simd#readme -bug-reports: https://github.com/haskell-works/hw-simd/issues -author: John Ky -maintainer: newhoggy@gmail.com -copyright: 2018-2019 John Ky -license: BSD-3-Clause -license-file: LICENSE -tested-with: GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2 -build-type: Simple -extra-source-files: - README.md - ChangeLog.md - cbits/simd.h - cbits/simd_debug.h +cabal-version: 2.2 +name: hw-simd +version: 0.1.2.0 +synopsis: SIMD library +description: Please see the README on Github at +category: Data, Bit, SIMD +homepage: https://github.com/haskell-works/hw-simd#readme +bug-reports: https://github.com/haskell-works/hw-simd/issues +author: John Ky +maintainer: newhoggy@gmail.com +copyright: 2018-2020 John Ky +license: BSD-3-Clause +license-file: LICENSE +tested-with: GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4 +build-type: Simple +extra-source-files: README.md + ChangeLog.md + cbits/simd.h + cbits/simd_debug.h + source-repository head type: git location: https://github.com/haskell-works/hw-simd @@ -38,166 +38,139 @@ manual: False default: True -common base { build-depends: base >= 4.7 && < 5 } -common bits-extra { build-depends: bits-extra >= 0.0.1.2 && < 0.1 } -common bytestring { build-depends: bytestring >= 0.10 && < 0.11 } -common cassava { build-depends: cassava >= 0.5.1.0 && < 0.6 } -common containers { build-depends: containers >= 0.5 && < 0.7 } -common criterion { build-depends: criterion >= 1.4.1.0 && < 1.6 } -common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } -common directory { build-depends: directory >= 1.2.2 && < 1.4 } -common hedgehog { build-depends: hedgehog >= 0.5 && < 1.1 } -common hspec { build-depends: hspec >= 2.4 && < 3 } -common hw-bits { build-depends: hw-bits >= 0.7.0.2 && < 0.8 } -common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 } -common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.4 && < 0.2 } -common hw-prim { build-depends: hw-prim >= 0.6.2.12 && < 0.7 } -common hw-rankselect { build-depends: hw-rankselect >= 0.13 && < 0.14 } -common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.3.2.0 && < 0.4 } -common lens { build-depends: lens >= 4 && < 5 } -common mmap { build-depends: mmap >= 0.5.9 && < 0.6 } -common text { build-depends: text >= 1.2.2 && < 2.0 } -common vector { build-depends: vector >= 0.12.0.1 && < 0.13 } - -common semigroups { if (!impl(ghc >= 8.0.1)) { build-depends: semigroups >= 0.8.4 && < 0.19 } } -common transformers { if (!impl(ghc >= 8.0.1)) { build-depends: transformers >= 0.4 && < 0.6 } } +common base { build-depends: base >= 4.11 && < 5 } -common common - default-language: Haskell2010 +common bits-extra { build-depends: bits-extra >= 0.0.1.2 && < 0.1 } +common bytestring { build-depends: bytestring >= 0.10 && < 0.11 } +common cassava { build-depends: cassava >= 0.5.1.0 && < 0.6 } +common containers { build-depends: containers >= 0.5 && < 0.7 } +common criterion { build-depends: criterion >= 1.4.1.0 && < 1.6 } +common deepseq { build-depends: deepseq >= 1.4 && < 1.5 } +common directory { build-depends: directory >= 1.2.2 && < 1.4 } +common doctest { build-depends: doctest >= 0.16.2 && < 0.17 } +common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 } +common hedgehog { build-depends: hedgehog >= 0.5 && < 1.1 } +common hspec { build-depends: hspec >= 2.4 && < 3 } +common hw-bits { build-depends: hw-bits >= 0.7.0.2 && < 0.8 } +common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 } +common hw-hspec-hedgehog { build-depends: hw-hspec-hedgehog >= 0.1.0.4 && < 0.2 } +common hw-prim { build-depends: hw-prim >= 0.6.2.12 && < 0.7 } +common hw-rankselect { build-depends: hw-rankselect >= 0.13 && < 0.14 } +common hw-rankselect-base { build-depends: hw-rankselect-base >= 0.3.2.0 && < 0.4 } +common lens { build-depends: lens >= 4 && < 5 } +common mmap { build-depends: mmap >= 0.5.9 && < 0.6 } +common text { build-depends: text >= 1.2.2 && < 2.0 } +common transformers { build-depends: transformers >= 0.4 && < 0.6 } +common vector { build-depends: vector >= 0.12.0.1 && < 0.13 } -library - import: base, common - , bits-extra - , bytestring - , deepseq - , hw-bits - , hw-prim - , hw-rankselect - , hw-rankselect-base - , semigroups - , transformers - , vector - exposed-modules: - HaskellWorks.Data.Simd.Capabilities - HaskellWorks.Data.Simd.ChunkString - HaskellWorks.Data.Simd.Comparison - HaskellWorks.Data.Simd.Comparison.Avx2 - HaskellWorks.Data.Simd.Comparison.Stock - HaskellWorks.Data.Simd.Internal.Bits - HaskellWorks.Data.Simd.Internal.Broadword - HaskellWorks.Data.Simd.Internal.ChunkString - HaskellWorks.Data.Simd.Internal.Foreign - HaskellWorks.Data.Simd.Internal.Marshal - HaskellWorks.Data.Simd.Logical - HaskellWorks.Data.Simd.Logical.Avx2 - HaskellWorks.Data.Simd.Logical.Stock - other-modules: Paths_hw_simd - autogen-modules: Paths_hw_simd - hs-source-dirs: src - ghc-options: -O2 -Wall - include-dirs: cbits - c-sources: - cbits/simd_avx2.c - cbits/simd_sse2.c - if flag(sse42) - ghc-options: -msse4.2 - cc-options: -msse4.2 - if flag(bmi2) - cc-options: -mbmi2 -DBMI2_ENABLED - if (flag(bmi2)) && (impl(ghc >=8.4.1)) - ghc-options: -mbmi2 -msse4.2 - if flag(avx2) - cc-options: -mavx2 -DAVX2_ENABLED +common config + default-language: Haskell2010 + ghc-options: -O2 -Wall if (flag(avx2)) && (impl(ghc >=8.4.1)) - ghc-options: -mbmi2 -msse4.2 - cpp-options: -DBMI2_ENABLED -DAVX2_ENABLED + ghc-options: -mbmi2 -msse4.2 + cpp-options: -DBMI2_ENABLED -DAVX2_ENABLED if (impl(ghc >=8.0.1)) - ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints - if (!impl(ghc >=8.0.1)) - build-depends: - semigroups >=0.8.4 && <0.19 - , transformers >=0.4 && <0.6 + ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints + if flag(avx2) + cc-options: -mavx2 -DAVX2_ENABLED + if (flag(bmi2)) && (impl(ghc >=8.4.1)) + ghc-options: -mbmi2 -msse4.2 + if flag(bmi2) + cc-options: -mbmi2 -DBMI2_ENABLED + if flag(sse42) + ghc-options: -msse4.2 + cc-options: -msse4.2 + +common hw-simd + build-depends: hw-simd + +library + import: base, config + , bits-extra + , bytestring + , deepseq + , hw-bits + , hw-prim + , hw-rankselect + , hw-rankselect-base + , transformers + , vector + exposed-modules: HaskellWorks.Data.Simd.Capabilities + HaskellWorks.Data.Simd.ChunkString + HaskellWorks.Data.Simd.Comparison + HaskellWorks.Data.Simd.Comparison.Avx2 + HaskellWorks.Data.Simd.Comparison.Stock + HaskellWorks.Data.Simd.Internal.Bits + HaskellWorks.Data.Simd.Internal.Broadword + HaskellWorks.Data.Simd.Internal.ChunkString + HaskellWorks.Data.Simd.Internal.Foreign + HaskellWorks.Data.Simd.Internal.Marshal + HaskellWorks.Data.Simd.Logical + HaskellWorks.Data.Simd.Logical.Avx2 + HaskellWorks.Data.Simd.Logical.Stock + other-modules: Paths_hw_simd + autogen-modules: Paths_hw_simd + hs-source-dirs: src + include-dirs: cbits + c-sources: cbits/simd_avx2.c + cbits/simd_sse2.c build-tool-depends: c2hs:c2hs test-suite hw-simd-test - import: base, common - , bits-extra - , bytestring - , deepseq - , directory - , hedgehog - , hspec - , hw-bits - , hw-hedgehog - , hw-hspec-hedgehog - , hw-prim - , hw-rankselect - , hw-rankselect-base - , lens - , text - , vector - type: exitcode-stdio-1.0 - main-is: Spec.hs - build-depends: hw-simd - other-modules: - HaskellWorks.Data.Simd.ComparisonSpec - HaskellWorks.Data.Simd.Internal.BroadwordSpec - HaskellWorks.Data.Simd.LogicalSpec - Paths_hw_simd - autogen-modules: Paths_hw_simd - hs-source-dirs: test - ghc-options: -O2 -Wall -threaded -rtsopts -with-rtsopts=-N - if flag(sse42) - ghc-options: -msse4.2 - cc-options: -msse4.2 - if flag(bmi2) - cc-options: -mbmi2 -DBMI2_ENABLED - if (flag(bmi2)) && (impl(ghc >=8.4.1)) - ghc-options: -mbmi2 -msse4.2 - if flag(avx2) - cc-options: -mavx2 -DAVX2_ENABLED - if (flag(avx2)) && (impl(ghc >=8.4.1)) - ghc-options: -mbmi2 -msse4.2 - cpp-options: -DBMI2_ENABLED -DAVX2_ENABLED - if (impl(ghc >=8.0.1)) - ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints - build-tool-depends: hspec-discover:hspec-discover + import: base, config + , bits-extra + , bytestring + , deepseq + , directory + , hedgehog + , hspec + , hw-bits + , hw-hedgehog + , hw-hspec-hedgehog + , hw-prim + , hw-rankselect + , hw-rankselect-base + , lens + , text + , vector + type: exitcode-stdio-1.0 + main-is: Spec.hs + build-depends: hw-simd + other-modules: HaskellWorks.Data.Simd.ComparisonSpec + HaskellWorks.Data.Simd.Internal.BroadwordSpec + HaskellWorks.Data.Simd.LogicalSpec + hs-source-dirs: test + ghc-options: -threaded -rtsopts -with-rtsopts=-N + build-tool-depends: hspec-discover:hspec-discover benchmark bench - import: base, common - , bits-extra - , bytestring - , cassava - , containers - , criterion - , deepseq - , directory - , hw-bits - , hw-prim - , hw-rankselect - , hw-rankselect-base - , mmap - , semigroups - , transformers - , vector - type: exitcode-stdio-1.0 - main-is: Main.hs - other-modules: Paths_hw_simd - autogen-modules: Paths_hw_simd - hs-source-dirs: bench - ghc-options: -O2 -Wall -msse4.2 - build-depends: hw-simd - if flag(sse42) - ghc-options: -msse4.2 - cc-options: -msse4.2 - if flag(bmi2) - cc-options: -mbmi2 -DBMI2_ENABLED - if (flag(bmi2)) && (impl(ghc >=8.4.1)) - ghc-options: -mbmi2 -msse4.2 - if flag(avx2) - cc-options: -mavx2 -DAVX2_ENABLED - if (flag(avx2)) && (impl(ghc >=8.4.1)) - ghc-options: -mbmi2 -msse4.2 - cpp-options: -DBMI2_ENABLED -DAVX2_ENABLED - if (impl(ghc >=8.0.1)) - ghc-options: -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints + import: base, config + , bits-extra + , bytestring + , cassava + , containers + , criterion + , deepseq + , directory + , hw-bits + , hw-prim + , hw-rankselect + , hw-rankselect-base + , mmap + , transformers + , vector + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: bench + build-depends: hw-simd + +test-suite doctest + import: base, config + , doctest + , doctest-discover + , hw-simd + type: exitcode-stdio-1.0 + ghc-options: -threaded + main-is: DoctestDriver.hs + HS-Source-Dirs: doctest + build-tool-depends: doctest-discover:doctest-discover diff --git a/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs b/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs --- a/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs +++ b/src/HaskellWorks/Data/Simd/Comparison/Avx2.hs @@ -6,7 +6,6 @@ module HaskellWorks.Data.Simd.Comparison.Avx2 where import Control.Monad -import Data.Monoid ((<>)) import Data.Word import qualified Data.ByteString as BS diff --git a/src/HaskellWorks/Data/Simd/Internal/Marshal.hs b/src/HaskellWorks/Data/Simd/Internal/Marshal.hs --- a/src/HaskellWorks/Data/Simd/Internal/Marshal.hs +++ b/src/HaskellWorks/Data/Simd/Internal/Marshal.hs @@ -2,7 +2,6 @@ module HaskellWorks.Data.Simd.Internal.Marshal where -import Data.Monoid ((<>)) import Data.Word import qualified Data.Vector.Storable as DVS