From patchwork Wed Jul 29 13:56:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Medvedkin X-Patchwork-Id: 6657 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 8B327C438; Wed, 29 Jul 2015 15:59:10 +0200 (CEST) Received: from mailrelay1.rambler.ru (mailrelay1.rambler.ru [81.19.66.239]) by dpdk.org (Postfix) with ESMTP id E33CFC356 for ; Wed, 29 Jul 2015 15:59:08 +0200 (CEST) Received: from hst119.rambler.ru (unknown [10.201.1.2]) by mailrelay1.rambler.ru (Postfix) with ESMTP id 3mhGgw2glxzJwW; Wed, 29 Jul 2015 16:59:08 +0300 (MSK) From: Vladimir Medvedkin To: dev@dpdk.org Date: Wed, 29 Jul 2015 09:56:24 -0400 Message-Id: <1438178184-25709-1-git-send-email-medvedkinv@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1438088792-16344-1-git-send-email-medvedkinv@gmail.com> References: <1438088792-16344-1-git-send-email-medvedkinv@gmail.com> X-Rcpt-To: , Subject: [dpdk-dev] [PATCH v2] Make the thash library arch-independent X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" v2 changes - Fix SSE to SSE3 typo - remove unnecessary comments - Leave unalligned union rte_thash_tuple if no support for SSE3 - Makes 32bit compiler happy by adding ULL suffix Signed-off-by: Vladimir Medvedkin --- lib/librte_hash/rte_thash.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/librte_hash/rte_thash.h b/lib/librte_hash/rte_thash.h index 6156e8a..d98e98e 100644 --- a/lib/librte_hash/rte_thash.h +++ b/lib/librte_hash/rte_thash.h @@ -53,14 +53,19 @@ extern "C" { #include #include -#include #include +#ifdef __SSE3__ +#include +#endif + +#ifdef __SSE3__ /* Byte swap mask used for converting IPv6 address * 4-byte chunks to CPU byte order */ static const __m128i rte_thash_ipv6_bswap_mask = { - 0x0405060700010203, 0x0C0D0E0F08090A0B}; + 0x0405060700010203ULL, 0x0C0D0E0F08090A0BULL}; +#endif /** * length in dwords of input tuple to @@ -126,7 +131,11 @@ struct rte_ipv6_tuple { union rte_thash_tuple { struct rte_ipv4_tuple v4; struct rte_ipv6_tuple v6; +#ifdef __SSE3__ } __attribute__((aligned(XMM_SIZE))); +#else +}; +#endif /** * Prepare special converted key to use with rte_softrss_be() @@ -157,12 +166,22 @@ rte_convert_rss_key(const uint32_t *orig, uint32_t *targ, int len) static inline void rte_thash_load_v6_addrs(const struct ipv6_hdr *orig, union rte_thash_tuple *targ) { +#ifdef __SSE3__ __m128i ipv6 = _mm_loadu_si128((const __m128i *)orig->src_addr); *(__m128i *)targ->v6.src_addr = _mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask); ipv6 = _mm_loadu_si128((const __m128i *)orig->dst_addr); *(__m128i *)targ->v6.dst_addr = _mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask); +#else + int i; + for (i = 0; i < 4; i++) { + *((uint32_t *)targ->v6.src_addr + i) = + rte_be_to_cpu_32(*((const uint32_t *)orig->src_addr + i)); + *((uint32_t *)targ->v6.dst_addr + i) = + rte_be_to_cpu_32(*((const uint32_t *)orig->dst_addr + i)); + } +#endif } /**