mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 06:21:02 +00:00
Include StorageInfo in Benchmarking Pipeline (#9090)
* extend storageinfo * extend_storage_info * use vec * add storage info to pipeline * get read and written keys * undo storageinfo move * refactor keytracker * return read / write count * playing with key matching * add basic `StorageInfo` constructor * add whitelisted to returned info * fix some test stuff * pipe comments into benchmark data * add_storage_comments * add comments to template * track only storage prefix * Update frame/benchmarking/src/lib.rs * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix test * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * remove test logs * add temp benchmark script * Apply suggestions from code review Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * remove keytracker and use trackedstoragekey * add comment for unknown keys * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs * remove duplicate comments with unknown keys * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * refactor bench tracker, and fix results * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_balances --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/balances/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix child tries in new tracker * extra newline * fix unused warning * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=pallet_timestamp --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/timestamp/src/weights.rs --template=./.maintain/frame-weight-template.hbs * fix master merge * storage info usage refactor * remove now unused * fix refactor * use a vec for prefix * fix tests * also update writer to use vec * disable read and written keys for now * cargo run --release --features=runtime-benchmarks --manifest-path=bin/node/cli/Cargo.toml -- benchmark --chain=dev --steps=50 --repeat=20 --pallet=frame_system --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./frame/system/src/weights.rs --template=./.maintain/frame-weight-template.hbs * Update frame/system/src/weights.rs * fix test * Delete weights.rs * reset weights Co-authored-by: Parity Bot <admin@parity.io> Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
This commit is contained in:
Shawn Tabrizi
@@ -66,40 +66,6 @@ impl<Block: BlockT> sp_state_machine::Storage<HashFor<Block>> for StorageDb<Bloc
|
||||
}
|
||||
}
|
||||
|
||||
/// Track whether a specific key has already been read or written to.
|
||||
#[derive(Default, Clone, Copy)]
|
||||
pub struct KeyTracker {
|
||||
has_been_read: bool,
|
||||
has_been_written: bool,
|
||||
}
|
||||
|
||||
/// A simple object that counts the reads and writes at the key level to the underlying state db.
|
||||
#[derive(Default, Clone, Copy, Debug)]
|
||||
pub struct ReadWriteTracker {
|
||||
reads: u32,
|
||||
repeat_reads: u32,
|
||||
writes: u32,
|
||||
repeat_writes: u32,
|
||||
}
|
||||
|
||||
impl ReadWriteTracker {
|
||||
fn add_read(&mut self) {
|
||||
self.reads += 1;
|
||||
}
|
||||
|
||||
fn add_repeat_read(&mut self) {
|
||||
self.repeat_reads += 1;
|
||||
}
|
||||
|
||||
fn add_write(&mut self) {
|
||||
self.writes += 1;
|
||||
}
|
||||
|
||||
fn add_repeat_write(&mut self) {
|
||||
self.repeat_writes += 1;
|
||||
}
|
||||
}
|
||||
|
||||
/// State that manages the backend database reference. Allows runtime to control the database.
|
||||
pub struct BenchmarkingState<B: BlockT> {
|
||||
root: Cell<B::Hash>,
|
||||
@@ -110,11 +76,14 @@ pub struct BenchmarkingState<B: BlockT> {
|
||||
record: Cell<Vec<Vec<u8>>>,
|
||||
shared_cache: SharedCache<B>, // shared cache is always empty
|
||||
/// Key tracker for keys in the main trie.
|
||||
main_key_tracker: RefCell<HashMap<Vec<u8>, KeyTracker>>,
|
||||
/// We track the total number of reads and writes to these keys,
|
||||
/// not de-duplicated for repeats.
|
||||
main_key_tracker: RefCell<HashMap<Vec<u8>, TrackedStorageKey>>,
|
||||
/// Key tracker for keys in a child trie.
|
||||
/// Child trie are identified by their storage key (i.e. `ChildInfo::storage_key()`)
|
||||
child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, KeyTracker>>>,
|
||||
read_write_tracker: RefCell<ReadWriteTracker>,
|
||||
/// We track the total number of reads and writes to these keys,
|
||||
/// not de-duplicated for repeats.
|
||||
child_key_tracker: RefCell<HashMap<Vec<u8>, HashMap<Vec<u8>, TrackedStorageKey>>>,
|
||||
whitelist: RefCell<Vec<TrackedStorageKey>>,
|
||||
proof_recorder: Option<ProofRecorder<B::Hash>>,
|
||||
proof_recorder_root: Cell<B::Hash>,
|
||||
@@ -137,7 +106,6 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
shared_cache: new_shared_cache(0, (1, 10)),
|
||||
main_key_tracker: Default::default(),
|
||||
child_key_tracker: Default::default(),
|
||||
read_write_tracker: Default::default(),
|
||||
whitelist: Default::default(),
|
||||
proof_recorder: record_proof.then(Default::default),
|
||||
proof_recorder_root: Cell::new(root.clone()),
|
||||
@@ -191,10 +159,8 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
let whitelist = self.whitelist.borrow();
|
||||
|
||||
whitelist.iter().for_each(|key| {
|
||||
let whitelisted = KeyTracker {
|
||||
has_been_read: key.has_been_read,
|
||||
has_been_written: key.has_been_written,
|
||||
};
|
||||
let mut whitelisted = TrackedStorageKey::new(key.key.clone());
|
||||
whitelisted.whitelist();
|
||||
main_key_tracker.insert(key.key.clone(), whitelisted);
|
||||
});
|
||||
}
|
||||
@@ -203,12 +169,10 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
*self.main_key_tracker.borrow_mut() = HashMap::new();
|
||||
*self.child_key_tracker.borrow_mut() = HashMap::new();
|
||||
self.add_whitelist_to_tracker();
|
||||
*self.read_write_tracker.borrow_mut() = Default::default();
|
||||
}
|
||||
|
||||
// Childtrie is identified by its storage key (i.e. `ChildInfo::storage_key`)
|
||||
fn add_read_key(&self, childtrie: Option<&[u8]>, key: &[u8]) {
|
||||
let mut read_write_tracker = self.read_write_tracker.borrow_mut();
|
||||
let mut child_key_tracker = self.child_key_tracker.borrow_mut();
|
||||
let mut main_key_tracker = self.main_key_tracker.borrow_mut();
|
||||
|
||||
@@ -218,33 +182,21 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
&mut main_key_tracker
|
||||
};
|
||||
|
||||
let read = match key_tracker.get(key) {
|
||||
let should_log = match key_tracker.get_mut(key) {
|
||||
None => {
|
||||
let has_been_read = KeyTracker {
|
||||
has_been_read: true,
|
||||
has_been_written: false,
|
||||
};
|
||||
let mut has_been_read = TrackedStorageKey::new(key.to_vec());
|
||||
has_been_read.add_read();
|
||||
key_tracker.insert(key.to_vec(), has_been_read);
|
||||
read_write_tracker.add_read();
|
||||
true
|
||||
},
|
||||
Some(tracker) => {
|
||||
if !tracker.has_been_read {
|
||||
let has_been_read = KeyTracker {
|
||||
has_been_read: true,
|
||||
has_been_written: tracker.has_been_written,
|
||||
};
|
||||
key_tracker.insert(key.to_vec(), has_been_read);
|
||||
read_write_tracker.add_read();
|
||||
true
|
||||
} else {
|
||||
read_write_tracker.add_repeat_read();
|
||||
false
|
||||
}
|
||||
let should_log = !tracker.has_been_read();
|
||||
tracker.add_read();
|
||||
should_log
|
||||
}
|
||||
};
|
||||
|
||||
if read {
|
||||
if should_log {
|
||||
if let Some(childtrie) = childtrie {
|
||||
log::trace!(
|
||||
target: "benchmark",
|
||||
@@ -258,7 +210,6 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
|
||||
// Childtrie is identified by its storage key (i.e. `ChildInfo::storage_key`)
|
||||
fn add_write_key(&self, childtrie: Option<&[u8]>, key: &[u8]) {
|
||||
let mut read_write_tracker = self.read_write_tracker.borrow_mut();
|
||||
let mut child_key_tracker = self.child_key_tracker.borrow_mut();
|
||||
let mut main_key_tracker = self.main_key_tracker.borrow_mut();
|
||||
|
||||
@@ -269,30 +220,21 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
};
|
||||
|
||||
// If we have written to the key, we also consider that we have read from it.
|
||||
let has_been_written = KeyTracker {
|
||||
has_been_read: true,
|
||||
has_been_written: true,
|
||||
};
|
||||
|
||||
let write = match key_tracker.get(key) {
|
||||
let should_log = match key_tracker.get_mut(key) {
|
||||
None => {
|
||||
let mut has_been_written = TrackedStorageKey::new(key.to_vec());
|
||||
has_been_written.add_write();
|
||||
key_tracker.insert(key.to_vec(), has_been_written);
|
||||
read_write_tracker.add_write();
|
||||
true
|
||||
},
|
||||
Some(tracker) => {
|
||||
if !tracker.has_been_written {
|
||||
key_tracker.insert(key.to_vec(), has_been_written);
|
||||
read_write_tracker.add_write();
|
||||
true
|
||||
} else {
|
||||
read_write_tracker.add_repeat_write();
|
||||
false
|
||||
}
|
||||
let should_log = !tracker.has_been_written();
|
||||
tracker.add_write();
|
||||
should_log
|
||||
}
|
||||
};
|
||||
|
||||
if write {
|
||||
if should_log {
|
||||
if let Some(childtrie) = childtrie {
|
||||
log::trace!(
|
||||
target: "benchmark",
|
||||
@@ -303,6 +245,23 @@ impl<B: BlockT> BenchmarkingState<B> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Return all the tracked storage keys among main and child trie.
|
||||
fn all_trackers(&self) -> Vec<TrackedStorageKey> {
|
||||
let mut all_trackers = Vec::new();
|
||||
|
||||
self.main_key_tracker.borrow().iter().for_each(|(_, tracker)| {
|
||||
all_trackers.push(tracker.clone());
|
||||
});
|
||||
|
||||
self.child_key_tracker.borrow().iter().for_each(|(_, child_tracker)| {
|
||||
child_tracker.iter().for_each(|(_, tracker)| {
|
||||
all_trackers.push(tracker.clone());
|
||||
});
|
||||
});
|
||||
|
||||
all_trackers
|
||||
}
|
||||
}
|
||||
|
||||
fn state_err() -> String {
|
||||
@@ -507,9 +466,30 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
|
||||
}
|
||||
|
||||
/// Get the key tracking information for the state db.
|
||||
/// 1. `reads` - Total number of DB reads.
|
||||
/// 2. `repeat_reads` - Total number of in-memory reads.
|
||||
/// 3. `writes` - Total number of DB writes.
|
||||
/// 4. `repeat_writes` - Total number of in-memory writes.
|
||||
fn read_write_count(&self) -> (u32, u32, u32, u32) {
|
||||
let count = *self.read_write_tracker.borrow_mut();
|
||||
(count.reads, count.repeat_reads, count.writes, count.repeat_writes)
|
||||
let mut reads = 0;
|
||||
let mut repeat_reads = 0;
|
||||
let mut writes = 0;
|
||||
let mut repeat_writes = 0;
|
||||
|
||||
self.all_trackers().iter().for_each(|tracker| {
|
||||
if !tracker.whitelisted {
|
||||
if tracker.reads > 0 {
|
||||
reads += 1;
|
||||
repeat_reads += tracker.reads - 1;
|
||||
}
|
||||
|
||||
if tracker.writes > 0 {
|
||||
writes += 1;
|
||||
repeat_writes += tracker.reads - 1;
|
||||
}
|
||||
}
|
||||
});
|
||||
(reads, repeat_reads, writes, repeat_writes)
|
||||
}
|
||||
|
||||
/// Reset the key tracking information for the state db.
|
||||
@@ -525,6 +505,40 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
|
||||
*self.whitelist.borrow_mut() = new;
|
||||
}
|
||||
|
||||
fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
|
||||
// We only track at the level of a key-prefix and not whitelisted for now for memory size.
|
||||
// TODO: Refactor to enable full storage key transparency, where we can remove the
|
||||
// `prefix_key_tracker`.
|
||||
let mut prefix_key_tracker = HashMap::<Vec<u8>, (u32, u32, bool)>::new();
|
||||
self.all_trackers().iter().for_each(|tracker| {
|
||||
if !tracker.whitelisted {
|
||||
let prefix_length = tracker.key.len().min(32);
|
||||
let prefix = tracker.key[0..prefix_length].to_vec();
|
||||
// each read / write of a specific key is counted at most one time, since
|
||||
// additional reads / writes happen in the memory overlay.
|
||||
let reads = tracker.reads.min(1);
|
||||
let writes = tracker.writes.min(1);
|
||||
if let Some(prefix_tracker) = prefix_key_tracker.get_mut(&prefix) {
|
||||
prefix_tracker.0 += reads;
|
||||
prefix_tracker.1 += writes;
|
||||
} else {
|
||||
prefix_key_tracker.insert(
|
||||
prefix,
|
||||
(
|
||||
reads,
|
||||
writes,
|
||||
tracker.whitelisted,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
prefix_key_tracker.iter().map(|(key, tracker)| -> (Vec<u8>, u32, u32, bool) {
|
||||
(key.to_vec(), tracker.0, tracker.1, tracker.2)
|
||||
}).collect::<Vec<_>>()
|
||||
}
|
||||
|
||||
fn register_overlay_stats(&self, stats: &sp_state_machine::StateMachineStats) {
|
||||
self.state.borrow_mut().as_mut().map(|s| s.register_overlay_stats(stats));
|
||||
}
|
||||
@@ -597,11 +611,11 @@ mod test {
|
||||
]
|
||||
).unwrap();
|
||||
|
||||
let rw_tracker = bench_state.read_write_tracker.borrow();
|
||||
assert_eq!(rw_tracker.reads, 6);
|
||||
assert_eq!(rw_tracker.repeat_reads, 0);
|
||||
assert_eq!(rw_tracker.writes, 2);
|
||||
assert_eq!(rw_tracker.repeat_writes, 0);
|
||||
let rw_tracker = bench_state.read_write_count();
|
||||
assert_eq!(rw_tracker.0, 6);
|
||||
assert_eq!(rw_tracker.1, 0);
|
||||
assert_eq!(rw_tracker.2, 2);
|
||||
assert_eq!(rw_tracker.3, 0);
|
||||
drop(rw_tracker);
|
||||
bench_state.wipe().unwrap();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user