@@ -544,7 +544,6 @@ o_1_space_nested streamLen =
544544o_1_space_transformation :: Int -> Benchmark
545545o_1_space_transformation streamLen =
546546 bgroup "transformation"
547− [ bgroup "X1"
548547 [ benchFold "foldrS" (foldrS 1) (sourceUnfoldrM streamLen)
549548 , benchFold "scan" (scan 1) (sourceUnfoldrM streamLen)
550549 , benchFold "map" (map 1) (sourceUnfoldrM streamLen)
@@ -552,7 +551,10 @@ o_1_space_transformation streamLen =
552551 , benchFold "mapM" (mapM 1) (sourceUnfoldrM streamLen)
553552 , benchFold "mapMSerial" (mapMSerial 1) (sourceUnfoldrM streamLen)
554553 ]
555− , bgroup "X4"
554+
555+o_1_space_transformationX4 :: Int -> Benchmark
556+o_1_space_transformationX4 streamLen =
557+ bgroup "transformationX4"
556558 [ benchFold "scan" (scan 4) (sourceUnfoldrM streamLen)
557559 , benchFold "map" (map 4) (sourceUnfoldrM streamLen)
558560 , benchFold "fmap" (fmapK 4) (sourceUnfoldrM streamLen)
@@ -561,7 +563,6 @@ o_1_space_transformation streamLen =
561563 -- XXX this is horribly slow
562564 -- , benchFold "concatMap" (concatMap 4) (sourceUnfoldrM streamLen16)
563565 ]
564− ]
565566
566567o_1_space_concat :: Int -> Benchmark
567568o_1_space_concat streamLen =
@@ -600,7 +601,6 @@ o_1_space_concat streamLen =
600601o_1_space_filtering :: Int -> Benchmark
601602o_1_space_filtering streamLen =
602603 bgroup "filtering"
603− [ bgroup "X1"
604604 [ benchFold "filter-even" (filterEven 1) (sourceUnfoldrM streamLen)
605605 , benchFold "filter-all-out" (filterAllOut streamLen 1) (sourceUnfoldrM streamLen)
606606 , benchFold "filter-all-in" (filterAllIn streamLen 1) (sourceUnfoldrM streamLen)
@@ -611,7 +611,10 @@ o_1_space_filtering streamLen =
611611 , benchFold "dropWhile-true" (dropWhileTrue streamLen 1) (sourceUnfoldrM streamLen)
612612 , benchFold "dropWhile-false" (dropWhileFalse 1) (sourceUnfoldrM streamLen)
613613 ]
614− , bgroup "X4"
614+
615+o_1_space_filteringX4 :: Int -> Benchmark
616+o_1_space_filteringX4 streamLen =
617+ bgroup "filteringX4"
615618 [ benchFold "filter-even" (filterEven 4) (sourceUnfoldrM streamLen)
616619 , benchFold "filter-all-out" (filterAllOut streamLen 4) (sourceUnfoldrM streamLen)
617620 , benchFold "filter-all-in" (filterAllIn streamLen 4) (sourceUnfoldrM streamLen)
@@ -622,7 +625,6 @@ o_1_space_filtering streamLen =
622625 , benchFold "dropWhile-true" (dropWhileTrue streamLen 4) (sourceUnfoldrM streamLen)
623626 , benchFold "dropWhile-false" (dropWhileFalse 4) (sourceUnfoldrM streamLen)
624627 ]
625− ]
626628
627629o_1_space_zipping :: Int -> Benchmark
628630o_1_space_zipping streamLen =
@@ -633,7 +635,6 @@ o_1_space_zipping streamLen =
633635o_1_space_mixed :: Int -> Benchmark
634636o_1_space_mixed streamLen =
635637 bgroup "mixed"
636− [ bgroup "X1"
637638 [ benchFold "scan-map" (scanMap 1) (sourceUnfoldrM streamLen)
638639 , benchFold "drop-map" (dropMap 1) (sourceUnfoldrM streamLen)
639640 , benchFold "drop-scan" (dropScan 1) (sourceUnfoldrM streamLen)
@@ -645,7 +646,10 @@ o_1_space_mixed streamLen =
645646 , benchFold "filter-scan" (filterScan streamLen 1) (sourceUnfoldrM streamLen)
646647 , benchFold "filter-map" (filterMap streamLen 1) (sourceUnfoldrM streamLen)
647648 ]
648− , bgroup "X2"
649+
650+o_1_space_mixedX2 :: Int -> Benchmark
651+o_1_space_mixedX2 streamLen =
652+ bgroup "mixedX2"
649653 [ benchFold "scan-map" (scanMap 2) (sourceUnfoldrM streamLen)
650654 , benchFold "drop-map" (dropMap 2) (sourceUnfoldrM streamLen)
651655 , benchFold "drop-scan" (dropScan 2) (sourceUnfoldrM streamLen)
@@ -657,7 +661,10 @@ o_1_space_mixed streamLen =
657661 , benchFold "filter-scan" (filterScan streamLen 2) (sourceUnfoldrM streamLen)
658662 , benchFold "filter-map" (filterMap streamLen 2) (sourceUnfoldrM streamLen)
659663 ]
660− , bgroup "X4"
664+
665+o_1_space_mixedX4 :: Int -> Benchmark
666+o_1_space_mixedX4 streamLen =
667+ bgroup "mixedX4"
661668 [ benchFold "scan-map" (scanMap 4) (sourceUnfoldrM streamLen)
662669 , benchFold "drop-map" (dropMap 4) (sourceUnfoldrM streamLen)
663670 , benchFold "drop-scan" (dropScan 4) (sourceUnfoldrM streamLen)
@@ -669,7 +676,6 @@ o_1_space_mixed streamLen =
669676 , benchFold "filter-scan" (filterScan streamLen 4) (sourceUnfoldrM streamLen)
670677 , benchFold "filter-map" (filterMap streamLen 4) (sourceUnfoldrM streamLen)
671678 ]
672− ]
673679
674680o_1_space_list :: Int -> Benchmark
675681o_1_space_list streamLen =
@@ -697,10 +703,14 @@ o_1_space streamLen =
697703 , o_1_space_elimination streamLen
698704 , o_1_space_nested streamLen
699705 , o_1_space_transformation streamLen
706+ , o_1_space_transformationX4 streamLen
700707 , o_1_space_concat streamLen
701708 , o_1_space_filtering streamLen
709+ , o_1_space_filteringX4 streamLen
702710 , o_1_space_zipping streamLen
703711 , o_1_space_mixed streamLen
712+ , o_1_space_mixedX2 streamLen
713+ , o_1_space_mixedX4 streamLen
704714 , o_1_space_list streamLen
705715 ]
706716