* [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine
@ 2016-08-23 14:54 Hemant Agrawal
2016-08-23 14:54 ` [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs Hemant Agrawal
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Hemant Agrawal @ 2016-08-23 14:54 UTC (permalink / raw)
To: dev
if machine level CRC extension are available, offload the
hash to machine provided functions e.g. armv8-a CRC extensions
support it
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
examples/l3fwd/l3fwd_em.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index def5a02..a889c67 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -58,13 +58,13 @@
#include "l3fwd.h"
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
#include <rte_hash_crc.h>
#define DEFAULT_HASH_FUNC rte_hash_crc
#else
#include <rte_jhash.h>
#define DEFAULT_HASH_FUNC rte_jhash
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
#define IPV6_ADDR_LEN 16
@@ -169,17 +169,17 @@ ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len,
t = k->proto;
p = (const uint32_t *)&k->port_src;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
init_val = rte_hash_crc_4byte(t, init_val);
init_val = rte_hash_crc_4byte(k->ip_src, init_val);
init_val = rte_hash_crc_4byte(k->ip_dst, init_val);
init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#else
init_val = rte_jhash_1word(t, init_val);
init_val = rte_jhash_1word(k->ip_src, init_val);
init_val = rte_jhash_1word(k->ip_dst, init_val);
init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
return init_val;
}
@@ -191,16 +191,16 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
const union ipv6_5tuple_host *k;
uint32_t t;
const uint32_t *p;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
const uint32_t *ip_src0, *ip_src1, *ip_src2, *ip_src3;
const uint32_t *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
k = data;
t = k->proto;
p = (const uint32_t *)&k->port_src;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
ip_src0 = (const uint32_t *) k->ip_src;
ip_src1 = (const uint32_t *)(k->ip_src+4);
ip_src2 = (const uint32_t *)(k->ip_src+8);
@@ -219,14 +219,14 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
init_val = rte_hash_crc_4byte(*ip_dst2, init_val);
init_val = rte_hash_crc_4byte(*ip_dst3, init_val);
init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#else
init_val = rte_jhash_1word(t, init_val);
init_val = rte_jhash(k->ip_src,
sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
init_val = rte_jhash(k->ip_dst,
sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
return init_val;
}
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs
2016-08-23 14:54 [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Hemant Agrawal
@ 2016-08-23 14:54 ` Hemant Agrawal
2016-10-13 8:22 ` Thomas Monjalon
2016-10-05 11:52 ` [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Jerin Jacob
2016-10-13 18:47 ` [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64 Hemant Agrawal
2 siblings, 1 reply; 10+ messages in thread
From: Hemant Agrawal @ 2016-08-23 14:54 UTC (permalink / raw)
To: dev
This patch enables the support for 4 million hash entries
for all 64 bit architectures.
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
examples/l3fwd/l3fwd.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index d8798b7..011ba14 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -68,7 +68,7 @@
#define MASK_ETH 0x3f
/* Hash parameters. */
-#ifdef RTE_ARCH_X86_64
+#ifdef RTE_ARCH_64
/* default to 4 million hash entries (approx) */
#define L3FWD_HASH_ENTRIES (1024*1024*4)
#else
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine
2016-08-23 14:54 [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Hemant Agrawal
2016-08-23 14:54 ` [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs Hemant Agrawal
@ 2016-10-05 11:52 ` Jerin Jacob
2016-10-07 7:06 ` Hemant Agrawal
2016-10-13 18:47 ` [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64 Hemant Agrawal
2 siblings, 1 reply; 10+ messages in thread
From: Jerin Jacob @ 2016-10-05 11:52 UTC (permalink / raw)
To: Hemant Agrawal; +Cc: dev
On Tue, Aug 23, 2016 at 08:24:39PM +0530, Hemant Agrawal wrote:
Maybe you can change the subject line to:
examples/l3fwd: em: use hw accelerated crc hash function for arm64
instead of:
examples/l3fwd: em path hash offload to machine
> if machine level CRC extension are available, offload the
> hash to machine provided functions e.g. armv8-a CRC extensions
> support it
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---
> examples/l3fwd/l3fwd_em.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
> index def5a02..a889c67 100644
> --- a/examples/l3fwd/l3fwd_em.c
> +++ b/examples/l3fwd/l3fwd_em.c
> @@ -58,13 +58,13 @@
>
> #include "l3fwd.h"
>
> -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
Rather than adding new compilation flag everywhere, Maybe you can add
#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) &&
defined(RTE_MACHINE_CPUFLAG_CRC32)
#define EM_HASH_CRC 1
#endif
something like above to reduce the change for future platforms with crc
support.
Other than that, you can add:
Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> #include <rte_hash_crc.h>
> #define DEFAULT_HASH_FUNC rte_hash_crc
> #else
> #include <rte_jhash.h>
> #define DEFAULT_HASH_FUNC rte_jhash
> -#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> +#endif
>
> #define IPV6_ADDR_LEN 16
>
> @@ -169,17 +169,17 @@ ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len,
> t = k->proto;
> p = (const uint32_t *)&k->port_src;
>
> -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
> init_val = rte_hash_crc_4byte(t, init_val);
> init_val = rte_hash_crc_4byte(k->ip_src, init_val);
> init_val = rte_hash_crc_4byte(k->ip_dst, init_val);
> init_val = rte_hash_crc_4byte(*p, init_val);
> -#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> +#else
> init_val = rte_jhash_1word(t, init_val);
> init_val = rte_jhash_1word(k->ip_src, init_val);
> init_val = rte_jhash_1word(k->ip_dst, init_val);
> init_val = rte_jhash_1word(*p, init_val);
> -#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> +#endif
>
> return init_val;
> }
> @@ -191,16 +191,16 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
> const union ipv6_5tuple_host *k;
> uint32_t t;
> const uint32_t *p;
> -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
> const uint32_t *ip_src0, *ip_src1, *ip_src2, *ip_src3;
> const uint32_t *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
> -#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> +#endif
>
> k = data;
> t = k->proto;
> p = (const uint32_t *)&k->port_src;
>
> -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
> ip_src0 = (const uint32_t *) k->ip_src;
> ip_src1 = (const uint32_t *)(k->ip_src+4);
> ip_src2 = (const uint32_t *)(k->ip_src+8);
> @@ -219,14 +219,14 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
> init_val = rte_hash_crc_4byte(*ip_dst2, init_val);
> init_val = rte_hash_crc_4byte(*ip_dst3, init_val);
> init_val = rte_hash_crc_4byte(*p, init_val);
> -#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> +#else
> init_val = rte_jhash_1word(t, init_val);
> init_val = rte_jhash(k->ip_src,
> sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
> init_val = rte_jhash(k->ip_dst,
> sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
> init_val = rte_jhash_1word(*p, init_val);
> -#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> +#endif
> return init_val;
> }
>
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine
2016-10-05 11:52 ` [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Jerin Jacob
@ 2016-10-07 7:06 ` Hemant Agrawal
0 siblings, 0 replies; 10+ messages in thread
From: Hemant Agrawal @ 2016-10-07 7:06 UTC (permalink / raw)
To: Jerin Jacob; +Cc: dev
Hi Jerin,
Thanks for the review, I will send a v2 with the suggestions made
Regards,
Hemant
> -----Original Message-----
> From: Jerin Jacob [mailto:jerin.jacob@caviumnetworks.com]
> Sent: Wednesday, October 05, 2016 5:23 PM
> To: Hemant Agrawal <hemant.agrawal@nxp.com>
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to
> machine
>
> On Tue, Aug 23, 2016 at 08:24:39PM +0530, Hemant Agrawal wrote:
>
> Maybe you can change the subject line to:
> examples/l3fwd: em: use hw accelerated crc hash function for arm64 instead of:
> examples/l3fwd: em path hash offload to machine
>
> > if machine level CRC extension are available, offload the hash to
> > machine provided functions e.g. armv8-a CRC extensions support it
> >
> > Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> > ---
> > examples/l3fwd/l3fwd_em.c | 20 ++++++++++----------
> > 1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
> > index def5a02..a889c67 100644
> > --- a/examples/l3fwd/l3fwd_em.c
> > +++ b/examples/l3fwd/l3fwd_em.c
> > @@ -58,13 +58,13 @@
> >
> > #include "l3fwd.h"
> >
> > -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> > +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) ||
> > +defined(RTE_MACHINE_CPUFLAG_CRC32)
>
> Rather than adding new compilation flag everywhere, Maybe you can add
>
> #if defined(RTE_MACHINE_CPUFLAG_SSE4_2) &&
> defined(RTE_MACHINE_CPUFLAG_CRC32)
> #define EM_HASH_CRC 1
> #endif
>
> something like above to reduce the change for future platforms with crc
> support.
>
> Other than that, you can add:
> Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
>
> > #include <rte_hash_crc.h>
> > #define DEFAULT_HASH_FUNC rte_hash_crc
> > #else
> > #include <rte_jhash.h>
> > #define DEFAULT_HASH_FUNC rte_jhash
> > -#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
> > +#endif
> >
> > #define IPV6_ADDR_LEN 16
> >
> > @@ -169,17 +169,17 @@ ipv4_hash_crc(const void *data, __rte_unused
> uint32_t data_len,
> > t = k->proto;
> > p = (const uint32_t *)&k->port_src;
> >
> > -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> > +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) ||
> > +defined(RTE_MACHINE_CPUFLAG_CRC32)
> > init_val = rte_hash_crc_4byte(t, init_val);
> > init_val = rte_hash_crc_4byte(k->ip_src, init_val);
> > init_val = rte_hash_crc_4byte(k->ip_dst, init_val);
> > init_val = rte_hash_crc_4byte(*p, init_val); -#else /*
> > RTE_MACHINE_CPUFLAG_SSE4_2 */
> > +#else
> > init_val = rte_jhash_1word(t, init_val);
> > init_val = rte_jhash_1word(k->ip_src, init_val);
> > init_val = rte_jhash_1word(k->ip_dst, init_val);
> > init_val = rte_jhash_1word(*p, init_val); -#endif /*
> > RTE_MACHINE_CPUFLAG_SSE4_2 */
> > +#endif
> >
> > return init_val;
> > }
> > @@ -191,16 +191,16 @@ ipv6_hash_crc(const void *data, __rte_unused
> uint32_t data_len,
> > const union ipv6_5tuple_host *k;
> > uint32_t t;
> > const uint32_t *p;
> > -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> > +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) ||
> > +defined(RTE_MACHINE_CPUFLAG_CRC32)
> > const uint32_t *ip_src0, *ip_src1, *ip_src2, *ip_src3;
> > const uint32_t *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3; -#endif /*
> > RTE_MACHINE_CPUFLAG_SSE4_2 */
> > +#endif
> >
> > k = data;
> > t = k->proto;
> > p = (const uint32_t *)&k->port_src;
> >
> > -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> > +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) ||
> > +defined(RTE_MACHINE_CPUFLAG_CRC32)
> > ip_src0 = (const uint32_t *) k->ip_src;
> > ip_src1 = (const uint32_t *)(k->ip_src+4);
> > ip_src2 = (const uint32_t *)(k->ip_src+8); @@ -219,14 +219,14 @@
> > ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
> > init_val = rte_hash_crc_4byte(*ip_dst2, init_val);
> > init_val = rte_hash_crc_4byte(*ip_dst3, init_val);
> > init_val = rte_hash_crc_4byte(*p, init_val); -#else /*
> > RTE_MACHINE_CPUFLAG_SSE4_2 */
> > +#else
> > init_val = rte_jhash_1word(t, init_val);
> > init_val = rte_jhash(k->ip_src,
> > sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
> > init_val = rte_jhash(k->ip_dst,
> > sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
> > init_val = rte_jhash_1word(*p, init_val); -#endif /*
> > RTE_MACHINE_CPUFLAG_SSE4_2 */
> > +#endif
> > return init_val;
> > }
> >
> > --
> > 1.9.1
> >
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs
2016-08-23 14:54 ` [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs Hemant Agrawal
@ 2016-10-13 8:22 ` Thomas Monjalon
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Monjalon @ 2016-10-13 8:22 UTC (permalink / raw)
To: Hemant Agrawal; +Cc: dev
2016-08-23 20:24, Hemant Agrawal:
> This patch enables the support for 4 million hash entries
> for all 64 bit architectures.
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Applied, thanks
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64
2016-10-13 18:47 ` [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64 Hemant Agrawal
@ 2016-10-13 13:36 ` Jerin Jacob
2016-10-14 5:32 ` Hemant Agrawal
2016-10-14 11:10 ` [dpdk-dev] [PATCHv3] " Hemant Agrawal
1 sibling, 1 reply; 10+ messages in thread
From: Jerin Jacob @ 2016-10-13 13:36 UTC (permalink / raw)
To: Hemant Agrawal; +Cc: dev
On Fri, Oct 14, 2016 at 12:17:05AM +0530, Hemant Agrawal wrote:
> if machine level CRC extension are available, offload the
> hash to machine provide functions e.g. armv8-a CRC extensions
> support it
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> ---
> examples/l3fwd/l3fwd_em.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
> index 89a68e6..d92d0aa 100644
> --- a/examples/l3fwd/l3fwd_em.c
> +++ b/examples/l3fwd/l3fwd_em.c
> @@ -57,13 +57,17 @@
>
> #include "l3fwd.h"
>
> -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
> +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) && defined(RTE_MACHINE_CPUFLAG_CRC32)
The will evaluate as FALSE always.
Please change to logical OR operation here. ie #if defined(RTE_MACHINE_CPUFLAG_SSE4_2) ||
defined(RTE_MACHINE_CPUFLAG_CRC32)
> +#define EM_HASH_CRC 1
> +#endif
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64
2016-08-23 14:54 [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Hemant Agrawal
2016-08-23 14:54 ` [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs Hemant Agrawal
2016-10-05 11:52 ` [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Jerin Jacob
@ 2016-10-13 18:47 ` Hemant Agrawal
2016-10-13 13:36 ` Jerin Jacob
2016-10-14 11:10 ` [dpdk-dev] [PATCHv3] " Hemant Agrawal
2 siblings, 2 replies; 10+ messages in thread
From: Hemant Agrawal @ 2016-10-13 18:47 UTC (permalink / raw)
To: dev; +Cc: jerin.jacob, Hemant Agrawal
if machine level CRC extension are available, offload the
hash to machine provide functions e.g. armv8-a CRC extensions
support it
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
examples/l3fwd/l3fwd_em.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 89a68e6..d92d0aa 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -57,13 +57,17 @@
#include "l3fwd.h"
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) && defined(RTE_MACHINE_CPUFLAG_CRC32)
+#define EM_HASH_CRC 1
+#endif
+
+#ifdef EM_HASH_CRC
#include <rte_hash_crc.h>
#define DEFAULT_HASH_FUNC rte_hash_crc
#else
#include <rte_jhash.h>
#define DEFAULT_HASH_FUNC rte_jhash
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
#define IPV6_ADDR_LEN 16
@@ -168,17 +172,17 @@ ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len,
t = k->proto;
p = (const uint32_t *)&k->port_src;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef EM_HASH_CRC
init_val = rte_hash_crc_4byte(t, init_val);
init_val = rte_hash_crc_4byte(k->ip_src, init_val);
init_val = rte_hash_crc_4byte(k->ip_dst, init_val);
init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#else
init_val = rte_jhash_1word(t, init_val);
init_val = rte_jhash_1word(k->ip_src, init_val);
init_val = rte_jhash_1word(k->ip_dst, init_val);
init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
return init_val;
}
@@ -190,16 +194,16 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
const union ipv6_5tuple_host *k;
uint32_t t;
const uint32_t *p;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef EM_HASH_CRC
const uint32_t *ip_src0, *ip_src1, *ip_src2, *ip_src3;
const uint32_t *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
k = data;
t = k->proto;
p = (const uint32_t *)&k->port_src;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef EM_HASH_CRC
ip_src0 = (const uint32_t *) k->ip_src;
ip_src1 = (const uint32_t *)(k->ip_src+4);
ip_src2 = (const uint32_t *)(k->ip_src+8);
@@ -218,14 +222,14 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
init_val = rte_hash_crc_4byte(*ip_dst2, init_val);
init_val = rte_hash_crc_4byte(*ip_dst3, init_val);
init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#else
init_val = rte_jhash_1word(t, init_val);
init_val = rte_jhash(k->ip_src,
sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
init_val = rte_jhash(k->ip_dst,
sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
return init_val;
}
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64
2016-10-13 13:36 ` Jerin Jacob
@ 2016-10-14 5:32 ` Hemant Agrawal
0 siblings, 0 replies; 10+ messages in thread
From: Hemant Agrawal @ 2016-10-14 5:32 UTC (permalink / raw)
To: Jerin Jacob; +Cc: dev
On 10/13/2016 7:06 PM, Jerin Jacob wrote:
> On Fri, Oct 14, 2016 at 12:17:05AM +0530, Hemant Agrawal wrote:
>> if machine level CRC extension are available, offload the
>> hash to machine provide functions e.g. armv8-a CRC extensions
>> support it
>>
>> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
>> Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
>> ---
>> examples/l3fwd/l3fwd_em.c | 24 ++++++++++++++----------
>> 1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
>> index 89a68e6..d92d0aa 100644
>> --- a/examples/l3fwd/l3fwd_em.c
>> +++ b/examples/l3fwd/l3fwd_em.c
>> @@ -57,13 +57,17 @@
>>
>> #include "l3fwd.h"
>>
>> -#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
>> +#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) && defined(RTE_MACHINE_CPUFLAG_CRC32)
>
> The will evaluate as FALSE always.
>
> Please change to logical OR operation here. ie #if defined(RTE_MACHINE_CPUFLAG_SSE4_2) ||
> defined(RTE_MACHINE_CPUFLAG_CRC32)
>
Oops! Will fix it.
>> +#define EM_HASH_CRC 1
>> +#endif
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [dpdk-dev] [PATCHv3] examples/l3fwd: em: use hw accelerated crc hash function for arm64
2016-10-13 18:47 ` [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64 Hemant Agrawal
2016-10-13 13:36 ` Jerin Jacob
@ 2016-10-14 11:10 ` Hemant Agrawal
2016-10-25 16:49 ` Thomas Monjalon
1 sibling, 1 reply; 10+ messages in thread
From: Hemant Agrawal @ 2016-10-14 11:10 UTC (permalink / raw)
To: dev; +Cc: jerin.jacob, Hemant Agrawal
if machine level CRC extension are available, offload the
hash to machine provide functions e.g. armv8-a CRC extensions
support it
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
examples/l3fwd/l3fwd_em.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 89a68e6..9cc4460 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -57,13 +57,17 @@
#include "l3fwd.h"
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#if defined(RTE_MACHINE_CPUFLAG_SSE4_2) || defined(RTE_MACHINE_CPUFLAG_CRC32)
+#define EM_HASH_CRC 1
+#endif
+
+#ifdef EM_HASH_CRC
#include <rte_hash_crc.h>
#define DEFAULT_HASH_FUNC rte_hash_crc
#else
#include <rte_jhash.h>
#define DEFAULT_HASH_FUNC rte_jhash
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
#define IPV6_ADDR_LEN 16
@@ -168,17 +172,17 @@ ipv4_hash_crc(const void *data, __rte_unused uint32_t data_len,
t = k->proto;
p = (const uint32_t *)&k->port_src;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef EM_HASH_CRC
init_val = rte_hash_crc_4byte(t, init_val);
init_val = rte_hash_crc_4byte(k->ip_src, init_val);
init_val = rte_hash_crc_4byte(k->ip_dst, init_val);
init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#else
init_val = rte_jhash_1word(t, init_val);
init_val = rte_jhash_1word(k->ip_src, init_val);
init_val = rte_jhash_1word(k->ip_dst, init_val);
init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
return init_val;
}
@@ -190,16 +194,16 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
const union ipv6_5tuple_host *k;
uint32_t t;
const uint32_t *p;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef EM_HASH_CRC
const uint32_t *ip_src0, *ip_src1, *ip_src2, *ip_src3;
const uint32_t *ip_dst0, *ip_dst1, *ip_dst2, *ip_dst3;
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
k = data;
t = k->proto;
p = (const uint32_t *)&k->port_src;
-#ifdef RTE_MACHINE_CPUFLAG_SSE4_2
+#ifdef EM_HASH_CRC
ip_src0 = (const uint32_t *) k->ip_src;
ip_src1 = (const uint32_t *)(k->ip_src+4);
ip_src2 = (const uint32_t *)(k->ip_src+8);
@@ -218,14 +222,14 @@ ipv6_hash_crc(const void *data, __rte_unused uint32_t data_len,
init_val = rte_hash_crc_4byte(*ip_dst2, init_val);
init_val = rte_hash_crc_4byte(*ip_dst3, init_val);
init_val = rte_hash_crc_4byte(*p, init_val);
-#else /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#else
init_val = rte_jhash_1word(t, init_val);
init_val = rte_jhash(k->ip_src,
sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
init_val = rte_jhash(k->ip_dst,
sizeof(uint8_t) * IPV6_ADDR_LEN, init_val);
init_val = rte_jhash_1word(*p, init_val);
-#endif /* RTE_MACHINE_CPUFLAG_SSE4_2 */
+#endif
return init_val;
}
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCHv3] examples/l3fwd: em: use hw accelerated crc hash function for arm64
2016-10-14 11:10 ` [dpdk-dev] [PATCHv3] " Hemant Agrawal
@ 2016-10-25 16:49 ` Thomas Monjalon
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Monjalon @ 2016-10-25 16:49 UTC (permalink / raw)
To: Hemant Agrawal; +Cc: dev, jerin.jacob
2016-10-14 16:40, Hemant Agrawal:
> if machine level CRC extension are available, offload the
> hash to machine provide functions e.g. armv8-a CRC extensions
> support it
>
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> Reviewed-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Applied, thanks
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-10-25 16:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-23 14:54 [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Hemant Agrawal
2016-08-23 14:54 ` [dpdk-dev] [PATCH] examples/l3fwd: enabling 4m hash for all 64 bit archs Hemant Agrawal
2016-10-13 8:22 ` Thomas Monjalon
2016-10-05 11:52 ` [dpdk-dev] [PATCH] examples/l3fwd: em path hash offload to machine Jerin Jacob
2016-10-07 7:06 ` Hemant Agrawal
2016-10-13 18:47 ` [dpdk-dev] [PATCH v2] examples/l3fwd: em: use hw accelerated crc hash function for arm64 Hemant Agrawal
2016-10-13 13:36 ` Jerin Jacob
2016-10-14 5:32 ` Hemant Agrawal
2016-10-14 11:10 ` [dpdk-dev] [PATCHv3] " Hemant Agrawal
2016-10-25 16:49 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).