Skip to content

bpo-41972: Tweak fastsearch.h string search algorithms #27091

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
ambv merged 21 commits into from
Jul 19, 2021
Merged

bpo-41972: Tweak fastsearch.h string search algorithms #27091

Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
90a6a0c
Don't force inlining
sweeneyde Jul 6, 2021
19fa661
Use a Boyer-Moore skip table
sweeneyde Jul 7, 2021
d2219d5
Switch to two-way in more cases
sweeneyde Jul 8, 2021
3b8760f
Tighter comments
sweeneyde Jul 9, 2021
5d86b8d
Fix the direction of the cutoff inequality :)
sweeneyde Jul 10, 2021
2e9a9b1
Separate a gap loop
sweeneyde Jul 10, 2021
c84314c
update cutoffs
sweeneyde Jul 10, 2021
7517c60
tweak cutoffs, fix i - cut + 1 jump
sweeneyde Jul 10, 2021
e5ef33b
Refactor into smaller functions
sweeneyde Jul 11, 2021
a01fb70
Focus the table on the last character of the pattern, giving a tighte…
sweeneyde Jul 11, 2021
6be0c32
tweak cutoffs
sweeneyde Jul 11, 2021
f9fe807
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 12, 2021
25f9b56
Fix sanitizer warnings
sweeneyde Jul 12, 2021
d3f8438
Merge branch 'fastersearch' of https://github.com/sweeneyde/cpython i…
sweeneyde Jul 12, 2021
4379ea6
Refactor for sanitizer
sweeneyde Jul 12, 2021
e336b79
Don't goto declarations
sweeneyde Jul 12, 2021
b8df3e1
Emphasize to the compiler that the loop is a loop
sweeneyde Jul 13, 2021
869f7d0
Use Py_LOCAL_INLINE
sweeneyde Jul 15, 2021
747a39a
Use Py_LOCAL_INLINE again
sweeneyde Jul 15, 2021
72143ef
Tweak thresholds based on most recent comparison.
sweeneyde Jul 16, 2021
4d7d102
Fix greater/less than sign.
sweeneyde Jul 16, 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
189 changes: 98 additions & 91 deletions Objects/stringlib/fastsearch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,16 @@ STRINGLIB(rfind_char)(const STRINGLIB_CHAR* s, Py_ssize_t n, STRINGLIB_CHAR ch)
/* Change to a 1 to see logging comments walk through the algorithm. */
#if 0 && STRINGLIB_SIZEOF_CHAR == 1
# define LOG(...) printf(__VA_ARGS__)
# define LOG_STRING(s, n) printf("\"%.*s\"", n, s)
# define LOG_STRING(s, n) printf("\"%.*s\"", (int)(n), s)
# define LOG_LINEUP() do { \
LOG("> "); LOG_STRING(haystack, len_haystack); LOG("\n> "); \
LOG("%*s",(int)(window_last + 1 - len_needle - haystack), ""); \
LOG_STRING(needle, len_needle); LOG("\n"); \
} while(0)
#else
# define LOG(...)
# define LOG_STRING(s, n)
# define LOG_LINEUP()
#endif

static inline Py_ssize_t
Comment thread
sweeneyde marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -287,9 +293,9 @@ STRINGLIB(_factorize)(const STRINGLIB_CHAR *needle,
return cut;
}


#define SHIFT_TYPE uint8_t
#define NOT_FOUND ((1U<<(8*sizeof(SHIFT_TYPE))) - 1U)
#define SHIFT_OVERFLOW (NOT_FOUND - 1U)
#define MAX_SHIFT UINT8_MAX

