Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use hash_many in sector_roots #53

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Use hash_many in sector_roots #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eed15dc
rhp: use hash_many for sector_root
ChrisSchinnerl Sep 28, 2024
af1b156
rhp: fix test
ChrisSchinnerl Sep 28, 2024
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
1 change: 1 addition & 0 deletions src/merkle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ impl Accumulator {
}
}

#[allow(dead_code)]
pub fn sum_leaf(params: &Params, leaf: &[u8]) -> [u8; 32] {
let h = params
.to_state()
Expand Down
69 changes: 57 additions & 12 deletions src/rhp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::merkle::{sum_leaf, sum_node};
use crate::merkle::{sum_node, LEAF_HASH_PREFIX, NODE_HASH_PREFIX};
use crate::Hash256;
use blake2b_simd::many::{hash_many, HashManyJob};
use blake2b_simd::Params;
use rayon::prelude::*;

Expand All @@ -12,21 +13,65 @@ pub fn sector_root(sector: &[u8]) -> Hash256 {
let mut params = Params::new();
params.hash_length(32);

let mut tree_hashes = sector
.par_chunks_exact(SEGMENT_SIZE)
.map(|chunk| sum_leaf(&params, chunk))
.collect::<Vec<_>>();
let mut tree_hashes = vec![[0; 32]; SECTOR_SIZE / SEGMENT_SIZE];
ChrisSchinnerl marked this conversation as resolved.
Show resolved Hide resolved
tree_hashes
.par_chunks_exact_mut(4)
.enumerate()
.for_each(|(i, chunk)| {
// prepare inputs
let mut inputs = [[0u8; SEGMENT_SIZE + 1]; 4];
for (j, input) in inputs.iter_mut().enumerate() {
input[0] = LEAF_HASH_PREFIX[0];
input[1..]
.copy_from_slice(&sector[SEGMENT_SIZE * (i + j)..SEGMENT_SIZE * (i + j + 1)]);
}

let mut chunk_size = 2;
// hash them
let mut jobs = [
HashManyJob::new(&params, &inputs[0][..]),
HashManyJob::new(&params, &inputs[1][..]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused. It seems like you're iterating over groups of 4 segments at a time, but here you're only hashing 2 of them? 🤔

HashManyJob::new(&params, &inputs[2][..]),
HashManyJob::new(&params, &inputs[3][..]),
];
hash_many(&mut jobs);

// collect results
for j in 0..4 {
chunk[j] = jobs[j].to_hash().as_bytes().try_into().unwrap();
}
});

let mut chunk_size = 4;
while chunk_size <= tree_hashes.len() {
tree_hashes
.par_chunks_exact_mut(chunk_size)
.for_each(|nodes| {
nodes[0] = sum_node(&params, &nodes[0], &nodes[nodes.len() / 2]);
});
tree_hashes.par_chunks_mut(chunk_size).for_each(|nodes| {
// prepare inputs
let mut inputs = [[0u8; 65]; 2];
for (j, input) in inputs.iter_mut().enumerate() {
input[0] = NODE_HASH_PREFIX[0];
let step = j * chunk_size / 2;
input[1..33].copy_from_slice(&nodes[step]);
input[33..65].copy_from_slice(&nodes[step + chunk_size / 4]);
}

// hash them
let mut jobs = [
HashManyJob::new(&params, &inputs[0][..]),
HashManyJob::new(&params, &inputs[1][..]),
];
hash_many(&mut jobs);

// collect results
nodes[0] = jobs[0].to_hash().as_bytes().try_into().unwrap();
nodes[nodes.len() / 2] = jobs[1].to_hash().as_bytes().try_into().unwrap();
});
chunk_size *= 2;
}
Hash256::from(tree_hashes[0])
// hash last two nodes into roots
Hash256::from(sum_node(
&params,
&tree_hashes[0],
&tree_hashes[tree_hashes.len() / 2],
))
}

#[cfg(test)]
Expand Down