Skip to content

Commit

Permalink
pythongh-126024: unicodeobject: optimize find_first_nonascii (pythonG…
Browse files Browse the repository at this point in the history
…H-127790)

Remove 1 branch.
  • Loading branch information
methane authored Dec 13, 2024
1 parent 8bc1818 commit 5dd775b
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions Objects/unicodeobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -5077,28 +5077,32 @@ load_unaligned(const unsigned char *p, size_t size)
static Py_ssize_t
find_first_nonascii(const unsigned char *start, const unsigned char *end)
{
// The search is done in `size_t` chunks.
// The start and end might not be aligned at `size_t` boundaries,
// so they're handled specially.

const unsigned char *p = start;

if (end - start >= SIZEOF_SIZE_T) {
const unsigned char *p2 = _Py_ALIGN_UP(p, SIZEOF_SIZE_T);
// Avoid unaligned read.
#if PY_LITTLE_ENDIAN && HAVE_CTZ
if (p < p2) {
size_t u;
memcpy(&u, p, sizeof(size_t));
u &= ASCII_CHAR_MASK;
if (u) {
return (ctz(u) - 7) / 8;
}
p = p2;
size_t u;
memcpy(&u, p, sizeof(size_t));
u &= ASCII_CHAR_MASK;
if (u) {
return (ctz(u) - 7) / 8;
}
p = _Py_ALIGN_DOWN(p + SIZEOF_SIZE_T, SIZEOF_SIZE_T);
#else /* PY_LITTLE_ENDIAN && HAVE_CTZ */
const unsigned char *p2 = _Py_ALIGN_UP(p, SIZEOF_SIZE_T);
while (p < p2) {
if (*p & 0x80) {
return p - start;
}
p++;
}
#endif

const unsigned char *e = end - SIZEOF_SIZE_T;
while (p <= e) {
size_t u = (*(const size_t *)p) & ASCII_CHAR_MASK;
Expand All @@ -5115,6 +5119,7 @@ find_first_nonascii(const unsigned char *start, const unsigned char *end)
}
}
#if PY_LITTLE_ENDIAN && HAVE_CTZ
assert((end - p) < SIZEOF_SIZE_T);
// we can not use *(const size_t*)p to avoid buffer overrun.
size_t u = load_unaligned(p, end - p) & ASCII_CHAR_MASK;
if (u) {
Expand Down

0 comments on commit 5dd775b

Please sign in to comment.