From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0061.outbound.protection.outlook.com [207.46.100.61]) by dpdk.org (Postfix) with ESMTP id 822D9C512 for ; Fri, 29 Jan 2016 05:11:49 +0100 (CET) Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost.localdomain.localdomain (122.167.176.101) by CY1PR0701MB1726.namprd07.prod.outlook.com (10.163.21.140) with Microsoft SMTP Server (TLS) id 15.1.390.13; Fri, 29 Jan 2016 04:11:43 +0000 From: Jerin Jacob To: Date: Fri, 29 Jan 2016 09:40:43 +0530 Message-ID: <1454040645-23864-2-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1454040645-23864-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1449242086-19051-1-git-send-email-jerin.jacob@caviumnetworks.com> <1454040645-23864-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [122.167.176.101] X-ClientProxiedBy: BM1PR01CA0020.INDPRD01.PROD.OUTLOOK.COM (25.163.198.155) To CY1PR0701MB1726.namprd07.prod.outlook.com (25.163.21.140) X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1726; 2:sHa3ie8ixUS9ZWeL/vUvU3K7Ad09wldFLD6dpYoaoL6o+xdo6rCnHGIphRBcK74mvihxZ9MqeD/KKB2m7Nw7PTqqYcqR6iXr39JIRZYCVBGTaqqPPMce1In9jt/E1PCy5wyjPdiU5on5Tw8yDDlCrw==; 3:r6OlZVCgejUG7KWznyCxnLBFedfolzg0Iul96gJdLLGMjR7ynUyTl59STpSlAuxsDUhOkF6jggk1rdPO+D6LzU1GOTHFFnwYDU3XI1ZR4adsKoACXzpXD201LBeYizqD; 25:HOZaHTHAH71kMAIIoaRL06h9xEKqDJ44PGfrZ9NO3quNFeXLYFfsqTsZvd7xNDPWuHmw8jWOuFrir5lvYOeKoLovSNog7sNzH5lFSH9zh0JttW9zGIt3XjoFHc3Zf4Ohaq7jzoUamsLmZp8hG6YWn892LnLN7ymN/QAqQkMEm8a8zvffA/jl8lFq6UH6n7fShhCNwTacfPGWHS1w5X51XbQmnZg+Xc81mpFe/uw2DYbFihbtDFerJ4V5oEx8uj1o X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1726; X-MS-Office365-Filtering-Correlation-Id: 5fa7f2d6-ce1b-4cb7-8dd6-08d328624de0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1726; 20:C6DDaEUd31RkhOBeIR2POsL5DKcBo51lmTfnlPEtFhiN7bDzUeRPoNjzj4WbtF1ZnWt1pUnOYKqFjzqcAGtVqG/YjIw29JN5dKVclNKGB0iitdIgUUEfGGJ4GkT0xb0LGFiVQ/ZSnq7Hdd6wq8ZY6jZ3m4CiIn8qkrM41QUdyarw6S+uhnQCtt+PhlH2AWp3X+sLCDjcD9Gj6RFE0BiYvYpboi7PoVNkSxm69Bz21GOcufF+s99Ti1vF1w3ts/q9vDnJjWLxhE2W2o079bYG8cWKNbWDHdj8gALURe/eNpnBuNgbbLNxQtli4RKCqhPaBtlR9Y3GuhJQ1hQyxdVi2HzvyEV0VsPP5yexXpcXhYEmat3XuhHvoQRU2LbIexQ03Dn17pIo6qAnhOqdV7kUx733ts5p0Tj+QKxzkIqMvwCHKnBuYZo1J9IdkhfPAkCiZwyh0yqrLBQu8wiJKZBNLXLE5q8eNlhjMIVtmq7WhrGrf5ySfUIqgG/r9DayyYG1HLCMnay0qVQqfdGkJNzSRp1h3QQ7mNWvsJnQh16maqYDXYT40g37lTZPhSNKNBFERWGI7ZaCSwoBovzANHwM1s6SA+1oCrSnLdv78DeNx8w= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:CY1PR0701MB1726; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB1726; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1726; 4:BoVcA639ujjC0AcQsIjFKPFlHycidZjspEwW/YYtOueQIT6FuWWHn4RYLRnhQTRrVNwVijFEoaY1uz1Sq5XDe9xWS0/CSJAj7D19P4Zgdf6KSInMF81v4cEjNi6xb84NOowiMFSb1nYFxvtd7sydIpCaej27U4hohdxHpiV8k8f4yZC5t8t9yBcSnlgEaoOuwSiiT15/ZQFynX5p+JauuFhbVOnjb2QCRh211VK0VxMBKMT1ASf32QavWUgZTLzrkfWwbXQVUR8X21QxPXBCEedTw0tlNxsIBJVC7LKBQz+KcpjBySNfkM53B1NNSJq0XVlas3dsWCwzXLOqd8Epj+7k6jZsMO2gQBig4FsFhngmStqW6ct+5ZAjjPdAxV70 X-Forefront-PRVS: 083691450C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(50226001)(5008740100001)(122386002)(36756003)(33646002)(1096002)(3470700001)(40100003)(3846002)(586003)(6116002)(48376002)(4326007)(2906002)(42186005)(92566002)(87976001)(107886002)(19580405001)(110136002)(19580395003)(76176999)(4001430100002)(2351001)(47776003)(50466002)(5001960100002)(77096005)(229853001)(2950100001)(189998001)(86362001)(66066001)(5003940100001)(50986999)(5004730100002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1726; H:localhost.localdomain.localdomain; FPR:; SPF:None; MLV:nov; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB1726; 23:D7onXWtEtGskH2h3ehtUhwA2xTpvVZYCTajp3MB?= =?us-ascii?Q?sdZnwUrz3dEaXs1n8IA3Km+Ir88HRUQmCKbtJGjAWqGjFELUkLfPftou6V8n?= =?us-ascii?Q?Fz3FcR1sy/sste8kKnL56feislVxXu+Zb/gTmbheKhS13lvUVCfHJfQ9vo+0?= =?us-ascii?Q?U/8jRZqs8IWtjWPfSl9b1dLjbvLDEXRgo8cH/SpTiwDHwaI9cTZHwsn2/D4E?= =?us-ascii?Q?9CqAmvGg67WQskeIb+UiAvx8+e3CvFC2yucFiSvp6xqbBBC0n/EmJNWkdtoz?= =?us-ascii?Q?NY8IBRFOCavtyJgXWPWKc1KZCLOU0pdShcGucR9oz0QVs8BhsBd8GjeiL+hF?= =?us-ascii?Q?kX3AbnTK/zzDcNOUEgqbi94T3sU2tCn6t5jazkHe3vgv23SL2KChO/yQRkC3?= =?us-ascii?Q?mnD3Yhk4KTe0USMNtByAHDd8taHJvoZbeJi0Yzt6DxkC+/cgiPY6awXFG5Qf?= =?us-ascii?Q?kQIgt4gt5ZQMYLbfP7f7bQDM+4PfWUQiBKakVbT1HPiWbikpGvI4cWha6zh1?= =?us-ascii?Q?rloCuyMHk1cBPKUB/ZPilVAcz+aTJ5dCEn+ODnTZqn/cBxD930LY9lSgStnm?= =?us-ascii?Q?931XICkZaDz2yFh1cJvjhc8HwzvGOgV0sejDJmBnGcX+MKHk6AKRbrFcXH7U?= =?us-ascii?Q?Q735XyzifqajKEnJi7ny+8sPnob38RDjajE2qr4YXyL3RyDyRiORvC5Y6U82?= =?us-ascii?Q?B6w++fsWwlRu86j2IAn2mLK6smlVuLgl+unZK22w/Pe+25zqnMkRqXf0i5Fn?= =?us-ascii?Q?s5hjQw9B5jM90L90m0h2km/+pcXmYY/yGfZPzZyVSwqNThfb4eoRihhqc1Es?= =?us-ascii?Q?ppfRO2PDpGW3PjBL5eEi8SDDdmE59OnFajf9RzzmSW5gI6pdySNJk5DJbYTT?= =?us-ascii?Q?Qzfd30n69aF0XDeZPstMdbVfuhMvEnh8X+1+vV7kplhMVM9oQFiSHyBxWgz2?= =?us-ascii?Q?ujXg5GpyHmrvY4a4zyyXCHgY3UdVBjNK3Fc0ihtJMkRYU92g/FxETPssAvSS?= =?us-ascii?Q?BFSkCwPRgNEz3n21a5SWVSLGaoCO0xBjkjsMRSRtCCZEGbuB2BMIY9YhQcqV?= =?us-ascii?Q?zxs5g+Bs=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1726; 5:y7JmJ1vB2Whpl7w+JWMvnEp3uXHn+/kwJSRe6FySaGeydBYRUpFdcoAP8G13w/GwjH+x9NxfVKDYlxJ0REfVMadT1MINUKLCsDnto4E3R85zLVF3oqVM2nYlVLLZ8CzXw5t17ML4IonkCsWg6bQ9Hw==; 24:FWttojkO75G6ZAaIoxtECIpn1mVOYf3i/Ge6NzJ7HezJnbNNod4av3csLzETAtDapayKYWt2wr3RJwtqtmDh10V7b76yO1p4/rOUeMRdbfo= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2016 04:11:43.2682 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1726 Cc: viktorin@rehivetech.com Subject: [dpdk-dev] [PATCH v3 1/3] lpm: make rte_lpm_lookupx4 API definition architecture agnostic 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: , X-List-Received-Date: Fri, 29 Jan 2016 04:11:50 -0000 -Used architecture agnostic xmm_t to represent 128 bit SIMD variable -Introduced vect_* API abstraction in app/test to test rte_lpm_lookupx4 API in architecture agnostic way -Moved rte_lpm_lookupx4 SSE implementation to architecture specific rte_lpm_sse.h file to accommodate new rte_lpm_lookupx4 implementation for a different architecture. Signed-off-by: Jerin Jacob Acked-by: Konstantin Ananyev --- app/test/test_lpm.c | 21 ++++--- app/test/test_xmmt_ops.h | 47 ++++++++++++++ lib/librte_lpm/Makefile | 2 + lib/librte_lpm/rte_lpm.h | 93 +--------------------------- lib/librte_lpm/rte_lpm_sse.h | 143 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 206 insertions(+), 100 deletions(-) create mode 100644 app/test/test_xmmt_ops.h create mode 100644 lib/librte_lpm/rte_lpm_sse.h diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c index 8b4ded9..59674f1 100644 --- a/app/test/test_lpm.c +++ b/app/test/test_lpm.c @@ -49,6 +49,7 @@ #include "rte_lpm.h" #include "test_lpm_routes.h" +#include "test_xmmt_ops.h" #define TEST_LPM_ASSERT(cond) do { \ if (!(cond)) { \ @@ -308,7 +309,7 @@ test6(void) int32_t test7(void) { - __m128i ipx4; + xmm_t ipx4; uint16_t hop[4]; struct rte_lpm *lpm = NULL; uint32_t ip = IPv4(0, 0, 0, 0); @@ -324,7 +325,7 @@ test7(void) status = rte_lpm_lookup(lpm, ip, &next_hop_return); TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add)); - ipx4 = _mm_set_epi32(ip, ip + 0x100, ip - 0x100, ip); + ipx4 = vect_set_epi32(ip, ip + 0x100, ip - 0x100, ip); rte_lpm_lookupx4(lpm, ipx4, hop, UINT16_MAX); TEST_LPM_ASSERT(hop[0] == next_hop_add); TEST_LPM_ASSERT(hop[1] == UINT16_MAX); @@ -354,7 +355,7 @@ test7(void) int32_t test8(void) { - __m128i ipx4; + xmm_t ipx4; uint16_t hop[4]; struct rte_lpm *lpm = NULL; uint32_t ip1 = IPv4(127, 255, 255, 255), ip2 = IPv4(128, 0, 0, 0); @@ -380,7 +381,7 @@ test8(void) TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add)); - ipx4 = _mm_set_epi32(ip2, ip1, ip2, ip1); + ipx4 = vect_set_epi32(ip2, ip1, ip2, ip1); rte_lpm_lookupx4(lpm, ipx4, hop, UINT16_MAX); TEST_LPM_ASSERT(hop[0] == UINT16_MAX); TEST_LPM_ASSERT(hop[1] == next_hop_add); @@ -408,7 +409,7 @@ test8(void) status = rte_lpm_lookup(lpm, ip1, &next_hop_return); TEST_LPM_ASSERT(status == -ENOENT); - ipx4 = _mm_set_epi32(ip1, ip1, ip2, ip2); + ipx4 = vect_set_epi32(ip1, ip1, ip2, ip2); rte_lpm_lookupx4(lpm, ipx4, hop, UINT16_MAX); if (depth != 1) { TEST_LPM_ASSERT(hop[0] == next_hop_add); @@ -850,7 +851,7 @@ test11(void) int32_t test12(void) { - __m128i ipx4; + xmm_t ipx4; uint16_t hop[4]; struct rte_lpm *lpm = NULL; uint32_t ip, i; @@ -872,7 +873,7 @@ test12(void) TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add)); - ipx4 = _mm_set_epi32(ip, ip + 1, ip, ip - 1); + ipx4 = vect_set_epi32(ip, ip + 1, ip, ip - 1); rte_lpm_lookupx4(lpm, ipx4, hop, UINT16_MAX); TEST_LPM_ASSERT(hop[0] == UINT16_MAX); TEST_LPM_ASSERT(hop[1] == next_hop_add); @@ -1289,10 +1290,10 @@ perf_test(void) begin = rte_rdtsc(); for (j = 0; j < BATCH_SIZE; j += RTE_DIM(next_hops)) { unsigned k; - __m128i ipx4; + xmm_t ipx4; - ipx4 = _mm_loadu_si128((__m128i *)(ip_batch + j)); - ipx4 = *(__m128i *)(ip_batch + j); + ipx4 = vect_loadu_sil128((xmm_t *)(ip_batch + j)); + ipx4 = *(xmm_t *)(ip_batch + j); rte_lpm_lookupx4(lpm, ipx4, next_hops, UINT16_MAX); for (k = 0; k < RTE_DIM(next_hops); k++) if (unlikely(next_hops[k] == UINT16_MAX)) diff --git a/app/test/test_xmmt_ops.h b/app/test/test_xmmt_ops.h new file mode 100644 index 0000000..c055912 --- /dev/null +++ b/app/test/test_xmmt_ops.h @@ -0,0 +1,47 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2015 Cavium Networks. All rights reserved. + * All rights reserved. + * + * 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 _TEST_XMMT_OPS_H_ +#define _TEST_XMMT_OPS_H_ + +#include + +/* vect_* abstraction implementation using SSE */ + +/* loads the xmm_t value from address p(does not need to be 16-byte aligned)*/ +#define vect_loadu_sil128(p) _mm_loadu_si128(p) + +/* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ +#define vect_set_epi32(i3, i2, i1, i0) _mm_set_epi32(i3, i2, i1, i0) + +#endif /* _TEST_XMMT_OPS_H_ */ diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile index 688cfc9..ce3a1d1 100644 --- a/lib/librte_lpm/Makefile +++ b/lib/librte_lpm/Makefile @@ -47,6 +47,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_LPM) := rte_lpm.c rte_lpm6.c # install this header file SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include := rte_lpm.h rte_lpm6.h +SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h + # this lib needs eal DEPDIRS-$(CONFIG_RTE_LIBRTE_LPM) += lib/librte_eal diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h index c299ce2..dfe1378 100644 --- a/lib/librte_lpm/rte_lpm.h +++ b/lib/librte_lpm/rte_lpm.h @@ -381,97 +381,10 @@ rte_lpm_lookup_bulk_func(const struct rte_lpm *lpm, const uint32_t * ips, * if lookup would fail. */ static inline void -rte_lpm_lookupx4(const struct rte_lpm *lpm, __m128i ip, uint16_t hop[4], - uint16_t defv) -{ - __m128i i24; - rte_xmm_t i8; - uint16_t tbl[4]; - uint64_t idx, pt; +rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint16_t hop[4], + uint16_t defv); - const __m128i mask8 = - _mm_set_epi32(UINT8_MAX, UINT8_MAX, UINT8_MAX, UINT8_MAX); - - /* - * RTE_LPM_VALID_EXT_ENTRY_BITMASK for 4 LPM entries - * as one 64-bit value (0x0300030003000300). - */ - const uint64_t mask_xv = - ((uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK | - (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 16 | - (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 32 | - (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 48); - - /* - * RTE_LPM_LOOKUP_SUCCESS for 4 LPM entries - * as one 64-bit value (0x0100010001000100). - */ - const uint64_t mask_v = - ((uint64_t)RTE_LPM_LOOKUP_SUCCESS | - (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 16 | - (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 32 | - (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 48); - - /* get 4 indexes for tbl24[]. */ - i24 = _mm_srli_epi32(ip, CHAR_BIT); - - /* extract values from tbl24[] */ - idx = _mm_cvtsi128_si64(i24); - i24 = _mm_srli_si128(i24, sizeof(uint64_t)); - - tbl[0] = *(const uint16_t *)&lpm->tbl24[(uint32_t)idx]; - tbl[1] = *(const uint16_t *)&lpm->tbl24[idx >> 32]; - - idx = _mm_cvtsi128_si64(i24); - - tbl[2] = *(const uint16_t *)&lpm->tbl24[(uint32_t)idx]; - tbl[3] = *(const uint16_t *)&lpm->tbl24[idx >> 32]; - - /* get 4 indexes for tbl8[]. */ - i8.x = _mm_and_si128(ip, mask8); - - pt = (uint64_t)tbl[0] | - (uint64_t)tbl[1] << 16 | - (uint64_t)tbl[2] << 32 | - (uint64_t)tbl[3] << 48; - - /* search successfully finished for all 4 IP addresses. */ - if (likely((pt & mask_xv) == mask_v)) { - uintptr_t ph = (uintptr_t)hop; - *(uint64_t *)ph = pt & RTE_LPM_MASKX4_RES; - return; - } - - if (unlikely((pt & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == - RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { - i8.u32[0] = i8.u32[0] + - (uint8_t)tbl[0] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; - tbl[0] = *(const uint16_t *)&lpm->tbl8[i8.u32[0]]; - } - if (unlikely((pt >> 16 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == - RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { - i8.u32[1] = i8.u32[1] + - (uint8_t)tbl[1] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; - tbl[1] = *(const uint16_t *)&lpm->tbl8[i8.u32[1]]; - } - if (unlikely((pt >> 32 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == - RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { - i8.u32[2] = i8.u32[2] + - (uint8_t)tbl[2] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; - tbl[2] = *(const uint16_t *)&lpm->tbl8[i8.u32[2]]; - } - if (unlikely((pt >> 48 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == - RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { - i8.u32[3] = i8.u32[3] + - (uint8_t)tbl[3] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; - tbl[3] = *(const uint16_t *)&lpm->tbl8[i8.u32[3]]; - } - - hop[0] = (tbl[0] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[0] : defv; - hop[1] = (tbl[1] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[1] : defv; - hop[2] = (tbl[2] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[2] : defv; - hop[3] = (tbl[3] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[3] : defv; -} +#include "rte_lpm_sse.h" #ifdef __cplusplus } diff --git a/lib/librte_lpm/rte_lpm_sse.h b/lib/librte_lpm/rte_lpm_sse.h new file mode 100644 index 0000000..2b7eeec --- /dev/null +++ b/lib/librte_lpm/rte_lpm_sse.h @@ -0,0 +1,143 @@ +/*- + * BSD LICENSE + * + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * All rights reserved. + * + * 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 Intel Corporation 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 _RTE_LPM_SSE_H_ +#define _RTE_LPM_SSE_H_ + +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +static inline void +rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint16_t hop[4], + uint16_t defv) +{ + __m128i i24; + rte_xmm_t i8; + uint16_t tbl[4]; + uint64_t idx, pt; + + const __m128i mask8 = + _mm_set_epi32(UINT8_MAX, UINT8_MAX, UINT8_MAX, UINT8_MAX); + + /* + * RTE_LPM_VALID_EXT_ENTRY_BITMASK for 4 LPM entries + * as one 64-bit value (0x0300030003000300). + */ + const uint64_t mask_xv = + ((uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK | + (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 16 | + (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 32 | + (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 48); + + /* + * RTE_LPM_LOOKUP_SUCCESS for 4 LPM entries + * as one 64-bit value (0x0100010001000100). + */ + const uint64_t mask_v = + ((uint64_t)RTE_LPM_LOOKUP_SUCCESS | + (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 16 | + (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 32 | + (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 48); + + /* get 4 indexes for tbl24[]. */ + i24 = _mm_srli_epi32(ip, CHAR_BIT); + + /* extract values from tbl24[] */ + idx = _mm_cvtsi128_si64(i24); + i24 = _mm_srli_si128(i24, sizeof(uint64_t)); + + tbl[0] = *(const uint16_t *)&lpm->tbl24[(uint32_t)idx]; + tbl[1] = *(const uint16_t *)&lpm->tbl24[idx >> 32]; + + idx = _mm_cvtsi128_si64(i24); + + tbl[2] = *(const uint16_t *)&lpm->tbl24[(uint32_t)idx]; + tbl[3] = *(const uint16_t *)&lpm->tbl24[idx >> 32]; + + /* get 4 indexes for tbl8[]. */ + i8.x = _mm_and_si128(ip, mask8); + + pt = (uint64_t)tbl[0] | + (uint64_t)tbl[1] << 16 | + (uint64_t)tbl[2] << 32 | + (uint64_t)tbl[3] << 48; + + /* search successfully finished for all 4 IP addresses. */ + if (likely((pt & mask_xv) == mask_v)) { + uintptr_t ph = (uintptr_t)hop; + *(uint64_t *)ph = pt & RTE_LPM_MASKX4_RES; + return; + } + + if (unlikely((pt & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == + RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { + i8.u32[0] = i8.u32[0] + + (uint8_t)tbl[0] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; + tbl[0] = *(const uint16_t *)&lpm->tbl8[i8.u32[0]]; + } + if (unlikely((pt >> 16 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == + RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { + i8.u32[1] = i8.u32[1] + + (uint8_t)tbl[1] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; + tbl[1] = *(const uint16_t *)&lpm->tbl8[i8.u32[1]]; + } + if (unlikely((pt >> 32 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == + RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { + i8.u32[2] = i8.u32[2] + + (uint8_t)tbl[2] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; + tbl[2] = *(const uint16_t *)&lpm->tbl8[i8.u32[2]]; + } + if (unlikely((pt >> 48 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == + RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { + i8.u32[3] = i8.u32[3] + + (uint8_t)tbl[3] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; + tbl[3] = *(const uint16_t *)&lpm->tbl8[i8.u32[3]]; + } + + hop[0] = (tbl[0] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[0] : defv; + hop[1] = (tbl[1] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[1] : defv; + hop[2] = (tbl[2] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[2] : defv; + hop[3] = (tbl[3] & RTE_LPM_LOOKUP_SUCCESS) ? (uint8_t)tbl[3] : defv; +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_LPM_SSE_H_ */ -- 2.1.0