Skip to content

update phf hash #71

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

Merged
hayanesuru merged 1 commit into from
May 6, 2026
Merged

update phf hash #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion haya_data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ fn main() {
let x = block::mud.state_default();
let b = x.to_block();
assert_eq!(b.name(), "mud");
assert_eq!(b, str::parse("mud").unwrap());
assert_eq!(b, "mud".parse().unwrap());

assert_eq!(x.side_solid_full(), Some(0b111111));
assert_eq!(x.side_solid_rigid(), Some(0b111111));
Expand Down
20 changes: 8 additions & 12 deletions haya_data/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ fn hex_line(x: &str) -> impl Iterator<Item = u32> + Clone + '_ {

struct GenerateHash {
wy_rand: u64,
hashes: Vec<[u64; 2]>,
hashes: Vec<u64>,
buckets: Vec<Bucket>,
values_to_add: Vec<(usize, u32)>,
map: Vec<Option<u32>>,
Expand All @@ -1496,7 +1496,7 @@ impl GenerateHash {
let key = self.next();
self.hashes.clear();
self.hashes
.extend(entries.iter().map(|&x| hash128(x.as_bytes(), key)));
.extend(entries.iter().map(|&x| hash64(x.as_bytes(), key)));
let table_len = self.hashes.len();
let buckets_len = table_len.div_ceil(DEFAULT_LAMBDA);

Expand All @@ -1512,8 +1512,8 @@ impl GenerateHash {
bucket.idx = i;
bucket.keys.clear();
}
for (i, [a, _]) in self.hashes.iter().enumerate() {
self.buckets[(((a >> 32) as u32) % buckets_len as u32) as usize]
for (i, a) in self.hashes.iter().enumerate() {
self.buckets[(((a >> 24) as u32) % buckets_len as u32) as usize]
.keys
.push(i as u32);
}
Expand All @@ -1540,9 +1540,9 @@ impl GenerateHash {
generation += 1;

for &key in &bucket.keys {
let [a, b] = (&mut self.hashes)[key as usize];
let a = (&mut self.hashes)[key as usize];
let f1 = a as u32;
let f2 = b as u32;
let f2 = (a >> 32) as u32;
let x = d2.wrapping_add(f1.wrapping_mul(d1)).wrapping_add(f2);
let idx = (x % (table_len as u32)) as usize;
if self.map[idx].is_some() || self.try_map[idx] == generation {
Expand Down Expand Up @@ -1779,9 +1779,8 @@ fn parse_u64(n: &str) -> u64 {
u64::from_str_radix(n.trim_ascii(), 16).expect("parse hex")
}

const fn hash128(n: &[u8], seed: u64) -> [u64; 2] {
const fn hash64(n: &[u8], seed: u64) -> u64 {
const M: u64 = 0xc6a4a7935bd1e995;
const N: u128 = 0xdbe6d5d5fe4cce213198a2e03707344u128;
let mut h: u64 = seed ^ ((n.len() as u64).wrapping_mul(M));
let mut i = 0;
while i + 8 <= n.len() {
Expand All @@ -1792,10 +1791,7 @@ const fn hash128(n: &[u8], seed: u64) -> [u64; 2] {
h ^= (unsafe { *n.as_ptr().add(i) } as u64) << ((i & 7) * 8);
i += 1;
}
let h = (h as u128).wrapping_mul(N);
let h = h ^ (h >> 64);
let h = h.wrapping_mul(N);
[(h >> 64) as u64, h as u64]
h.wrapping_mul(M)
}

fn impl_codec_struct(w: &mut String, name: &str, size: usize, repr: Repr) {
Expand Down
37 changes: 17 additions & 20 deletions haya_data/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ fn name_u8<const K: u64, const N: usize, const M: usize>(
vals: &'static [u8; M],
name: &str,
) -> Option<u8> {
let [a, b] = hash128(name, K);
let g = (a >> 32) as u32;
let a = hash64(name, K);
let g = (a >> 24) as u32;
let f1 = a as u32;
let f2 = b as u32;
let f2 = (a >> 32) as u32;
let d = unsafe { *disps.get_unchecked((g % (N as u32)) as usize) };
let d1 = (d >> 32) as u32;
let d2 = d as u32;
Expand All @@ -33,10 +33,10 @@ fn name_u16<const K: u64, const N: usize, const M: usize>(
vals: &'static [u16; M],
name: &str,
) -> Option<u16> {
let [a, b] = hash128(name, K);
let g = (a >> 32) as u32;
let a = hash64(name, K);
let g = (a >> 24) as u32;
let f1 = a as u32;
let f2 = b as u32;
let f2 = (a >> 32) as u32;
let d = unsafe { *disps.get_unchecked((g % (N as u32)) as usize) };
let d1 = (d >> 32) as u32;
let d2 = d as u32;
Expand Down Expand Up @@ -582,9 +582,9 @@ impl core::fmt::Debug for fluid_state {
}
}

const fn hash128(n: &str, seed: u64) -> [u64; 2] {
#[inline]
const fn hash64(n: &str, seed: u64) -> u64 {
const M: u64 = 0xc6a4a7935bd1e995;
const N: u128 = 0xdbe6d5d5fe4cce213198a2e03707344u128;
let mut h: u64 = seed ^ ((n.len() as u64).wrapping_mul(M));
let mut i = 0;
while i + 8 <= n.len() {
Expand All @@ -595,10 +595,7 @@ const fn hash128(n: &str, seed: u64) -> [u64; 2] {
h ^= (unsafe { *n.as_ptr().add(i) } as u64) << ((i & 7) * 8);
i += 1;
}
let h = (h as u128).wrapping_mul(N);
let h = h ^ (h >> 64);
let h = h.wrapping_mul(N);
[(h >> 64) as u64, h as u64]
h.wrapping_mul(M)
}

#[cfg(test)]
Expand All @@ -610,15 +607,15 @@ mod tests {
assert_eq!(game_event::block_activate.name(), "block_activate");
assert_eq!(
sound_event::block_bamboo_wood_pressure_plate_click_on,
str::parse("block.bamboo_wood_pressure_plate.click_on").unwrap()
"block.bamboo_wood_pressure_plate.click_on".parse().unwrap()
);
}

#[test]
fn test_air() {
let air_bl = block::air;
assert_eq!(air_bl.name(), "air");
assert_eq!(air_bl, str::parse(air_bl.name()).unwrap());
assert_eq!(air_bl, air_bl.name().parse().unwrap());

let air_bs = air_bl.state_default();
assert_eq!(air_bs.side_solid_full(), Some(0));
Expand Down Expand Up @@ -650,15 +647,15 @@ mod tests {

let b = white_concrete_bs.to_block();
assert_eq!(b.name(), "white_concrete");
assert_eq!(b, str::parse(b.name()).unwrap());
assert_eq!(b, b.name().parse().unwrap());

let oak_sapling_bs = block_state::new(
(oak_sapling::new()).encode() as raw_block_state + block::oak_sapling.state_index(),
)
.unwrap();
let b = oak_sapling_bs.to_block();
assert_eq!(b.name(), "oak_sapling");
assert_eq!(b, str::parse(b.name()).unwrap());
assert_eq!(b, b.name().parse().unwrap());

assert_eq!(oak_sapling_bs.side_solid_full(), Some(0));
assert_eq!(oak_sapling_bs.side_solid_rigid(), Some(0));
Expand All @@ -668,7 +665,7 @@ mod tests {
let mud_bs = block::mud.state_default();
let b = mud_bs.to_block();
assert_eq!(b.name(), "mud");
assert_eq!(b, str::parse("mud").unwrap());
assert_eq!(b, "mud".parse().unwrap());

assert_eq!(mud_bs.side_solid_full(), Some(0b111111));
assert_eq!(mud_bs.side_solid_rigid(), Some(0b111111));
Expand Down Expand Up @@ -702,7 +699,7 @@ mod tests {
assert_eq!(
block_state::parse(
block::redstone_wire,
&mut [(str::parse("east").unwrap(), str::parse("side").unwrap())][..]
&mut [("east".parse().unwrap(), "side".parse().unwrap())][..]
),
a
);
Expand All @@ -721,8 +718,8 @@ mod tests {
block_state::parse(
block::redstone_wire,
&mut [
(str::parse("east").unwrap(), str::parse("side").unwrap()),
(str::parse("power").unwrap(), str::parse("11").unwrap())
("east".parse().unwrap(), "side".parse().unwrap()),
("power".parse().unwrap(), "11".parse().unwrap())
][..]
),
a
Expand Down