git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/member: add functional and perf tests
[dpdk.git]
/
examples
/
l3fwd
/
l3fwd_em.c
diff --git
a/examples/l3fwd/l3fwd_em.c
b/examples/l3fwd/l3fwd_em.c
index
9cc4460
..
df38a13
100644
(file)
--- a/
examples/l3fwd/l3fwd_em.c
+++ b/
examples/l3fwd/l3fwd_em.c
@@
-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
#endif
#define EM_HASH_CRC 1
#endif
@@
-246,7
+246,7
@@
static rte_xmm_t mask0;
static rte_xmm_t mask1;
static rte_xmm_t mask2;
static rte_xmm_t mask1;
static rte_xmm_t mask2;
-#if defined(
__SSE2__
)
+#if defined(
RTE_MACHINE_CPUFLAG_SSE2
)
static inline xmm_t
em_mask_key(void *key, xmm_t mask)
{
static inline xmm_t
em_mask_key(void *key, xmm_t mask)
{
@@
-328,11
+328,11
@@
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 || defined RTE_MACHINE_CPUFLAG_NEON
#if defined(NO_HASH_MULTI_LOOKUP)
#if defined(NO_HASH_MULTI_LOOKUP)
-#include "l3fwd_em_s
se
.h"
+#include "l3fwd_em_s
equential
.h"
#else
#else
-#include "l3fwd_em_hlm
_sse
.h"
+#include "l3fwd_em_hlm.h"
#endif
#else
#include "l3fwd_em.h"
#endif
#else
#include "l3fwd_em.h"
@@
-614,7
+614,7
@@
em_parse_ptype(struct rte_mbuf *m)
packet_type |= RTE_PTYPE_L4_UDP;
} else
packet_type |= RTE_PTYPE_L3_IPV4_EXT;
packet_type |= RTE_PTYPE_L4_UDP;
} else
packet_type |= RTE_PTYPE_L3_IPV4_EXT;
- } else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv
4
)) {
+ } else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv
6
)) {
ipv6_hdr = (struct ipv6_hdr *)l3;
if (ipv6_hdr->proto == IPPROTO_TCP)
packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP;
ipv6_hdr = (struct ipv6_hdr *)l3;
if (ipv6_hdr->proto == IPPROTO_TCP)
packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP;
@@
-628,7
+628,7
@@
em_parse_ptype(struct rte_mbuf *m)
}
uint16_t
}
uint16_t
-em_cb_parse_ptype(uint
8
_t port __rte_unused, uint16_t queue __rte_unused,
+em_cb_parse_ptype(uint
16
_t port __rte_unused, uint16_t queue __rte_unused,
struct rte_mbuf *pkts[], uint16_t nb_pkts,
uint16_t max_pkts __rte_unused,
void *user_param __rte_unused)
struct rte_mbuf *pkts[], uint16_t nb_pkts,
uint16_t max_pkts __rte_unused,
void *user_param __rte_unused)
@@
-709,13
+709,13
@@
em_main_loop(__attribute__((unused)) void *dummy)
if (nb_rx == 0)
continue;
if (nb_rx == 0)
continue;
-#if defined
(__SSE4_1__)
+#if defined
RTE_ARCH_X86 || defined RTE_MACHINE_CPUFLAG_NEON
l3fwd_em_send_packets(nb_rx, pkts_burst,
portid, qconf);
#else
l3fwd_em_no_opt_send_packets(nb_rx, pkts_burst,
portid, qconf);
l3fwd_em_send_packets(nb_rx, pkts_burst,
portid, qconf);
#else
l3fwd_em_no_opt_send_packets(nb_rx, pkts_burst,
portid, qconf);
-#endif
/* __SSE_4_1__ */
+#endif
}
}
}
}