examples/packet_ordering: enhance getopt_long usage

[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 59332d5..a85561b 100644 (file)
--- a/lib/librte_member/rte_member_ht.c
+++ b/lib/librte_member/rte_member_ht.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <rte_errno.h>
@@ -36,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"
@@ -142,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
@@ -205,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) ||
@@ -245,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]) ||
@@ -282,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);
@@ -325,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,
@@ -386,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,