Since all supported compilers can generate AVX2 code, no need to check for AVX2 support when x86 arch is already checked.
Signed-off-by: Thomas Monjalon <[email protected]> --- lib/member/rte_member_ht.c | 14 +++++++------- lib/member/rte_member_x86.h | 3 --- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/member/rte_member_ht.c b/lib/member/rte_member_ht.c index 738471b378..0a5b206778 100644 --- a/lib/member/rte_member_ht.c +++ b/lib/member/rte_member_ht.c @@ -13,7 +13,7 @@ #include "rte_member.h" #include "rte_member_ht.h" -#if defined(RTE_ARCH_X86) +#ifdef RTE_ARCH_X86 #include "rte_member_x86.h" #endif @@ -113,7 +113,7 @@ rte_member_create_ht(struct rte_member_setsum *ss, for (j = 0; j < RTE_MEMBER_BUCKET_ENTRIES; j++) buckets[i].sets[j] = RTE_MEMBER_NO_MATCH; } -#if defined(RTE_ARCH_X86) +#ifdef RTE_ARCH_X86 if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) && RTE_MEMBER_BUCKET_ENTRIES == 16 && rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) @@ -179,7 +179,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(__AVX2__) +#ifdef RTE_ARCH_X86 case RTE_MEMBER_COMPARE_AVX2: if (search_bucket_single_avx(prim_bucket, tmp_sig, buckets, set_id) || @@ -219,7 +219,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(__AVX2__) +#ifdef RTE_ARCH_X86 case RTE_MEMBER_COMPARE_AVX2: if (search_bucket_single_avx(prim_buckets[i], tmp_sig[i], buckets, &set_id[i]) || @@ -256,7 +256,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(__AVX2__) +#ifdef RTE_ARCH_X86 case RTE_MEMBER_COMPARE_AVX2: search_bucket_multi_avx(prim_bucket, tmp_sig, buckets, &num_matches, match_per_key, set_id); @@ -299,7 +299,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(__AVX2__) +#ifdef RTE_ARCH_X86 case RTE_MEMBER_COMPARE_AVX2: search_bucket_multi_avx(prim_buckets[i], tmp_sig[i], buckets, &match_cnt_tmp, match_per_key, @@ -360,7 +360,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(__AVX2__) +#ifdef RTE_ARCH_X86 case RTE_MEMBER_COMPARE_AVX2: if (update_entry_search_avx(prim, sig, buckets, set_id) || update_entry_search_avx(sec, sig, buckets, diff --git a/lib/member/rte_member_x86.h b/lib/member/rte_member_x86.h index 4de453485b..29cc2f0132 100644 --- a/lib/member/rte_member_x86.h +++ b/lib/member/rte_member_x86.h @@ -11,8 +11,6 @@ extern "C" { #endif -#if defined(__AVX2__) - static inline int update_entry_search_avx(uint32_t bucket_id, member_sig_t tmp_sig, struct member_ht_bucket *buckets, @@ -69,7 +67,6 @@ search_bucket_multi_avx(uint32_t bucket_id, member_sig_t tmp_sig, hitmask &= ~(3U << ((hit_idx) << 1)); } } -#endif #ifdef __cplusplus } -- 2.51.0
