diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-16 18:42:05 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-16 18:46:04 +0100 |
| commit | f239aed5e674965691846e8ce3f187dd47523689 (patch) | |
| tree | a153a3125c6e183c73871a8ecaa4b285fed5fbd5 /lib/librte_distributor | |
| parent | bf7567fd2a5b0b28ab724046143c24561d38d015 (diff) | |
New upstream version 17.08
Change-Id: I288b50990f52646089d6b1f3aaa6ba2f091a51d7
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_distributor')
| -rw-r--r-- | lib/librte_distributor/Makefile | 4 | ||||
| -rw-r--r-- | lib/librte_distributor/rte_distributor.c | 9 | ||||
| -rw-r--r-- | lib/librte_distributor/rte_distributor_v20.c | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile index 3ffb911c..b417ee7b 100644 --- a/lib/librte_distributor/Makefile +++ b/lib/librte_distributor/Makefile @@ -46,10 +46,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_v20.c SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c ifeq ($(CONFIG_RTE_ARCH_X86),y) SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c -# distributor SIMD algo needs SSE4.2 support -ifeq ($(findstring RTE_MACHINE_CPUFLAG_SSE4_2,$(CFLAGS)),) -CFLAGS_rte_distributor_match_sse.o += -msse4.2 -endif else SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_generic.c endif diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index e4dfa7f0..20ba9ffb 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -41,7 +41,8 @@ #include <rte_errno.h> #include <rte_string_fns.h> #include <rte_eal_memconfig.h> -#include <rte_compat.h> +#include <rte_pause.h> + #include "rte_distributor_private.h" #include "rte_distributor.h" #include "rte_distributor_v20.h" @@ -656,12 +657,10 @@ rte_distributor_create_v1705(const char *name, d->num_workers = num_workers; d->alg_type = alg_type; + d->dist_match_fn = RTE_DIST_MATCH_SCALAR; #if defined(RTE_ARCH_X86) - if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_SSE4_2)) - d->dist_match_fn = RTE_DIST_MATCH_VECTOR; - else + d->dist_match_fn = RTE_DIST_MATCH_VECTOR; #endif - d->dist_match_fn = RTE_DIST_MATCH_SCALAR; /* * Set up the backog tags so they're pointing at the second cache diff --git a/lib/librte_distributor/rte_distributor_v20.c b/lib/librte_distributor/rte_distributor_v20.c index bb6c5d70..b09abecd 100644 --- a/lib/librte_distributor/rte_distributor_v20.c +++ b/lib/librte_distributor/rte_distributor_v20.c @@ -41,6 +41,8 @@ #include <rte_compat.h> #include <rte_string_fns.h> #include <rte_eal_memconfig.h> +#include <rte_pause.h> + #include "rte_distributor_v20.h" #include "rte_distributor_private.h" |