Skip to content

Partial fix for RNG on 1.7 #42158

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

Closed
PallHaraldsson wants to merge 3 commits into from
Closed

Partial fix for RNG on 1.7 #42158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc2af8
Partial fix for RNG on 1.7
PallHaraldsson Sep 8, 2021
fc1ee93
Fix RNG
PallHaraldsson Sep 8, 2021
2b303ac
Fix SIMD too
PallHaraldsson Sep 10, 2021
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 src/task.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ JL_DLLEXPORT uint64_t jl_tasklocal_genrandom(jl_task_t *task) JL_NOTSAFEPOINT
uint64_t s2 = task->rngState2;
uint64_t s3 = task->rngState3;

uint64_t t = s0 << 17;
uint64_t t = s1 << 17;
uint64_t tmp = s0 + s3;
uint64_t res = ((tmp << 23) | (tmp >> 41)) + s0;
s2 ^= s0;
Expand Down
4 changes: 2 additions & 2 deletions stdlib/Random/src/Xoshiro.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ rng_native_52(::Xoshiro) = UInt64
@inline function rand(rng::Xoshiro, ::SamplerType{UInt64})
s0, s1, s2, s3 = rng.s0, rng.s1, rng.s2, rng.s3
tmp = s0 + s3
res = tmp << 23 | tmp >> 41
res = ((tmp << 23) | (tmp >> 41)) + s0
t = s1 << 17
s2 = xor(s2, s0)
s3 = xor(s3, s1)
Expand Down Expand Up @@ -103,7 +103,7 @@ end
task = current_task()
s0, s1, s2, s3 = task.rngState0, task.rngState1, task.rngState2, task.rngState3
tmp = s0 + s3
res = tmp << 23 | tmp >> 41
res = ((tmp << 23) | (tmp >> 41)) + s0
t = s1 << 17
s2 = xor(s2, s0)
s3 = xor(s3, s1)
Expand Down
12 changes: 6 additions & 6 deletions stdlib/Random/src/XoshiroSimd.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ end

i = 0
while i+8 <= len
res = _rotl23(_plus(s0,s3))
res = _plus(_rotl23(_plus(s0, s3)), s0)
unsafe_store!(reinterpret(Ptr{UInt64}, dst + i), f(res, T))
t = _shl17(s1)
s2 = _xor(s2, s0)
Expand All @@ -170,7 +170,7 @@ end
i += 8
end
if i < len
res = _rotl23(_plus(s0,s3))
res = _plus(_rotl23(_plus(s0, s3)), s0)
t = _shl17(s1)
s2 = _xor(s2, s0)
s3 = _xor(s3, s1)
Expand Down Expand Up @@ -200,7 +200,7 @@ end

i = 0
while i+8 <= len
res = _rotl23(_plus(s0,s3))
res = _plus(_rotl23(_plus(s0, s3)), s0)
shift = 0
while i+8 <= len && shift < 8
resLoc = _and(_lshr(res, shift), 0x0101010101010101)
Expand All @@ -219,7 +219,7 @@ end
end
if i < len
# we may overgenerate some bytes here, if len mod 64 <= 56 and len mod 8 != 0
res = _rotl23(_plus(s0,s3))
res = _plus(_rotl23(_plus(s0, s3)), s0)
resLoc = _and(res, 0x0101010101010101)
ref = Ref(resLoc)
ccall(:memcpy, Ptr{Cvoid}, (Ptr{UInt8}, Ptr{UInt64}, Csize_t), dst+i, ref, len-i)
Expand All @@ -245,7 +245,7 @@ end

i = 0
while i + 8*N <= len
res = _rotl23(_plus(s0,s3))
res = _plus(_rotl23(_plus(s0, s3)), s0)
t = _shl17(s1)
s2 = _xor(s2, s0)
s3 = _xor(s3, s1)
Expand All @@ -264,7 +264,7 @@ end
msk = ntuple(i->VecElement(0x0101010101010101), Val(N))
i = 0
while i + 64*N <= len
res = _rotl23(_plus(s0,s3))
res = _plus(_rotl23(_plus(s0, s3)), s0)
t = _shl17(s1)
s2 = _xor(s2, s0)
s3 = _xor(s3, s1)
Expand Down