Skip to content

Commit

Permalink
Proper bare-metal instances for benchmarking workflows (#505)
Browse files Browse the repository at this point in the history 
* Use c5d.metal for benchmarking

Signed-off-by: ghzlatarev <ghzlatarev@gmail.com>

* Update calamari weights with https://github.com/Manta-Network/Manta/actions/runs/2185313764

Signed-off-by: ghzlatarev <ghzlatarev@gmail.com>

* Update Dolphin weights with https://github.com/Manta-Network/Manta/actions/runs/2185313764

Signed-off-by: ghzlatarev <ghzlatarev@gmail.com>
  • Loading branch information
@ghzlatarev
ghzlatarev committed May 2, 2022
1 parent 41fc16e commit aa0b10d
Show file tree
Hide file tree
Showing 37 changed files with 1,251 additions and 1,254 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/generate_calamari_weights_files.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ on:
workflow_dispatch:

env:
AWS_INSTANCE_SSH_PUBLIC_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb24HEQ++aNFWaqVyMtIs6GotUB8R+q61XOoI2z6uMj
AWS_REGION: us-east-1
AWS_SUBNET_ID: subnet-08c26caf0a52b7c19
AWS_SECURITY_GROUP_ID: sg-0315bffea9042ac9b
AWS_INSTANCE_TYPE: r5dn.2xlarge
AWS_INSTANCE_TYPE: c5d.metal
AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]' # canonical
Expand Down Expand Up @@ -286,8 +283,6 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-instance-ssh-public-key: ${{ env.AWS_INSTANCE_SSH_PUBLIC_KEY }}
aws-region: ${{ env.AWS_REGION }}
aws-subnet-id: ${{ env.AWS_SUBNET_ID }}
aws-security-group-id: ${{ env.AWS_SECURITY_GROUP_ID }}
aws-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
aws-instance-root-volume-size: ${{ env.AWS_INSTANCE_ROOT_VOLUME_SIZE }}
aws-image-search-pattern: ${{ env.AWS_IMAGE_SEARCH_PATTERN }}
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/generate_dolphin_weights_files.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ on:
workflow_dispatch:

env:
AWS_INSTANCE_SSH_PUBLIC_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb24HEQ++aNFWaqVyMtIs6GotUB8R+q61XOoI2z6uMj
AWS_REGION: us-east-1
AWS_SUBNET_ID: subnet-08c26caf0a52b7c19
AWS_SECURITY_GROUP_ID: sg-0315bffea9042ac9b
AWS_INSTANCE_TYPE: r5dn.2xlarge
AWS_INSTANCE_TYPE: c5d.metal
AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]' # canonical
Expand Down Expand Up @@ -286,8 +283,6 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-instance-ssh-public-key: ${{ env.AWS_INSTANCE_SSH_PUBLIC_KEY }}
aws-region: ${{ env.AWS_REGION }}
aws-subnet-id: ${{ env.AWS_SUBNET_ID }}
aws-security-group-id: ${{ env.AWS_SECURITY_GROUP_ID }}
aws-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
aws-instance-root-volume-size: ${{ env.AWS_INSTANCE_ROOT_VOLUME_SIZE }}
aws-image-search-pattern: ${{ env.AWS_IMAGE_SEARCH_PATTERN }}
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/generate_manta_weights_files.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ on:
workflow_dispatch:

