1b6d5ff · text · git.iko.soy

git.iko.soy/text

on master help sign in

Merge 1b33e0812bf036b250c094d3c39df1b6351af890 into 3845ffd4b616fb920e1ef16a61ab3c384e20cd78

1b6d5ffGitHub Merge Button15 years ago

tests/benchmarks/src/Data/Text/Benchmarks.hs+2

compare with master

unifiedsplit

@@ -19,6 +19,7 @@ import qualified Data.Text.Benchmarks.Pure as Pure

19import qualified Data.Text.Benchmarks.ReadNumbers as ReadNumbers

20import qualified Data.Text.Benchmarks.Replace as Replace

21import qualified Data.Text.Benchmarks.Search as Search

22+import qualified Data.Text.Benchmarks.Stream as Stream

22import qualified Data.Text.Benchmarks.WordFrequencies as WordFrequencies

23import qualified Data.Text.Benchmarks.WordFrequencies as WordFrequencies

24import qualified Data.Text.Benchmarks.Programs.BigTable as Programs.BigTable

25import qualified Data.Text.Benchmarks.Programs.BigTable as Programs.BigTable

@@ -52,6 +53,7 @@ benchmarks = do

52 , ReadNumbers.benchmark (tf "numbers.txt")

53 , ReadNumbers.benchmark (tf "numbers.txt")

53 , Replace.benchmark (tf "russian.txt") "принимая" "своем"

54 , Replace.benchmark (tf "russian.txt") "принимая" "своем"

54 , Search.benchmark (tf "russian.txt") "принимая"

55 , Search.benchmark (tf "russian.txt") "принимая"

56+ , Stream.benchmark (tf "russian.txt")

55 , WordFrequencies.benchmark (tf "russian.txt")

57 , WordFrequencies.benchmark (tf "russian.txt")

56 ]

58 ]

tests/benchmarks/src/Data/Text/Benchmarks/Programs/Sort.hs+10−3

@@ -21,15 +21,17 @@ import Criterion (Benchmark, bgroup, bench)

21import Data.Monoid (mconcat)

22import System.IO (Handle, hPutStr)

23import qualified Data.ByteString as B

24+import qualified Data.ByteString.Char8 as BC

24import qualified Data.ByteString.Lazy as BL

25import qualified Data.ByteString.Lazy as BL

25import qualified Data.ByteString.Lazy.Char8 as BLC

26import qualified Data.ByteString.Lazy.Char8 as BLC

26−import qualified Data.ByteString.Char8 as BC

27import qualified Data.List as L

28import qualified Data.Text as T

29+import qualified Data.Text.Encoding as T

29import qualified Data.Text.IO as T

30import qualified Data.Text.IO as T

30import qualified Data.Text.Lazy as TL

31import qualified Data.Text.Lazy as TL

31−import qualified Data.Text.Lazy.IO as TL

32import qualified Data.Text.Lazy.Builder as TLB

33+import qualified Data.Text.Lazy.Encoding as TL

34+import qualified Data.Text.Lazy.IO as TL

34benchmark :: FilePath -> Handle -> IO Benchmark

36benchmark :: FilePath -> Handle -> IO Benchmark

35benchmark i o = return $ bgroup "Sort"

37benchmark i o = return $ bgroup "Sort"

@@ -38,7 +40,12 @@ benchmark i o = return $ bgroup "Sort"

38 , bench "LazyByteString" $ BL.readFile i >>= BL.hPutStr o . lazyByteString

40 , bench "LazyByteString" $ BL.readFile i >>= BL.hPutStr o . lazyByteString

39 , bench "Text" $ T.readFile i >>= T.hPutStr o . text

41 , bench "Text" $ T.readFile i >>= T.hPutStr o . text

40 , bench "LazyText" $ TL.readFile i >>= TL.hPutStr o . lazyText

42 , bench "LazyText" $ TL.readFile i >>= TL.hPutStr o . lazyText

43+ , bench "TextByteString" $ B.readFile i >>=

44+ B.hPutStr o . T.encodeUtf8 . text . T.decodeUtf8

