Skip to content

Commit 22f5f2f

Browse files
NanuIjazNanuIjaz
committed
Merge remote-tracking branch 'upstream/master'
2 parents 16927be + 8355517 commit 22f5f2f

File tree

4 files changed

+56
-58
lines changed

4 files changed

+56
-58
lines changed

‎Makefile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,17 @@ PROFILES_PLUTUSCALL += plutuscall-loop-double plutuscall-secp-ecdsa-double
8787
PROFILES_MODEL := model-value model-secp-ecdsa-plain model-secp-ecdsa-half model-secp-ecdsa-double
8888
PROFILES_MODEL += model-value-test
8989
PROFILES_10 := 10 10-p2p 10-plutus 10-notracer
90-
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
91-
PROFILES_FORGE_STRESS_PRE := forge-stress-pre forge-stress-pre-plutus forge-stress-pre-notracer forge-stress-pre-solo
90+
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
91+
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
9292
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
9393
PROFILES_CHAINSYNC := chainsync-early-byron chainsync-early-byron-notracer chainsync-early-byron-oldtracing
9494
PROFILES_CHAINSYNC += chainsync-early-alonzo chainsync-early-alonzo-notracer chainsync-early-alonzo-oldtracing chainsync-early-alonzo-p2p
9595
PROFILES_VENDOR := dish dish-plutus dish-10M dish-10M-plutus
96-
# Cardano World (world.dev.cardano.org) Nomad cluster's "qa" class nodes
97-
# Cloud version of "default", "ci-test" and "ci-bench"
98-
# Not all local profiles are compatible or tested (yet) with a cloud runs
99-
PROFILES_NOMAD_CW_QA := default-nomadcwqa ci-test-nomadcwqa ci-bench-nomadcwqa oldtracing-nomadcwqa ci-test-oldtracing-nomadcwqa ci-bench-oldtracing-nomadcwqa
10096
# The dedicated P&T Nomad cluster on AWS
10197
# Cloud version of "default", "ci-test" and "ci-bench" plus value (52+explorer)
10298
# Not all local profiles are compatible or tested (yet) with a cloud runs
10399
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
104-
PROFILES_NOMAD_PERF += plutus-nomadperf
100+
PROFILES_NOMAD_PERF += plutus-nomadperf idle-nomadperf
105101
PROFILES_NOMAD_PERF_NOP2P := default-nomadperf-nop2p oldtracing-nomadperf-nop2p ci-test-nomadperf-nop2p ci-bench-nomadperf-nop2p
106102
PROFILES_NOMAD_PERF_NOP2P += value-nomadperf-nop2p value-oldtracing-nomadperf-nop2p plutus-nomadperf-nop2p
107103

@@ -120,7 +116,7 @@ LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_PRE)
120116
LOCAL_PROFILES += $(PROFILES_FORGE_STRESS_RTS)
121117
LOCAL_PROFILES += $(PROFILES_CHAINSYNC)
122118
LOCAL_PROFILES += $(PROFILES_VENDOR)
123-
CLOUD_PROFILES += $(PROFILES_NOMAD_CW_QA) $(PROFILES_NOMAD_PERF)
119+
CLOUD_PROFILES += $(PROFILES_NOMAD_PERF)
124120
CLOUD_PROFILES += $(PROFILES_NOMAD_PERF_NOP2P)
125121

126122