env:
AWS_INSTANCE_SSH_PUBLIC_KEY: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPb24HEQ++aNFWaqVyMtIs6GotUB8R+q61XOoI2z6uMj
AWS_REGION: us-east-1
AWS_SUBNET_ID: subnet-08c26caf0a52b7c19
AWS_SECURITY_GROUP_ID: sg-0315bffea9042ac9b
AWS_INSTANCE_TYPE: r5dn.2xlarge
AWS_INSTANCE_TYPE: c5d.metal
AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]' # canonical
Expand Down Expand Up @@ -214,8 +211,6 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-instance-ssh-public-key: ${{ env.AWS_INSTANCE_SSH_PUBLIC_KEY }}
aws-region: ${{ env.AWS_REGION }}
aws-subnet-id: ${{ env.AWS_SUBNET_ID }}
aws-security-group-id: ${{ env.AWS_SECURITY_GROUP_ID }}
aws-instance-type: ${{ env.AWS_INSTANCE_TYPE }}
aws-instance-root-volume-size: ${{ env.AWS_INSTANCE_ROOT_VOLUME_SIZE }}
aws-image-search-pattern: ${{ env.AWS_IMAGE_SEARCH_PATTERN }}
Expand Down
14 changes: 7 additions & 7 deletions runtime/calamari/src/weights/calamari_vesting.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//! Autogenerated weights for calamari_vesting
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2022-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2022-04-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("calamari-dev"), DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -54,7 +54,7 @@ impl<T: frame_system::Config> calamari_vesting::WeightInfo for SubstrateWeight<T
// Storage: CalamariVesting VestingSchedule (r:1 w:1)
// Storage: Timestamp Now (r:1 w:0)
fn update_vesting_schedule() -> Weight {
(15_499_000 as Weight)
(13_826_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
Expand All @@ -64,7 +64,7 @@ impl<T: frame_system::Config> calamari_vesting::WeightInfo for SubstrateWeight<T
// Storage: Balances Locks (r:1 w:1)
// Storage: System Account (r:1 w:1)
fn vest() -> Weight {
(39_442_000 as Weight)
(32_402_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
Expand All @@ -74,7 +74,7 @@ impl<T: frame_system::Config> calamari_vesting::WeightInfo for SubstrateWeight<T
// Storage: CalamariVesting VestingSchedule (r:1 w:0)
// Storage: Balances Locks (r:1 w:1)
fn vested_transfer() -> Weight {
(68_273_000 as Weight)
(56_163_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
Expand All @@ -85,7 +85,7 @@ impl WeightInfo for () {
// Storage: CalamariVesting VestingSchedule (r:1 w:1)
// Storage: Timestamp Now (r:1 w:0)
fn update_vesting_schedule() -> Weight {
(15_499_000 as Weight)
(13_826_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
Expand All @@ -95,7 +95,7 @@ impl WeightInfo for () {
// Storage: Balances Locks (r:1 w:1)
// Storage: System Account (r:1 w:1)
fn vest() -> Weight {
(39_442_000 as Weight)
(32_402_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
Expand All @@ -105,7 +105,7 @@ impl WeightInfo for () {
// Storage: CalamariVesting VestingSchedule (r:1 w:0)
// Storage: Balances Locks (r:1 w:1)
fn vested_transfer() -> Weight {
(68_273_000 as Weight)
(56_163_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
Expand Down
26 changes: 13 additions & 13 deletions runtime/calamari/src/weights/frame_system.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//! Autogenerated weights for frame_system
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2022-04-13, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2022-04-18, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("calamari-dev"), DB CACHE: 1024

// Executed Command:
Expand Down Expand Up @@ -55,83 +55,83 @@ pub trait WeightInfo {
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> frame_system::WeightInfo for SubstrateWeight<T> {
fn remark(b: u32, ) -> Weight {
(0 as Weight)
(6_759_000 as Weight)
// Standard Error: 0
.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
}
fn remark_with_event(b: u32, ) -> Weight {
(0 as Weight)
(27_529_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
}
// Storage: System Digest (r:1 w:1)
// Storage: unknown [0x3a686561707061676573] (r:0 w:1)
fn set_heap_pages() -> Weight {
(3_396_000 as Weight)
(2_953_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
// Storage: Skipped Metadata (r:0 w:0)
fn set_storage(i: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 0
.saturating_add((624_000 as Weight).saturating_mul(i as Weight))
.saturating_add((500_000 as Weight).saturating_mul(i as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
}
// Storage: Skipped Metadata (r:0 w:0)
fn kill_storage(i: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 1_000
.saturating_add((453_000 as Weight).saturating_mul(i as Weight))
.saturating_add((365_000 as Weight).saturating_mul(i as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
}
// Storage: Skipped Metadata (r:0 w:0)
fn kill_prefix(p: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 1_000
.saturating_add((1_019_000 as Weight).saturating_mul(p as Weight))
.saturating_add((827_000 as Weight).saturating_mul(p as Weight))
.saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
}
}

// For backwards compatibility and tests
impl WeightInfo for () {
fn remark(b: u32, ) -> Weight {
(0 as Weight)
(6_759_000 as Weight)
// Standard Error: 0
.saturating_add((1_000 as Weight).saturating_mul(b as Weight))
}
fn remark_with_event(b: u32, ) -> Weight {
(0 as Weight)
(27_529_000 as Weight)
// Standard Error: 0
.saturating_add((2_000 as Weight).saturating_mul(b as Weight))
}
// Storage: System Digest (r:1 w:1)
// Storage: unknown [0x3a686561707061676573] (r:0 w:1)
fn set_heap_pages() -> Weight {
(3_396_000 as Weight)
(2_953_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
// Storage: Skipped Metadata (r:0 w:0)
fn set_storage(i: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 0
.saturating_add((624_000 as Weight).saturating_mul(i as Weight))
.saturating_add((500_000 as Weight).saturating_mul(i as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
}
// Storage: Skipped Metadata (r:0 w:0)
fn kill_storage(i: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 1_000
.saturating_add((453_000 as Weight).saturating_mul(i as Weight))
.saturating_add((365_000 as Weight).saturating_mul(i as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(i as Weight)))
}
// Storage: Skipped Metadata (r:0 w:0)
fn kill_prefix(p: u32, ) -> Weight {
(0 as Weight)
// Standard Error: 1_000
.saturating_add((1_019_000 as Weight).saturating_mul(p as Weight))
.saturating_add((827_000 as Weight).saturating_mul(p as Weight))
.saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(p as Weight)))
}
}
Loading

0 comments on commit aa0b10d

Please sign in to comment.