Merge pull request IntersectMBO#5376 from input-output-hk/bench-master

workbench: various shell fixes + RTS parametrization
zeme-wana · Jul 3, 2023 · 7c5e582 · 7c5e582
2 parents ad26099 + fb27207
commit 7c5e582
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -87,6 +87,7 @@ PROFILES_MODEL		       	+= model-value-test
 PROFILES_10               := 10 10-p2p 10-plutus 10-notracer
 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-light
 PROFILES_FORGE_STRESS_PRE := forge-stress-pre forge-stress-pre-plutus forge-stress-pre-notracer forge-stress-pre-solo
+PROFILES_FORGE_STRESS_RTS := forge-stress-pre-rtsA4m forge-stress-pre-rtsA64m forge-stress-pre-rtsN3 forge-stress-pre-rtsA4mN3 forge-stress-pre-rtsA64mN3
 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
@@ -108,6 +109,7 @@ 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_CW_QA) $(PROFILES_CW_PERF)

diff --git a/nix/workbench/lib-cabal.sh b/nix/workbench/lib-cabal.sh
@@ -37,7 +37,7 @@ function workbench-prebuild-executables()
     newline
 
     unset NIX_ENFORCE_PURITY
-    for exe in cardano-node cardano-cli cardano-topology cardano-tracer tx-generator locli
+    for exe in cardano-node cardano-topology cardano-tracer tx-generator locli
     do echo "workbench:  $(blue prebuilding) $(red $exe)"
        verbose "exec"                         "cabal build ${WB_FLAGS_CABAL} -- exe:$exe"
        cabal $(test -z "${verbose:-}" && echo '-v0') build ${WB_FLAGS_CABAL} -- exe:$exe || return 1
@@ -46,10 +46,6 @@ function workbench-prebuild-executables()
     eval $restore_trace
 }
 
-function cardano-cli() {
-                          cabal -v0 run   ${WB_FLAGS_CABAL} exe:cardano-cli      -- ${WB_FLAGS_RTS} "$@"
-}
-
 function cardano-node() {
     ${WB_NODE_EXECPREFIX} cabal -v0 run   ${WB_FLAGS_CABAL} exe:cardano-node     -- ${WB_FLAGS_RTS} "$@"
 }
@@ -76,4 +72,4 @@ function tx-generator() {
 
 export WB_MODE_CABAL=t
 
-export -f cardano-cli cardano-node cardano-topology cardano-tracer locli tx-generator
+export -f cardano-node cardano-topology cardano-tracer locli tx-generator
diff --git a/nix/workbench/profile/prof1-variants.jq b/nix/workbench/profile/prof1-variants.jq
@@ -388,7 +388,7 @@ def all_profile_variants:
     ({ extra_desc:                     "with legacy iohk-monitoring"
      , suffix:                         "iomf"
      }|
-     .node.tracing_backend           = "iohk-monitoring"
+     .node.tracing_backend            = "iohk-monitoring"
     ) as $old_tracing
   |
     ({ extra_desc:                     "with P2P networking"
@@ -398,6 +398,39 @@ def all_profile_variants:
     ) as $p2p
   |
   ##
+  ### Definition vocabulary:  RTS config variants
+  ##
+    ({ extra_desc:                     "RTSflags A4m"
+     , suffix:                         "rtsA4m"
+     }|
+     .node.rts_flags_override         = ["-A4m"]
+    ) as $rts_A4m
+  |
+    ({ extra_desc:                     "RTSflags A64m"
+     , suffix:                         "rtsA64m"
+     }|
+     .node.rts_flags_override         = ["-A64m"]
+    ) as $rts_A64m
+  |
+    ({ extra_desc:                     "RTSflags N3"
+     , suffix:                         "rtsN3"
+     }|
+     .node.rts_flags_override         = ["-N3"]
+    ) as $rts_N3
+  |
+    ({ extra_desc:                     "RTSflags A4m N3"
+     , suffix:                         "rtsA4mN3"
+     }|
+     .node.rts_flags_override         = ["-A4m", "-N3"]
+    ) as $rts_A4mN3
+  |
+    ({ extra_desc:                     "RTSflags A64m N3"
+     , suffix:                         "rtsA64mN3"
+     }|
+     .node.rts_flags_override         = ["-A64m", "-N3"]
+    ) as $rts_A64mN3
+  |
+  ##
   ### Definition vocabulary:  scenario
   ##
    ($mainnet_timescale * $chainsync_cluster * $no_filtering * $without_tracer *
@@ -815,6 +848,23 @@ def all_profile_variants:
     { name: "forge-stress-pre-notracer"
     }
 
+  ## Large dataset, small cluster (3 nodes), variants for RTS parametrization
+  , $forge_stress_pre_base * $rts_A4m *
+    { name: "forge-stress-pre-rtsA4m"
+    }
+  , $forge_stress_pre_base * $rts_A64m *
+    { name: "forge-stress-pre-rtsA64m"
+    }
+  , $forge_stress_pre_base * $rts_N3 *
+    { name: "forge-stress-pre-rtsN3"
+    }
+  , $forge_stress_pre_base * $rts_A4mN3 *
+    { name: "forge-stress-pre-rtsA4mN3"
+    }
+  , $forge_stress_pre_base * $rts_A64mN3 *
+    { name: "forge-stress-pre-rtsA64mN3"
+    }
+
   , $scenario_chainsync * $chaindb_early_byron *
     { name: "chainsync-early-byron"
     }

diff --git a/nix/workbench/shell.nix b/nix/workbench/shell.nix
@@ -107,6 +107,7 @@ in project.shellFor {
     db-analyser
     pkgs.graphviz
     graphmod
+    jq
     weeder
     nix
     pkgconfig