on master help sign in
Allow decoding of multiple files when benchmarking
62f1c97Bryan O'Sullivan
tests/benchmarks/src/Data/Text/Benchmarks.hs+4−1
@@ -39,7 +39,10 @@ benchmarks = do
39 -- Traditional benchmarks
39 -- Traditional benchmarks
40 bs <- sequence
40 bs <- sequence
41 [ Builder.benchmark
41 [ Builder.benchmark
42− , DecodeUtf8.benchmark (tf "russian.txt")
42+ , DecodeUtf8.benchmark "xml" (tf "yiwiki.xml")
43+ , DecodeUtf8.benchmark "ascii" (tf "ascii.txt")
44+ , DecodeUtf8.benchmark "russian" (tf "russian.txt")
45+ , DecodeUtf8.benchmark "japanese" (tf "japanese.txt")
43 , EncodeUtf8.benchmark "επανάληψη 竺法蘭共譯"
46 , EncodeUtf8.benchmark "επανάληψη 竺法蘭共譯"
44 , Equality.benchmark (tf "japanese.txt")
47 , Equality.benchmark (tf "japanese.txt")
45 , FileRead.benchmark (tf "russian.txt")
48 , FileRead.benchmark (tf "russian.txt")
tests/benchmarks/src/Data/Text/Benchmarks/DecodeUtf8.hs+5−3
@@ -23,7 +23,8 @@ import Data.ByteString.Internal (ByteString(..))
23import Foreign.Ptr (Ptr, plusPtr)
23import Foreign.Ptr (Ptr, plusPtr)
24import Foreign.ForeignPtr (withForeignPtr)
24import Foreign.ForeignPtr (withForeignPtr)
25import Data.Word (Word8)
25import Data.Word (Word8)
26+import qualified Criterion as C
26−import Criterion (Benchmark, bgroup, bench, nf)
27+import Criterion (Benchmark, bgroup, nf)
27import qualified Codec.Binary.UTF8.Generic as U8
28import qualified Codec.Binary.UTF8.Generic as U8
28import qualified Data.ByteString as B
29import qualified Data.ByteString as B
29import qualified Data.ByteString.Lazy as BL
30import qualified Data.ByteString.Lazy as BL
@@ -32,10 +33,11 @@ import qualified Data.Text.Encoding as T
32import qualified Data.Text.Lazy as TL
33import qualified Data.Text.Lazy as TL
33import qualified Data.Text.Lazy.Encoding as TL
34import qualified Data.Text.Lazy.Encoding as TL
34
35
35−benchmark :: FilePath -> IO Benchmark
36+benchmark :: String -> FilePath -> IO Benchmark
36−benchmark fp = do
37+benchmark kind fp = do
37 bs <- B.readFile fp
38 bs <- B.readFile fp
38 lbs <- BL.readFile fp
39 lbs <- BL.readFile fp
40+ let bench name = C.bench (name ++ "+" ++ kind)
39 return $ bgroup "DecodeUtf8"
41 return $ bgroup "DecodeUtf8"
40 [ bench "Strict" $ nf T.decodeUtf8 bs
42 [ bench "Strict" $ nf T.decodeUtf8 bs
41 , bench "IConv" $ iconv bs
43 , bench "IConv" $ iconv bs