Skip to content

Commit 57a7d44

Browse files
fmastefmaste
committed
wb | move all profiles using genesis epoch 300 to voltaire keeping 64k block size
1 parent 9fa5cd2 commit 57a7d44

13 files changed

Lines changed: 55507 additions & 16306 deletions

File tree

‎bench/cardano-profile/data/all-profiles.json‎

Lines changed: 55481 additions & 16281 deletions
Large diffs are not rendered by default.

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Cloud.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ profilesCloud =
218218
P.empty & B.base
219219
. P.fixedLoaded
220220
. composeFiftytwo
221-
-- TODO: Use `genesisVariant300` like the others and to "Scenario.Base".
221+
-- TODO: Use the same genesis variant as the others and move to "Scenario.Base".
222222
. V.genesisVariantPreVoltaire
223223
. V.timescaleCompressed
224224
-- TODO: "tracer-only" and "idle" have `P.delegators 6`.
@@ -248,7 +248,7 @@ profilesCloud =
248248
-- TODO: Inconsistency: "ci-test-nomadperf" uses 2+Explorer nodes and "fast-nomadperf*" 52+Explorer nodes.
249249
. P.torus . V.hosts 2 . P.withExplorerNode
250250
-- TODO: Inconsistency: "ci-test-nomadperf" uses epoch 300 and "fast-nomadperf*" the last know epoch.
251-
. V.genesisVariant300
251+
. V.genesisVariantVoltaire64k
252252
in [
253253
fastNP & P.name "fast-nomadperf"
254254
, ciNP & P.name "ci-test-nomadperf"
@@ -260,7 +260,7 @@ profilesCloud =
260260
-- TODO: Inconsistency: "fast-nomadperf*" uses 52+Explorer nodes and "ci-test-nomadperf" 2+Explorer nodes.
261261
. P.torus . V.hosts 6 . P.withExplorerNode
262262
-- TODO: Inconsistency: "ci-test-nomadperf" uses epoch 300 and "fast-nomadperf*" the last know epoch.
263-
. V.genesisVariant300
263+
. V.genesisVariantVoltaire64k
264264
-- TODO: The only ones without 0 delegators.
265265
-- Fix and remove `E.baseNoDataset` (Same `E.base` for all).
266266
. P.delegators 6
@@ -274,7 +274,7 @@ profilesCloud =
274274
& P.fixedLoaded
275275
. V.hosts 2 . P.torus . nomadPerf . P.withExplorerNode
276276
. V.timescaleCompressed
277-
. V.genesisVariant300
277+
. V.genesisVariantVoltaire64k
278278
. V.datasetMiniature . V.fundsDefault
279279
. P.shutdownOnBlock 15
280280
-- TODO: dummy "generator.epochs" ignored in favor of "--shutdown-on".

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Empty.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ baseNoDataset =
4848

4949
-- TODO: Move to `base`?
5050
genesis :: Types.Profile -> Types.Profile
51-
genesis = V.genesisVariant300
51+
genesis = V.genesisVariantVoltaire64k
5252

5353
--------------------------------------------------------------------------------
5454

@@ -177,8 +177,8 @@ profilesEmpty = map baseNoDataset
177177
-- TODO: The only one without 0 delegators.
178178
-- Fix and remove `baseNoDataset` (Same `base` for all).
179179
. P.utxo 0 . P.delegators 6 . P.dreps 0
180-
value = noCliStop & V.genesisVariant300
181-
-- TODO: "fast-plutus" and "ci-test-plutus" are using `genesisVariant300`.
180+
value = noCliStop & V.genesisVariantVoltaire64k
181+
-- TODO: "fast-plutus" and "ci-test-plutus" use the value `genesis` variant, not `genesisVariantPreVoltaire`.
182182
plutus = noCliStop & V.genesisVariantPreVoltaire
183183
-- intricacies of fee calculation..., default fee works for ci-test-plutus and ci-bench-plutus
184184
loop = P.txFeeOverwrite 1380000 . V.plutusLoop

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/ForgeStress.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ profilesForgeStress =
5454
let fs = P.empty & base
5555
-- Helpers by composition size:
5656
-- TODO: Bump all to genesisVariantVoltaire; however, except for the solo profile, forge-stress works better with a smaller block size (64k)
57-
n1 = V.genesisVariantPreVoltaire . V.hosts 1
58-
n3 = V.genesisVariant300 . V.hosts 3
59-
v6 = V.genesisVariantVoltaire . V.hosts 6 . P.blocksize64k
57+
n1 = V.genesisVariantPreVoltaire . V.hosts 1
58+
n3 = V.genesisVariantVoltaire64k . V.hosts 3
59+
v6 = V.genesisVariantVoltaire64k . V.hosts 6
6060
in [
6161
-- 1 node versions (non-pre).
6262
fs & P.name "forge-stress-solo-xs" . V.valueLocal . n1 . V.datasetCurrent . durationXS . P.traceForwardingOn . P.analysisUnitary

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/K3.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ profilesK3 =
2727
P.empty
2828
& P.fixedLoaded
2929
. P.uniCircle . V.hosts 3 . P.loopback
30-
. V.genesisVariant300
30+
. V.genesisVariantVoltaire64k
3131
. P.epochLength 600 . P.activeSlotsCoeff 0.05 . P.parameterK 3
3232
. V.datasetCurrent -- 10000000 UTxO (10000kU), 1300000 delegators (1300kD)
3333
. V.fundsDefault

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Legacy/Dense.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ profilesDense =
2626
P.empty & E.base
2727
-- Biggest difference is using `P.pools` instead of `P.hosts`.
2828
. P.uniCircle . P.pools 10 . P.loopback
29-
. V.genesisVariant300
29+
. V.genesisVariantVoltaire64k
3030
. E.ciTestDuration
3131
. P.cBlockMinimumAdoptions 9
3232
in [

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Legacy/Dish.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ profilesDish =
3333
-- Using `P.newTracing` like all "forge-stress" profiles.
3434
P.empty & FS.base
3535
. V.hosts 3
36-
. V.genesisVariant300
36+
. V.genesisVariantVoltaire64k
3737
. P.delegators 0 . P.dreps 0
3838
. FS.durationM
3939
. P.traceForwardingOn

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Miniature.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ profilesMiniature =
6969
ciBench02 = ciBench & V.hosts 2
7070
ciBench10 = ciBench & V.hosts 10
7171
-- Helpers by workload:
72-
ciBench02Value = ciBench02 & V.genesisVariant300
72+
ciBench02Value = ciBench02 & V.genesisVariantVoltaire64k
7373
ciBench02Plutus = ciBench02 & V.genesisVariantPreVoltaire
7474
ciBench02PlutusV3 = ciBench02 & V.genesisVariantVoltaire
75-
ciBench10Value = ciBench10 & V.genesisVariant300
76-
ciBench10Plutus = ciBench10 & V.genesisVariant300
75+
ciBench10Value = ciBench10 & V.genesisVariantVoltaire64k
76+
ciBench10Plutus = ciBench10 & V.genesisVariantVoltaire64k
7777

7878
loop = V.plutusSaturation . V.plutusTypeLoop . P.analysisSizeSmall
7979
loop2024 = V.plutusSaturation . V.plutusTypeLoop2024 . P.analysisSizeSmall

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Scenario/Chainsync.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ profilesChainsync =
2828
-- TODO: Explorer node is needed ? Or a new property is needed ?
2929
. P.uniCircle . P.withExplorerNode . P.loopback
3030
. P.hostsChainsync 1 . P.withChaindbServer
31-
. V.genesisVariant300
31+
. V.genesisVariantVoltaire64k
3232
. V.timescaleMainnet
3333
-- TODO: "tracer-only" and "idle" have `P.delegators 6`.
3434
-- Remove and use `V.datasetEmpty` in module "Scenario.Base".

‎bench/cardano-profile/src/Cardano/Benchmarking/Profile/Builtin/Scenario/Idle.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ profilesIdle =
2929
P.empty & B.base
3030
. P.idle
3131
. P.uniCircle . V.hosts 6 . P.loopback
32-
. V.genesisVariant300
32+
. V.genesisVariantVoltaire64k
3333
-- TODO: "tracer-only" and "idle" have `P.delegators 6`.
3434
-- Remove and use `V.datasetEmpty` in module "Scenario.Base".
3535
. P.delegators 6

0 commit comments

Comments
 (0)