From 504091f9bebf7c001933d90bb6e6e312d4b717bb Mon Sep 17 00:00:00 2001 From: Jon Cinque Date: Tue, 6 Dec 2022 18:06:27 +0100 Subject: [PATCH] perf: Change underlying Elems to *const u8 (#29089) * perf: Change underlying Elems to *const u8 * Remove clippy allows --- ledger/src/sigverify_shreds.rs | 10 ++++------ perf/src/perf_libs.rs | 3 +-- perf/src/sigverify.rs | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ledger/src/sigverify_shreds.rs b/ledger/src/sigverify_shreds.rs index 39185a5ff..7f31f1d20 100644 --- a/ledger/src/sigverify_shreds.rs +++ b/ledger/src/sigverify_shreds.rs @@ -224,14 +224,13 @@ pub fn verify_shreds_gpu( let mut out = recycler_cache.buffer().allocate("out_buffer"); out.set_pinnable(); elems.push(perf_libs::Elems { - #[allow(clippy::cast_ptr_alignment)] - elems: pubkeys.as_ptr() as *const solana_sdk::packet::Packet, + elems: pubkeys.as_ptr().cast::(), num: num_packets as u32, }); for batch in batches { elems.push(perf_libs::Elems { - elems: batch.as_ptr(), + elems: batch.as_ptr().cast::(), num: batch.len() as u32, }); let mut v = Vec::new(); @@ -352,14 +351,13 @@ pub fn sign_shreds_gpu( signatures_out.set_pinnable(); signatures_out.resize(total_sigs * sig_size, 0); elems.push(perf_libs::Elems { - #[allow(clippy::cast_ptr_alignment)] - elems: pinned_keypair.as_ptr() as *const solana_sdk::packet::Packet, + elems: pinned_keypair.as_ptr().cast::(), num: num_keypair_packets as u32, }); for batch in batches.iter() { elems.push(perf_libs::Elems { - elems: batch.as_ptr(), + elems: batch.as_ptr().cast::(), num: batch.len() as u32, }); let mut v = Vec::new(); diff --git a/perf/src/perf_libs.rs b/perf/src/perf_libs.rs index 6644a1eab..d6529149d 100644 --- a/perf/src/perf_libs.rs +++ b/perf/src/perf_libs.rs @@ -3,7 +3,6 @@ use { dlopen::symbor::{Container, SymBorApi, Symbol}, dlopen_derive::SymBorApi, log::*, - solana_sdk::packet::Packet, std::{ env, ffi::OsStr, @@ -16,7 +15,7 @@ use { #[repr(C)] pub struct Elems { - pub elems: *const Packet, + pub elems: *const u8, pub num: u32, } diff --git a/perf/src/sigverify.rs b/perf/src/sigverify.rs index cc9d9a0f0..2ceaab2d6 100644 --- a/perf/src/sigverify.rs +++ b/perf/src/sigverify.rs @@ -768,7 +768,7 @@ pub fn ed25519_verify( let mut num_packets: usize = 0; for batch in batches.iter() { elems.push(perf_libs::Elems { - elems: batch.as_ptr(), + elems: batch.as_ptr().cast::(), num: batch.len() as u32, }); let v = vec![0u8; batch.len()];