git.iko.soy/streamly
on master help sign in
Fix reports for StreamD/K
6279c37Harendra Kumar
benchmark/Chart.hs+36−13
compare with master
unifiedsplit
@@ -128,29 +128,29 @@ makeLinearGraphs cfg inputFile = do
128 fmap ("Streamly",) . stripPrefix "serially/filtering/"
128 fmap ("Streamly",) . stripPrefix "serially/filtering/"
129 }
129 }
130
130
131− ignoringErr $ graph inputFile "composed-transformation" $ cfg
131+ ignoringErr $ graph inputFile "transformationX4" $ cfg
132− { title = Just "Composed Transformation"
132+ { title = Just "Transformation x 4"
133 , classifyBenchmark =
133 , classifyBenchmark =
134− fmap ("Streamly",) . stripPrefix "serially/transformationN/"
134+ fmap ("Streamly",) . stripPrefix "serially/transformationX4/"
135 }
135 }
136
136
137− ignoringErr $ graph inputFile "composed-filtering"
137+ ignoringErr $ graph inputFile "filteringX4"
138 $ cfg
138 $ cfg
139− { title = Just "Composed Filtering"
139+ { title = Just "Filtering x 4"
140 , classifyBenchmark =
140 , classifyBenchmark =
141− fmap ("Streamly",) . stripPrefix "serially/filteringN/"
141+ fmap ("Streamly",) . stripPrefix "serially/filteringX4/"
142 }
142 }
143
143
144− ignoringErr $ graph inputFile "composed-mixed"
144+ ignoringErr $ graph inputFile "mixedX4"
145 $ cfg
145 $ cfg
146− { title = Just "Composed Mixed"
146+ { title = Just "Mixed x 4"
147 , classifyBenchmark =
147 , classifyBenchmark =
148− fmap ("Streamly",) . stripPrefix "serially/composed/"
148+ fmap ("Streamly",) . stripPrefix "serially/mixedX4/"
149 }
149 }
150
150
151 ignoringErr $ graph inputFile "iterated"
151 ignoringErr $ graph inputFile "iterated"
152 $ cfg
152 $ cfg
153− { title = Just "Iterated Ops"
153+ { title = Just "Iterate 10 x 100000"
154 , classifyBenchmark =
154 , classifyBenchmark =
155 fmap ("Streamly",) . stripPrefix "serially/iterated/"
155 fmap ("Streamly",) . stripPrefix "serially/iterated/"
156 }
156 }
@@ -200,13 +200,32 @@ showStreamDVsK Options{..} cfg inp out =
200 cfg' {outputDir = Just out}
200 cfg' {outputDir = Just out}
201 else ignoringErr $ report inp Nothing cfg'
201 else ignoringErr $ report inp Nothing cfg'
202
202
203−showBaseStreams Options{..} cfg inp out =
203+showStreamD Options{..} cfg inp out =
204− let cfg' = cfg { classifyBenchmark = classifyBase }
204+ let cfg' = cfg { classifyBenchmark = classifyStreamD }
205 in if genGraphs
205 in if genGraphs
206 then ignoringErr $ graph inp "streamD"
206 then ignoringErr $ graph inp "streamD"
207 cfg' {outputDir = Just out}
207 cfg' {outputDir = Just out}
208 else ignoringErr $ report inp Nothing cfg'
208 else ignoringErr $ report inp Nothing cfg'
209
209
210+ where
211+
212+ classifyStreamD b
213+ | "streamD/" `isPrefixOf` b = ("streamD",) <$> stripPrefix "streamD/" b
214+ | otherwise = Nothing
215+
216+showStreamK Options{..} cfg inp out =
217+ let cfg' = cfg { classifyBenchmark = classifyStreamK }
218+ in if genGraphs
219+ then ignoringErr $ graph inp "streamK"
220+ cfg' {outputDir = Just out}
221+ else ignoringErr $ report inp Nothing cfg'
222+
223+ where
224+
225+ classifyStreamK b
226+ | "streamK/" `isPrefixOf` b = ("streamK",) <$> stripPrefix "streamK/" b
227+ | otherwise = Nothing
228+
210------------------------------------------------------------------------------
229------------------------------------------------------------------------------
211-- text reports
230-- text reports
212------------------------------------------------------------------------------
231------------------------------------------------------------------------------
@@ -256,6 +275,10 @@ main = do
256 then showStreamDVsK opts cfg
275 then showStreamDVsK opts cfg
257 "charts/base/results.csv"
276 "charts/base/results.csv"
258 "charts/base"
277 "charts/base"
259− else showBaseStreams opts cfg
278+ else do
279+ showStreamD opts cfg
280+ "charts/base/results.csv"
281+ "charts/base"
282+ showStreamK opts cfg
260 "charts/base/results.csv"
283 "charts/base/results.csv"
261 "charts/base"
284 "charts/base"