Merge pull request #7125 from phadej/time-per-file-hackage-tests

Tell the time per file in hackage-tests parsec

Cabal-tests/tests/HackageTests.hs

@@ -341,7 +341,8 @@ main = join (O.execParser opts)
         putStrLn $ show n ++ " files processed"
         putStrLn $ show w ++ " files contained warnings"
         putStrLn $ show f ++ " files failed to parse"
-        putStrLn $ showFFloat (Just 6) (fromInteger diff / 1e9 :: Double) " seconds elapsed"
+        putStrLn $ showFFloat (Just 6) (fromInteger diff / 1e9                  :: Double) " seconds elapsed"
+        putStrLn $ showFFloat (Just 6) (fromInteger diff / 1e6 / fromIntegral n :: Double) " milliseconds per file"
 
     roundtripP = roundtripA <$> prefixP <*> testFieldsP
     roundtripA pfx testFieldsTransform = do

cabal-benchmarks/bench/CabalBenchmarks.hs

@@ -17,10 +17,12 @@ import qualified Distribution.Types.VersionInterval        as New
 
 main :: IO ()
 main = defaultMain
-    [ env (BS.readFile "Cabal/Cabal.cabal") $ \bs ->
-      bench "Cabal" $ whnf parseGenericPackageDescriptionMaybe bs
-    , env (BS.readFile "cabal-benchmarks/cabal-benchmarks.cabal") $ \bs ->
-      bench "cabal-benchmarks" $ whnf parseGenericPackageDescriptionMaybe bs
+    [ bgroup "parseGPD"
+        [ env (BS.readFile "Cabal/Cabal.cabal") $ \bs ->
+          bench "Cabal" $ whnf parseGenericPackageDescriptionMaybe bs
+        , env (BS.readFile "cabal-benchmarks/cabal-benchmarks.cabal") $ \bs ->
+          bench "cabal-benchmarks" $ whnf parseGenericPackageDescriptionMaybe bs
+        ]
 
     , bgroup "normaliseVersionRange" $
         let suite name f = bgroup name