da3cae7 · text · git.iko.soy

git.iko.soy/text

Separate group for program-like benchmarks

commitda3cae75b3bef536b3ee32974880b42e19d2471e authorJasper Van der Jeugt <jaspervdj@gmail.com> dateFri 3 Jun 2011, 09:22 (15 years ago) parent2a7db96

2 files changed+15−6

compare with master

unifiedsplit

tests/benchmarks/src/Data/Text/Benchmarks.hs+13−4 tests/benchmarks/src/Data/Text/Benchmarks/Cut.hs → tests/benchmarks/src/Data/Text/Benchmarks/Programs/Cut.hs+2−2

tests/benchmarks/src/Data/Text/Benchmarks.hs+13−4

@@ -5,13 +5,12 @@ module Main

55 ( main

66 ) where

8−import Criterion.Main (Benchmark, defaultMain)

8+import Criterion.Main (Benchmark, defaultMain, bgroup)

99import System.FilePath ((</>))

1010import System.IO (IOMode (WriteMode), openFile, hSetEncoding, utf8)

1111

1212import qualified Data.Text.Benchmarks.Builder as Builder

1313import qualified Data.Text.Benchmarks.CaseMap as CaseMap

14−import qualified Data.Text.Benchmarks.Cut as Cut

1514import qualified Data.Text.Benchmarks.DecodeUtf8 as DecodeUtf8

1615import qualified Data.Text.Benchmarks.EncodeUtf8 as EncodeUtf8

1716import qualified Data.Text.Benchmarks.Equality as Equality

@@ -27,6 +26,8 @@ import qualified Data.Text.Benchmarks.Sort as Sort

2726import qualified Data.Text.Benchmarks.StripBrackets as StripBrackets

2827import qualified Data.Text.Benchmarks.WordCount as WordCount

2928

29+import qualified Data.Text.Benchmarks.Programs.Cut as Programs.Cut

30+

3031main :: IO ()

3132main = benchmarks >>= defaultMain

3233

@@ -34,10 +35,11 @@ benchmarks :: IO [Benchmark]

3435benchmarks = do

3536 sink <- openFile "/dev/null" WriteMode

3637 hSetEncoding sink utf8

37− sequence

38+

39+ -- Traditional benchmarks

40+ bs <- sequence

3841 [ Builder.benchmark

3942 , CaseMap.benchmark (tf "russian.txt") sink

40− , Cut.benchmark (tf "russian.txt") sink 30 60

4143 , DecodeUtf8.benchmark (tf "russian.txt")

4244 , EncodeUtf8.benchmark sink "επανάληψη 竺法蘭共譯"

4345 , Equality.benchmark (tf "japanese.txt")

@@ -53,6 +55,13 @@ benchmarks = do

5355 , StripBrackets.benchmark (tf "russian.txt") sink

5456 , WordCount.benchmark (tf "russian.txt")

5557 ]

58+

59+ -- Program-like benchmarks

60+ ps <- bgroup "Programs" `fmap` sequence

61+ [ Programs.Cut.benchmark (tf "russian.txt") sink 20 40

62+ ]

63+

64+ return $ bs ++ [ps]

5665 where

5766 -- Location of a test file

5867 tf = ("../text/test" </>)

tests/benchmarks/src/Data/Text/Benchmarks/Cut.hs → tests/benchmarks/src/Data/Text/Benchmarks/Programs/Cut.hsrenamed+2−2

@@ -1,6 +1,6 @@

1−-- | Cut into a file, selecting certain columns (e.g. lines 10 to 40)

1+-- | Cut into a file, selecting certain columns (e.g. columns 10 to 40)

22--

3−module Data.Text.Benchmarks.Cut

3+module Data.Text.Benchmarks.Programs.Cut

44 ( benchmark

55 ) where