Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Apple M1 compatibility #16346

Merged
merged 20 commits into from
Apr 10, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unused crap
  • Loading branch information
Christian Drappi authored and cdrappi committed Apr 9, 2021
commit 10c5e3c31ed462583a7c3acb862cf8f3422401a4
86 changes: 65 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions ledger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ prost = "0.7.0"
rand = "0.7.0"
rand_chacha = "0.2.2"
rayon = "1.5.0"
# reed-solomon-erasure = { path = "../../reed-solomon-erasure", features = ["simd-accel"] }
reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] }
serde = "1.0.122"
serde_bytes = "0.11.4"
Expand Down Expand Up @@ -60,9 +59,7 @@ trees = "0.2.1"
[dependencies.rocksdb]
# Avoid the vendored bzip2 within rocksdb-sys that can cause linker conflicts
# when also using the bzip2 crate
# version = "0.15.0"
git = "https://github.com/rust-rocksdb/rust-rocksdb.git"
rev = "bc59596da15867510133d60822e615ef6e3a1ca4"
version = "0.15.0"
default-features = false
features = ["lz4"]

Expand Down
54 changes: 26 additions & 28 deletions poh-bench/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,38 +84,36 @@ fn main() {
time.as_us() / iterations as u64
);

#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
if is_x86_feature_detected!("avx2") && entry::api().is_some() {
let mut time = Measure::start("time");
for _ in 0..iterations {
assert!(ticks[..num_entries]
.verify_cpu_x86_simd(&start_hash, 8)
.finish_verify(&ticks[..num_entries]));
}
time.stop();
println!(
"{},cpu_simd_avx2,{}",
num_entries,
time.as_us() / iterations as u64
);
if is_x86_feature_detected!("avx2") && entry::api().is_some() {
let mut time = Measure::start("time");
for _ in 0..iterations {
assert!(ticks[..num_entries]
.verify_cpu_x86_simd(&start_hash, 8)
.finish_verify(&ticks[..num_entries]));
}
time.stop();
println!(
"{},cpu_simd_avx2,{}",
num_entries,
time.as_us() / iterations as u64
);
}

if is_x86_feature_detected!("avx512f") && entry::api().is_some() {
let mut time = Measure::start("time");
for _ in 0..iterations {
assert!(ticks[..num_entries]
.verify_cpu_x86_simd(&start_hash, 16)
.finish_verify(&ticks[..num_entries]));
}
time.stop();
println!(
"{},cpu_simd_avx512,{}",
num_entries,
time.as_us() / iterations as u64
);
if is_x86_feature_detected!("avx512f") && entry::api().is_some() {
let mut time = Measure::start("time");
for _ in 0..iterations {
assert!(ticks[..num_entries]
.verify_cpu_x86_simd(&start_hash, 16)
.finish_verify(&ticks[..num_entries]));
}
time.stop();
println!(
"{},cpu_simd_avx512,{}",
num_entries,
time.as_us() / iterations as u64
);
}

if perf_libs::api().is_some() {
let mut time = Measure::start("time");
let recyclers = VerifyRecyclers::default();
Expand Down