net/hns3: support fixed link speed

[dpdk.git] / lib / librte_member / rte_member_ht.c

diff --git a/lib/librte_member/rte_member_ht.c b/lib/librte_member/rte_member_ht.c
index cbcd0d4..a85561b 100644 (file)
--- a/lib/librte_member/rte_member_ht.c
+++ b/lib/librte_member/rte_member_ht.c
@@ -7,6 +7,7 @@
 #include <rte_prefetch.h>
 #include <rte_random.h>
 #include <rte_log.h>
+#include <rte_vect.h>
 
 #include "rte_member.h"
 #include "rte_member_ht.h"
@@ -113,7 +114,8 @@ rte_member_create_ht(struct rte_member_setsum *ss,
        }
 #if defined(RTE_ARCH_X86)
        if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) &&
-                       RTE_MEMBER_BUCKET_ENTRIES == 16)
+                       RTE_MEMBER_BUCKET_ENTRIES == 16 &&
+                       rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256)
                ss->sig_cmp_fn = RTE_MEMBER_COMPARE_AVX2;
        else
 #endif
@@ -176,7 +178,7 @@ rte_member_lookup_ht(const struct rte_member_setsum *ss,
        get_buckets_index(ss, key, &prim_bucket, &sec_bucket, &tmp_sig);
 
        switch (ss->sig_cmp_fn) {
-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)
+#if defined(RTE_ARCH_X86) && defined(__AVX2__)
        case RTE_MEMBER_COMPARE_AVX2:
                if (search_bucket_single_avx(prim_bucket, tmp_sig, buckets,
                                set_id) ||
@@ -216,7 +218,7 @@ rte_member_lookup_bulk_ht(const struct rte_member_setsum *ss,
 
        for (i = 0; i < num_keys; i++) {
                switch (ss->sig_cmp_fn) {
-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)
+#if defined(RTE_ARCH_X86) && defined(__AVX2__)
                case RTE_MEMBER_COMPARE_AVX2:
                        if (search_bucket_single_avx(prim_buckets[i],
                                        tmp_sig[i], buckets, &set_id[i]) ||
@@ -253,7 +255,7 @@ rte_member_lookup_multi_ht(const struct rte_member_setsum *ss,
        get_buckets_index(ss, key, &prim_bucket, &sec_bucket, &tmp_sig);
 
        switch (ss->sig_cmp_fn) {
-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)
+#if defined(RTE_ARCH_X86) && defined(__AVX2__)
        case RTE_MEMBER_COMPARE_AVX2:
                search_bucket_multi_avx(prim_bucket, tmp_sig, buckets,
                        &num_matches, match_per_key, set_id);
@@ -296,7 +298,7 @@ rte_member_lookup_multi_bulk_ht(const struct rte_member_setsum *ss,
                match_cnt_tmp = 0;
 
                switch (ss->sig_cmp_fn) {
-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)
+#if defined(RTE_ARCH_X86) && defined(__AVX2__)
                case RTE_MEMBER_COMPARE_AVX2:
                        search_bucket_multi_avx(prim_buckets[i], tmp_sig[i],
                                buckets, &match_cnt_tmp, match_per_key,
@@ -357,7 +359,7 @@ try_update(struct member_ht_bucket *buckets, uint32_t prim, uint32_t sec,
                enum rte_member_sig_compare_function cmp_fn)
 {
        switch (cmp_fn) {
-#if defined(RTE_ARCH_X86) && defined(RTE_MACHINE_CPUFLAG_AVX2)
+#if defined(RTE_ARCH_X86) && defined(__AVX2__)
        case RTE_MEMBER_COMPARE_AVX2:
                if (update_entry_search_avx(prim, sig, buckets, set_id) ||
                                update_entry_search_avx(sec, sig, buckets,