Merge pull request #5969 from IntersectMBO/bench-master-coay

bench: new performance baseline for Voltaire era
IntersectMBO · Sep 5, 2024 · 51fa20e · 51fa20e
2 parents 602d5ec + 2266e64
commit 51fa20e
Show file tree

Hide file tree

Showing 22 changed files with 1,430 additions and 430,023 deletions.
diff --git a/Makefile b/Makefile
@@ -7,8 +7,8 @@ include nix.mk
 PROJECT_NAME = cardano-node
 NUM_PROC     = $(nproc --all)
 
-## One of:  shey alra mary alzo bage
-ERA     ?= bage
+## One of:  shey alra mary alzo bage coay
+ERA     ?= coay
 
 PROFILE ?= default-${ERA}
 BACKEND ?= supervisor
@@ -74,65 +74,10 @@ ps:                                              ## Plain-text list of profiles
 ##
 ## Profile-based cluster shells (autogenerated targets)
 ##
-PROFILES_BASE             := default default-p2p plutus plutus-secp-ecdsa plutus-secp-schnorr oldtracing idle tracer-only
-PROFILES_FAST             := fast fast-solo fast-p2p fast-plutus fast-notracer fast-oldtracing faststartup-24M
-PROFILES_CI_TEST          := ci-test ci-test-p2p ci-test-plutus ci-test-notracer ci-test-rtview ci-test-dense10 ci-test-hydra
-PROFILES_CI_BENCH         := ci-bench ci-bench-p2p ci-bench-plutus ci-bench-plutus-secp-ecdsa ci-bench-plutus-secp-schnorr ci-bench-notracer ci-bench-rtview ci-bench-lmdb ci-bench-drep
-PROFILES_CI_BENCH         += ci-bench-plutusv3-blst ci-bench-plutus24
-PROFILES_TRACE_BENCH      := trace-bench trace-bench-notracer trace-bench-oldtracing trace-bench-rtview
-PROFILES_TRACE_FULL       := trace-full trace-full-rtview
-PROFILES_EPOCHTRANS       := epoch-transition
-PROFILES_PLUTUSCALL       := plutuscall-loop-plain plutuscall-secp-ecdsa-plain plutuscall-secp-schnorr-plain
-PROFILES_PLUTUSCALL       += plutuscall-loop-half plutuscall-secp-ecdsa-half plutuscall-secp-schnorr-half
-PROFILES_PLUTUSCALL       += plutuscall-loop-double plutuscall-secp-ecdsa-double plutuscall-secp-schnorr-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
-PROFILES_CHAINSYNC        := chainsync-early-byron  chainsync-early-byron-notracer  chainsync-early-byron-oldtracing
-PROFILES_CHAINSYNC        += chainsync-early-alonzo chainsync-early-alonzo-notracer chainsync-early-alonzo-oldtracing chainsync-early-alonzo-p2p
-PROFILES_VENDOR           := dish dish-plutus dish-10M dish-10M-plutus
-# The dedicated P&T Nomad cluster on AWS
-# Cloud version of "default", "ci-test" and "ci-bench" plus value (52+explorer)
-# Not all local profiles are compatible or tested (yet) with a cloud runs
-PROFILES_NOMAD_PERF       := default-nomadperf ci-test-nomadperf ci-bench-nomadperf value-nomadperf oldtracing-nomadperf ci-test-oldtracing-nomadperf ci-bench-oldtracing-nomadperf value-oldtracing-nomadperf
-PROFILES_NOMAD_PERF       += plutus-nomadperf plutus24-nomadperf fast-nomadperf latency-nomadperf
-PROFILES_NOMAD_PERF       += plutusv3-blst-nomadperf plutusv3-blst-half-nomadperf plutusv3-blst-double-nomadperf
-PROFILES_NOMAD_PERF       += plutus-secp-ecdsa-nomadperf plutus-secp-schnorr-nomadperf
-PROFILES_NOMAD_PERF_DREP  := value-drep1k-nomadperf value-drep2k-nomadperf value-drep10k-nomadperf value-drep100k-nomadperf
-PROFILES_NOMAD_PERF_DREP  += plutus-drep1k-nomadperf plutus-drep2k-nomadperf plutus-drep10k-nomadperf plutus-drep100k-nomadperf
-PROFILES_NOMAD_PERF_NOP2P := default-nomadperf-nop2p oldtracing-nomadperf-nop2p ci-test-nomadperf-nop2p ci-bench-nomadperf-nop2p
-PROFILES_NOMAD_PERF_NOP2P += value-nomadperf-nop2p value-oldtracing-nomadperf-nop2p plutus-nomadperf-nop2p fast-nomadperf-nop2p
-PROFILES_NOMAD_PERFSSD    := value-nomadperfssd fast-nomadperfssd latency-nomadperfssd
-# single node profiles on the NomadSSD cluster on AWS
-PROFILES_UTXOSCALE_SOLO	  := utxoscale-solo-24M64G-nomadperfssd utxoscale-solo-12M64G-nomadperfssd utxoscale-solo-12M16G-nomadperfssd
-
-LOCAL_PROFILES += $(PROFILES_BASE)
-LOCAL_PROFILES += $(PROFILES_FAST)
-LOCAL_PROFILES += $(PROFILES_CI_TEST)
-LOCAL_PROFILES += $(PROFILES_CI_BENCH)
-LOCAL_PROFILES += $(PROFILES_TRACE_BENCH)
-LOCAL_PROFILES += $(PROFILES_TRACE_FULL)
-LOCAL_PROFILES += $(PROFILES_EPOCHTRANS)
-LOCAL_PROFILES += $(PROFILES_PLUTUSCALL)
-LOCAL_PROFILES += $(PROFILES_MODEL)
-LOCAL_PROFILES += $(PROFILES_10)
-LOCAL_PROFILES += $(PROFILES_FORGE_STRESS)
-LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_PRE)
-LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_RTS)
-LOCAL_PROFILES += $(PROFILES_CHAINSYNC)
-LOCAL_PROFILES += $(PROFILES_VENDOR)
-CLOUD_PROFILES += $(PROFILES_NOMAD_PERF)
-CLOUD_PROFILES += $(PROFILES_NOMAD_PERF_DREP)
-CLOUD_PROFILES += $(PROFILES_NOMAD_PERF_NOP2P)
-CLOUD_PROFILES += $(PROFILES_NOMAD_PERFSSD)
-CLOUD_PROFILES += $(PROFILES_UTXOSCALE_SOLO)
-
-
-## Note:  to enable a shell for a profile, just add its name (one of names from 'make ps') to SHELL_PROFILES
+## wb_profiles.mk is autogenerated by `cardano-profile lib-make`. It contains all known profile families and flavours (minus the era, backend and shell type suffixes).
+## After adding or removing profile definitions in `cardano-profile`, you'll probably want to also commit a regenerated version of that file.
+##
+include wb_profiles.mk
 
 $(eval $(call define_profile_targets,           $(LOCAL_PROFILES)))
 $(eval $(call define_profile_targets_nomadcloud,$(CLOUD_PROFILES)))

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.5.0
+version:                8.6.0
 synopsis:               A Cardano benchmarking profile generator
 description:            A Cardano benchmarking profile generator.
 category:               Cardano,
@@ -70,9 +70,6 @@ executable cardano-profile
   import:               project-config
   hs-source-dirs:       app/
   main-is:              cardano-profile.hs
-  ghc-options:          -threaded
-                        -rtsopts
-                        "-with-rtsopts=-T"
   build-depends:        aeson
                       , vector
                       , bytestring
@@ -93,6 +90,3 @@ test-suite cardano-profile-test
                       , tasty
                       , tasty-hunit
                       , cardano-profile
-  ghc-options:          -threaded
-                        -rtsopts
-                        "-with-rtsopts=-T"