From patchwork Thu Dec 5 20:35:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Muezerie X-Patchwork-Id: 149047 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AFB1045E3C; Thu, 5 Dec 2024 21:36:27 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4E8240E03; Thu, 5 Dec 2024 21:36:14 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 107BE40B91 for ; Thu, 5 Dec 2024 21:36:10 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 3A79A20ACD85; Thu, 5 Dec 2024 12:36:09 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3A79A20ACD85 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733430969; bh=NGt0C47e6u1nb/xVzGEu1D8vf9tmCNwG/dqehRSLoQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X/uqSiC/ONE9kitSOaYgT9zHL9wyyMCcIA3mz0+7lAJmFEV9rIW8lemIxibS8QTL1 +2EEh+uSwoGOREfrF5q9u7u//iqWUT51mSLhzd9+unL+xZQvW93qJsoCdqSjWt+k6u iwwlU+uCbe290nKbq3rzCnqW4mGiU2Z6YUxIQdfY= From: Andre Muezerie To: dev@dpdk.org Cc: Tyler Retzlaff Subject: [PATCH v2 1/3] eal: provide movdiri for MSVC Date: Thu, 5 Dec 2024 12:35:48 -0800 Message-Id: <1733430950-10412-2-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1733430950-10412-1-git-send-email-andremue@linux.microsoft.com> References: <1710969879-23701-1-git-send-email-roretzla@linux.microsoft.com> <1733430950-10412-1-git-send-email-andremue@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Tyler Retzlaff MSVC does not support inline assembly. Instead it provides compiler intrinsics. Provide conditional compile for MSVC for movdiri using the _directstoreu_u32 intrinsic. Signed-off-by: Tyler Retzlaff --- lib/eal/x86/include/rte_io.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/eal/x86/include/rte_io.h b/lib/eal/x86/include/rte_io.h index f92a2e5295..7087e728ce 100644 --- a/lib/eal/x86/include/rte_io.h +++ b/lib/eal/x86/include/rte_io.h @@ -22,11 +22,15 @@ extern "C" { static __rte_always_inline void __rte_x86_movdiri(uint32_t value, volatile void *addr) { +#ifdef RTE_TOOLCHAIN_MSVC + _directstoreu_u32((void *)(uintptr_t)addr, value); +#else asm volatile( /* MOVDIRI */ ".byte 0x0f, 0x38, 0xf9, 0x02" : : "a" (value), "d" (addr)); +#endif } __rte_experimental From patchwork Thu Dec 5 20:35:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Muezerie X-Patchwork-Id: 149045 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 380EE45E3C; Thu, 5 Dec 2024 21:36:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F2DC40B9C; Thu, 5 Dec 2024 21:36:12 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id EA7B040A73 for ; Thu, 5 Dec 2024 21:36:09 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 4760220ACD86; Thu, 5 Dec 2024 12:36:09 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4760220ACD86 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733430969; bh=ipP59q4a8bU8s687NkQfrAHZeX5VlXdNr+dNKGeKz0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Asb5bw2EfDLvw70X1CykMAuL03Ud9zadbWWp6htbFnoUgSchAO866BZB9ozselPN2 zsw7XPvap1G0qXmdW7Ym3q4uTqlbjPARuFGC1a/mrdcqQ1jqVQ4X/RRnEQpblGJm1R AD8JPdJDwFscuXjZA9UctNtvTTIW33IjoHnPwH/w= From: Andre Muezerie To: dev@dpdk.org Cc: Tyler Retzlaff Subject: [PATCH v2 2/3] eal: add rte ffs32 and rte ffs64 inline functions Date: Thu, 5 Dec 2024 12:35:49 -0800 Message-Id: <1733430950-10412-3-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1733430950-10412-1-git-send-email-andremue@linux.microsoft.com> References: <1710969879-23701-1-git-send-email-roretzla@linux.microsoft.com> <1733430950-10412-1-git-send-email-andremue@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Tyler Retzlaff Provide toolchain abstraction for __builtin_ffs{,l,ll} gcc built-in intrinsics. Signed-off-by: Tyler Retzlaff --- lib/eal/include/rte_bitops.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h index deb1fd43f2..14074850ec 100644 --- a/lib/eal/include/rte_bitops.h +++ b/lib/eal/include/rte_bitops.h @@ -958,6 +958,28 @@ rte_popcount64(uint64_t v) return (unsigned int)__popcnt64(v); } +static inline unsigned int +rte_ffs32(uint32_t v) +{ + unsigned long rv; + + if (_BitScanForward(&rv, v) == 0) + return 0; + + return (unsigned int)rv + 1; +} + +static inline unsigned int +rte_ffs64(uint64_t v) +{ + unsigned long rv; + + if (_BitScanForward64(&rv, v) == 0) + return 0; + + return (unsigned int)rv + 1; +} + #else /** @@ -1044,6 +1066,18 @@ rte_popcount64(uint64_t v) return (unsigned int)__builtin_popcountll(v); } +static inline unsigned int +rte_ffs32(uint32_t v) +{ + return (unsigned int)__builtin_ffs(v); +} + +static inline unsigned int +rte_ffs64(uint64_t v) +{ + return (unsigned int)__builtin_ffsll(v); +} + #endif /** From patchwork Thu Dec 5 20:35:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Muezerie X-Patchwork-Id: 149046 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 324F945E3C; Thu, 5 Dec 2024 21:36:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8732240DD3; Thu, 5 Dec 2024 21:36:13 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 03F5540A87 for ; Thu, 5 Dec 2024 21:36:09 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 545F820ACD87; Thu, 5 Dec 2024 12:36:09 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 545F820ACD87 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733430969; bh=Zb9EKkm4A70gnrrCQpmqdDsDsjzf3Y+JRNcLFBXm0Hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RpX2KZ8eGJpPlBTxSoEEEzvecpqnBjmQTEHMOUIOVoYRwCJ/LvgeuELZLjuchwxtU 8fbDvr80/EvqwrWS4HO7Q1giOFMP4itzFr5jBMh5rRpqMH9Bn2IBRAxzRQ4LrcHmBz U6GYRAMtCDRA/pKS2o3WCLus/y5954UnfykRUiuI= From: Andre Muezerie To: dev@dpdk.org Cc: Andre Muezerie Subject: [PATCH v2 3/3] app/test: add test for rte_ffs32 and rte_ffs64 functions. Date: Thu, 5 Dec 2024 12:35:50 -0800 Message-Id: <1733430950-10412-4-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1733430950-10412-1-git-send-email-andremue@linux.microsoft.com> References: <1710969879-23701-1-git-send-email-roretzla@linux.microsoft.com> <1733430950-10412-1-git-send-email-andremue@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add tests for new rte_ffs32 and rte_ffs64 functions. Signed-off-by: Andre Muezerie --- app/test/test_bitops.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/app/test/test_bitops.c b/app/test/test_bitops.c index 78a7df6bb1..dd374d7883 100644 --- a/app/test/test_bitops.c +++ b/app/test/test_bitops.c @@ -406,6 +406,42 @@ test_bit_relaxed_test_set_clear(void) return TEST_SUCCESS; } +static int +test_bit_scan_forward(void) +{ + unsigned int bit_nr; + + TEST_ASSERT((bit_nr = rte_ffs32(0)) == 0, + "rte_ffs32 returned unexpected %d", bit_nr); + + for (int i = 0; i < 32; ++i) { + uint32_t n = RTE_BIT32(i); + + TEST_ASSERT((bit_nr = rte_ffs32(n)) == (unsigned int)(i+1), + "rte_ffs32 returned unexpected %d", bit_nr); + } + + return TEST_SUCCESS; +} + +static int +test_bit_scan_forward64(void) +{ + unsigned int bit_nr; + + TEST_ASSERT((bit_nr = rte_ffs64(0)) == 0, + "rte_ffs64 returned unexpected %d", bit_nr); + + for (int i = 0; i < 64; ++i) { + uint64_t n = RTE_BIT64(i); + + TEST_ASSERT((bit_nr = rte_ffs64(n)) == (unsigned int)(i+1), + "rte_ffs64 returned unexpected %d", bit_nr); + } + + return TEST_SUCCESS; +} + static struct unit_test_suite test_suite = { .suite_name = "Bitops test suite", .unit_test_cases = { @@ -428,6 +464,8 @@ static struct unit_test_suite test_suite = { TEST_CASE(test_bit_relaxed_set), TEST_CASE(test_bit_relaxed_clear), TEST_CASE(test_bit_relaxed_test_set_clear), + TEST_CASE(test_bit_scan_forward), + TEST_CASE(test_bit_scan_forward64), TEST_CASES_END() } };