Skip to content

Commit 1553bd7

Browse files
committed
Revert change
1 parent d648ed4 commit 1553bd7

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/native/containers/dn-simdhash-specialization.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,8 @@ DN_SIMDHASH_SCAN_BUCKET_INTERNAL (DN_SIMDHASH_T_PTR hash, bucket_t *restrict buc
190190
// no good reason.
191191
#define bucket_suffixes (bucket->suffixes)
192192
#endif
193-
// Don't load the cascaded slot early, since we won't need it if we find a match,
194-
// and loading it too early will waste a valuable register or worse, spill to the stack
195-
uint8_t count = dn_simdhash_extract_lane(bucket_suffixes, DN_SIMDHASH_COUNT_SLOT);
193+
uint8_t count = dn_simdhash_extract_lane(bucket_suffixes, DN_SIMDHASH_COUNT_SLOT),
194+
overflow_count = dn_simdhash_extract_lane(bucket_suffixes, DN_SIMDHASH_CASCADED_SLOT);
196195
// We could early-out here when count==0, but it doesn't appear to meaningfully improve
197196
// search performance to do so, and might actually worsen it
198197
#ifdef DN_SIMDHASH_USE_SCALAR_FALLBACK
@@ -212,15 +211,10 @@ DN_SIMDHASH_SCAN_BUCKET_INTERNAL (DN_SIMDHASH_T_PTR hash, bucket_t *restrict buc
212211
return index;
213212
}
214213

215-
#ifdef DN_SIMDHASH_USE_SCALAR_FALLBACK
216-
if (bucket->suffixes.values[DN_SIMDHASH_CASCADED_SLOT])
217-
#else
218-
if (dn_simdhash_extract_lane(bucket_suffixes, DN_SIMDHASH_CASCADED_SLOT))
219-
#endif
214+
if (overflow_count)
220215
return DN_SIMDHASH_SCAN_BUCKET_OVERFLOWED;
221216
else
222217
return DN_SIMDHASH_SCAN_BUCKET_NO_OVERFLOW;
223-
#undef bucket_suffixes
224218
}
225219

226220
// Helper macros so that we can optimize and change scan logic more easily

0 commit comments

Comments
 (0)