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

workbench: new profile; fix shell

Makefile

@@ -90,7 +90,8 @@ PROFILES_FORGE_STRESS_PRE := forge-stress-pre forge-stress-pre-plutus forge-stre
 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
-PROFILES_CARDANO_WORLD_QA := cardano-world-qa cardano-world-qa-test cardano-world-qa-bench
+PROFILES_CARDANO_WORLD_QA := cwqa-default cwqa-ci-test cwqa-ci-bench
+PROFILES_CARDANO_WORLD_QA += cwqa-value
 
 SHELL_PROFILES       += $(PROFILES_BASE)
 SHELL_PROFILES       += $(PROFILES_FAST)

nix/workbench/profile/prof1-variants.jq

@@ -153,6 +153,12 @@ def all_profile_variants:
       , n_dense_hosts:                  0
       }
     } as $tenner
+  |
+    { composition:
+      { n_singular_hosts:               52
+      , n_dense_hosts:                  0
+      }
+    } as $compose_fiftytwo
   |
     { composition:
       { topology:                       "torus"
@@ -254,6 +260,9 @@ def all_profile_variants:
   | ({}|
      .generator.tps                   = 15
     ) as $current_tps_saturation_value
+  | ({}|
+     .generator.tps                   = 12
+    ) as $cwqa_tps_saturation_value
   | ({}|
      .generator.tps                   = 9
     ) as $model_tps_saturation_value
@@ -395,6 +404,10 @@ def all_profile_variants:
    ($compressed_timescale * $current_tps_saturation_value *
     { scenario:                        "fixed-loaded"
     }) as $scenario_fixed_loaded
+  |
+   ($model_timescale * $cwqa_tps_saturation_value *
+    { scenario:                        "fixed-loaded"
+    }) as $scenario_cwqa
   |
    ($model_timescale * $model_tps_saturation_value *
     { scenario:                        "fixed-loaded"
@@ -438,6 +451,23 @@ def all_profile_variants:
         }
       , desc: "Small dataset, honest 15 epochs duration"
     }) as $plutuscall_base
+  |
+   ($scenario_cwqa * $compose_fiftytwo * $dataset_oct2021 * $for_7ep *
+    { node:
+        { shutdown_on_slot_synced:        56000
+        }
+      , analysis:
+        { filters:                        ["epoch3+", "size-full"]
+        }
+      , generator:
+        { init_cooldown:                  45
+        }
+      , genesis:
+        { funds_balance:                  20000000000000
+        , max_block_size:                 88000
+        }
+      , desc: "AWS c5-2xlarge cluster dataset, 7 epochs"
+    }) as $cwqa_base
   |
    ($scenario_model * $quadruplet * $dataset_current * $for_7ep *
     { node:
@@ -554,8 +584,8 @@ def all_profile_variants:
     , desc: "Idle scenario:  start only the tracer & detach from tty;  no termination"
     }
   , $cardano_world_qa *
-    { name: "cardano-world-qa"
-    , desc: "Default, as per nix/workbench/profile/prof0-defaults.jq"
+    { name: "cwqa-default"
+    , desc: "Default, but on Cardano World QA"
     }
 
   ## Fastest profile to pass analysis: just 1 block
@@ -592,7 +622,7 @@ def all_profile_variants:
     { name: "ci-test-rtview"
     }
   , $citest_base * $cardano_world_qa *
-    { name: "cardano-world-qa-test"
+    { name: "cwqa-ci-test"
     }
 
   ## CI variants: bench duration, 15 blocks
@@ -618,7 +648,7 @@ def all_profile_variants:
     { name: "ci-bench-rtview"
     }
   , $cibench_base * $cardano_world_qa *
-    { name: "cardano-world-qa-bench"
+    { name: "cwqa-ci-bench"
     }
 
   ## CI variants: test duration, 3 blocks, dense10
@@ -674,6 +704,11 @@ def all_profile_variants:
     { name: "plutuscall-secp-schnorr-double"
     }
 
+## Cardano World QA cluster: 52 nodes, 2 regions, value variant
+  , $cwqa_base * $cardano_world_qa *
+    { name: "cwqa-value"
+    }
+
 ## Model value variant: 7 epochs (128GB RAM needed; 16GB for testing locally)
   , $model_base * $costmodel_v8_preview *
     { name: "model-value"