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

Remove duplicated code

Browse Source
This commit is contained in:
Michael Vines
2019-03-04 09:56:27 -08:00
committed by Grimes
parent 3a4018cd03
commit d0be16b49a
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
programs/bpf_loader/benches/bpf_loader.rs
View File

@ -1,8 +1,5 @@
#![feature(test)] #![feature(test)]
#![cfg(feature = "bpf_c")] #![cfg(feature = "bpf_c")]
extern crate byteorder;
extern crate solana_bpf_loader;
extern crate solana_rbpf;
extern crate test; extern crate test;
use byteorder::{ByteOrder, LittleEndian, WriteBytesExt}; use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
@ -33,15 +30,20 @@ fn empty_check(_prog: &[u8]) -> Result<(), Error> {
Ok(()) Ok(())
} }
fn load_elf() -> Result<Vec<u8>, std::io::Error> {
let path = create_bpf_path("bench_alu");
let mut file = File::open(&path).expect(&format!("Unable to open {:?}", path));
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
Ok(elf)
}
const ARMSTRONG_LIMIT: u64 = 500; const ARMSTRONG_LIMIT: u64 = 500;
const ARMSTRONG_EXPECTED: u64 = 5; const ARMSTRONG_EXPECTED: u64 = 5;
#[bench] #[bench]
fn bench_program_load_elf(bencher: &mut Bencher) { fn bench_program_load_elf(bencher: &mut Bencher) {
let mut file = File::open(create_bpf_path("bench_alu")).expect("file open failed"); let elf = load_elf().unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let mut vm = EbpfVmRaw::new(None).unwrap(); let mut vm = EbpfVmRaw::new(None).unwrap();
vm.set_verifier(empty_check).unwrap(); vm.set_verifier(empty_check).unwrap();
@ -52,10 +54,7 @@ fn bench_program_load_elf(bencher: &mut Bencher) {
#[bench] #[bench]
fn bench_program_verify(bencher: &mut Bencher) { fn bench_program_verify(bencher: &mut Bencher) {
let mut file = File::open(create_bpf_path("bench_alu")).expect("file open failed"); let elf = load_elf().unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let mut vm = EbpfVmRaw::new(None).unwrap(); let mut vm = EbpfVmRaw::new(None).unwrap();
vm.set_verifier(empty_check).unwrap(); vm.set_verifier(empty_check).unwrap();
vm.set_elf(&elf).unwrap(); vm.set_elf(&elf).unwrap();
@ -76,9 +75,7 @@ fn bench_program_alu(bencher: &mut Bencher) {
.unwrap(); .unwrap();
inner_iter.write_u64::<LittleEndian>(0).unwrap(); inner_iter.write_u64::<LittleEndian>(0).unwrap();
let mut file = File::open(create_bpf_path("bench_alu")).expect("file open failed"); let elf = load_elf().unwrap();
let mut elf = Vec::new();
file.read_to_end(&mut elf).unwrap();
let mut vm = solana_bpf_loader::create_vm(&elf).unwrap(); let mut vm = solana_bpf_loader::create_vm(&elf).unwrap();
println!("Interpreted:"); println!("Interpreted:");