From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0074.outbound.protection.outlook.com [104.47.32.74]) by dpdk.org (Postfix) with ESMTP id E217C68F7 for ; Tue, 9 May 2017 11:53:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=oTENgeZjB8plJTnjNM7gq836TlJqFAXwOW3tyyXRIJs=; b=Q1WJOUudwzydfWTiDbsKb93uXs43QcU3EQP2aitcmRuuvcEjZyJKvFRUXlxIF5auepRvia8Z66JzIQDUd6tTgtiTvI95G1S4aKhTyE87pm1bU544xZPu0Bi15RPog8+0WpTVyUXQzBQWsErvegsBEwW/uSr6jJwO1C3J5lh8OKg= Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=caviumnetworks.com; Received: from 1scrb-1.caveonetworks.com (50.233.148.156) by BY2PR07MB2421.namprd07.prod.outlook.com (10.166.115.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Tue, 9 May 2017 09:53:54 +0000 From: Ashwin Sekhar T K To: cristian.dumitrescu@intel.com, thomas@monjalon.net, jasvinder.singh@intel.com, viktorin@rehivetech.com, jerin.jacob@caviumnetworks.com, jianbo.liu@linaro.org Cc: dev@dpdk.org, Ashwin Sekhar T K Date: Tue, 9 May 2017 02:53:40 -0700 Message-Id: <20170509095341.10734-3-ashwin.sekhar@caviumnetworks.com> X-Mailer: git-send-email 2.13.0.rc1 In-Reply-To: <20170509095341.10734-1-ashwin.sekhar@caviumnetworks.com> References: <20170427140618.35897-1-ashwin.sekhar@caviumnetworks.com> <20170509095341.10734-1-ashwin.sekhar@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR10CA0071.namprd10.prod.outlook.com (10.169.238.33) To BY2PR07MB2421.namprd07.prod.outlook.com (10.166.115.13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c070d77e-3e81-4a5d-1f9f-08d496c14e53 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:BY2PR07MB2421; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2421; 3:foSlVNj4S1j4bbdFaL/2EYVmS8UhFmqQ7pEB0UMylmDlSoItHYyieNXfeAg+MuHB+04Ah2aMO+YgTHS3Fgxaeu526KoI3Z7nUC0HzrgVQUc0fw15dLCxwWgD/gSXw0yUJ/f+WILpl/SnanQk09e0dma/oobDpi9U9wou+k8e2e+E6uH46zggtid5rWkQq2KvtkpzvL2ZJKKfqrFechRXyXueVME+LlKyb0QGkuy0FuNjT3KVQv5Mq0z3qZDWCp1nHyBJT4pDD+TUOOLelZKbI56+c6I9jbauXtQVCoZobUPQ5ipGUqWzkAqdq+MMkGBhcKvop2zcyS+gHGcp64ztVg==; 25:4Z6bNBStb+DcoUEvSir5wAyluX2c+66wa6P5w8xD8vwuJu9AyHssyh7YqeqREomQOLirfJrIWqPwYpgkGJj2s653y4kICkHWR/Zip8A7Zco/uivZ/5LdAjPr7um014RWcWg+i0Vi+/d67aB99HiE8qg3XA+XL9Vq61vgGEJQQgpKzr+adFD0akCjy6hvHxvOdUY7rxlSwnB2JDJQotew0YZ9FZ5SZldTmcDzPK0YvHWjawNnlv7gMzeWQOBDSpYmsyvcjvP0IzWGB2IHpmE8V7WI57FcE+7u/Wwt4Qro9ex4Qt5be38QT2s89PkGOLWA1Mld71rxz7R8HghYQj+Ehsl9k3AVRnUQFFMqLh7uyNF+Ki7nWhQd89qoBjvd3GEw5LTYYhYYTvyH7XmvcqME5fCW7OysQmpMHfGRya7gISOOtHMy2OiDWxgOjC7XNaOZTp/fBl69axN966OBVyXMkUOImLwiwsZtMLU7282KNns= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2421; 31:RJLc5kH5fBCT+XDV8J9BFV5n/mFOeH9cbyDM37KxNlj9dmFMAvWAzVwAG3FqvVPowNSbmuYlLmoN4z/KGg1Rp8NIi8uZOEhB1H5E5xcyabMYp+r8HXzunh/Nuvk//JFGnP5oKqNq9l2F6LeyqVRRk1D1/qh6t9AtPltFsTUztGAMGE2lsepQeaeoC+zdOPkLB466NGNCehwDel597fqnU2L8Djy9g1XOAXgWcjh4xrM=; 20:i5CstuZKeTL/k4r5U6xj3Vpfpbiro3Tupc1UnlvKwntvssz1esnmkB463YdPj8qWnAwjhqrjUK0yYriLD6WqFe0s+97Qrny3M09gkowd6unyIaue7/ekpKeCWxDu5YyHcyFNLF3Ts/lRmTCQhUDy1SbCHGRdbbehQwMPm8H94W1kJfLLNj9/QnR6yk0BU3i380ZJYQvSVMKXhEQhW2DFkFFhUrHvRg6+qBV3Em81hjsj0huIrarEd4lX+pYTNS+JADXJ6NMW8/Guw0M+QOPj0fu3T+1aJ9WorLT2QT/fIWBKKIAt0VIfQzRotfy5kOMXBdRHAUcFbQhkidfvtvWzw8jtwEpIqft7eXccbFV2uHa+lLJAsyUr10j29ubu+C/zRKOZs7zp0+A0uGI8/5WkC+7nWxBhvO/z18PThWtcneYW0oACyOMeVaee3PSFZe/fByOVM19ryiD7KKWHlT2SnD6u8gxQosuMhX6oSgzm7XZpe5J8TbTjBJpdyVfoWZlqIDqDp5Vo0mqo0jEcVgdIKTJuXGscp+6YT6mHna9qZ0w8VHVeXfBHz8n4s3/y0dpApMVxtWpuo3tS/wWxl+qOYbjfdYJQL80pYGU7hQfa+Xo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123560025)(201703131423075)(201703061421075)(201703161042150)(20161123558100)(6072148)(6042181); SRVR:BY2PR07MB2421; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB2421; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2421; 4:EBQEn8vXh0M4CR46S9iy5tFyqDN9Xx3cw7onyLXfXXyu2S0swdRFgcQbNbBDDv9Ka8+DpdLqq2oOvb21svQ90CtsZlQxQtxSeMc1qtWlUGZChknwk33r/DlXmwiYa02PbAiA39QdtIw0G0PkoDpnw/vSI7oGbuGZ+zdBtYBReAKiII5+qB/H/9DrTd59djq0JAtU+StxmM8OekWBioLCFp8VP4XWMO6uT6STcer45dAMAQBVMSxWWru/OisERmNurL+vXNY/vc94Uk0Xn+CC5Fvgj7lnWbGUsxCPa1IjP98Css7RKVntiNvenuYwiCofWEoW4P3+axf6gwvHNme2scOJe8zrFCfNY8nDdlpQGZFNhcb6HaMecAasM5SAHJitTgCVXciAsSqndGiG+N2XQe1pi46yoxSbnnVXM8FJ9MWVAKnfCAjLLsBjBq6w4xGxLuTFbjN8ydTWmzfu0vBs5dkp4LklYFe9iEO/qQOSZrx9piRp1Hz/w+AZA5ksk0tWtZNdEageyTTyTfivkwJMbOh80RlteFC08s6TUQOuT5x/Is7zzp+CQDo71bcapsFMNVeXd+WPyp6shrQ2FtUmhxL/6Kn2BJ6VVtnrvQ6BqUjPp0KEj3RoNa9DZ6GdKqtS7fP/PthoJyohG7DeUOYLYcQs+he8JCfobuBm7FtlVqMC1VBQ3A4tycjcqNED+XpATetxPK6SxgNLr4UegXSItAMkIrm/DDTdI21imnH4K+SfwYto/nwyT2p//YcV8liU X-Forefront-PRVS: 0302D4F392 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(1076002)(4326008)(3846002)(50466002)(48376002)(6512007)(6116002)(66066001)(498600001)(47776003)(36756003)(189998001)(25786009)(6506006)(575784001)(50226002)(5660300001)(6486002)(6666003)(38730400002)(107886003)(110136004)(50986999)(33646002)(2950100002)(42882006)(2906002)(53936002)(42186005)(81166006)(5003940100001)(305945005)(53416004)(76176999)(7736002)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB2421; H:1scrb-1.caveonetworks.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB2421; 23:1pkHabBivMiThDZckzSK/0ZFoKg32dvBi3aKSgP0A?= =?us-ascii?Q?Q7vFktHPWK5tTn1ffJursd50LXFnUOyYnF8uaLA5c3IdSqHLy7gw16WQWf4b?= =?us-ascii?Q?boezFGmLwbpnV+pbO8aLmzQoKfHx+v5TjOKoATCyWpd23SLKHJ1KFCYxxsoe?= =?us-ascii?Q?8oxL2wR1KM1yRilw7cL3R1B20gvHwrlmQ1AyqlAqQDJqwK72Q3/WxTdaXBY7?= =?us-ascii?Q?aw5sfqp5dxEJtUNkGUN2vVb42PYjHK+kUXrZxxjMJuaOa3cVMpnyZn95+t+A?= =?us-ascii?Q?eIq/Df6vwU9OCah7n7hry/ycfkkapNxTAx9WSknpqvQW489jM7Lreduk4Yix?= =?us-ascii?Q?FlXkbWg9iXOZn19U/m1TcKf8IJdLjBHQCb8CbbZTNnPy4JzJLkFr7bQGS/7I?= =?us-ascii?Q?iXsBR6iMuVqCBACSGsDakmaLws0SQMMITD2Oknop77ozkwIPtmtUdkiLUj79?= =?us-ascii?Q?vsZHxzhIpuUlONyDEg/942TPJyCodxKj6vaDAlexBJDWviA2cD5F23mYgALg?= =?us-ascii?Q?AWmVmbPebd6Mp9UvgmwHd1HQ6UUFFpa389xrOiyNAuBzg6FjoNjfohqW0hK/?= =?us-ascii?Q?Jxx3YiYlkAxxuQ5eN1+UoP9zyHh6d0A2XzSheur5VtL7qljkP0V+VhuOaF6R?= =?us-ascii?Q?HUVHRqCgWWGBmLfHbuLkAXnQBnZE6RusjMunkK+TAQYwckvtqpLI9eoCqXUN?= =?us-ascii?Q?ByoVir7wN4VtvFy8BnD4lNQS5n48O9nR7YfSyu3hyx9CpOc7QuXGiv63f3Fo?= =?us-ascii?Q?AukLvf3qIU5O5PL8veO644DKo+4I4a7ArnHzibWuel+dwX/sc26qmWuJ3e5Z?= =?us-ascii?Q?f62lJsq6J1cdFKTTvxX4GyuKEH86UybG5xoKNq/RNJcJpb3VEbwB984N8RaD?= =?us-ascii?Q?ICQ/BgXFb9EZ3AwbkHQIfqiQjVAZ6NyPTEUnZqseQHlqop0DiT0sV77McKAk?= =?us-ascii?Q?clxGcX1tis4eYioQsXZZyZJtH030XDpzo1HMr1DBw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2421; 6:eYjLw9kTtxvg7dB7NiiVlFpNh4KApdNkhrJz51MPWYcbrCI1VogE+Pa90vagSDdj1fe9NAW3ntoNi0p3euJpO0JLlqa+afQunPWZkF5bDuOmfK/lOtzMHbG1Q1H4tQVDRdrOrISIN7+0KnA3Y8GjdjBftQixt6S2XcmW7L57JPKiBOd/h8V/9tEwi8VOzc3kBbe+soksEpivQ7Vz49uUOHyVpL2AnEZg+7nIRAbsMwonFUev2oURlHmWLnj5J16Qc9/tluQ+CecpyeRmcjniNrhd32ASGLEgUl7Hz0RfgzRRdX6yXp2t0P6W+YOs8v2oOz26YBB3tvqEzHv/t5rujyAz7Ovf5LB2meFip3B7Kzc9OQZbz2x1A/p8unJ1avVQbbguiiyOOUIwRVt1EVbgo3cbmCH3adyg1l6i0p2x7QpuPYLTbcRZarch23fcKS3aDcvNYcUnXDnXdgPY7aCJ73dMGs4qqGLDNMJmjjxjvMpX6oPjqxa6YZSGy1i2Ry/DI8VYdmFHnx0nBGQCWtfNGC/HRn1xTiIHpenVRizsbfJgV/LU0yNAp1LM7IY7RHFR; 5:AsRf3OpJpV7CsL+T6DA0FXkkVxpUJLtdMdefWOZFn2+MK65YTbdGDwwKjKnyruZrFm1PldyWFCUlRmT4IO2jaVEuW+CiC6qmRmBLW4UkM8a4o4AI8WmbWGmTcRrm3tUQ0heiKszM2fdQmzftPVuJGTYg/dGCSkP1tf87VtdICOM=; 24:3YsIEUXQpspDMxvbM1COemDWlyZcdiM9binyfLsk+Tt7x7ciswED0Jcf4zLP25eU/OcMGymxroOo90KmKerE8fQ7fy1xx2Txwhvr/B4kzE0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2421; 7:HwCveB6KGV9Wb7e/G0vC7lq0Ksa34KcDvLTD+LvBqe9TTUye7uzMpD6OwHUgD8BpvAS24a1KSEBkySBWDTGaanB8iskgiBfOoLbsP9duINmIKiIXWTnyNeVWNSzMzl754At1J1/Akz9DKVovqsXroMJSFrv4tCVwuZBRBNGoUWO3LnjDtnYuSxJ2NL4ayP5/5WLxJjzm1BgqBWpb3XO12+DC/4/Bhx9jTgGjS0xA8MEnwxhWhFdx+SiQWNuH5Zlx8QRKqYagkJ4w45vKhDVH3cPlJq2tjpidLJQhHfaVoIEzmNr7nY6zVHSLusUlRDBnJIBBCMgd9hEXvUDlaVW+cA== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2017 09:53:54.8273 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB2421 Subject: [dpdk-dev] [PATCH v4 3/4] net: add arm64 neon version of CRC compute APIs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 May 2017 09:53:57 -0000 Added CRC compute APIs for arm64 utilizing the pmull capability Added new file net_crc_neon.h to hold the arm64 pmull CRC implementation Verified the changes with crc_autotest unit test case Signed-off-by: Ashwin Sekhar T K --- v2: * Fixed merge conflict in MAINTAINERS v3: * Moved feature detection changes and GCC_VERSION definition changes to separate commit * Replaced usage of assert() with RTE_ASSERT() * Made the comments in rte_vect.h more positive in sense v4: * Rebased on top of latest commit MAINTAINERS | 1 + lib/librte_eal/common/include/arch/arm/rte_vect.h | 28 ++ lib/librte_net/net_crc_neon.h | 357 ++++++++++++++++++++++ lib/librte_net/rte_net_crc.c | 34 ++- lib/librte_net/rte_net_crc.h | 2 + 5 files changed, 416 insertions(+), 6 deletions(-) create mode 100644 lib/librte_net/net_crc_neon.h diff --git a/MAINTAINERS b/MAINTAINERS index b6495d2..66d64c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -147,6 +147,7 @@ F: lib/librte_eal/common/include/arch/arm/*_64.h F: lib/librte_acl/acl_run_neon.* F: lib/librte_lpm/rte_lpm_neon.h F: lib/librte_hash/rte*_arm64.h +F: lib/librte_net/net_crc_neon.h F: drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c F: drivers/net/i40e/i40e_rxtx_vec_neon.c F: drivers/net/virtio/virtio_rxtx_simple_neon.c diff --git a/lib/librte_eal/common/include/arch/arm/rte_vect.h b/lib/librte_eal/common/include/arch/arm/rte_vect.h index 4107c99..b215cc9 100644 --- a/lib/librte_eal/common/include/arch/arm/rte_vect.h +++ b/lib/librte_eal/common/include/arch/arm/rte_vect.h @@ -35,6 +35,7 @@ #include #include "generic/rte_vect.h" +#include "rte_debug.h" #include "arm_neon.h" #ifdef __cplusplus @@ -78,6 +79,33 @@ vqtbl1q_u8(uint8x16_t a, uint8x16_t b) } #endif +#if (GCC_VERSION < 70000) +/* NEON intrinsic vreinterpretq_u64_p128() is supported since GCC version 7 */ +static inline uint64x2_t +vreinterpretq_u64_p128(poly128_t x) +{ + return (uint64x2_t)x; +} + +/* NEON intrinsic vreinterpretq_p64_u64() is supported since GCC version 7 */ +static inline poly64x2_t +vreinterpretq_p64_u64(uint64x2_t x) +{ + return (poly64x2_t)x; +} + +/* NEON intrinsic vgetq_lane_p64() is supported since GCC version 7 */ +static inline poly64_t +vgetq_lane_p64(poly64x2_t x, const int lane) +{ + RTE_ASSERT(lane >= 0 && lane <= 1); + + poly64_t *p = (poly64_t *)&x; + + return p[lane]; +} +#endif + #ifdef __cplusplus } #endif diff --git a/lib/librte_net/net_crc_neon.h b/lib/librte_net/net_crc_neon.h new file mode 100644 index 0000000..05120a7 --- /dev/null +++ b/lib/librte_net/net_crc_neon.h @@ -0,0 +1,357 @@ +/* + * BSD LICENSE + * + * Copyright (C) Cavium networks Ltd. 2017. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Cavium networks nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _NET_CRC_NEON_H_ +#define _NET_CRC_NEON_H_ + +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** PMULL CRC computation context structure */ +struct crc_pmull_ctx { + uint64x2_t rk1_rk2; + uint64x2_t rk5_rk6; + uint64x2_t rk7_rk8; +}; + +struct crc_pmull_ctx crc32_eth_pmull __rte_aligned(16); +struct crc_pmull_ctx crc16_ccitt_pmull __rte_aligned(16); + +static inline uint8x16_t +extract_vector(uint8x16_t v0, uint8x16_t v1, const int n) +{ + switch (n) { + case 0: return vextq_u8(v0, v1, 0); + case 1: return vextq_u8(v0, v1, 1); + case 2: return vextq_u8(v0, v1, 2); + case 3: return vextq_u8(v0, v1, 3); + case 4: return vextq_u8(v0, v1, 4); + case 5: return vextq_u8(v0, v1, 5); + case 6: return vextq_u8(v0, v1, 6); + case 7: return vextq_u8(v0, v1, 7); + case 8: return vextq_u8(v0, v1, 8); + case 9: return vextq_u8(v0, v1, 9); + case 10: return vextq_u8(v0, v1, 10); + case 11: return vextq_u8(v0, v1, 11); + case 12: return vextq_u8(v0, v1, 12); + case 13: return vextq_u8(v0, v1, 13); + case 14: return vextq_u8(v0, v1, 14); + case 15: return vextq_u8(v0, v1, 15); + } + return v1; +} + +/** + * Shifts right 128 bit register by specified number of bytes + * + * @param reg 128 bit value + * @param num number of bytes to shift reg by (0-16) + * + * @return reg << (num * 8) + */ +static inline uint64x2_t +shift_bytes_right(uint64x2_t reg, const unsigned int num) +{ + /* Right Shift */ + return vreinterpretq_u64_u8(extract_vector( + vreinterpretq_u8_u64(reg), + vdupq_n_u8(0), + num)); +} + +/** + * Shifts left 128 bit register by specified number of bytes + * + * @param reg 128 bit value + * @param num number of bytes to shift reg by (0-16) + * + * @return reg << (num * 8) + */ +static inline uint64x2_t +shift_bytes_left(uint64x2_t reg, const unsigned int num) +{ + /* Left Shift */ + return vreinterpretq_u64_u8(extract_vector( + vdupq_n_u8(0), + vreinterpretq_u8_u64(reg), + 16 - num)); +} + +/** + * @brief Performs one folding round + * + * Logically function operates as follows: + * DATA = READ_NEXT_16BYTES(); + * F1 = LSB8(FOLD) + * F2 = MSB8(FOLD) + * T1 = CLMUL(F1, RK1) + * T2 = CLMUL(F2, RK2) + * FOLD = XOR(T1, T2, DATA) + * + * @param data_block 16 byte data block + * @param precomp precomputed rk1 constanst + * @param fold running 16 byte folded data + * + * @return New 16 byte folded data + */ +static inline uint64x2_t +crcr32_folding_round(uint64x2_t data_block, uint64x2_t precomp, + uint64x2_t fold) +{ + uint64x2_t tmp0 = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(fold), 1), + vgetq_lane_p64(vreinterpretq_p64_u64(precomp), 0))); + + uint64x2_t tmp1 = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(fold), 0), + vgetq_lane_p64(vreinterpretq_p64_u64(precomp), 1))); + + return veorq_u64(tmp1, veorq_u64(data_block, tmp0)); +} + +/** + * Performs reduction from 128 bits to 64 bits + * + * @param data128 128 bits data to be reduced + * @param precomp rk5 and rk6 precomputed constants + * + * @return data reduced to 64 bits + */ +static inline uint64x2_t +crcr32_reduce_128_to_64(uint64x2_t data128, + uint64x2_t precomp) +{ + uint64x2_t tmp0, tmp1, tmp2; + + /* 64b fold */ + tmp0 = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(data128), 0), + vgetq_lane_p64(vreinterpretq_p64_u64(precomp), 0))); + tmp1 = shift_bytes_right(data128, 8); + tmp0 = veorq_u64(tmp0, tmp1); + + /* 32b fold */ + tmp2 = shift_bytes_left(tmp0, 4); + tmp1 = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(tmp2), 0), + vgetq_lane_p64(vreinterpretq_p64_u64(precomp), 1))); + + return veorq_u64(tmp1, tmp0); +} + +/** + * Performs Barret's reduction from 64 bits to 32 bits + * + * @param data64 64 bits data to be reduced + * @param precomp rk7 precomputed constant + * + * @return data reduced to 32 bits + */ +static inline uint32_t +crcr32_reduce_64_to_32(uint64x2_t data64, + uint64x2_t precomp) +{ + static uint32_t mask1[4] __rte_aligned(16) = { + 0xffffffff, 0xffffffff, 0x00000000, 0x00000000 + }; + static uint32_t mask2[4] __rte_aligned(16) = { + 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff + }; + uint64x2_t tmp0, tmp1, tmp2; + + tmp0 = vandq_u64(data64, vld1q_u64((uint64_t *)mask2)); + + tmp1 = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(tmp0), 0), + vgetq_lane_p64(vreinterpretq_p64_u64(precomp), 0))); + tmp1 = veorq_u64(tmp1, tmp0); + tmp1 = vandq_u64(tmp1, vld1q_u64((uint64_t *)mask1)); + + tmp2 = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(tmp1), 0), + vgetq_lane_p64(vreinterpretq_p64_u64(precomp), 1))); + tmp2 = veorq_u64(tmp2, tmp1); + tmp2 = veorq_u64(tmp2, tmp0); + + return vgetq_lane_u32(vreinterpretq_u32_u64(tmp2), 2); +} + +static inline uint32_t +crc32_eth_calc_pmull( + const uint8_t *data, + uint32_t data_len, + uint32_t crc, + const struct crc_pmull_ctx *params) +{ + uint64x2_t temp, fold, k; + uint32_t n; + + /* Get CRC init value */ + temp = vreinterpretq_u64_u32(vsetq_lane_u32(crc, vmovq_n_u32(0), 0)); + + /** + * Folding all data into single 16 byte data block + * Assumes: fold holds first 16 bytes of data + */ + if (unlikely(data_len < 32)) { + if (unlikely(data_len == 16)) { + /* 16 bytes */ + fold = vld1q_u64((const uint64_t *)data); + fold = veorq_u64(fold, temp); + goto reduction_128_64; + } + + if (unlikely(data_len < 16)) { + /* 0 to 15 bytes */ + uint8_t buffer[16] __rte_aligned(16); + + memset(buffer, 0, sizeof(buffer)); + memcpy(buffer, data, data_len); + + fold = vld1q_u64((uint64_t *)buffer); + fold = veorq_u64(fold, temp); + if (unlikely(data_len < 4)) { + fold = shift_bytes_left(fold, 8 - data_len); + goto barret_reduction; + } + fold = shift_bytes_left(fold, 16 - data_len); + goto reduction_128_64; + } + /* 17 to 31 bytes */ + fold = vld1q_u64((const uint64_t *)data); + fold = veorq_u64(fold, temp); + n = 16; + k = params->rk1_rk2; + goto partial_bytes; + } + + /** At least 32 bytes in the buffer */ + /** Apply CRC initial value */ + fold = vld1q_u64((const uint64_t *)data); + fold = veorq_u64(fold, temp); + + /** Main folding loop - the last 16 bytes is processed separately */ + k = params->rk1_rk2; + for (n = 16; (n + 16) <= data_len; n += 16) { + temp = vld1q_u64((const uint64_t *)&data[n]); + fold = crcr32_folding_round(temp, k, fold); + } + +partial_bytes: + if (likely(n < data_len)) { + uint64x2_t last16, a, b, mask; + uint32_t rem = data_len & 15; + + last16 = vld1q_u64((const uint64_t *)&data[data_len - 16]); + a = shift_bytes_left(fold, 16 - rem); + b = shift_bytes_right(fold, rem); + mask = shift_bytes_left(vdupq_n_u64(-1), 16 - rem); + b = vorrq_u64(b, vandq_u64(mask, last16)); + + /* k = rk1 & rk2 */ + temp = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(a), 1), + vgetq_lane_p64(vreinterpretq_p64_u64(k), 0))); + fold = vreinterpretq_u64_p128(vmull_p64( + vgetq_lane_p64(vreinterpretq_p64_u64(a), 0), + vgetq_lane_p64(vreinterpretq_p64_u64(k), 1))); + fold = veorq_u64(fold, temp); + fold = veorq_u64(fold, b); + } + + /** Reduction 128 -> 32 Assumes: fold holds 128bit folded data */ +reduction_128_64: + k = params->rk5_rk6; + fold = crcr32_reduce_128_to_64(fold, k); + +barret_reduction: + k = params->rk7_rk8; + n = crcr32_reduce_64_to_32(fold, k); + + return n; +} + +static inline void +rte_net_crc_neon_init(void) +{ + /* Initialize CRC16 data */ + uint64_t ccitt_k1_k2[2] = {0x189aeLLU, 0x8e10LLU}; + uint64_t ccitt_k5_k6[2] = {0x189aeLLU, 0x114aaLLU}; + uint64_t ccitt_k7_k8[2] = {0x11c581910LLU, 0x10811LLU}; + + /* Initialize CRC32 data */ + uint64_t eth_k1_k2[2] = {0xccaa009eLLU, 0x1751997d0LLU}; + uint64_t eth_k5_k6[2] = {0xccaa009eLLU, 0x163cd6124LLU}; + uint64_t eth_k7_k8[2] = {0x1f7011640LLU, 0x1db710641LLU}; + + /** Save the params in context structure */ + crc16_ccitt_pmull.rk1_rk2 = vld1q_u64(ccitt_k1_k2); + crc16_ccitt_pmull.rk5_rk6 = vld1q_u64(ccitt_k5_k6); + crc16_ccitt_pmull.rk7_rk8 = vld1q_u64(ccitt_k7_k8); + + /** Save the params in context structure */ + crc32_eth_pmull.rk1_rk2 = vld1q_u64(eth_k1_k2); + crc32_eth_pmull.rk5_rk6 = vld1q_u64(eth_k5_k6); + crc32_eth_pmull.rk7_rk8 = vld1q_u64(eth_k7_k8); +} + +static inline uint32_t +rte_crc16_ccitt_neon_handler(const uint8_t *data, + uint32_t data_len) +{ + return (uint16_t)~crc32_eth_calc_pmull(data, + data_len, + 0xffff, + &crc16_ccitt_pmull); +} + +static inline uint32_t +rte_crc32_eth_neon_handler(const uint8_t *data, + uint32_t data_len) +{ + return ~crc32_eth_calc_pmull(data, + data_len, + 0xffffffffUL, + &crc32_eth_pmull); +} + +#ifdef __cplusplus +} +#endif + +#endif /* _NET_CRC_NEON_H_ */ diff --git a/lib/librte_net/rte_net_crc.c b/lib/librte_net/rte_net_crc.c index 9d1ee63..be65f34 100644 --- a/lib/librte_net/rte_net_crc.c +++ b/lib/librte_net/rte_net_crc.c @@ -43,10 +43,16 @@ && defined(RTE_MACHINE_CPUFLAG_SSE4_2) \ && defined(RTE_MACHINE_CPUFLAG_PCLMULQDQ) #define X86_64_SSE42_PCLMULQDQ 1 +#elif defined(RTE_ARCH_ARM64) +#if defined(RTE_MACHINE_CPUFLAG_PMULL) +#define ARM64_NEON_PMULL 1 +#endif #endif #ifdef X86_64_SSE42_PCLMULQDQ #include +#elif defined(ARM64_NEON_PMULL) +#include #endif /* crc tables */ @@ -74,6 +80,11 @@ static rte_net_crc_handler handlers_sse42[] = { [RTE_NET_CRC16_CCITT] = rte_crc16_ccitt_sse42_handler, [RTE_NET_CRC32_ETH] = rte_crc32_eth_sse42_handler, }; +#elif defined(ARM64_NEON_PMULL) +static rte_net_crc_handler handlers_neon[] = { + [RTE_NET_CRC16_CCITT] = rte_crc16_ccitt_neon_handler, + [RTE_NET_CRC32_ETH] = rte_crc32_eth_neon_handler, +}; #endif /** @@ -162,14 +173,20 @@ void rte_net_crc_set_alg(enum rte_net_crc_alg alg) { switch (alg) { - case RTE_NET_CRC_SSE42: #ifdef X86_64_SSE42_PCLMULQDQ + case RTE_NET_CRC_SSE42: handlers = handlers_sse42; -#else - alg = RTE_NET_CRC_SCALAR; -#endif break; +#elif defined(ARM64_NEON_PMULL) + case RTE_NET_CRC_NEON: + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_PMULL)) { + handlers = handlers_neon; + break; + } + //-fallthrough +#endif case RTE_NET_CRC_SCALAR: + //-fallthrough default: handlers = handlers_scalar; break; @@ -199,8 +216,13 @@ rte_net_crc_init(void) rte_net_crc_scalar_init(); #ifdef X86_64_SSE42_PCLMULQDQ - alg = RTE_NET_CRC_SSE42; - rte_net_crc_sse42_init(); + alg = RTE_NET_CRC_SSE42; + rte_net_crc_sse42_init(); +#elif defined(ARM64_NEON_PMULL) + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_PMULL)) { + alg = RTE_NET_CRC_NEON; + rte_net_crc_neon_init(); + } #endif rte_net_crc_set_alg(alg); diff --git a/lib/librte_net/rte_net_crc.h b/lib/librte_net/rte_net_crc.h index d22286c..d01cf4b 100644 --- a/lib/librte_net/rte_net_crc.h +++ b/lib/librte_net/rte_net_crc.h @@ -57,6 +57,7 @@ enum rte_net_crc_type { enum rte_net_crc_alg { RTE_NET_CRC_SCALAR = 0, RTE_NET_CRC_SSE42, + RTE_NET_CRC_NEON, }; /** @@ -68,6 +69,7 @@ enum rte_net_crc_alg { * This parameter is used to select the CRC implementation version. * - RTE_NET_CRC_SCALAR * - RTE_NET_CRC_SSE42 (Use 64-bit SSE4.2 intrinsic) + * - RTE_NET_CRC_NEON (Use ARM Neon intrinsic) */ void rte_net_crc_set_alg(enum rte_net_crc_alg alg); -- 2.7.4