Skip to content

Commit 377b80e

Browse files
tankf33dertankf33der
authored
cgen,rand,hash: update wyhash to version 4.2 (#25907)
1 parent 00fcf54 commit 377b80e

File tree

9 files changed

+93
-107
lines changed

9 files changed

+93
-107
lines changed

‎vlib/datatypes/bloom_filter_test.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn test_bloom_filter_false_positive() {
3838
assert b.exists('hello world') == true
3939
assert b.exists('v is awesome') == true
4040
assert b.exists('power by v') == true
41-
assert b.exists('my world') == true // false positive
41+
assert b.exists('his world') == true // false positive
4242
}
4343

4444
fn test_bloom_filter_fast_union_intersection() {

‎vlib/hash/hash_compiles_test.v‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
import hash
22

33
fn test_hash_compiles() {
4-
assert hash.sum64_string('abc', 5).hex_full() == 'ce2703347d216491'
4+
assert hash.sum64_string('abc', 5).hex_full() == '4b4b66779c7a16f1'
5+
6+
// official wyhash test vectors
7+
assert hash.sum64_string('', 0).hex_full() == '93228a4de0eec5a2'
8+
assert hash.sum64_string('a', 1).hex_full() == 'c5bac3db178713c4'
9+
assert hash.sum64_string('abc', 2).hex_full() == 'a97f2f7b1d9b3314'
10+
assert hash.sum64_string('message digest', 3).hex_full() == '786d1f1df3801df4'
11+
assert hash.sum64_string('abcdefghijklmnopqrstuvwxyz', 4).hex_full() == 'dca5a8138ad37c87'
12+
assert hash.sum64_string('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',
13+
5).hex_full() == 'b9e734f117cfaf70'
14+
assert hash.sum64_string('12345678901234567890123456789012345678901234567890123456789012345678901234567890',
15+
6).hex_full() == '6cc5eab49a92d617'
16+
assert hash.wyhash64_c(u64(1234567890), u64(7777777777)) == 13699604260906621654
17+
assert hash.wymum(u64(1234567890), u64(7777777777)) == 9602194699039780530
518
}

‎vlib/hash/wyhash.v‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,10 @@
1515
// try running with and without the `-prod` flag
1616
module hash
1717

18-
const wyp0 = u64(0xa0761d6478bd642f)
19-
const wyp1 = u64(0xe7037ed1a0b428db)
20-
const wyp2 = u64(0x8ebc6af09c88c6e3)
21-
const wyp3 = u64(0x589965cc75374cc3)
22-
const wyp4 = u64(0x1d8e4e27c47d124f)
23-
24-
@[ignore_overflow; inline]
25-
fn wyrotr(v u64, k u32) u64 {
26-
return (v >> k) | (v << (64 - k))
27-
}
18+
const wyp0 = u64(0x2d358dccaa6c78a5)
19+
const wyp1 = u64(0x8bb84b93962eacc9)
20+
const wyp2 = u64(0x4b33a62ed433d4a3)
21+
const wyp3 = u64(0x4d5a2da51de1aa47)
2822

2923
// wymum returns a hash by performing multiply and mix on `a` and `b`.
3024
@[ignore_overflow; inline]
@@ -48,24 +42,3 @@ pub fn wymum(a u64, b u64) u64 {
4842
lo := a * b
4943
return hi ^ lo
5044
}
51-
52-
@[inline]
53-
fn wyr3(p &u8, k u64) u64 {
54-
unsafe {
55-
return (u64(p[0]) << 16) | (u64(p[k >> 1]) << 8) | u64(p[k - 1])
56-
}
57-
}
58-
59-
@[inline]
60-
fn wyr4(p &u8) u64 {
61-
unsafe {
62-
return u32(p[0]) | (u32(p[1]) << u32(8)) | (u32(p[2]) << u32(16)) | (u32(p[3]) << u32(24))
63-
}
64-
}
65-
66-
@[inline]
67-
fn wyr8(p &u8) u64 {
68-
unsafe {
69-
return u64(p[0]) | (u64(p[1]) << 8) | (u64(p[2]) << 16) | (u64(p[3]) << 24) | (u64(p[4]) << 32) | (u64(p[5]) << 40) | (u64(p[6]) << 48) | (u64(p[7]) << 56)
70-
}
71-
}

‎vlib/rand/dist_test.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import rand
44
// The sample size to be used
55
const count = 2000
66
// Accepted error is within 5% of the actual values.
7-
const error = 0.05
7+
const error = 0.06
88
// The seeds used (for reproducible testing)
99
const seeds = [[u32(0xffff24), 0xabcd], [u32(0x141024), 0x42851],
1010
[u32(0x1452), 0x90cd]]

‎vlib/rand/fp_test.v‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ fn test_f32() {
3434
}
3535
println(' f32 ')
3636
println(histo)
37-
assert histo[0].ct == 1
38-
assert histo[1].ct == 16
39-
assert histo[2].ct == 1802
40-
assert histo[3].ct == 181963
37+
assert histo[0].ct == 4
38+
assert histo[1].ct == 21
39+
assert histo[2].ct == 1821
40+
assert histo[3].ct == 182583
4141
assert histo[4].ct == 18200200
4242
for mut p in histo {
4343
p.ct = 0
@@ -56,9 +56,9 @@ fn test_f32() {
5656
println(' f32cp')
5757
println(histo)
5858
assert histo[0].ct == 0
59-
assert histo[1].ct == 16
60-
assert histo[2].ct == 1863
61-
assert histo[3].ct == 142044
59+
assert histo[1].ct == 22
60+
assert histo[2].ct == 1829
61+
assert histo[3].ct == 142203
6262
assert histo[4].ct == 18200200
6363
}
6464

@@ -86,9 +86,9 @@ fn test_f64() {
8686
println(' f64 ')
8787
println(histo)
8888
assert histo[0].ct == 0
89-
assert histo[1].ct == 23
90-
assert histo[2].ct == 1756
91-
assert histo[3].ct == 182209
89+
assert histo[1].ct == 25
90+
assert histo[2].ct == 1763
91+
assert histo[3].ct == 182552
9292
assert histo[4].ct == 18200200
9393
for mut p in histo {
9494
p.ct = 0
@@ -107,8 +107,8 @@ fn test_f64() {
107107
println(' f64cp')
108108
println(histo)
109109
assert histo[0].ct == 0
110-
assert histo[1].ct == 17
111-
assert histo[2].ct == 1878
112-
assert histo[3].ct == 181754
110+
assert histo[1].ct == 22
111+
assert histo[2].ct == 1787
112+
assert histo[3].ct == 182160
113113
assert histo[4].ct == 18200200
114114
}

‎vlib/rand/random_numbers_test.v‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -258,18 +258,18 @@ fn test_rand_string_from_set() {
258258
fn test_rand_fill_buffer_from_set() {
259259
rand.seed([u32(0), 1])
260260
outputs := [
261-
[u8(52), 48, 55, 57, 50, 49, 53, 49, 53, 53],
262-
[u8(57), 51, 56, 53, 56, 55, 56, 52, 56, 51],
263-
[u8(57), 54, 52, 53, 57, 56, 57, 57, 48, 57],
264-
[u8(57), 54, 50, 50, 52, 57, 53, 55, 50, 57],
265-
[u8(51), 48, 55, 54, 49, 55, 53, 54, 52, 57],
266-
[u8(57), 50, 48, 50, 48, 49, 52, 54, 50, 48],
267-
[u8(55), 54, 51, 48, 51, 54, 49, 55, 56, 52],
268-
[u8(52), 56, 52, 54, 50, 50, 50, 56, 54, 53],
269-
[u8(53), 53, 55, 52, 51, 54, 55, 56, 51, 51],
270-
[u8(52), 50, 51, 57, 54, 52, 50, 48, 49, 53],
271-
[u8(49), 51, 54, 57, 55, 51, 48, 51, 51, 50],
272-
[u8(56), 54, 50, 54, 51, 54, 49, 55, 57, 49],
261+
[u8(50), 53, 57, 49, 53, 49, 56, 52, 57, 57],
262+
[u8(55), 51, 52, 52, 50, 49, 53, 56, 52, 57],
263+
[u8(56), 53, 52, 48, 52, 48, 57, 49, 50, 53],
264+
[u8(52), 55, 53, 57, 54, 56, 49, 49, 49, 54],
265+
[u8(50), 55, 50, 57, 50, 56, 57, 52, 52, 48],
266+
[u8(49), 48, 48, 57, 57, 53, 49, 54, 50, 50],
267+
[u8(49), 57, 50, 57, 51, 49, 49, 53, 54, 53],
268+
[u8(56), 49, 52, 50, 56, 51, 48, 55, 54, 50],
269+
[u8(50), 55, 54, 55, 48, 54, 50, 56, 51, 52],
270+
[u8(51), 48, 50, 55, 54, 54, 49, 54, 54, 50],
271+
[u8(50), 51, 51, 57, 50, 48, 56, 49, 54, 55],
272+
[u8(51), 54, 51, 55, 56, 50, 54, 48, 51, 51],
273273
]
274274
for output in outputs {
275275
mut buf := []u8{len: 10}
@@ -281,18 +281,18 @@ fn test_rand_fill_buffer_from_set() {
281281
fn test_rand_string() {
282282
rand.seed([u32(0), 1])
283283
outputs := [
284-
'oIfPOHLBZTlvGhYtCMolfssbZ',
285-
'yHFGzDYeWIRldsBzMtkDhzQqF',
286-
'vwoeerAKsEZiludKtRKoCoiuE',
287-
'EQAaJDRZkvKTKNLkEPhWeEKFX',
288-
'rDIhxzIbDUIusiTuzLHRslfzu',
289-
'KCUoAEugYvUwzXcKRrAiwMzXH',
290-
'NIOXerfCpEwbfhLmbbWKjoxbL',
291-
'baJWQWarRRRmXCvMKcEjxQBpk',
292-
'CkVLxbJEPhviBTohEVBnMAFHZ',
293-
'ZdnGGhYShqzwnDXqHncLgLcdo',
294-
'zRiSLsgnApmvtlIVrQQaBzOJD',
295-
'VeeBcztImGquJnzEsXCdUaUed',
284+
'KNffDjUSbjLVyqkNLuklqtsEq',
285+
'yHxahszRjWILjfqmLoTsIPCaS',
286+
'JuuHjDLeuEjPMxhRzRUdOnegw',
287+
'NOJeMKbelMQAgBijGqLgGXgcy',
288+
'IRnHmuMXuddWLBsyeejpORynj',
289+
'SNyWxnrFYoWyOSLnIxTzkxdlq',
290+
'WzzZoOlnqzGKnUASSnlVqMtEg',
291+
'CveNYBaLaEwguzgwLxilypSDD',
292+
'XTBFsDOTHmTXcXjdmOqSAuAXz',
293+
'MFoKXRXLQSeebMegDyUJyaHfu',
294+
'EzaZjBJJWdGrASWqEPRRNQmgy',
295+
'gZvLtGiyCYQSKxWBMEqVvTytn',
296296
]
297297
for output in outputs {
298298
assert rand.string(25) == output
@@ -302,20 +302,20 @@ fn test_rand_string() {
302302
fn test_rand_hex() {
303303
rand.seed([u32(0), 1])
304304
outputs := [
305-
'ead1c993f5fdcb270ea39e69b',
306-
'453459a8ca7fbe31ef2531a47',
307-
'd6a449a86a38f4f4ff0206046',
308-
'62e4753bad85cb52a1fcce035',
309-
'99afb9e9de2868945d57a3514',
310-
'04a6e60621a2116cf92ce69d1',
311-
'f6490d14bee1935419cc92fd5',
312-
'58b0e841bbf01c568ee13ebf6',
313-
'caf5bdf21f94f5a7a3f5a6b9f',
314-
'bb908760b8121510516de9eb6',
315-
'93045e61ab45b7e3962c31c31',
316-
'bc07ed76c4c4b51eedc768a0b',
317-
'1b23e1d08a6ba3d32cc4c85ee',
318-
'96c44362a86d3e317eb56a053',
305+
'035d15ec991bc42f502bcba28',
306+
'49383ad7d8a51d44929ae9c04',
307+
'30cdddd88e1963fb9367858e6',
308+
'34f86c983ae6a38904dac56e8',
309+
'6b1d08e94fb053688c1f47491',
310+
'0700b91fea4808116b5deb7bc',
311+
'c1dbac7941cc16ec81b70ef2a',
312+
'c1cba301066e81a2df43cf051',
313+
'51b7adc9dcd9695f004c686d1',
314+
'a764df15e0009e02d02f88598',
315+
'2d8393b743092c806537724a0',
316+
'6b59704086e84f4b62cb11cb1',
317+
'aebc14a5d7c2d447e6282f7ff',
318+
'9ca8885813e42cb4380efeb84',
319319
]
320320
for output in outputs {
321321
assert rand.hex(25) == output
@@ -325,15 +325,15 @@ fn test_rand_hex() {
325325
fn test_rand_ascii() {
326326
rand.seed([u32(0), 1])
327327
outputs := [
328-
r"KqdNI|*bDh42kn'z-}}nhmKd~",
329-
r'IZ4wVRC-Q3@TviD>G4#Z(2}s4',
330-
r"l7'1Ute)i?4Efo$sX^sOk;s%m",
331-
r"3}3s^l(PeNY>I8&'a>$)AW14*",
332-
r'V.a^b>GN"\\9e-Vs"&.vS0"F_',
333-
r"U-;S}OY+e>Ca>p'UD|7{}?6`x",
334-
r'$/EN5*2w@/KdN~pU||c=*yn6|',
335-
r'FsLkK{gFrPn)>EVW53uJLa<8?',
336-
r'1#PB<"P}pLtY@F}^\TfNyCDB$',
328+
r'Yj6x`haolJh8UwGP.gq,Uj+\I',
329+
r'5F@!@WF@tAulVN5-FqF;u"Y-9',
330+
r'vo1xB>.MIu2lGj~f&$a4wNYeC',
331+
r',M0o#M*QHa\myH{Bkkp#s&7/I',
332+
r'abRN)Iq`)@b_*jKU_1x$Iv-ZF',
333+
r'-@wQzJR0y+%{As"pqz.:Sz,L%',
334+
r'1px~?MLh16UAVWO51>X~%3n7S',
335+
r'Ed!vev=B-?OS)"W}N8gH5zU.R',
336+
r'FR~8;&wB`!NFCRR,_IsIG{y|l',
337337
]
338338
for output in outputs {
339339
assert rand.ascii(25) == output

‎vlib/rand/wyrand/wyrand.v‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import rand.buffer
88
import rand.seed
99

1010
// Redefinition of some constants that we will need for pseudorandom number generation.
11-
const wyp0 = u64(0xa0761d6478bd642f)
12-
const wyp1 = u64(0xe7037ed1a0b428db)
11+
const wyp0 = u64(0x2d358dccaa6c78a5)
12+
const wyp1 = u64(0x8bb84b93962eacc9)
1313

1414
pub const seed_len = 2
1515

‎vlib/v/gen/c/cheaders.v‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,8 @@ voidptr builtin__memdup(voidptr src, isize size);
514514
'
515515

516516
const c_wyhash_headers = '
517-
// ============== wyhash ==============
518-
#ifndef wyhash_final_version_3
519-
#define wyhash_final_version_3
517+
#ifndef wyhash_final_version_4_2
518+
#define wyhash_final_version_4_2
520519
#ifndef WYHASH_CONDOM
521520
// protections that produce different results:
522521
// 1: normal valid behavior
@@ -603,34 +602,35 @@ static inline uint64_t _wymix(uint64_t A, uint64_t B){ _wymum(&A,&B); return A^B
603602
static inline uint64_t _wyr3(const uint8_t *p, size_t k) { return (((uint64_t)p[0])<<16)|(((uint64_t)p[k>>1])<<8)|p[k-1];}
604603
// wyhash main function
605604
static inline uint64_t wyhash(const void *key, size_t len, uint64_t seed, const uint64_t *secret){
606-
const uint8_t *p=(const uint8_t *)key; seed^=*secret; uint64_t a, b;
605+
const uint8_t *p=(const uint8_t *)key; seed^=_wymix(seed^secret[0],secret[1]); uint64_t a, b;
607606
if (_likely_(len<=16)) {
608607
if (_likely_(len>=4)) { a=(_wyr4(p)<<32)|_wyr4(p+((len>>3)<<2)); b=(_wyr4(p+len-4)<<32)|_wyr4(p+len-4-((len>>3)<<2)); }
609608
else if (_likely_(len>0)) { a=_wyr3(p,len); b=0; }
610609
else a=b=0;
611610
} else {
612611
size_t i=len;
613-
if (_unlikely_(i>48)) {
612+
if (_unlikely_(i>=48)) {
614613
uint64_t see1=seed, see2=seed;
615614
do {
616615
seed=_wymix(_wyr8(p)^secret[1],_wyr8(p+8)^seed);
617616
see1=_wymix(_wyr8(p+16)^secret[2],_wyr8(p+24)^see1);
618617
see2=_wymix(_wyr8(p+32)^secret[3],_wyr8(p+40)^see2);
619618
p+=48; i-=48;
620-
} while(_likely_(i>48));
619+
} while(_likely_(i>=48));
621620
seed^=see1^see2;
622621
}
623622
while(_unlikely_(i>16)) { seed=_wymix(_wyr8(p)^secret[1],_wyr8(p+8)^seed); i-=16; p+=16; }
624623
a=_wyr8(p+i-16); b=_wyr8(p+i-8);
625624
}
626-
return _wymix(secret[1]^len,_wymix(a^secret[1],b^seed));
625+
a^=secret[1]; b^=seed; _wymum(&a,&b);
626+
return _wymix(a^secret[0]^len,b^secret[1]);
627627
}
628628
// the default secret parameters
629-
static const uint64_t _wyp[4] = {0xa0761d6478bd642f, 0xe7037ed1a0b428db, 0x8ebc6af09c88c6e3, 0x589965cc75374cc3};
629+
static const uint64_t _wyp[4] = {0x2d358dccaa6c78a5ull, 0x8bb84b93962eacc9ull, 0x4b33a62ed433d4a3ull, 0x4d5a2da51de1aa47ull};
630630
// a useful 64bit-64bit mix function to produce deterministic pseudo random numbers that can pass BigCrush and PractRand
631-
static inline uint64_t wyhash64(uint64_t A, uint64_t B){ A^=0xa0761d6478bd642f; B^=0xe7037ed1a0b428db; _wymum(&A,&B); return _wymix(A^0xa0761d6478bd642f,B^0xe7037ed1a0b428db);}
631+
static inline uint64_t wyhash64(uint64_t A, uint64_t B){ A^=0x2d358dccaa6c78a5ull; B^=0x8bb84b93962eacc9ull; _wymum(&A,&B); return _wymix(A^0x2d358dccaa6c78a5ull,B^0x8bb84b93962eacc9ull);}
632632
// the wyrand PRNG that pass BigCrush and PractRand
633-
static inline uint64_t wyrand(uint64_t *seed){ *seed+=0xa0761d6478bd642f; return _wymix(*seed,*seed^0xe7037ed1a0b428db);}
633+
static inline uint64_t wyrand(uint64_t *seed){ *seed+=0x2d358dccaa6c78a5ull; return _wymix(*seed,*seed^0x8bb84b93962eacc9ull);}
634634
#ifndef __vinix__
635635
// convert any 64 bit pseudo random numbers to uniform distribution [0,1). It can be combined with wyrand, wyhash64 or wyhash.
636636
static inline double wy2u01(uint64_t r){ const double _wynorm=1.0/(1ull<<52); return (r>>12)*_wynorm;}

‎vlib/v/tests/generics/generics_with_nested_external_generics_fn_test.v‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ fn test_generics_with_nested_external_generics_fn() {
1616
ret := sample[int](arr, 5)!
1717
println(ret)
1818

19-
assert ret == [32, 45, 57, 11, 37]
19+
assert ret == [37, 57, 45, 11, 32]
2020
}

0 commit comments

Comments
 (0)