45+ , bench "LazyTextByteString" $ BL.readFile i >>=

46+ BL.hPutStr o . TL.encodeUtf8 . lazyText . TL.decodeUtf8

41− , bench "TextBuilder" $ T.readFile i >>= TL.hPutStr o . textBuilder

47+ , bench "TextBuilder" $ B.readFile i >>=

48+ BL.hPutStr o . TL.encodeUtf8 . textBuilder . T.decodeUtf8

42 ]

49 ]

44string :: String -> String

51string :: String -> String

tests/benchmarks/src/Data/Text/Benchmarks/Programs/StripTags.hs+3−1

@@ -22,12 +22,14 @@ import qualified Data.ByteString as B

22import qualified Data.ByteString.Char8 as BC

23import qualified Data.Text as T

24import qualified Data.Text.Encoding as T

25+import qualified Data.Text.IO as T

26benchmark :: FilePath -> Handle -> IO Benchmark

27benchmark :: FilePath -> Handle -> IO Benchmark

27benchmark i o = return $ bgroup "StripTags"

28benchmark i o = return $ bgroup "StripTags"

28 [ bench "String" $ readFile i >>= hPutStr o . string

29 [ bench "String" $ readFile i >>= hPutStr o . string

29 , bench "ByteString" $ B.readFile i >>= B.hPutStr o . byteString

30 , bench "ByteString" $ B.readFile i >>= B.hPutStr o . byteString

30− , bench "Text" $

31+ , bench "Text" $ T.readFile i >>= T.hPutStr o . text

32+ , bench "TextByteString" $

31 B.readFile i >>= B.hPutStr o . T.encodeUtf8 . text . T.decodeUtf8

33 B.readFile i >>= B.hPutStr o . T.encodeUtf8 . text . T.decodeUtf8

32 ]

34 ]

tests/benchmarks/src/Data/Text/Benchmarks/Programs/Throughput.hs+6

@@ -22,7 +22,9 @@ import Criterion (Benchmark, bgroup, bench)

22import System.IO (Handle, hPutStr)

23import qualified Data.ByteString as B

24import qualified Data.ByteString.Lazy as BL

25+import qualified Data.Text.Encoding as T

25import qualified Data.Text.IO as T

26import qualified Data.Text.IO as T

27+import qualified Data.Text.Lazy.Encoding as TL

26import qualified Data.Text.Lazy.IO as TL

28import qualified Data.Text.Lazy.IO as TL

28benchmark :: FilePath -> Handle -> IO Benchmark

30benchmark :: FilePath -> Handle -> IO Benchmark

@@ -32,4 +34,8 @@ benchmark fp sink = return $ bgroup "Throughput"

32 , bench "LazyByteString" $ BL.readFile fp >>= BL.hPutStr sink

34 , bench "LazyByteString" $ BL.readFile fp >>= BL.hPutStr sink

33 , bench "Text" $ T.readFile fp >>= T.hPutStr sink

35 , bench "Text" $ T.readFile fp >>= T.hPutStr sink

34 , bench "LazyText" $ TL.readFile fp >>= TL.hPutStr sink

36 , bench "LazyText" $ TL.readFile fp >>= TL.hPutStr sink

37+ , bench "TextByteString" $

38+ B.readFile fp >>= B.hPutStr sink . T.encodeUtf8 . T.decodeUtf8

39+ , bench "LazyTextByteString" $

40+ BL.readFile fp >>= BL.hPutStr sink . TL.encodeUtf8 . TL.decodeUtf8

35 ]

41 ]

tests/benchmarks/src/Data/Text/Benchmarks/Stream.hsnew file+94

@@ -0,0 +1,94 @@

1+-- | This module contains a number of benchmarks for the different streaming

2+-- functions

3+--

4+-- Tested in this benchmark:

5+--

6+-- * Most streaming functions

7+--

