From 878a842611ad685f65398ed2c969ec47b55c055f Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Sat, 6 Apr 2019 07:18:56 -0600
Subject: [PATCH] Move append_vec bench to the crate with append_vec (#3650)

* Move append_vec bench to the crate with append_vec

* Use black_box to tell the compiler not to optimize away test data

```
pub fn black_box<T>(dummy: T) -> T {
    unsafe {
        let ret = std::ptr::read_volatile(&dummy);
        std::mem::forget(dummy);
        ret
    }
}
```

* Revert "Use black_box to tell the compiler not to optimize away test data"

This reverts commit 5610b8ee957f1d8bf6e270e392859e8b23b1e472.

* Use black_box to tell the compiler not to optimize away test data

* Create bench directories
---
 {core => runtime}/benches/append_vec.rs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
 rename {core => runtime}/benches/append_vec.rs (95%)

diff --git a/core/benches/append_vec.rs b/runtime/benches/append_vec.rs
similarity index 95%
rename from core/benches/append_vec.rs
rename to runtime/benches/append_vec.rs
index fe4c0d7b5..2533ac14e 100644
--- a/core/benches/append_vec.rs
+++ b/runtime/benches/append_vec.rs
@@ -11,6 +11,7 @@ use solana_runtime::append_vec::{
 use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;
 use std::env;
+use std::fs::{create_dir_all, remove_dir_all};
 use std::io::Cursor;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -31,6 +32,8 @@ fn get_append_vec_bench_path(path: &str) -> PathBuf {
     let out_dir = env::var("OUT_DIR").unwrap_or_else(|_| "target".to_string());
     let mut buf = PathBuf::new();
     buf.push(&format!("{}/{}", out_dir, path));
+    let _ignored = remove_dir_all(out_dir.clone());
+    create_dir_all(out_dir).expect("Create directory failed");
     buf
 }
 
@@ -203,7 +206,7 @@ fn bench_account_serialize(bencher: &mut Bencher) {
     let account = Account::new(2, 100, &Pubkey::new_rand());
     let len = get_serialized_size(&account);
     let ser_len = align_up!(len + std::mem::size_of::<u64>(), std::mem::size_of::<u64>());
-    let mut memory = vec![0; num * ser_len];
+    let mut memory = test::black_box(vec![0; num * ser_len]);
     bencher.iter(|| {
         for i in 0..num {
             let start = i * ser_len;
@@ -211,12 +214,7 @@ fn bench_account_serialize(bencher: &mut Bencher) {
         }
     });
 
-    // make sure compiler doesn't delete the code.
     let index = thread_rng().gen_range(0, num);
-    if memory[index] != 0 {
-        println!("memory: {}", memory[index]);
-    }
-
     let start = index * ser_len;
     let new_account = deserialize_account(&memory[start..start + ser_len], 0, num * len).unwrap();
     assert_eq!(new_account, account);
@@ -227,7 +225,7 @@ fn bench_account_serialize_bincode(bencher: &mut Bencher) {
     let num: usize = 1000;
     let account = Account::new(2, 100, &Pubkey::new_rand());
     let len = serialized_size(&account).unwrap() as usize;
-    let mut memory = vec![0u8; num * len];
+    let mut memory = test::black_box(vec![0u8; num * len]);
     bencher.iter(|| {
         for i in 0..num {
             let start = i * len;
@@ -236,12 +234,7 @@ fn bench_account_serialize_bincode(bencher: &mut Bencher) {
         }
     });
 
-    // make sure compiler doesn't delete the code.
     let index = thread_rng().gen_range(0, len);
-    if memory[index] != 0 {
-        println!("memory: {}", memory[index]);
-    }
-
     let start = index * len;
     let new_account: Account = deserialize(&memory[start..start + len]).unwrap();
     assert_eq!(new_account, account);