From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0055.outbound.protection.outlook.com [157.56.111.55]) by dpdk.org (Postfix) with ESMTP id 319B495DD for ; Fri, 12 Feb 2016 13:29:31 +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.12.50) by BY1PR0701MB1721.namprd07.prod.outlook.com (10.162.111.140) with Microsoft SMTP Server (TLS) id 15.1.403.16; Fri, 12 Feb 2016 12:29:26 +0000 From: Jerin Jacob To: Date: Fri, 12 Feb 2016 17:58:41 +0530 Message-ID: <1455280123-9311-2-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1455280123-9311-1-git-send-email-jerin.jacob@caviumnetworks.com> References: <1454040645-23864-1-git-send-email-jerin.jacob@caviumnetworks.com> <1455280123-9311-1-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [122.167.12.50] X-ClientProxiedBy: PN1PR01CA0022.INDPRD01.PROD.OUTLOOK.COM (25.164.137.29) To BY1PR0701MB1721.namprd07.prod.outlook.com (25.162.111.140) X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 2:rRauShuoKz++mKhihA2kJHaWlgg/fsntVhNWx4E7+LePxO/Kjhsn9v9sYwJKCsoWZwzPBL57bkazYWhuxf9d2CzlRmxJz3Nh5sC5SIgtAU6ZYL1uoBfqid+Cy+em9lPu4Gy5Pohs2ake4t1ay9ehzQ==; 3:GhEX4Lz7n7uv+BFpxK1KEjJWiQV6ibNJwu9zum6ToO8W4/HqbyLKKsnNI+MVM1ie0sGD7e1IsHZ8YO9bkaVH92BvggCH8UwnMNGRD6G0ZXksboVyI1LQ+PfMLxwJ3u3n; 25:KUqM8NGriUW6tZAf7CpRX/YbW3p2h60OmJMzMpuuWWnq/dUeRltcoAB1IaG9ib/2SfN+tW++g9SCvTreNsv+/iUgbH6ImCxLpKtgRjPwAqK2hM7JNmDa2967/IbzIJVOBjK6UMe2Ks9O6q78eoUNj656ubr0qP1+4lUsvYmNJHKzYQxbnsmXxOyTDey/tAfPjSmizgDoYS1mq3qvIzcKgkMc+6AaqfTLuLbf2CvPvx86reWBp4MyUhPiWP23nP3uZSY/MFHFnAlBBI5MMAfkBqs+IJkYIL02AbivUF2RBZ9ee2AyPpM9E3yTp/sXoXy0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0701MB1721; X-MS-Office365-Filtering-Correlation-Id: a2737ceb-aa02-45fe-5a9b-08d333a826f1 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 20:VlkddGtAZex0/uACgdWjE18Xs4Ng0bJ0QiZ5KoBHBPfKjL5kWihks2rj+cKf906ez+SkdJ5m88XGz7DzJEkZmD3IGPnwGnC9wiSlqgyVEuWwQKEKuRlGORgggGHKvUFx+FpQ3N2omT/Zel2QAEqov1TVw9TR03URzpAZPBmJaiZukVXorP+h7O6Mdrtr6OvEq3pSMD9KbjX/NLFgYOVtBUyyNvpSPUN+kzh0R2wZXbWEsBj2eGUotWLvugfP9Vl5jdfmzMi/l07AswukoEbVedUE6djUfDenEFaLI1ZyMaHC5tAD0s57TTLz9bSFxf8LXbw+eZCYfkFkOph0s0XKcvDnAYSBBQtMVnwTR+rAiR1P/FbWKWi2/SqKxZeffZ2G4Q2AnmHbE1iLBekPo9SK3q7cKTa9hFm+in5RvymfdOnGJRMdK+GChfA+2e84/tuHrWQxbJG6N993hy81TJh0P6A3X/gZfbp6pZRE12SPr/Odop4g/3TpRHkMnhGCLVMBgcbA40t6L5FgtX071QtDoVSrDm0Ep7f7lOjQB9viScy2azAvfPrs/EozHK4ZHbHYP7IEAjlLB138q8UE4m60iMtTH/Gb/CYGOUhpQKdIZOA= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:BY1PR0701MB1721; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0701MB1721; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 4:YbnhjuW8N+VyQcZYg6kDxjKx6l1vOXzuZ5pqU/wxlNHn4XkBidBefRGAXSOJo7BvmIjgpuh21A+f9pQLOjVS/WlN134ry4F1tblJ9zLbukQXvqQSk9UaoPelHGxRH7IvHoMerMXOMeysEg8bV5kN+MicG1xcIRTt7RiyF3AR9n5Qrg4lI4gws50AJA++NAnW9yqZlmoL+NQZh7yAccZdgwfMiyBjwOXOK8vr0b90r94Xk6m7ro4ourZu8Ru1mBHRg6NiI0DYmpRWNWkKFnXmUqjhGvnqQv9JHx5MqGPTsl42UU4wWUWWz4qgiyw38qFccNYzY8l44tO/zP/a1XcRTAhFs6Gkd4GvVVq3Q7QV+gJUEs0Y9GUOePnSPL7nHWum X-Forefront-PRVS: 0850800A29 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(6069001)(42186005)(50226001)(4326007)(36756003)(2906002)(586003)(3846002)(1096002)(47776003)(40100003)(122386002)(6116002)(76176999)(92566002)(5004730100002)(50466002)(4001430100002)(2351001)(19580395003)(2950100001)(86362001)(87976001)(5003940100001)(229853001)(33646002)(110136002)(19580405001)(50986999)(189998001)(48376002)(66066001)(77096005)(5008740100001)(107886002)(5001960100002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0701MB1721; H:localhost.localdomain.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0701MB1721; 23:YmEqHaGJ5w1zOh8v/iCUfXtWRZr0sVWzkq5sWYt?= =?us-ascii?Q?jr34ojM7vl1WC4F1kEwU68dPjJxPnSZ2OKKo2H4OBhFbLXlsggUnggglbDRG?= =?us-ascii?Q?FL+szW/16m52QtYtpo+YwcppQ2KKsafTKrcuVdlgKe6spVqLQjoePTe/DVnL?= =?us-ascii?Q?qfNAdZJmttgOQm07BIbXABabfkvIayfsrPhZLRn99/OGfHTKFTCNm4Q/rn+W?= =?us-ascii?Q?U1NOCEIYnMnKeobZxix+UWLSmMtAQB58q4jhUi5uNKwgxudeEU/iH5yAPCbw?= =?us-ascii?Q?nS5AmeKhIoNsRkV/oe+HlCV7ZexkoDkYIlZoutAtbSPil+6+7x7NSlBUEvtW?= =?us-ascii?Q?sQaQu7P5wKqaBprVydp21clyazcg9CvS8TeD6IWmbHUBHZHw8R9ICGzpYaBo?= =?us-ascii?Q?6+wjzpMRSxLP85l0sMG3Ekd/W3cIwuX5Twr2zVEeQkfxj8tYhu3AWBUeITib?= =?us-ascii?Q?UN5HABGPgaQfBNGwmCoVlnnZuf7e32jBPUow/DtbtFcgDyDbwQye36t+NYXZ?= =?us-ascii?Q?AmT7WaiZNg6tpYWumr/pGt+SAWtWLbhuX7ub4Iy1tGBlM6qDzlfNNaG+l/oK?= =?us-ascii?Q?a/JYLjlqaWljOK2glSVLf1tJtptbWs6db/lFG2iRLEIBy1ohHeVBwnDJNwm7?= =?us-ascii?Q?7rw0wc13tlIXrGYpnGJWCRf+AErYYXvCeVWeM44vvc0klNE5yBagAosZVBNl?= =?us-ascii?Q?spomGQb+sfcOvKLjFSdLA+KWBF/uGs9W1fB/4HlGRpn9eOsYUl/5l4EbPcqV?= =?us-ascii?Q?B41vVCMbR86Ber+x4Pn1lnUHH9NxGVaoWGbXRgbCCuqm1RlcTRZgCdys8tK+?= =?us-ascii?Q?bkK2ZmNHKClspG+pnog3iYyHegrN+A8PvMOoHkMMxGU9uYxvnJkuIWMibekt?= =?us-ascii?Q?br5N2w2WF2lmCVIBu/pGiLKXqfaw1syN7x5jL7cg3zmpQUiD6t3trCSD4CUu?= =?us-ascii?Q?XvoLi/EkfWEuiR7GEfn1Iyow2uIxBCj69VEyhz9iAJb5TC9LenyDpGP/LQpT?= =?us-ascii?Q?ZGbaEcEaCr1kc2DCZHJ0NGh+LSI4ZyEslKoVm2ma92txRsg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0701MB1721; 5:I2nmsDpSb4nPSHDGJWvTDYbUzc8PzQ80RO6qLaj+ezrkX2Xt6sXjNaPqkKnpe22tKJcgdnnOI+RqGIVL8Sy3cNW5ep5Ka823y6z/RHnOnnvcyKYOeUSdsB5ohNfEumTd4uG+dAK4MkiZytRca8QWng==; 24:VCdCHheiPHl1OcBF4KO++Ruw/o9xUO5jrOGKOIEmFc4v0qEpG1L5vlkVFZzwfFEsmWhIe1PIxglFo1Vx8/e4wnTCOKhspu4ff1zt+3Jg0Kw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2016 12:29:26.1650 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0701MB1721 Cc: viktorin@rehivetech.com Subject: [dpdk-dev] [PATCH v4 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, 12 Feb 2016 12:29:31 -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