Skip to content

Commit c99980f

Browse files
committed
wb | latency is a cloud profile (nomadcloud backend)
1 parent 3ab929e commit c99980f

File tree

5 files changed

+47
-52
lines changed

5 files changed

+47
-52
lines changed

bench/cardano-profile/cardano-profile.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ library
5656
, Cardano.Benchmarking.Profile.Builtin.Plutuscall
5757
, Cardano.Benchmarking.Profile.Builtin.Scenario.Base
5858
, Cardano.Benchmarking.Profile.Builtin.Scenario.Chainsync
59-
, Cardano.Benchmarking.Profile.Builtin.Scenario.Latency
6059
, Cardano.Benchmarking.Profile.Builtin.Scenario.Idle
6160
, Cardano.Benchmarking.Profile.Builtin.Scenario.TracerOnly
6261
, Cardano.Benchmarking.Profile.Extra.Scaling

bench/cardano-profile/src/Cardano/Benchmarking/Profile.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import Cardano.Benchmarking.Profile.Builtin.Model (profi
4141
import Cardano.Benchmarking.Profile.Builtin.Plutuscall (profilesNoEraPlutuscall)
4242
import Cardano.Benchmarking.Profile.Builtin.Scenario.Chainsync (profilesNoEraChainsync)
4343
import Cardano.Benchmarking.Profile.Builtin.Scenario.Idle (profilesNoEraIdle)
44-
import Cardano.Benchmarking.Profile.Builtin.Scenario.Latency (profilesNoEraLatency)
4544
import Cardano.Benchmarking.Profile.Builtin.Scenario.TracerOnly (profilesNoEraTracerOnly)
4645
import Cardano.Benchmarking.Profile.Extra.Scaling (profilesNoEraScalingLocal, profilesNoEraScalingCloud)
4746
import Cardano.Benchmarking.Profile.Extra.Voting (profilesNoEraVoting)
@@ -142,7 +141,6 @@ profilesNoEra obj = Map.fromList $ map
142141
-- Empty datasets not running `FixedLoaded`.
143142
++ profilesNoEraChainsync -- Scenario `Chainsync`
144143
++ profilesNoEraIdle -- Scenario `Idle`
145-
++ profilesNoEraLatency -- Scenario `Latency`
146144
++ profilesNoEraTracerOnly -- Scenario `TracerOnly`
147145
-- Extra modules
148146
++ profilesNoEraScalingLocal
@@ -582,7 +580,6 @@ libMKLocations =
582580
, ("PROFILES_SCENARIOS" ,
583581
profilesNoEraChainsync
584582
++ profilesNoEraIdle
585-
++ profilesNoEraLatency
586583
++ profilesNoEraTracerOnly
587584
)
588585
, ("PROFILES_LEGACY" ,

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ import Prelude
1818
import Data.Function ((&))
1919
-- Package: self.
2020
import qualified Cardano.Benchmarking.Profile.Builtin.Empty as E
21+
import qualified Cardano.Benchmarking.Profile.Builtin.Scenario.Base as B
2122
import qualified Cardano.Benchmarking.Profile.Primitives as P
2223
import qualified Cardano.Benchmarking.Profile.Types as Types
2324
import qualified Cardano.Benchmarking.Profile.Vocabulary as V
2425
import qualified Cardano.Benchmarking.Profile.Workload.Voting as W
26+
import qualified Cardano.Benchmarking.Profile.Workload.Latency as L
2527

2628
--------------------------------------------------------------------------------
2729

@@ -170,10 +172,31 @@ profilesNoEraCloud =
170172
, loopVoting & P.name "plutus-voting-volt-nomadperf" . P.dreps 10000 . P.newTracing . P.p2pOn . P.workloadAppend W.votingWorkloadx1
171173
, loopVoting & P.name "plutus-voting-double-volt-nomadperf" . P.dreps 10000 . P.newTracing . P.p2pOn . P.workloadAppend W.votingWorkloadx2
172174
]
175+
-----------
176+
-- Latency.
177+
-----------
178+
++
179+
let latency =
180+
P.empty & B.base
181+
. P.fixedLoaded
182+
. composeFiftytwo
183+
-- TODO: Use `genesisVariant300` like the others and to "Scenario.Base".
184+
. V.genesisVariantPreVoltaire
185+
. V.timescaleCompressed
186+
-- TODO: "tracer-only" and "idle" have `P.delegators 6`.
187+
-- Remove and use `V.datasetEmpty` in module "Scenario.Base".
188+
. P.delegators 0
189+
. P.workloadAppend L.latencyWorkload
190+
. P.analysisStandard
191+
in (
192+
latency & P.name "latency-nomadperf"
193+
. P.desc "AWS perf class cluster, stop when all latency services stop"
194+
. P.traceForwardingOn . P.newTracing . P.p2pOn . nomadPerf
195+
)
173196
----------------------
174197
-- Testing benchmarks.
175198
----------------------
176-
++
199+
:
177200
-- TODO: Inconsistency: "fast*" and "ci-test*" use `V.valueLocal` and "default*"/"oldtracing" use `V.valueCloud`.
178201
let valueCI = P.empty & E.base . V.valueLocal . P.traceForwardingOn . nomadPerf
179202
fastNP = valueCI

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

Lines changed: 0 additions & 47 deletions
This file was deleted.

bench/cardano-profile/src/Cardano/Benchmarking/Profile/Extra/Scaling.hs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ import Data.Function ((&))
1616
-- Package: self.
1717
import qualified Cardano.Benchmarking.Profile.Builtin.Cloud as C
1818
import qualified Cardano.Benchmarking.Profile.Builtin.Empty as E
19+
import qualified Cardano.Benchmarking.Profile.Builtin.Scenario.Base as B
1920
import qualified Cardano.Benchmarking.Profile.Primitives as P
2021
import qualified Cardano.Benchmarking.Profile.Types as Types
2122
import qualified Cardano.Benchmarking.Profile.Vocabulary as V
23+
import qualified Cardano.Benchmarking.Profile.Workload.Latency as L
2224

2325
--------------------------------------------------------------------------------
2426

@@ -63,6 +65,27 @@ profilesNoEraScalingCloud =
6365
, fast & P.name "fast-nomadperfssd" . V.valueLocal . P.traceForwardingOn . P.newTracing . P.p2pOn
6466
, value & P.name "value-nomadperfssd" . V.valueCloud . V.datasetOct2021 . P.dreps 0 . V.fundsDouble . P.newTracing . P.p2pOn
6567
]
68+
-----------
69+
-- Latency.
70+
-----------
71+
++
72+
let latency =
73+
P.empty & B.base
74+
. P.fixedLoaded
75+
. C.composeFiftytwo
76+
-- TODO: Use `genesisVariant300` like the others and to "Scenario.Base".
77+
. V.genesisVariantPreVoltaire
78+
. V.timescaleCompressed
79+
-- TODO: "tracer-only" and "idle" have `P.delegators 6`.
80+
-- Remove and use `V.datasetEmpty` in module "Scenario.Base".
81+
. P.delegators 0
82+
. P.workloadAppend L.latencyWorkload
83+
. P.analysisStandard
84+
in [
85+
latency & P.name "latency-nomadperfssd"
86+
. P.desc "AWS perf-ssd class cluster, stop when all latency services stop"
87+
. P.traceForwardingOn . P.newTracing . P.p2pOn . nomadSsd
88+
]
6689

6790
nomadSsd :: Types.Profile -> Types.Profile
6891
nomadSsd = clusterNomadSsdNoRegions . nomadSsdRegions

0 commit comments

Comments
 (0)