‎nix/workbench/profile/prof1-variants.jq‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,6 @@ def all_profile_variants:
168168
, with_explorer: true
169169
}
170170
} as $chainsync_cluster
171-
|
172-
# "qa" class Nodes of Cardano World Nomad cluster
173-
{ composition:
174-
{ locations: ["eu-central-1", "us-east-2"]
175-
, topology: "torus"
176-
, with_explorer: true
177-
}
178-
} as $nomad_cardano_world_qa
179171
|
180172
# P&T exclusive Nomad cluster Nodes
181173
{ composition:
@@ -560,6 +552,10 @@ def all_profile_variants:
560552
}
561553
, desc: "AWS c5-2xlarge cluster dataset, 9 epochs"
562554
}) as $nomad_perf_plutus_base
555+
|
556+
($scenario_idle * $compose_fiftytwo * $dataset_empty *
557+
{ desc: "AWS c5-2xlarge cluster, deploy and start run only"
558+
}) as $nomad_perf_idle_base
563559
|
564560
($scenario_model * $quadruplet * $dataset_current * $for_7ep *
565561
{ node:
@@ -589,19 +585,34 @@ def all_profile_variants:
589585
}
590586
, desc: "Oct 2021 dataset size, four epochs."
591587
}) as $forge_stress_pre_base
588+
|
589+
($forge_stress_pre_base * $hexagon *
590+
{ analysis:
591+
{ filters: ["epoch3+"] }
592+
, node:
593+
{ shutdown_on_slot_synced: 4800 }
594+
, desc: "Status-quo dataset size, eight epochs, six nodes."
595+
}) as $forge_stress_pre_large_base
592596
|
593597
($scenario_fixed_loaded * $triplet * $dataset_current *
594598
{ node:
595599
{ shutdown_on_slot_synced: 2400
596600
}
597601
, desc: "Status-quo dataset size, four epochs."
598602
}) as $forge_stress_base
603+
|
604+
($scenario_fixed_loaded * $triplet * $dataset_current *
605+
{ node:
606+
{ shutdown_on_slot_synced: 1200
607+
}
608+
, desc: "Status-quo dataset size, two epochs."
609+
}) as $forge_stress_short_base
599610
|
600611
($scenario_fixed_loaded * $triplet * $dataset_oct2021 *
601612
{ node:
602-
{ shutdown_on_slot_synced: 2400
613+
{ shutdown_on_slot_synced: 1200
603614
}
604-
, desc: "Status-quo dataset size, four epochs, smaller UTxO/delegation."
615+
, desc: "Oct 2021 dataset size, two epochs."
605616
}) as $forge_stress_light_base
606617
|
607618
($forge_stress_base * $hexagon *
@@ -655,10 +666,6 @@ def all_profile_variants:
655666
{ name: "default-p2p"
656667
, desc: "Default, as per nix/workbench/profile/prof0-defaults.jq with P2P enabled"
657668
}
658-
, $nomad_cardano_world_qa *
659-
{ name: "default-nomadcwqa"
660-
, desc: "Default on Cardano World QA"
661-
}
662669
, $nomad_perf_torus * $p2p *
663670
{ name: "default-nomadperf"
664671
, desc: "Default on P&T exclusive cluster"
@@ -683,10 +690,6 @@ def all_profile_variants:
683690
{ name: "oldtracing"
684691
, desc: "Default in legacy tracing mode"
685692
}
686-
, $nomad_cardano_world_qa * $old_tracing *
687-
{ name: "oldtracing-nomadcwqa"
688-
, desc: "Default in legacy tracing mode on Cardano World QA"
689-
}
690693
, $nomad_perf_torus * $p2p * $old_tracing *
691694
{ name: "oldtracing-nomadperf"
692695
, desc: "Default in legacy tracing mode on P&T exclusive cluster"
@@ -737,14 +740,6 @@ def all_profile_variants:
737740
, $citest_base * $with_rtview *
738741
{ name: "ci-test-rtview"
739742
}
740-
, $citest_base * $nomad_cardano_world_qa *
741-
{ name: "ci-test-nomadcwqa"
742-
, desc: "ci-test on Cardano World QA"
743-
}
744-
, $citest_base * $nomad_cardano_world_qa * $old_tracing *
745-
{ name: "ci-test-oldtracing-nomadcwqa"
746-
, desc: "ci-test in legacy tracing mode on Cardano World QA"
747-
}
748743
, $citest_base * $nomad_perf_torus * $p2p *
749744
{ name: "ci-test-nomadperf"
750745
, desc: "ci-test on P&T exclusive cluster"
@@ -780,14 +775,6 @@ def all_profile_variants:
780775
, $cibench_base * $with_rtview *
781776
{ name: "ci-bench-rtview"
782777
}
783-
, $cibench_base * $nomad_cardano_world_qa *
784-
{ name: "ci-bench-nomadcwqa"
785-
, desc: "ci-bench on Cardano World QA"
786-
}
787-
, $cibench_base * $nomad_cardano_world_qa * $old_tracing *
788-
{ name: "ci-bench-oldtracing-nomadcwqa"
789-
, desc: "ci-bench in legacy tracing mode on Cardano World QA"
790-
}
791778
, $cibench_base * $nomad_perf_torus * $p2p *
792779
{ name: "ci-bench-nomadperf"
793780
, desc: "ci-bench on P&T exclusive cluster"
@@ -872,6 +859,9 @@ def all_profile_variants:
872859
, $nomad_perf_plutus_base * $nomad_perf_dense * $p2p * $costmodel_v8_preview *
873860
{ name: "plutus-nomadperf"
874861
}
862+
, $nomad_perf_idle_base * $nomad_perf_dense * $p2p * $costmodel_v8_preview *
863+
{ name: "idle-nomadperf"
864+
}
875865

876866
## P&T Nomad cluster: 52 nodes, 3 regions, value-only (with old tracing variant) and Plutus, no P2P flavour
877867
, $nomad_perf_base * $nomad_perf_dense * $costmodel_v8_preview *
@@ -942,44 +932,55 @@ def all_profile_variants:
942932
{ name: "forge-stress-large"
943933
}
944934

945-
## Status-quo (huge) dataset, 1 node
946-
, $forge_stress_base * $solo *
947-
{ name: "forge-stress-solo"
948-
}
949-
950935
## Status-quo (huge) dataset, small cluster (2 nodes)
951936
, $forge_stress_base *
952937
{ name: "forge-stress"
953938
}
954-
, $forge_stress_light_base *
955-
{ name: "forge-stress-light"
956-
}
957939
, $forge_stress_base * $plutus_base * $plutus_loop_counter *
958940
{ name: "forge-stress-p2p"
959941
}
960942
, $forge_stress_base * $plutus_base * $plutus_loop_counter *
961943
{ name: "forge-stress-plutus"
962944
}
963-
, $forge_stress_base * $plutus_base * $plutus_loop_counter * $solo *
964-
{ name: "forge-stress-plutus-solo"
965-
}
966945
, $forge_stress_base * $without_tracer *
967946
{ name: "forge-stress-notracer"
968947
}
969-
970948
, $forge_stress_pre_base *
971949
{ name: "forge-stress-pre"
972950
}
973-
, $forge_stress_pre_base * $solo *
974-
{ name: "forge-stress-pre-solo"
975-
}
976951
, $forge_stress_pre_base * $plutus_base * $plutus_loop_counter *
977952
{ name: "forge-stress-pre-plutus"
978953
}
979954
, $forge_stress_pre_base * $without_tracer *
980955
{ name: "forge-stress-pre-notracer"
981956
}
982957

958+
# single forger node, larger blocksize, various flavours
959+
, $forge_stress_base * $solo * $costmodel_v8_preview *
960+
{ name: "forge-stress-solo"
961+
, extra_desc: "with blocksize bumped to 88k"
962+
}
963+
, $forge_stress_base * $plutus_base * $plutus_loop_counter * $solo * $costmodel_v8_preview *
964+
{ name: "forge-stress-plutus-solo"
965+
, extra_desc: "with blocksize bumped to 88k"
966+
}
967+
, $forge_stress_short_base * $solo * $costmodel_v8_preview *
968+
{ name: "forge-stress-solo-xs"
969+
, extra_desc: "with blocksize bumped to 88k"
970+
}
971+
, $forge_stress_pre_base * $solo * $costmodel_v8_preview *
972+
{ name: "forge-stress-pre-solo"
973+
, extra_desc: "with blocksize bumped to 88k"
974+
}
975+
, $forge_stress_pre_large_base * $solo * $costmodel_v8_preview *
976+
{ name: "forge-stress-pre-solo-xl"
977+
, extra_desc: "with blocksize bumped to 88k"
978+
}
979+
, $forge_stress_light_base * $solo * $costmodel_v8_preview *
980+
{ name: "forge-stress-pre-solo-xs"
981+
, extra_desc: "with blocksize bumped to 88k"
982+
}
983+
983984
## Large dataset, small cluster (3 nodes), variants for RTS parametrization
984985
, $forge_stress_pre_base * $rts_A4m *
985986
{ name: "forge-stress-pre-rtsA4m"

‎nix/workbench/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fi
7979

8080
if test -v "WB_REMOTE"
8181
then remote=$WB_REMOTE
82-
else remote='{"env":"bench","depl":"bench-1","dir":"runs"}' # cardano-ops/bench-1 as fallback default
82+
else remote='{"env":"deployer","depl":"nomad-1"}' # nomad/nomad-1 as fallback default
8383
fi
8484

8585
local sargs=()

‎nix/workbench/shell.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ in project.shellFor {
122122
sqlite-interactive
123123
tmux
124124
pkgs.cairo
125+
pkgs.dyff
125126
pkgs.git
126127
pkgs.hlint
127128
pkgs.moreutils

0 commit comments

Comments
 (0)