whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QUrl: use the SIMD ASCII-checking code from the last commit 

Improves performance a little. This is just because I can and the
function is right there for the taking, as this qt_urlRecodeByteArray
function is only used in deprecated QUrl code.

Change-Id: I5d0ee9389a794d80983efffd152d290e570af387
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
bb10
Thiago Macieira 2018-05-09 19:56:30 -07:00
parent 65711d7aea
commit 9d0907b076
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/io/qurlrecode.cpp
View File

@ -603,6 +603,9 @@ qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end,
encoding, actionTable, false);
}
// qstring.cpp
bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW;
/*!
\internal
\since 5.0
@ -623,12 +626,7 @@ QString qt_urlRecodeByteArray(const QByteArray &ba)
// control points below 0x20 are fine in QString
const char *in = ba.constData();
const char *const end = ba.constEnd();
for ( ; in < end; ++in) {
if (*in & 0x80)
break;
}
if (in == end) {
if (qt_is_ascii(in, end)) {
// no non-ASCII found, we're safe to convert to QString
return QString::fromLatin1(ba, ba.size());
}

25
src/corelib/tools/qstring.cpp
View File

@ -333,11 +333,10 @@ static bool simdTestMask(const char *&ptr, const char *end, quint32 maskval)
}
#endif
bool QtPrivate::isAscii(QLatin1String s) Q_DECL_NOTHROW
// Note: ptr on output may be off by one and point to a preceding US-ASCII
// character. Usually harmless.
bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW
{
const char *ptr = s.begin();
const char *end = s.end();
#if defined(__AVX2__)
if (!simdTestMask(ptr, end, 0x80808080))
return false;
@ -346,16 +345,22 @@ bool QtPrivate::isAscii(QLatin1String s) Q_DECL_NOTHROW
while (ptr + 16 < end) {
__m128i data = _mm_loadu_si128(reinterpret_cast<const __m128i *>(ptr));
quint32 mask = _mm_movemask_epi8(data);
if (mask)
if (mask) {
uint idx = qCountTrailingZeroBits(mask);
ptr += idx;
return false;
}
ptr += 16;
}
#endif
while (ptr + 4 <= end) {
quint32 data = qFromUnaligned<quint32>(ptr);
if (data & 0x80808080U)
if (data &= 0x80808080U) {
uint idx = qCountTrailingZeroBits(data);
ptr += idx / 8;
return false;
}
ptr += 4;
}
@ -367,6 +372,14 @@ bool QtPrivate::isAscii(QLatin1String s) Q_DECL_NOTHROW
return true;
}
bool QtPrivate::isAscii(QLatin1String s) Q_DECL_NOTHROW
{
const char *ptr = s.begin();
const char *end = s.end();
return qt_is_ascii(ptr, end);
}
static bool isAscii(const QChar *&ptr, const QChar *end)
{
#ifdef __SSE2__