Skip to content

Fix std.digest.murmurhash regression #44

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
kinke merged 1 commit into from
Dec 10, 2017
Merged

Fix std.digest.murmurhash regression #44

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
57 changes: 31 additions & 26 deletions std/digest/murmurhash.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,9 @@ $(BR) $(LINK2 https://en.wikipedia.org/wiki/MurmurHash, Wikipedia)
module std.digest.murmurhash;

version (X86)
{
version = haveUnalignedLoads;
}
else version (X86_64)
{
version = haveUnalignedLoads;
}

///
@safe unittest
Expand Down Expand Up @@ -541,41 +537,50 @@ struct MurmurHash3(uint size /* 32 or 128 */ , uint opt = size_t.sizeof == 8 ? 6
}
else
{
void processChunks(TChunk)()
void processChunks(T)() @trusted
{
alias TChunk = T[Element.sizeof / T.sizeof];
foreach (ref const chunk; cast(const(TChunk[])) data[0 .. remainderStart])
{
putElement(cast(Element) chunk);
static if (T.alignof >= Element.alignof)
{
putElement(*cast(const(Element)*) chunk.ptr);
}
else
{
Element[1] alignedCopy = void;
version (LDC)
{
import ldc.intrinsics : llvm_memcpy;
llvm_memcpy(alignedCopy.ptr, chunk.ptr, Element.sizeof, T.alignof);
}
else
{
(cast(T[]) alignedCopy)[] = chunk[];
}
putElement(alignedCopy[0]);
}
}
}

const startAddress = cast(size_t) data.ptr;
static if (size >= 64)
{
if ((startAddress & 7) == 0)
processChunks!(ulong[size / 64])();
else if ((startAddress & 3) == 0)
processChunks!(uint[size / 32])();
else if ((startAddress & 1) == 0)
processChunks!(ushort[size / 16])();
else
processChunks!(ubyte[size / 8])();
}
else
{
static assert(size == 32);
if ((startAddress & 3) == 0)
processChunks!(Element)();
else
{
foreach (ref const chunk; cast(const(ubyte[4])[]) data[0 .. remainderStart])
{
Element[1] block = void;
(cast(ubyte[]) block)[] = chunk[];
putElement(block[0]);
}
processChunks!ulong();
goto L_end;
}
}
static assert(size >= 32);
if ((startAddress & 3) == 0)
processChunks!uint();
else if ((startAddress & 1) == 0)
processChunks!ushort();
else
processChunks!ubyte();

L_end:
}
element_count += numElements * Element.sizeof;
data = data[remainderStart .. $];
Expand Down