8+{-# LANGUAGE BangPatterns #-}

9+{-# OPTIONS_GHC -fno-warn-orphans #-}

10+module Data.Text.Benchmarks.Stream

11+ ( benchmark

12+ ) where

13+

14+import Control.DeepSeq (NFData (..))

15+import Criterion (Benchmark, bgroup, bench, nf)

16+import Data.Text.Fusion.Internal (Step (..), Stream (..))

17+import qualified Data.Text.Encoding as T

18+import qualified Data.Text.Encoding.Error as E

19+import qualified Data.Text.Encoding.Fusion as T

20+import qualified Data.Text.Encoding.Fusion.Common as F

21+import qualified Data.Text.Fusion as T

22+import qualified Data.Text.IO as T

23+import qualified Data.Text.Lazy.Encoding as TL

24+import qualified Data.Text.Lazy.Encoding.Fusion as TL

25+import qualified Data.Text.Lazy.Fusion as TL

26+import qualified Data.Text.Lazy.IO as TL

27+

28+instance NFData a => NFData (Stream a) where

29+ -- Currently, this implementation does not force evaluation of the size hint

30+ rnf (Stream next s0 _) = go s0

31+ where

32+ go !s = case next s of

33+ Done -> ()

34+ Skip s' -> go s'

35+ Yield x s' -> rnf x `seq` go s'

36+

37+benchmark :: FilePath -> IO Benchmark

38+benchmark fp = do

39+ -- Different formats

40+ t <- T.readFile fp

41+ let !utf8 = T.encodeUtf8 t

42+ !utf16le = T.encodeUtf16LE t

43+ !utf16be = T.encodeUtf16BE t

44+ !utf32le = T.encodeUtf32LE t

45+ !utf32be = T.encodeUtf32BE t

46+

47+ -- Once again for the lazy variants

48+ tl <- TL.readFile fp

49+ let !utf8L = TL.encodeUtf8 tl

50+ !utf16leL = TL.encodeUtf16LE tl

51+ !utf16beL = TL.encodeUtf16BE tl

52+ !utf32leL = TL.encodeUtf32LE tl

53+ !utf32beL = TL.encodeUtf32BE tl

54+

55+ -- For the functions which operate on streams

56+ let !s = T.stream t

57+

58+ return $ bgroup "Stream"

59+

60+ -- Fusion

61+ [ bgroup "stream" $

62+ [ bench "Text" $ nf T.stream t

63+ , bench "LazyText" $ nf TL.stream tl

64+ ]

65+

66+ -- Encoding.Fusion

67+ , bgroup "streamUtf8"

68+ [ bench "Text" $ nf (T.streamUtf8 E.lenientDecode) utf8

69+ , bench "LazyText" $ nf (TL.streamUtf8 E.lenientDecode) utf8L

70+ ]

71+ , bgroup "streamUtf16LE"

72+ [ bench "Text" $ nf (T.streamUtf16LE E.lenientDecode) utf16le

73+ , bench "LazyText" $ nf (TL.streamUtf16LE E.lenientDecode) utf16leL

74+ ]

75+ , bgroup "streamUtf16BE"

76+ [ bench "Text" $ nf (T.streamUtf16BE E.lenientDecode) utf16be

77+ , bench "LazyText" $ nf (TL.streamUtf16BE E.lenientDecode) utf16beL

78+ ]

79+ , bgroup "streamUtf32LE"

80+ [ bench "Text" $ nf (T.streamUtf32LE E.lenientDecode) utf32le

81+ , bench "LazyText" $ nf (TL.streamUtf32LE E.lenientDecode) utf32leL

82+ ]

83+ , bgroup "streamUtf32BE"

84+ [ bench "Text" $ nf (T.streamUtf32BE E.lenientDecode) utf32be

85+ , bench "LazyText" $ nf (TL.streamUtf32BE E.lenientDecode) utf32beL

86+ ]

87+

88+ -- Encoding.Fusion.Common

89+ , bench "restreamUtf8" $ nf F.restreamUtf8 s

90+ , bench "restreamUtf16LE" $ nf F.restreamUtf16LE s

91+ , bench "restreamUtf16BE" $ nf F.restreamUtf16BE s

92+ , bench "restreamUtf32LE" $ nf F.restreamUtf32LE s

93+ , bench "restreamUtf32BE" $ nf F.restreamUtf32BE s

94+ ]