Skip to content

Commit

Permalink
hash: align SSE lookup to scalar implementation
Browse files Browse the repository at this point in the history
[ upstream commit e93bbaa72cca7ec912d756afdf10e393f9d71791 ]

__mm_cmpeq_epi16 returns 0xFFFF if the corresponding 16-bit elements are
equal. In original SSE2 implementation for function compare_signatures,
it utilizes _mm_movemask_epi8 to create mask from the MSB of each 8-bit
element, while we should only care about the MSB of lower 8-bit in each
16-bit element.

For example, if the comparison result is all equal, SSE2 path returns
0xFFFF while NEON and default scalar path return 0x5555.
Although this bug is not causing any negative effects since the caller
function solely examines the trailing zeros of each match mask, we
recommend this fix to ensure consistency with NEON and default scalar
code behaviors.

Fixes: c7d93df ("hash: use partial-key hashing")

Signed-off-by: Feifei Wang <feifei.wang2@arm.com>
Signed-off-by: Jieqiang Wang <jieqiang.wang@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
  • Loading branch information
Snowball-Wang authored and bluca committed Oct 18, 2023
1 parent 23419b7 commit 733bc36
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/librte_hash/rte_cuckoo_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -1866,11 +1866,15 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
_mm_load_si128(
(__m128i const *)prim_bkt->sig_current),
_mm_set1_epi16(sig)));
/* Extract the even-index bits only */
*prim_hash_matches &= 0x5555;
/* Compare all signatures in the bucket */
*sec_hash_matches = _mm_movemask_epi8(_mm_cmpeq_epi16(
_mm_load_si128(
(__m128i const *)sec_bkt->sig_current),
_mm_set1_epi16(sig)));
/* Extract the even-index bits only */
*sec_hash_matches &= 0x5555;
break;
#elif defined(__ARM_NEON)
case RTE_HASH_COMPARE_NEON: {
Expand Down

0 comments on commit 733bc36

Please sign in to comment.