From: Neil Horman <nhorman@tuxdriver.com>
To: Konstantin Ananyev <konstantin.ananyev@intel.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH 17/17] libte_acl: fix compilation issues with RTE_LIBRTE_ACL_STANDALONE=y.
Date: Tue, 16 Dec 2014 08:51:45 -0500 [thread overview]
Message-ID: <20141216135145.GB13806@hmsreliant.think-freely.org> (raw)
In-Reply-To: <1418580659-12595-18-git-send-email-konstantin.ananyev@intel.com>
On Sun, Dec 14, 2014 at 06:10:59PM +0000, Konstantin Ananyev wrote:
> Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> ---
> lib/librte_acl/rte_acl_osdep_alone.h | 47 ++++++++++++++++++++++++++++++++++--
> 1 file changed, 45 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_acl/rte_acl_osdep_alone.h b/lib/librte_acl/rte_acl_osdep_alone.h
> index a84b6f9..58c4f6a 100644
> --- a/lib/librte_acl/rte_acl_osdep_alone.h
> +++ b/lib/librte_acl/rte_acl_osdep_alone.h
> @@ -57,6 +57,10 @@
> #include <smmintrin.h>
> #endif
>
> +#if defined(__AVX__)
> +#include <immintrin.h>
> +#endif
> +
> #else
>
> #include <x86intrin.h>
> @@ -128,8 +132,8 @@ typedef __m128i xmm_t;
> #define XMM_SIZE (sizeof(xmm_t))
> #define XMM_MASK (XMM_SIZE - 1)
>
> -typedef union rte_mmsse {
> - xmm_t m;
> +typedef union rte_xmm {
> + xmm_t x;
> uint8_t u8[XMM_SIZE / sizeof(uint8_t)];
> uint16_t u16[XMM_SIZE / sizeof(uint16_t)];
> uint32_t u32[XMM_SIZE / sizeof(uint32_t)];
> @@ -137,6 +141,33 @@ typedef union rte_mmsse {
> double pd[XMM_SIZE / sizeof(double)];
> } rte_xmm_t;
>
> +#ifdef __AVX__
> +
> +typedef __m256i ymm_t;
> +
> +#define YMM_SIZE (sizeof(ymm_t))
> +#define YMM_MASK (YMM_SIZE - 1)
> +
> +typedef union rte_ymm {
> + ymm_t y;
> + xmm_t x[YMM_SIZE / sizeof(xmm_t)];
> + uint8_t u8[YMM_SIZE / sizeof(uint8_t)];
> + uint16_t u16[YMM_SIZE / sizeof(uint16_t)];
> + uint32_t u32[YMM_SIZE / sizeof(uint32_t)];
> + uint64_t u64[YMM_SIZE / sizeof(uint64_t)];
> + double pd[YMM_SIZE / sizeof(double)];
> +} rte_ymm_t;
> +
> +#endif /* __AVX__ */
> +
> +#ifdef RTE_ARCH_I686
> +#define _mm_cvtsi128_si64(a) ({ \
> + rte_xmm_t m; \
> + m.x = (a); \
> + (m.u64[0]); \
> +})
> +#endif
> +
> /*
> * rte_cycles related.
> */
> @@ -214,6 +245,13 @@ rte_rdtsc(void)
> /*
> * rte_tailq related.
> */
> +
> +struct rte_tailq_entry {
> + TAILQ_ENTRY(rte_tailq_entry) next; /**< Pointer entries for a tailq list
> + */
> + void *data; /**< Pointer to the data referenced by this tailq entry */
> +};
> +
> static inline void *
> rte_dummy_tailq(void)
> {
> @@ -248,6 +286,7 @@ rte_zmalloc_socket(__rte_unused const char *type, size_t size, unsigned align,
> void *ptr;
> int rc;
>
> + align = (align != 0) ? align : RTE_CACHE_LINE_SIZE;
> rc = posix_memalign(&ptr, align, size);
> if (rc != 0) {
> rte_errno = rc;
> @@ -258,6 +297,8 @@ rte_zmalloc_socket(__rte_unused const char *type, size_t size, unsigned align,
> return ptr;
> }
>
> +#define rte_zmalloc(type, sz, align) rte_zmalloc_socket(type, sz, align, 0)
> +
> /*
> * rte_debug related
> */
> @@ -271,6 +312,8 @@ rte_zmalloc_socket(__rte_unused const char *type, size_t size, unsigned align,
> exit(err); \
> } while (0)
>
> +#define rte_cpu_get_flag_enabled(x) (0)
> +
> #ifdef __cplusplus
> }
> #endif
> --
> 1.8.5.3
>
>
I think you should merge these changes with patch 10 where the problem was
introduced, so that you avoid a FTBFS issue
Neil
prev parent reply other threads:[~2014-12-16 13:51 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-14 18:10 [dpdk-dev] [PATCH 00/17] ACL: New AVX2 classify method and several other enhancements Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 01/17] app/test: few small fixes fot test_acl.c Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 02/17] librte_acl: make data_indexes long enough to survive idle transitions Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 03/17] librte_acl: remove build phase heuristsic with negative perfomance effect Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 04/17] librte_acl: fix a bug at build phase that can cause matches beeing overwirtten Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 05/17] librte_acl: introduce DFA nodes compression (group64) for identical entries Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 06/17] librte_acl: build/gen phase - simplify the way match nodes are allocated Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 07/17] librte_acl: make scalar RT code to be more similar to vector one Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 08/17] librte_acl: a bit of RT code deduplication Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 09/17] EAL: introduce rte_ymm and relatives in rte_common_vect.h Konstantin Ananyev
2014-12-15 15:56 ` Neil Horman
2014-12-14 18:10 ` [dpdk-dev] [PATCH 10/17] librte_acl: add AVX2 as new rte_acl_classify() method Konstantin Ananyev
2014-12-15 16:00 ` Neil Horman
2014-12-15 16:33 ` Ananyev, Konstantin
2014-12-15 20:20 ` Neil Horman
2014-12-16 16:16 ` Ananyev, Konstantin
2014-12-17 15:32 ` Neil Horman
2014-12-17 19:22 ` Ananyev, Konstantin
2014-12-17 20:27 ` Neil Horman
2014-12-18 15:01 ` Ananyev, Konstantin
2015-01-06 9:57 ` Ananyev, Konstantin
2015-01-06 12:40 ` Neil Horman
2014-12-17 0:38 ` Ananyev, Konstantin
2014-12-14 18:10 ` [dpdk-dev] [PATCH 11/17] test-acl: add ability to manually select RT method Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 12/17] librte_acl: Remove search_sse_2 and relatives Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 13/17] libter_acl: move lo/hi dwords shuffle out from calc_addr Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 14/17] libte_acl: make calc_addr a define to deduplicate the code Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 15/17] libte_acl: introduce max_size into rte_acl_config Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 16/17] libte_acl: remove unused macros Konstantin Ananyev
2014-12-14 18:10 ` [dpdk-dev] [PATCH 17/17] libte_acl: fix compilation issues with RTE_LIBRTE_ACL_STANDALONE=y Konstantin Ananyev
2014-12-16 13:51 ` Neil Horman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141216135145.GB13806@hmsreliant.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=dev@dpdk.org \
--cc=konstantin.ananyev@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).