[v3,2/7] hash: use abstracted bit count functions

Message ID 1699400300-22545-3-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series use abstracted bit count functions |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Tyler Retzlaff Nov. 7, 2023, 11:38 p.m. UTC
  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/hash/rte_cuckoo_hash.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
  

Patch

diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index b2cf60d..19ee53a 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -1931,7 +1931,7 @@  struct rte_hash *
 
 		if (prim_hitmask[i]) {
 			uint32_t first_hit =
-					__builtin_ctzl(prim_hitmask[i])
+					rte_ctz32(prim_hitmask[i])
 					>> 1;
 			uint32_t key_idx =
 				primary_bkt[i]->key_idx[first_hit];
@@ -1945,7 +1945,7 @@  struct rte_hash *
 
 		if (sec_hitmask[i]) {
 			uint32_t first_hit =
-					__builtin_ctzl(sec_hitmask[i])
+					rte_ctz32(sec_hitmask[i])
 					>> 1;
 			uint32_t key_idx =
 				secondary_bkt[i]->key_idx[first_hit];
@@ -1962,7 +1962,7 @@  struct rte_hash *
 		positions[i] = -ENOENT;
 		while (prim_hitmask[i]) {
 			uint32_t hit_index =
-					__builtin_ctzl(prim_hitmask[i])
+					rte_ctz32(prim_hitmask[i])
 					>> 1;
 			uint32_t key_idx =
 				primary_bkt[i]->key_idx[hit_index];
@@ -1990,7 +1990,7 @@  struct rte_hash *
 
 		while (sec_hitmask[i]) {
 			uint32_t hit_index =
-					__builtin_ctzl(sec_hitmask[i])
+					rte_ctz32(sec_hitmask[i])
 					>> 1;
 			uint32_t key_idx =
 				secondary_bkt[i]->key_idx[hit_index];
@@ -2088,7 +2088,7 @@  struct rte_hash *
 
 			if (prim_hitmask[i]) {
 				uint32_t first_hit =
-						__builtin_ctzl(prim_hitmask[i])
+						rte_ctz32(prim_hitmask[i])
 						>> 1;
 				uint32_t key_idx =
 					primary_bkt[i]->key_idx[first_hit];
@@ -2102,7 +2102,7 @@  struct rte_hash *
 
 			if (sec_hitmask[i]) {
 				uint32_t first_hit =
-						__builtin_ctzl(sec_hitmask[i])
+						rte_ctz32(sec_hitmask[i])
 						>> 1;
 				uint32_t key_idx =
 					secondary_bkt[i]->key_idx[first_hit];
@@ -2118,7 +2118,7 @@  struct rte_hash *
 		for (i = 0; i < num_keys; i++) {
 			while (prim_hitmask[i]) {
 				uint32_t hit_index =
-						__builtin_ctzl(prim_hitmask[i])
+						rte_ctz32(prim_hitmask[i])
 						>> 1;
 				uint32_t key_idx =
 				rte_atomic_load_explicit(
@@ -2150,7 +2150,7 @@  struct rte_hash *
 
 			while (sec_hitmask[i]) {
 				uint32_t hit_index =
-						__builtin_ctzl(sec_hitmask[i])
+						rte_ctz32(sec_hitmask[i])
 						>> 1;
 				uint32_t key_idx =
 				rte_atomic_load_explicit(