From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0078.outbound.protection.outlook.com [157.56.110.78]) by dpdk.org (Postfix) with ESMTP id D85F88E56 for ; Mon, 2 Nov 2015 15:20:11 +0100 (CET) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jerin.Jacob@caviumnetworks.com; Received: from localhost.caveonetworks.com (122.167.52.198) by BLUPR0701MB1971.namprd07.prod.outlook.com (10.163.121.22) with Microsoft SMTP Server (TLS) id 15.1.312.18; Mon, 2 Nov 2015 14:20:07 +0000 From: Jerin Jacob To: Date: Mon, 2 Nov 2015 19:48:40 +0530 Message-ID: <1446473921-12706-3-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1446473921-12706-2-git-send-email-jerin.jacob@caviumnetworks.com> References: <1446473921-12706-1-git-send-email-jerin.jacob@caviumnetworks.com> <1446473921-12706-2-git-send-email-jerin.jacob@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [122.167.52.198] X-ClientProxiedBy: MA1PR01CA0025.INDPRD01.PROD.OUTLOOK.COM (25.164.117.32) To BLUPR0701MB1971.namprd07.prod.outlook.com (25.163.121.22) X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1971; 2:vZ1TqOlklqu7/fGMevhFBxNewI7ve8i5F5CE0gHlCSMzGjZ5hOBkCO2QyTU84EpTc1nY0bKbP+SJ+PhJbTlmvFKXbaAxvCrahX/tf1VbVw85+3yq9FJU90AJMvw709X2DSR/i7hy9mS+vg/Im0P0hTZjWLKF55R88jDyaaZPMXA=; 3:HA90vuRpIG8gm+aiFoFh8gV9nWdGZ5vZRBwvlU+JTU4sgmH8xJjqbWsHpVCg+Ku90ZQQg2yWl9wHrJwjyyBj5ws9CWI9MD3dFBesPTmRh0cMWUtvXCBueWtpumOt5UuxFlLLKRUV8AX4+z9NIVvJsQ==; 25:VIwavRBI9QDBb+se9JD+OrgL53tf06dWkCKi3mNQvr63ZLzGuYfqdgpaYAY/i1X0KKsPScY3yctSdsZrs0zY2bVX5wYqLS22btmv6S+c6ogLFRsRcj5Cks8D8mNN9TvW9o/ZjQaGrhyggThkWLEFWOfd4ERC6Ionrq3epkSxi59EsXdxDr+G3oWV9FQXhUadTRwppU9O3B4Et/5eEAIllsx6JNBCfq/9ORN/g5WdU867MvGfKFHQ/3EGBQtTOGnjuLb5TE46IWbM7QsVSNS5fg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0701MB1971; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1971; 20:/G3FbLpeTNtu+h3by25KRC85AJlyUKcoPZNhxp42TTIGTOo9koFDmmgPakYTBrKFZyoXs5OiOkFPVb70UT7DpVVLHYU9VFvCkP2E88c5WEz0vFvUg5zR58Gw3JhQ3sNCx8i77QW2eGwWyep7DOaR6COUiWPo4VetvMlmDkjG4wOBWi6ZmjgjUd/O2MXUGUlhrFBAP89/16Q8NhKbf9X6a4xtznM8R+h2hPYT9Tv4iCk3BLU30gJhYHhWLRRl9z06pwYGFPTJ8P79xh7JdOuNcc1KUgK+FJXZpHznM9zmtBukfzyVnR2uvYMU7hHWxccl50Q2TzVGKeI5hkGtWgjUuZdH+DDMTDpUUs4lBg/EHa6rys59lpNiCIt8kQdMq5l6i61Ra0muFhi4uJHcApnE/kVf9YwfyJqht2VTd4sNj7CrYETx5xHLWe7aTc3w2oeSYxz7tyFLYICCHjKhj8GRJQo54p14qUWU0MdejSBpr7Y8NV2aWbg9bPAJlO3FSmrWvKBAGxemARjlHxT/Vo2XpLAHHBaFC7nSCH4glW/nXkM2E4LK140Gy7Oxlu0gCCJSytRWFkAzG+f2olhH9cghHKuqUPRdV+HgcCcnngT42As= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236414709691187); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001); SRVR:BLUPR0701MB1971; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1971; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1971; 4:9LpBQAWQCRqxPG80NijfjPXvS0DBA+a3Oi+ogChOEXxAEnKyCRQ2/N18ZJUFcqn+MoVXr2Spg0zJLX40nzfj0e7TLdv4G5uqaB2ttSXMtz7yJrthp6WPxeaeQwEclb1jiQtyo/C3Ktg1DKgXCMuNGclv40lTzsnNwY3SKOmWwwDY7tqDwxQglS+YY4FxsyZEMJC6ZccGTFrREX/paigrL7ZatkPafwLSsFzUm+7h0GZAXcYYJLvYQvqisL7twvazPcCrcBt1qmvMpzXd1OImOsZ05mpuWA29TCPoffpChGtzetMrV4Q/5YHHzRZEi4Yj1/+TotzWWx4XGddBt87jSUA3grvNOU9y58GM4bvZryN7ts/LMODagmRbBlM2OC+q X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(6009001)(199003)(189002)(101416001)(105586002)(66066001)(76176999)(110136002)(42186005)(5001960100002)(97736004)(36756003)(229853001)(2351001)(87976001)(50466002)(81156007)(50986999)(4001430100002)(76506005)(53416004)(69596002)(48376002)(122386002)(77096005)(106356001)(19580405001)(5001920100001)(107886002)(33646002)(19580395003)(189998001)(575784001)(5007970100001)(2950100001)(50226001)(40100003)(5008740100001)(47776003)(86362001)(5003940100001)(92566002)(5004730100002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1971; H:localhost.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1971; 23:8sHgNcWVcI7fYnJymWs5NnSojEIpzHFjw8GSnRL?= =?us-ascii?Q?qR3MNN7eTPRi07/v+scUC6+JSV7o8EqBqqbEwsOwbbulgTdXsSpUESSnbG0u?= =?us-ascii?Q?4IEQSnntrTSiZUhvs+7TDLNtfCYZRp2y0Ys+RkjKIOZUqeCwgv+P9ZzOGgS3?= =?us-ascii?Q?fuPIAhpVpKD9coh92ambS4ZmntSmXsJsFEbREEnGBMoWWS9zmssE4IHnkxaK?= =?us-ascii?Q?JfgC2cvFHgZvywpCv+T61iIw//pRLQ9C4Q1TLPMX2oeuBYj4jv+OdiRyLjso?= =?us-ascii?Q?YtV0D2mtbEPKuuE5KZE+oeRot9xYbNbSYwHEMTbIIaTnP22KJkn/Px/nzoA9?= =?us-ascii?Q?0hhpnapL3964qyFREg+GikkWaYo0uwTncsHr4Y0LpzkxGqo3gSwUyID4wCUO?= =?us-ascii?Q?J2hW7aeVttBHo0Kj2pexKLUJJ74oSuJ06jRp2nvfm1ofz2Ycr87i5o9YPEkt?= =?us-ascii?Q?vdahO35TSDYZ5tbQa6je++4iaOjiyRPerz/3mfUMe/UcUw4kyoivd+94ZA9w?= =?us-ascii?Q?yYDX8N0t8KCO0IrzSB4EVV+G5SdsAWGloAzYtMxENWAYH08kJiuFQcc7Z1g5?= =?us-ascii?Q?jj2SRh8yuPipEHS0Yg6VfjBgxiLGWqq6j7ESeVISFgnxjIQ3U2Yxy+ICRszX?= =?us-ascii?Q?QTl+lL+G1LbURHnF1uSGlyEp3xnw64znMJqfrOGtb/ujwUPv2YjjaE2/bYBx?= =?us-ascii?Q?wxqNcR/HVdTtnJa2hCbBhC7akEW5fgAjTnlcKn9QhF0vulK7q6vmwTHD2Sql?= =?us-ascii?Q?6wieguEnoh9DBTtOL7g6LWiITZnNetHBCd3tO2uokG4W9vEAiOi49dwIyPbj?= =?us-ascii?Q?9meS1n93ScqTL4aDDCS93vkC9p7kFi3r/NfMPwT28ymwzJdAfPKWVjghDb5I?= =?us-ascii?Q?wzg18BDUwovAFgOaGC2+FAFi9i95jwtuHWbXX9GMM1W/7UWrAwv224J+cqTn?= =?us-ascii?Q?bpopN3zJCqJPnuh2MVOOs/z2aXosNC1QnJ7ZkL5rhizeknyAXaMcdY0EJtes?= =?us-ascii?Q?UvmOcXOgQsYYq9hKoXYQxQx4fycBDacy21ln4E60+V25vhHfP8ynRX4oK9Ap?= =?us-ascii?Q?S+oAeEfJCOvoZh3h3K0ulAZoo7quwD9wvGF6fJm0/VOCeQx497+5XvTXXN6S?= =?us-ascii?Q?DBgpZEiDGu1WX52CoQEdjlmViwE6WIttog+RnWSgTdZPcvyeRD8A3HnVt4vi?= =?us-ascii?Q?OcIzvgGhfi3c93C+tA5FYpl6kzh3sC46sc6D2?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1971; 5:YfnLtCYbBn8kC8TkRpmia7Oefk6AUIcr6Te7xnvK57wX+noGXQSjCqZulllLs9FyCBWqbEADF6afmbIeqJF3ufFi3r+icLekjtOJ9O+VbGtK/Y2BgrXXRn1C92Q+PeCuwse49B8rRnOkWGBcInL54w==; 24:RoC5OCanW/iij/UOeR8RPfDU2ZhX1kZJQ0qwa6CkOvlS8gFvy6fBvuSZ0izeDX7mar2QOTb03Wz/y+aw0Hziy3ukZwCIWJxm2BJGxM9M2QI=; 20:kWAC7JQtNT6KcyxAfMksIsU09n613/2vQOql4VA5YiMiSyrRr2tKSwWwiTaSxBA9ZiiYsZhWpM/100pZfJV1JQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2015 14:20:07.4164 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1971 Subject: [dpdk-dev] [PATCH 2/3] arm64: acl: add neon based acl implementation 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: Mon, 02 Nov 2015 14:20:12 -0000 Signed-off-by: Jerin Jacob --- app/test-acl/main.c | 4 + lib/librte_acl/Makefile | 5 + lib/librte_acl/acl.h | 4 + lib/librte_acl/acl_run_neon.c | 46 +++++++ lib/librte_acl/acl_run_neon.h | 290 ++++++++++++++++++++++++++++++++++++++++++ lib/librte_acl/rte_acl.c | 25 ++++ lib/librte_acl/rte_acl.h | 1 + 7 files changed, 375 insertions(+) create mode 100644 lib/librte_acl/acl_run_neon.c create mode 100644 lib/librte_acl/acl_run_neon.h diff --git a/app/test-acl/main.c b/app/test-acl/main.c index 72ce83c..0b0c093 100644 --- a/app/test-acl/main.c +++ b/app/test-acl/main.c @@ -101,6 +101,10 @@ static const struct acl_alg acl_alg[] = { .name = "avx2", .alg = RTE_ACL_CLASSIFY_AVX2, }, + { + .name = "neon", + .alg = RTE_ACL_CLASSIFY_NEON, + }, }; static struct { diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile index 7a1cf8a..27f91d5 100644 --- a/lib/librte_acl/Makefile +++ b/lib/librte_acl/Makefile @@ -48,9 +48,14 @@ SRCS-$(CONFIG_RTE_LIBRTE_ACL) += rte_acl.c SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_bld.c SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_gen.c SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c +ifeq ($(CONFIG_RTE_ARCH_ARM64),y) +SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c +else SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c +endif CFLAGS_acl_run_sse.o += -msse4.1 +CFLAGS_acl_run_neon.o += -flax-vector-conversions -Wno-maybe-uninitialized # # If the compiler supports AVX2 instructions, diff --git a/lib/librte_acl/acl.h b/lib/librte_acl/acl.h index eb4930c..09d6784 100644 --- a/lib/librte_acl/acl.h +++ b/lib/librte_acl/acl.h @@ -230,6 +230,10 @@ int rte_acl_classify_avx2(const struct rte_acl_ctx *ctx, const uint8_t **data, uint32_t *results, uint32_t num, uint32_t categories); +int +rte_acl_classify_neon(const struct rte_acl_ctx *ctx, const uint8_t **data, + uint32_t *results, uint32_t num, uint32_t categories); + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/lib/librte_acl/acl_run_neon.c b/lib/librte_acl/acl_run_neon.c new file mode 100644 index 0000000..b014451 --- /dev/null +++ b/lib/librte_acl/acl_run_neon.c @@ -0,0 +1,46 @@ +/* + * BSD LICENSE + * + * Copyright (C) Cavium networks Ltd. 2015. + * + * 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. +*/ + +#include "acl_run_neon.h" + +int +rte_acl_classify_neon(const struct rte_acl_ctx *ctx, const uint8_t **data, + uint32_t *results, uint32_t num, uint32_t categories) +{ + if (likely(num >= 8)) + return search_neon_8(ctx, data, results, num, categories); + else if (num >= 4) + return search_neon_4(ctx, data, results, num, categories); + else + return rte_acl_classify_scalar(ctx, data, results, num, + categories); +} diff --git a/lib/librte_acl/acl_run_neon.h b/lib/librte_acl/acl_run_neon.h new file mode 100644 index 0000000..4579476 --- /dev/null +++ b/lib/librte_acl/acl_run_neon.h @@ -0,0 +1,290 @@ +/* + * BSD LICENSE + * + * Copyright (C) Cavium networks Ltd. 2015. + * + * 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. +*/ + +#include "acl_run.h" +#include "acl_vect.h" + +struct _neon_acl_const { + rte_xmm_t xmm_shuffle_input; + rte_xmm_t xmm_index_mask; + rte_xmm_t range_base; +} neon_acl_const __attribute__((aligned(RTE_CACHE_LINE_SIZE))) = { + { + .u32 = {0x00000000, 0x04040404, 0x08080808, 0x0c0c0c0c} + }, + { + .u32 = {RTE_ACL_NODE_INDEX, RTE_ACL_NODE_INDEX, + RTE_ACL_NODE_INDEX, RTE_ACL_NODE_INDEX} + }, + { + .u32 = {0xffffff00, 0xffffff04, 0xffffff08, 0xffffff0c} + }, +}; + +/* + * Resolve priority for multiple results (neon version). + * This consists comparing the priority of the current traversal with the + * running set of results for the packet. + * For each result, keep a running array of the result (rule number) and + * its priority for each category. + */ +static inline void +resolve_priority_neon(uint64_t transition, int n, const struct rte_acl_ctx *ctx, + struct parms *parms, + const struct rte_acl_match_results *p, + uint32_t categories) +{ + uint32_t x; + int32x4_t results, priority, results1, priority1; + uint32x4_t selector; + int32_t *saved_results, *saved_priority; + + for (x = 0; x < categories; x += RTE_ACL_RESULTS_MULTIPLIER) { + saved_results = (int32_t *)(&parms[n].cmplt->results[x]); + saved_priority = (int32_t *)(&parms[n].cmplt->priority[x]); + + /* get results and priorities for completed trie */ + results = vld1q_s32( + (const int32_t *)&p[transition].results[x]); + priority = vld1q_s32( + (const int32_t *)&p[transition].priority[x]); + + /* if this is not the first completed trie */ + if (parms[n].cmplt->count != ctx->num_tries) { + /* get running best results and their priorities */ + results1 = vld1q_s32(saved_results); + priority1 = vld1q_s32(saved_priority); + + /* select results that are highest priority */ + selector = vcgtq_s32(priority1, priority); + results = vbslq_s32(selector, results1, results); + priority = vbslq_s32(selector, priority1, priority); + } + + /* save running best results and their priorities */ + vst1q_s32(saved_results, results); + vst1q_s32(saved_priority, priority); + } +} + +/* + * Check for any match in 4 transitions + */ +static inline __attribute__((always_inline)) uint32_t +check_any_match_x4(uint64_t val[]) +{ + return ((val[0] | val[1] | val[2] | val[3]) & RTE_ACL_NODE_MATCH); +} + +static inline __attribute__((always_inline)) void +acl_match_check_x4(int slot, const struct rte_acl_ctx *ctx, struct parms *parms, + struct acl_flow_data *flows, uint64_t transitions[]) +{ + while (check_any_match_x4(transitions)) { + transitions[0] = acl_match_check(transitions[0], slot, ctx, + parms, flows, resolve_priority_neon); + transitions[1] = acl_match_check(transitions[1], slot + 1, ctx, + parms, flows, resolve_priority_neon); + transitions[2] = acl_match_check(transitions[2], slot + 2, ctx, + parms, flows, resolve_priority_neon); + transitions[3] = acl_match_check(transitions[3], slot + 3, ctx, + parms, flows, resolve_priority_neon); + } +} + +/* + * Process 4 transitions (in 2 NEON Q registers) in parallel + */ +static inline __attribute__((always_inline)) int32x4_t +transition4(int32x4_t next_input, const uint64_t *trans, uint64_t transitions[]) +{ + int32x4x2_t tr_hi_lo; + int32x4_t t, in, r; + uint32x4_t index_msk, node_type, addr; + uint32x4_t dfa_msk, mask, quad_ofs, dfa_ofs; + + /* Move low 32 into tr_hi_lo.val[0] and high 32 into tr_hi_lo.val[1] */ + tr_hi_lo = vld2q_s32((const int32_t *)transitions); + + /* Calculate the address (array index) for all 4 transitions. */ + + index_msk = vld1q_u32((const uint32_t *)&neon_acl_const.xmm_index_mask); + + /* Calc node type and node addr */ + node_type = vbicq_s32(tr_hi_lo.val[0], index_msk); + addr = vandq_s32(tr_hi_lo.val[0], index_msk); + + /* t = 0 */ + t = veorq_s32(node_type, node_type); + + /* mask for DFA type(0) nodes */ + dfa_msk = vceqq_u32(node_type, t); + + mask = vld1q_s32((const int32_t *)&neon_acl_const.xmm_shuffle_input); + in = vqtbl1q_u8((uint8x16_t)next_input, (uint8x16_t)mask); + + /* DFA calculations. */ + r = vshrq_n_u32(in, 30); /* div by 64 */ + mask = vld1q_s32((const int32_t *)&neon_acl_const.range_base); + r = vaddq_u8(r, mask); + t = vshrq_n_u32(in, 24); + r = vqtbl1q_u8((uint8x16_t)tr_hi_lo.val[1], (uint8x16_t)r); + dfa_ofs = vsubq_s32(t, r); + + /* QUAD/SINGLE calculations. */ + t = vcgtq_s8(in, tr_hi_lo.val[1]); + t = vabsq_s8(t); + t = vpaddlq_u8(t); + quad_ofs = vpaddlq_u16(t); + + /* blend DFA and QUAD/SINGLE. */ + t = vbslq_u8(dfa_msk, dfa_ofs, quad_ofs); + + /* calculate address for next transitions */ + addr = vaddq_u32(addr, t); + + /* Fill next transitions */ + transitions[0] = trans[vgetq_lane_u32(addr, 0)]; + transitions[1] = trans[vgetq_lane_u32(addr, 1)]; + transitions[2] = trans[vgetq_lane_u32(addr, 2)]; + transitions[3] = trans[vgetq_lane_u32(addr, 3)]; + + return vshrq_n_u32(next_input, CHAR_BIT); +} + +/* + * Execute trie traversal with 8 traversals in parallel + */ +static inline int +search_neon_8(const struct rte_acl_ctx *ctx, const uint8_t **data, + uint32_t *results, uint32_t total_packets, uint32_t categories) +{ + int n; + struct acl_flow_data flows; + uint64_t index_array[8]; + struct completion cmplt[8]; + struct parms parms[8]; + int32x4_t input0, input1; + + acl_set_flow(&flows, cmplt, RTE_DIM(cmplt), data, results, + total_packets, categories, ctx->trans_table); + + for (n = 0; n < 8; n++) { + cmplt[n].count = 0; + index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); + } + + /* Check for any matches. */ + acl_match_check_x4(0, ctx, parms, &flows, &index_array[0]); + acl_match_check_x4(4, ctx, parms, &flows, &index_array[4]); + + while (flows.started > 0) { + /* Gather 4 bytes of input data for each stream. */ + input0 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 0), input0, 0); + input1 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 4), input1, 0); + + input0 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 1), input0, 1); + input1 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 5), input1, 1); + + input0 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 2), input0, 2); + input1 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 6), input1, 2); + + input0 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 3), input0, 3); + input1 = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 7), input1, 3); + + /* Process the 4 bytes of input on each stream. */ + + input0 = transition4(input0, flows.trans, &index_array[0]); + input1 = transition4(input1, flows.trans, &index_array[4]); + + input0 = transition4(input0, flows.trans, &index_array[0]); + input1 = transition4(input1, flows.trans, &index_array[4]); + + input0 = transition4(input0, flows.trans, &index_array[0]); + input1 = transition4(input1, flows.trans, &index_array[4]); + + input0 = transition4(input0, flows.trans, &index_array[0]); + input1 = transition4(input1, flows.trans, &index_array[4]); + + /* Check for any matches. */ + acl_match_check_x4(0, ctx, parms, &flows, &index_array[0]); + acl_match_check_x4(4, ctx, parms, &flows, &index_array[4]); + } + + return 0; +} + +/* + * Execute trie traversal with 4 traversals in parallel + */ +static inline int +search_neon_4(const struct rte_acl_ctx *ctx, const uint8_t **data, + uint32_t *results, int total_packets, uint32_t categories) +{ + int n; + struct acl_flow_data flows; + uint64_t index_array[4]; + struct completion cmplt[4]; + struct parms parms[4]; + int32x4_t input; + + acl_set_flow(&flows, cmplt, RTE_DIM(cmplt), data, results, + total_packets, categories, ctx->trans_table); + + for (n = 0; n < 4; n++) { + cmplt[n].count = 0; + index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); + } + + /* Check for any matches. */ + acl_match_check_x4(0, ctx, parms, &flows, index_array); + + while (flows.started > 0) { + /* Gather 4 bytes of input data for each stream. */ + input = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 0), input, 0); + input = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 1), input, 1); + input = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 2), input, 2); + input = vsetq_lane_s32(GET_NEXT_4BYTES(parms, 3), input, 3); + + /* Process the 4 bytes of input on each stream. */ + input = transition4(input, flows.trans, index_array); + input = transition4(input, flows.trans, index_array); + input = transition4(input, flows.trans, index_array); + input = transition4(input, flows.trans, index_array); + + /* Check for any matches. */ + acl_match_check_x4(0, ctx, parms, &flows, index_array); + } + + return 0; +} + diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c index d60219f..e2fdebd 100644 --- a/lib/librte_acl/rte_acl.c +++ b/lib/librte_acl/rte_acl.c @@ -55,11 +55,32 @@ rte_acl_classify_avx2(__rte_unused const struct rte_acl_ctx *ctx, return -ENOTSUP; } +int __attribute__ ((weak)) +rte_acl_classify_sse(__rte_unused const struct rte_acl_ctx *ctx, + __rte_unused const uint8_t **data, + __rte_unused uint32_t *results, + __rte_unused uint32_t num, + __rte_unused uint32_t categories) +{ + return -ENOTSUP; +} + +int __attribute__ ((weak)) +rte_acl_classify_neon(__rte_unused const struct rte_acl_ctx *ctx, + __rte_unused const uint8_t **data, + __rte_unused uint32_t *results, + __rte_unused uint32_t num, + __rte_unused uint32_t categories) +{ + return -ENOTSUP; +} + static const rte_acl_classify_t classify_fns[] = { [RTE_ACL_CLASSIFY_DEFAULT] = rte_acl_classify_scalar, [RTE_ACL_CLASSIFY_SCALAR] = rte_acl_classify_scalar, [RTE_ACL_CLASSIFY_SSE] = rte_acl_classify_sse, [RTE_ACL_CLASSIFY_AVX2] = rte_acl_classify_avx2, + [RTE_ACL_CLASSIFY_NEON] = rte_acl_classify_neon, }; /* by default, use always available scalar code path. */ @@ -93,6 +114,9 @@ rte_acl_init(void) { enum rte_acl_classify_alg alg = RTE_ACL_CLASSIFY_DEFAULT; +#ifdef RTE_ARCH_ARM64 + alg = RTE_ACL_CLASSIFY_NEON; +#else #ifdef CC_AVX2_SUPPORT if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2)) alg = RTE_ACL_CLASSIFY_AVX2; @@ -102,6 +126,7 @@ rte_acl_init(void) #endif alg = RTE_ACL_CLASSIFY_SSE; +#endif rte_acl_set_default_classify(alg); } diff --git a/lib/librte_acl/rte_acl.h b/lib/librte_acl/rte_acl.h index 98ef2fc..0979a09 100644 --- a/lib/librte_acl/rte_acl.h +++ b/lib/librte_acl/rte_acl.h @@ -270,6 +270,7 @@ enum rte_acl_classify_alg { RTE_ACL_CLASSIFY_SCALAR = 1, /**< generic implementation. */ RTE_ACL_CLASSIFY_SSE = 2, /**< requires SSE4.1 support. */ RTE_ACL_CLASSIFY_AVX2 = 3, /**< requires AVX2 support. */ + RTE_ACL_CLASSIFY_NEON = 4, /**< requires NEON support. */ RTE_ACL_CLASSIFY_NUM /* should always be the last one. */ }; -- 2.1.0