gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename Packets to PacketBatch (backport #21794) (#21805)

Browse Source 
* Rename Packets to PacketBatch (#21794)

(cherry picked from commit 254ef3e7b6)

# Conflicts:
#	core/src/verified_vote_packets.rs

* resolve conflicts

Co-authored-by: Justin Starry <justin@solana.com>
This commit is contained in:
mergify[bot]
2021-12-11 16:53:23 +00:00
committed by GitHub
parent 4b63d51e3e
commit 01941cf3de
27 changed files with 720 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ledger/benches/sigverify_shreds.rs
View File

@@ -7,7 +7,7 @@ use {
sigverify_shreds::{sign_shreds_cpu, sign_shreds_gpu, sign_shreds_gpu_pinned_keypair},
},
solana_perf::{
packet::{Packet, Packets},
packet::{Packet, PacketBatch},
recycler_cache::RecyclerCache,
},
solana_sdk::signature::Keypair,
@@ -21,13 +21,13 @@ const NUM_BATCHES: usize = 1;
fn bench_sigverify_shreds_sign_gpu(bencher: &mut Bencher) {
let recycler_cache = RecyclerCache::default();
let mut packets = Packets::default();
packets.packets.set_pinnable();
let mut packet_batch = PacketBatch::default();
packet_batch.packets.set_pinnable();
let slot = 0xdead_c0de;
// need to pin explicitly since the resize will not cause re-allocation
packets.packets.reserve_and_pin(NUM_PACKETS);
packets.packets.resize(NUM_PACKETS, Packet::default());
for p in packets.packets.iter_mut() {
packet_batch.packets.reserve_and_pin(NUM_PACKETS);
packet_batch.packets.resize(NUM_PACKETS, Packet::default());
for p in packet_batch.packets.iter_mut() {
let shred = Shred::new_from_data(
slot,
0xc0de,
@@ -41,25 +41,25 @@ fn bench_sigverify_shreds_sign_gpu(bencher: &mut Bencher) {
);
shred.copy_to_packet(p);
}
let mut batch = vec![packets; NUM_BATCHES];
let mut batches = vec![packet_batch; NUM_BATCHES];
let keypair = Keypair::new();
let pinned_keypair = sign_shreds_gpu_pinned_keypair(&keypair, &recycler_cache);
let pinned_keypair = Some(Arc::new(pinned_keypair));
//warmup
for _ in 0..100 {
sign_shreds_gpu(&keypair, &pinned_keypair, &mut batch, &recycler_cache);
sign_shreds_gpu(&keypair, &pinned_keypair, &mut batches, &recycler_cache);
}
bencher.iter(|| {
sign_shreds_gpu(&keypair, &pinned_keypair, &mut batch, &recycler_cache);
sign_shreds_gpu(&keypair, &pinned_keypair, &mut batches, &recycler_cache);
})
}
#[bench]
fn bench_sigverify_shreds_sign_cpu(bencher: &mut Bencher) {
let mut packets = Packets::default();
let mut packet_batch = PacketBatch::default();
let slot = 0xdead_c0de;
packets.packets.resize(NUM_PACKETS, Packet::default());
for p in packets.packets.iter_mut() {
packet_batch.packets.resize(NUM_PACKETS, Packet::default());
for p in packet_batch.packets.iter_mut() {
let shred = Shred::new_from_data(
slot,
0xc0de,
@@ -73,9 +73,9 @@ fn bench_sigverify_shreds_sign_cpu(bencher: &mut Bencher) {
);
shred.copy_to_packet(p);
}
let mut batch = vec![packets; NUM_BATCHES];
let mut batches = vec![packet_batch; NUM_BATCHES];
let keypair = Keypair::new();
bencher.iter(|| {
sign_shreds_cpu(&keypair, &mut batch);
sign_shreds_cpu(&keypair, &mut batches);
})
}