@@ -128,29 +128,29 @@ makeLinearGraphs cfg inputFile = do
128128 fmap ("Streamly",) . stripPrefix "serially/filtering/"
129129 }
130130
131− ignoringErr $ graph inputFile "composed-transformation" $ cfg
132− { title = Just "Composed Transformation"
131+ ignoringErr $ graph inputFile "transformationX4" $ cfg
132+ { title = Just "Transformation x 4"
133133 , classifyBenchmark =
134− fmap ("Streamly",) . stripPrefix "serially/transformationN/"
134+ fmap ("Streamly",) . stripPrefix "serially/transformationX4/"
135135 }
136136
137− ignoringErr $ graph inputFile "composed-filtering"
137+ ignoringErr $ graph inputFile "filteringX4"
138138 $ cfg
139− { title = Just "Composed Filtering"
139+ { title = Just "Filtering x 4"
140140 , classifyBenchmark =
141− fmap ("Streamly",) . stripPrefix "serially/filteringN/"
141+ fmap ("Streamly",) . stripPrefix "serially/filteringX4/"
142142 }
143143
144− ignoringErr $ graph inputFile "composed-mixed"
144+ ignoringErr $ graph inputFile "mixedX4"
145145 $ cfg
146− { title = Just "Composed Mixed"
146+ { title = Just "Mixed x 4"
147147 , classifyBenchmark =
148− fmap ("Streamly",) . stripPrefix "serially/composed/"
148+ fmap ("Streamly",) . stripPrefix "serially/mixedX4/"
149149 }
150150
151151 ignoringErr $ graph inputFile "iterated"
152152 $ cfg
153− { title = Just "Iterated Ops"
153+ { title = Just "Iterate 10 x 100000"
154154 , classifyBenchmark =
155155 fmap ("Streamly",) . stripPrefix "serially/iterated/"
156156 }
@@ -200,13 +200,32 @@ showStreamDVsK Options{..} cfg inp out =
200200 cfg' {outputDir = Just out}
201201 else ignoringErr $ report inp Nothing cfg'
202202
203−showBaseStreams Options{..} cfg inp out =
204− let cfg' = cfg { classifyBenchmark = classifyBase }
203+showStreamD Options{..} cfg inp out =
204+ let cfg' = cfg { classifyBenchmark = classifyStreamD }
205205 in if genGraphs
206206 then ignoringErr $ graph inp "streamD"
207207 cfg' {outputDir = Just out}
208208 else ignoringErr $ report inp Nothing cfg'
209209
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+
210229------------------------------------------------------------------------------
211230-- text reports
212231------------------------------------------------------------------------------
@@ -256,6 +275,10 @@ main = do
256275 then showStreamDVsK opts cfg
257276 "charts/base/results.csv"
258277 "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
260283 "charts/base/results.csv"
261284 "charts/base"