Use rte_ctz64 instead of __builtin_ctzl

Fixes: 18898c4d06f9 ("eal: use abstracted bit count functions")

Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
 lib/hash/rte_cuckoo_hash.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index b2cf60d..d8d4cc1 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_ctz64(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_ctz64(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_ctz64(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_ctz64(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_ctz64(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_ctz64(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_ctz64(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_ctz64(sec_hitmask[i])
                                                >> 1;
                                uint32_t key_idx =
                                rte_atomic_load_explicit(
-- 
1.8.3.1

Reply via email to