[v3,3/7] member: use abstracted bit count functions
Checks
Commit Message
Use rte_ctz32 or rte_ctz64 respectively instead of __builtin_ctzl
depending on the resultant type of the expression passed as an argument
Fixes: 18898c4d06f9 ("eal: use abstracted bit count functions")
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
lib/member/rte_member_vbf.c | 12 ++++++------
lib/member/rte_member_x86.h | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
@@ -108,8 +108,8 @@
* div_shift is used for division shift, to be divided by number of bits
* represented by a uint32_t variable
*/
- ss->mul_shift = __builtin_ctzl(ss->num_set);
- ss->div_shift = __builtin_ctzl(32 >> ss->mul_shift);
+ ss->mul_shift = rte_ctz32(ss->num_set);
+ ss->div_shift = rte_ctz32(32 >> ss->mul_shift);
RTE_MEMBER_LOG(DEBUG, "vector bloom filter created, "
"each bloom filter expects %u keys, needs %u bits, %u hashes, "
@@ -174,7 +174,7 @@
}
if (mask) {
- *set_id = __builtin_ctzl(mask) + 1;
+ *set_id = rte_ctz32(mask) + 1;
return 1;
}
@@ -207,7 +207,7 @@
}
for (i = 0; i < num_keys; i++) {
if (mask[i]) {
- set_ids[i] = __builtin_ctzl(mask[i]) + 1;
+ set_ids[i] = rte_ctz32(mask[i]) + 1;
num_matches++;
} else
set_ids[i] = RTE_MEMBER_NO_MATCH;
@@ -233,7 +233,7 @@
mask &= test_bit(bit_loc, ss);
}
while (mask) {
- uint32_t loc = __builtin_ctzl(mask);
+ uint32_t loc = rte_ctz32(mask);
set_id[num_matches] = loc + 1;
num_matches++;
if (num_matches >= match_per_key)
@@ -272,7 +272,7 @@
for (i = 0; i < num_keys; i++) {
match_cnt_t = 0;
while (mask[i]) {
- uint32_t loc = __builtin_ctzl(mask[i]);
+ uint32_t loc = rte_ctz32(mask[i]);
set_ids[i * match_per_key + match_cnt_t] = loc + 1;
match_cnt_t++;
if (match_cnt_t >= match_per_key)
@@ -22,7 +22,7 @@
_mm256_load_si256((__m256i const *)buckets[bucket_id].sigs),
_mm256_set1_epi16(tmp_sig)));
if (hitmask) {
- uint32_t hit_idx = __builtin_ctzl(hitmask) >> 1;
+ uint32_t hit_idx = rte_ctz32(hitmask) >> 1;
buckets[bucket_id].sets[hit_idx] = set_id;
return 1;
}
@@ -38,7 +38,7 @@
_mm256_load_si256((__m256i const *)buckets[bucket_id].sigs),
_mm256_set1_epi16(tmp_sig)));
while (hitmask) {
- uint32_t hit_idx = __builtin_ctzl(hitmask) >> 1;
+ uint32_t hit_idx = rte_ctz32(hitmask) >> 1;
if (buckets[bucket_id].sets[hit_idx] != RTE_MEMBER_NO_MATCH) {
*set_id = buckets[bucket_id].sets[hit_idx];
return 1;
@@ -59,7 +59,7 @@
_mm256_load_si256((__m256i const *)buckets[bucket_id].sigs),
_mm256_set1_epi16(tmp_sig)));
while (hitmask) {
- uint32_t hit_idx = __builtin_ctzl(hitmask) >> 1;
+ uint32_t hit_idx = rte_ctz32(hitmask) >> 1;
if (buckets[bucket_id].sets[hit_idx] != RTE_MEMBER_NO_MATCH) {
set_id[*counter] = buckets[bucket_id].sets[hit_idx];
(*counter)++;