d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/l3fwd: remove checks for SSE4

Browse Source 
Since SSE4 is now part of the minimum requirements for DPDK, we don't need
to check for its presence any more.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Bruce Richardson 2017-06-20 16:23:12 +01:00 committed by Thomas Monjalon
parent a113713835
commit 193f9ec5c0
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/l3fwd-power/main.c
View File

@ -245,7 +245,7 @@ static struct rte_mempool * pktmbuf_pool[NB_SOCKETS];
#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 #ifdef RTE_ARCH_X86
#include <rte_hash_crc.h> #include <rte_hash_crc.h>
#define DEFAULT_HASH_FUNC rte_hash_crc #define DEFAULT_HASH_FUNC rte_hash_crc
#else #else

2
examples/l3fwd-vf/main.c
View File

@ -215,7 +215,7 @@ static struct rte_mempool * pktmbuf_pool[NB_SOCKETS];
#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH)
#ifdef RTE_MACHINE_CPUFLAG_SSE4_2 #ifdef RTE_ARCH_X86
#include <rte_hash_crc.h> #include <rte_hash_crc.h>
#define DEFAULT_HASH_FUNC rte_hash_crc #define DEFAULT_HASH_FUNC rte_hash_crc
#else #else

10
examples/l3fwd/l3fwd_em.c
View File

@ -57,7 +57,7 @@
#include "l3fwd.h" #include "l3fwd.h"
#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32) #if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_CRC32)
#define EM_HASH_CRC 1 #define EM_HASH_CRC 1
#endif #endif
@ -246,7 +246,7 @@ static rte_xmm_t mask0;
static rte_xmm_t mask1; static rte_xmm_t mask1;
static rte_xmm_t mask2; static rte_xmm_t mask2;
#if defined(__SSE2__) #if defined(RTE_MACHINE_CPUFLAG_SSE2)
static inline xmm_t static inline xmm_t
em_mask_key(void *key, xmm_t mask) em_mask_key(void *key, xmm_t mask)
{ {
@ -328,7 +328,7 @@ em_get_ipv6_dst_port(void *ipv6_hdr, uint8_t portid, void *lookup_struct)
return (uint8_t)((ret < 0) ? portid : ipv6_l3fwd_out_if[ret]); return (uint8_t)((ret < 0) ? portid : ipv6_l3fwd_out_if[ret]);
} }
#if defined(__SSE4_1__) #if defined(RTE_ARCH_X86)
#if defined(NO_HASH_MULTI_LOOKUP) #if defined(NO_HASH_MULTI_LOOKUP)
#include "l3fwd_em_sse.h" #include "l3fwd_em_sse.h"
#else #else
@ -709,13 +709,13 @@ em_main_loop(__attribute__((unused)) void *dummy)
if (nb_rx == 0) if (nb_rx == 0)
continue; continue;
#if defined(__SSE4_1__) #if defined(RTE_ARCH_X86)
l3fwd_em_send_packets(nb_rx, pkts_burst, l3fwd_em_send_packets(nb_rx, pkts_burst,
portid, qconf); portid, qconf);
#else #else
l3fwd_em_no_opt_send_packets(nb_rx, pkts_burst, l3fwd_em_no_opt_send_packets(nb_rx, pkts_burst,
portid, qconf); portid, qconf);
#endif /* __SSE_4_1__ */ #endif
} }
} }

6
examples/l3fwd/l3fwd_lpm.c
View File

@ -104,7 +104,7 @@ static struct ipv6_l3fwd_lpm_route ipv6_l3fwd_lpm_route_array[] = {
struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS]; struct rte_lpm *ipv4_l3fwd_lpm_lookup_struct[NB_SOCKETS];
struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS]; struct rte_lpm6 *ipv6_l3fwd_lpm_lookup_struct[NB_SOCKETS];
#if defined(__SSE4_1__) #if defined(RTE_ARCH_X86)
#include "l3fwd_lpm_sse.h" #include "l3fwd_lpm_sse.h"
#else #else
#include "l3fwd_lpm.h" #include "l3fwd_lpm.h"
@ -178,13 +178,13 @@ lpm_main_loop(__attribute__((unused)) void *dummy)
if (nb_rx == 0) if (nb_rx == 0)
continue; continue;
#if defined(__SSE4_1__) #if defined(RTE_ARCH_X86)
l3fwd_lpm_send_packets(nb_rx, pkts_burst, l3fwd_lpm_send_packets(nb_rx, pkts_burst,
portid, qconf); portid, qconf);
#else #else
l3fwd_lpm_no_opt_send_packets(nb_rx, pkts_burst, l3fwd_lpm_no_opt_send_packets(nb_rx, pkts_burst,
portid, qconf); portid, qconf);
#endif /* __SSE_4_1__ */ #endif /* X86 */
} }
} }