diff options
author | serge-sans-paille <sguelton@redhat.com> | 2021-04-01 22:18:55 +0200 |
---|---|---|
committer | serge-sans-paille <sguelton@redhat.com> | 2021-04-07 14:04:32 +0200 |
commit | 6951b72334bbe4c189c71751edc1e361d7b5632c (patch) | |
tree | 4769880a7a705156bf37adeb096644666e4814d1 /clang/lib/Basic/SourceManager.cpp | |
parent | f0e102c1a39f0f7e9e309b27916533b8fefd9be7 (diff) | |
download | llvm-6951b72334bbe4c189c71751edc1e361d7b5632c.zip llvm-6951b72334bbe4c189c71751edc1e361d7b5632c.tar.gz llvm-6951b72334bbe4c189c71751edc1e361d7b5632c.tar.bz2 |
[clang] Speedup line offset mapping computation
Clang spends a decent amount of time in the LineOffsetMapping::get(...)
function. This function used to be vectorized (through SSE2) then the
optimization got dropped because the sequential version was on-par performance
wise.
This provides an optimization of the sequential version that works on a word at
a time, using (documented) bithacks to provide a portable vectorization.
When preprocessing the sqlite amalgamation, this yields a sweet 3% speedup.
Differential Revision: https://reviews.llvm.org/D99409
Diffstat (limited to 'clang/lib/Basic/SourceManager.cpp')
-rw-r--r-- | clang/lib/Basic/SourceManager.cpp | 64 |
1 files changed, 53 insertions, 11 deletions
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index cc275d4..5aab2a4 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -1252,12 +1252,21 @@ unsigned SourceManager::getPresumedColumnNumber(SourceLocation Loc, return PLoc.getColumn(); } -#ifdef __SSE2__ -#include <emmintrin.h> -#endif +// Check if mutli-byte word x has bytes between m and n, included. This may also +// catch bytes equal to n + 1. +// The returned value holds a 0x80 at each byte position that holds a match. +// see http://graphics.stanford.edu/~seander/bithacks.html#HasBetweenInWord +template <class T> +static constexpr inline T likelyhasbetween(T x, unsigned char m, + unsigned char n) { + return ((x - ~0UL / 255 * (n + 1)) & ~x & + (x & ~0UL / 255 * 127) + ~0UL / 255 * (127 - (m - 1))) & + ~0UL / 255 * 128; +} LineOffsetMapping LineOffsetMapping::get(llvm::MemoryBufferRef Buffer, llvm::BumpPtrAllocator &Alloc) { + // Find the file offsets of all of the *physical* source lines. This does // not look at trigraphs, escaped newlines, or anything else tricky. SmallVector<unsigned, 256> LineOffsets; @@ -1268,18 +1277,51 @@ LineOffsetMapping LineOffsetMapping::get(llvm::MemoryBufferRef Buffer, const unsigned char *Buf = (const unsigned char *)Buffer.getBufferStart(); const unsigned char *End = (const unsigned char *)Buffer.getBufferEnd(); const std::size_t BufLen = End - Buf; + unsigned I = 0; - while (I < BufLen) { - // Use a fast check to catch both newlines - if (LLVM_UNLIKELY(Buf[I] <= std::max('\n', '\r'))) { - if (Buf[I] == '\n') { - LineOffsets.push_back(I + 1); - } else if (Buf[I] == '\r') { + uint64_t Word; + + // scan sizeof(Word) bytes at a time for new lines. + // This is much faster than scanning each byte independently. + if (BufLen > sizeof(Word)) { + do { + memcpy(&Word, Buf + I, sizeof(Word)); + // no new line => jump over sizeof(Word) bytes. + auto Mask = likelyhasbetween(Word, '\n', '\r'); + if (!Mask) { + I += sizeof(Word); + continue; + } + + // At that point, Mask contains 0x80 set at each byte that holds a value + // in [\n, \r + 1 [ + + // Scan for the next newline - it's very likely there's one. + unsigned N = + llvm::countTrailingZeros(Mask) - 7; // -7 because 0x80 is the marker + Word >>= N; + I += N / 8 + 1; + unsigned char Byte = Word; + if (Byte == '\n') { + LineOffsets.push_back(I); + } else if (Byte == '\r') { // If this is \r\n, skip both characters. - if (I + 1 < BufLen && Buf[I + 1] == '\n') + if (Buf[I] == '\n') ++I; - LineOffsets.push_back(I + 1); + LineOffsets.push_back(I); } + } while (I < BufLen - sizeof(Word) - 1); + } + + // Handle tail using a regular check. + while (I < BufLen) { + if (Buf[I] == '\n') { + LineOffsets.push_back(I + 1); + } else if (Buf[I] == '\r') { + // If this is \r\n, skip both characters. + if (I + 1 < BufLen && Buf[I + 1] == '\n') + ++I; + LineOffsets.push_back(I + 1); } ++I; } |