#define TABLE_SIZE_BITS 6
#define TABLE_SIZE (1U << TABLE_SIZE_BITS)
Expand All @@ -300,6 +306,7 @@ typedef struct STRINGLIB(_pre) {
Py_ssize_t len_needle;
Py_ssize_t cut;
Py_ssize_t period;
Py_ssize_t gap;
int is_periodic;
SHIFT_TYPE table[TABLE_SIZE];
} STRINGLIB(prework);
Expand All @@ -319,23 +326,32 @@ STRINGLIB(_preprocess)(const STRINGLIB_CHAR *needle, Py_ssize_t len_needle,
if (p->is_periodic) {
assert(p->cut <= len_needle/2);
assert(p->cut < p->period);
p->gap = 0; // unused
}
else {
// A lower bound on the period
p->period = Py_MAX(p->cut, len_needle - p->cut) + 1;
}
// Now fill up a table
memset(&(p->table[0]), 0xff, TABLE_SIZE*sizeof(SHIFT_TYPE));
assert(p->table[0] == NOT_FOUND);
assert(p->table[TABLE_MASK] == NOT_FOUND);
for (Py_ssize_t i = 0; i < len_needle; i++) {
Py_ssize_t shift = len_needle - i;
if (shift > SHIFT_OVERFLOW) {
shift = SHIFT_OVERFLOW;
// The gap between the last character and the previous
// occurrence of an equivalent character (modulo TABLE_SIZE)
p->gap = len_needle;
STRINGLIB_CHAR last = needle[len_needle - 1] & TABLE_MASK;
for (Py_ssize_t i = len_needle - 2; i >= 0; i--) {
if ((needle[i] & TABLE_MASK) == last) {
p->gap = len_needle - 1 - i;
break;
}
}
p->table[needle[i] & TABLE_MASK] = Py_SAFE_DOWNCAST(shift,
Py_ssize_t,
SHIFT_TYPE);
}
// Fill up a compressed Boyer-Moore "Bad Character" table
Py_ssize_t not_found_shift = Py_MIN(len_needle, MAX_SHIFT);
for (Py_ssize_t i = 0; i < TABLE_SIZE; i++) {
p->table[i] = Py_SAFE_DOWNCAST(not_found_shift,
Py_ssize_t, SHIFT_TYPE);
}
for (Py_ssize_t i = len_needle - not_found_shift; i < len_needle; i++) {
SHIFT_TYPE shift = Py_SAFE_DOWNCAST(len_needle - 1 - i,
Py_ssize_t, SHIFT_TYPE);
p->table[needle[i] & TABLE_MASK] = shift;
}
}

Expand All @@ -345,119 +361,109 @@ STRINGLIB(_two_way)(const STRINGLIB_CHAR *haystack, Py_ssize_t len_haystack,
{
// Crochemore and Perrin's (1991) Two-Way algorithm.
// See http://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260
Py_ssize_t len_needle = p->len_needle;
Py_ssize_t cut = p->cut;
const Py_ssize_t len_needle = p->len_needle;
const Py_ssize_t cut = p->cut;
Py_ssize_t period = p->period;
const STRINGLIB_CHAR *needle = p->needle;
const STRINGLIB_CHAR *window = haystack;
const STRINGLIB_CHAR *last_window = haystack + len_haystack - len_needle;
const STRINGLIB_CHAR *const needle = p->needle;
const STRINGLIB_CHAR *window_last = haystack + len_needle - 1;
const STRINGLIB_CHAR *const haystack_end = haystack + len_haystack;
SHIFT_TYPE *table = p->table;
LOG("===== Two-way: \"%s\" in \"%s\". =====\n", needle, haystack);

if (p->is_periodic) {
LOG("Needle is periodic.\n");
Py_ssize_t memory = 0;
periodicwindowloop:
while (window <= last_window) {
Py_ssize_t i = Py_MAX(cut, memory);

// Visualize the line-up:
LOG("> "); LOG_STRING(haystack, len_haystack);
LOG("\n> "); LOG("%*s", window - haystack, "");
LOG_STRING(needle, len_needle);
LOG("\n> "); LOG("%*s", window - haystack + i, "");
LOG(" ^ <-- cut\n");

if (window[i] != needle[i]) {
// Sunday's trick: if we're going to jump, we might
// as well jump to line up the character *after* the
// current window.
STRINGLIB_CHAR first_outside = window[len_needle];
SHIFT_TYPE shift = table[first_outside & TABLE_MASK];
if (shift == NOT_FOUND) {
LOG("\"%c\" not found. Skipping entirely.\n",
first_outside);
window += len_needle + 1;
}
else {
LOG("Shifting to line up \"%c\".\n", first_outside);
Py_ssize_t memory_shift = i - cut + 1;
window += Py_MAX(shift, memory_shift);
}
while (window_last < haystack_end) {
LOG_LINEUP();
Py_ssize_t shift = table[(*window_last) & TABLE_MASK];
if (shift > 0 && memory > 0) {
// A mismatch has been identified to the right of
// where i starts, so we can jump at least as far as
// if the mismatch occurred on the first comparison.
Py_ssize_t memory_shift = Py_MAX(cut, memory) - cut + 1;
LOG("Skip with Memory.\n");
window_last += Py_MAX(shift, memory_shift);
LOG_LINEUP();
memory = 0;
goto periodicwindowloop;
shift = table[(*window_last) & TABLE_MASK];
}
for (i = i + 1; i < len_needle; i++) {
while (shift > 0 && window_last < haystack_end) {
LOG("Horspool skip.\n");
window_last += shift;
shift = table[(*window_last) & TABLE_MASK];
LOG_LINEUP();
}
if (window_last >= haystack_end) {
break;
}
const STRINGLIB_CHAR *const window = window_last - len_needle + 1;
Py_ssize_t i = Py_MAX(cut, memory);
for (; i < len_needle; i++) {
if (needle[i] != window[i]) {
LOG("Right half does not match. Jump ahead by %d.\n",
i - cut + 1);
window += i - cut + 1;
LOG("Right half does not match.\n");
window_last += i - cut + 1;
memory = 0;
goto periodicwindowloop;
}
}
for (i = memory; i < cut; i++) {
if (needle[i] != window[i]) {
LOG("Left half does not match. Jump ahead by period %d.\n",
period);
window += period;
LOG("Left half does not match.\n");
window_last += period;
memory = len_needle - period;
goto periodicwindowloop;
}
}
LOG("Left half matches. Returning %d.\n",
window - haystack);
LOG("Found a match!\n");
return window - haystack;
}
}
else {
Py_ssize_t gap = p->gap;
period = Py_MAX(gap, period);
LOG("Needle is not periodic.\n");
assert(cut < len_needle);
STRINGLIB_CHAR needle_cut = needle[cut];
Py_ssize_t gap_jump_end = Py_MIN(len_needle, cut + gap);
windowloop:
while (window <= last_window) {

// Visualize the line-up:
LOG("> "); LOG_STRING(haystack, len_haystack);
LOG("\n> "); LOG("%*s", window - haystack, "");
LOG_STRING(needle, len_needle);
LOG("\n> "); LOG("%*s", window - haystack + cut, "");
LOG(" ^ <-- cut\n");

if (window[cut] != needle_cut) {
// Sunday's trick: if we're going to jump, we might
// as well jump to line up the character *after* the
// current window.
STRINGLIB_CHAR first_outside = window[len_needle];
SHIFT_TYPE shift = table[first_outside & TABLE_MASK];
if (shift == NOT_FOUND) {
LOG("\"%c\" not found. Skipping entirely.\n",
first_outside);
window += len_needle + 1;
}
else {
LOG("Shifting to line up \"%c\".\n", first_outside);
window += shift;
while (window_last < haystack_end) {
LOG_LINEUP();
Py_ssize_t shift = table[(*window_last) & TABLE_MASK];
while (shift > 0 && window_last < haystack_end) {
LOG("Horspool skip.\n");
window_last += shift;
shift = table[(*window_last) & TABLE_MASK];
LOG_LINEUP();
}
if (window_last >= haystack_end) {
break;
}
const STRINGLIB_CHAR *window = window_last - len_needle + 1;
for (Py_ssize_t i = cut; i < gap_jump_end; i++) {
if (needle[i] != window[i]) {
LOG("Early right half mismatch: jump by gap.\n");
assert(gap >= i - cut + 1);
window_last += gap;
goto windowloop;
}
goto windowloop;
}
for (Py_ssize_t i = cut + 1; i < len_needle; i++) {
for (Py_ssize_t i = gap_jump_end; i < len_needle; i++) {
if (needle[i] != window[i]) {
LOG("Right half does not match. Advance by %d.\n",
i - cut + 1);
window += i - cut + 1;
LOG("Late right half mismatch.\n");
assert(i - cut + 1 > gap);
window_last += i - cut + 1;
goto windowloop;
}
}
for (Py_ssize_t i = 0; i < cut; i++) {
if (needle[i] != window[i]) {
LOG("Left half does not match. Advance by period %d.\n",
period);
window += period;
LOG("Left half does not match.\n");
window_last += period;
goto windowloop;
}
}
LOG("Left half matches. Returning %d.\n", window - haystack);
LOG("Found a match!\n");
return window - haystack;
}
}
Expand Down Expand Up @@ -515,6 +521,7 @@ STRINGLIB(_two_way_count)(const STRINGLIB_CHAR *haystack,

#undef LOG
#undef LOG_STRING
#undef LOG_LINEUP

static inline Py_ssize_t
STRINGLIB(default_find)(const STRINGLIB_CHAR* s, Py_ssize_t n,
Expand All @@ -531,7 +538,7 @@ STRINGLIB(default_find)(const STRINGLIB_CHAR* s, Py_ssize_t n,
for (Py_ssize_t i = 0; i < mlast; i++) {
STRINGLIB_BLOOM_ADD(mask, p[i]);
if (p[i] == last) {
gap = mlast - i;
gap = mlast - i - 1;
}
}
STRINGLIB_BLOOM_ADD(mask, last);
Expand Down Expand Up @@ -592,7 +599,7 @@ STRINGLIB(adaptive_find)(const STRINGLIB_CHAR* s, Py_ssize_t n,
for (Py_ssize_t i = 0; i < mlast; i++) {
STRINGLIB_BLOOM_ADD(mask, p[i]);
if (p[i] == last) {
gap = mlast - i;
gap = mlast - i - 1;
}
}
STRINGLIB_BLOOM_ADD(mask, last);
Expand Down Expand Up @@ -741,7 +748,7 @@ FASTSEARCH(const STRINGLIB_CHAR* s, Py_ssize_t n,
}

if (mode != FAST_RSEARCH) {
if (n < 2000 || m < 6 || (m < 100 && n < 30000)) {
if (n < 2000 || (m < 100 && n < 30000) || m < 6) {
return STRINGLIB(default_find)(s, n, p, m, maxcount, mode);
}
else if (5 * m < n) {
Expand Down