Fix bench targets, array read instance benchmark

benchmark/Streamly/Benchmark/Data/Array.hs

@@ -78,7 +78,7 @@ o_1_space_generation value =
     [ bgroup
         "generation"
         [ benchIOSrc "write . intFromTo" (sourceIntFromToFromStream value)
-        , let testStr = mkListString value
+        , let testStr = "fromList " ++ mkListString value
            in testStr `deepseq` bench "read" (nf readInstance testStr)
         , benchPureSrc "writeN . IsList.fromList" (sourceIsList value)
         , benchPureSrc

benchmark/bench-runner/Main.hs

@@ -81,10 +81,10 @@ rtsOpts exeName benchName0 = unwords [general, exeSpecific, benchSpecific]
              && "/o-1-space.generation.read" `isSuffixOf` benchName = "-M32M"
         | "Data.Array" `isPrefixOf` benchName
              && "/o-1-space.generation.show" `isSuffixOf` benchName = "-M32M"
-        | "Data.Array/o-1-space.transformationX4.map" == benchName = "-M32M"
-        | "Data.Array.Unboxed/o-1-space.elimination.foldable.foldl"
+        | "Data.Array.Generic/o-1-space.transformationX4.map" == benchName = "-M32M"
+        | "Data.Array/o-1-space.elimination.foldable.foldl"
              `isPrefixOf` benchName = "-K8M"
-        | "Data.Array.Unboxed/o-1-space.elimination.foldable.sum" == benchName =
+        | "Data.Array/o-1-space.elimination.foldable.sum" == benchName =
             "-K8M"
         | "Unicode.Char/o-1-space." `isPrefixOf` benchName = "-M32M"
         | otherwise = ""

targets/Targets.hs

@@ -108,18 +108,18 @@ targets =
       )
 
     -- Arrays
-    , ("Data.Array",
+    , ("Data.Array.Generic",
             [ "array_grp"
             , "array_cmp"
             ]
       )
-    , ("Data.Array.Unboxed",
+    , ("Data.Array",
             [ "array_grp"
             , "array_cmp"
             , "pinned_array_cmp"
             ]
       )
-    , ("Data.Array.Unboxed.Mut",
+    , ("Data.Array.Mut",
             [ "array_grp"
             , "array_cmp"
             , "noTest"