Merge pull request #5964 from IntersectMBO/bench-master

bench: `6-dense` profiles; resource trace emission fix
IntersectMBO · Aug 31, 2024 · 914c62c · 914c62c
2 parents d7abccd + 4344e9f
commit 914c62c
Show file tree

Hide file tree

Showing 13 changed files with 132,268 additions and 100,731 deletions.
diff --git a/Makefile b/Makefile
@@ -88,6 +88,7 @@ PROFILES_PLUTUSCALL       += plutuscall-loop-double plutuscall-secp-ecdsa-double
 PROFILES_MODEL            := model-value model-secp-ecdsa-plain model-secp-ecdsa-half model-secp-ecdsa-double
 PROFILES_MODEL            += model-value-test
 PROFILES_10               := 10 10-p2p 10-plutus 10-notracer
+PROFILES_6                := 6-dense 6-dense-rtsprof 6-dense-1h 6-dense-1h-rtsprof 6-dense-4h 6-dense-4h-rtsprof
 PROFILES_FORGE_STRESS     := forge-stress forge-stress-p2p forge-stress-plutus forge-stress-plutus-solo forge-stress-notracer forge-stress-large forge-stress-solo forge-stress-solo-xs
 PROFILES_FORGE_STRESS_PRE := forge-stress-pre forge-stress-pre-plutus forge-stress-pre-notracer forge-stress-pre-solo forge-stress-pre-solo-xl forge-stress-pre-solo-xs
 PROFILES_FORGE_STRESS_RTS := forge-stress-pre-rtsA4m forge-stress-pre-rtsA64m forge-stress-pre-rtsN3 forge-stress-pre-rtsA4mN3 forge-stress-pre-rtsA64mN3 forge-stress-pre-rtsxn

diff --git a/bench/cardano-profile/app/cardano-profile.hs b/bench/cardano-profile/app/cardano-profile.hs
@@ -22,14 +22,7 @@ data Cli = Names | All | ByName String | LibMK | ToJson String | FromJson String
 
 main :: IO ()
 main = do
-  cli <- OA.execParser
-    (OA.info
-      cliParser
-      (   OA.fullDesc
-       <> OA.progDesc "Cardano benchmarking profile generator"
-       <> OA.header "names | all | make PROFILE_NAME | from-json FILE.json | to-json FILE.hs"
-      )
-    )
+  cli <- getOpts
   case cli of
     -- Print all profile names.
     Names -> BSL8.putStrLn $ Aeson.encode Profiles.names
@@ -68,6 +61,12 @@ lookupOverlay = do
                     (Just (Aeson.Object keyMap)) -> return keyMap
                     _ -> error ""
 
+getOpts :: IO Cli
+getOpts = OA.execParser $
+  OA.info
+    (cliParser OA.<**> OA.helper)
+    (OA.fullDesc <> OA.progDesc "Cardano benchmarking profile generator (-h for help)")
+
 --------------------------------------------------------------------------------
 
 cliParser :: OA.Parser Cli

diff --git a/bench/cardano-profile/cardano-profile.cabal b/bench/cardano-profile/cardano-profile.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-profile
-version:                8.4.0
+version:                8.5.0
 synopsis:               A Cardano benchmarking profile generator
 description:            A Cardano benchmarking profile generator.
 category:               Cardano,
@@ -17,10 +17,7 @@ extra-source-files:     README.md
 data-files:             data/all-profiles.json
                         data/ci-test-bage.json
                         data/genesis/epoch-timeline.json
-                        data/genesis/overlays/v8-preview.json
-                        data/genesis/overlays/v9-preview.json
-                        data/genesis/overlays/stepshalf.json
-                        data/genesis/overlays/doublebudget.json
+                        data/genesis/overlays/*.json
 
 common project-config
   build-depends:        base >= 4.14 && < 5