From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F035E45B94; Mon, 21 Oct 2024 18:05:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD0D9402C6; Mon, 21 Oct 2024 18:05:09 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7E36A402E2 for ; Mon, 21 Oct 2024 18:05:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729526707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lkNukZeKMzqPa/SkhCnnTyhLjNClxdr3GrqolC7qEnk=; b=DOT79igKLo9Fv8u19mViDK5Aqeyy9mEcUF5syFFCXI2WCdM4dsnFMraYQ2XKFjEmMe6vT2 1WlgdWGF3DLfsiM4shZtDVX8b9/jCYLuq1f8GLO5WevvVMMTntQoIomn0gOI9sUtR8cjLA tIockQdRCiW6g1uq6EarGmRrHy5gjvY= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-458-CzeULU-OPIe72Tv_wnzMzg-1; Mon, 21 Oct 2024 12:05:04 -0400 X-MC-Unique: CzeULU-OPIe72Tv_wnzMzg-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A7831955EE9; Mon, 21 Oct 2024 16:05:02 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.57]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C104830001A3; Mon, 21 Oct 2024 16:04:59 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, ktraynor@redhat.com, =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , Tyler Retzlaff , =?UTF-8?q?Morten=20Br=C3=B8rup?= Subject: [PATCH v3 1/4] bitset: fix build for GCC without experimental API Date: Mon, 21 Oct 2024 18:04:44 +0200 Message-ID: <20241021160447.3538245-2-david.marchand@redhat.com> In-Reply-To: <20241021160447.3538245-1-david.marchand@redhat.com> References: <20241015121046.2556695-1-david.marchand@redhat.com> <20241021160447.3538245-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 For a reason similar to the change on bitops header, hide bitset implementation relying on experimental API. Fixes: 99a1197647d8 ("eal: add bitset type") Signed-off-by: David Marchand --- Changes since v2: - added a runtime assert so that an application won't call those experimental APIs, --- lib/eal/include/rte_bitset.h | 132 +++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/lib/eal/include/rte_bitset.h b/lib/eal/include/rte_bitset.h index 27b7a2e34d..116121eec4 100644 --- a/lib/eal/include/rte_bitset.h +++ b/lib/eal/include/rte_bitset.h @@ -255,7 +255,13 @@ __rte_experimental static inline bool rte_bitset_test(const uint64_t *bitset, size_t bit_num) { +#ifdef ALLOW_EXPERIMENTAL_API return __RTE_BITSET_DELEGATE(rte_bit_test, bitset, bit_num); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_VERIFY(false); +#endif } /** @@ -277,7 +283,13 @@ __rte_experimental static inline void rte_bitset_set(uint64_t *bitset, size_t bit_num) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE(rte_bit_set, bitset, bit_num); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_VERIFY(false); +#endif } /** @@ -299,7 +311,13 @@ __rte_experimental static inline void rte_bitset_clear(uint64_t *bitset, size_t bit_num) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE(rte_bit_clear, bitset, bit_num); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_VERIFY(false); +#endif } /** @@ -323,7 +341,14 @@ __rte_experimental static inline void rte_bitset_assign(uint64_t *bitset, size_t bit_num, bool bit_value) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE_N(rte_bit_assign, bitset, bit_num, bit_value); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_SET_USED(bit_value); + RTE_VERIFY(false); +#endif } /** @@ -345,7 +370,13 @@ __rte_experimental static inline void rte_bitset_flip(uint64_t *bitset, size_t bit_num) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE(rte_bit_flip, bitset, bit_num); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_VERIFY(false); +#endif } /** @@ -370,7 +401,14 @@ __rte_experimental static inline bool rte_bitset_atomic_test(const uint64_t *bitset, size_t bit_num, int memory_order) { +#ifdef ALLOW_EXPERIMENTAL_API return __RTE_BITSET_DELEGATE_N(rte_bit_atomic_test, bitset, bit_num, memory_order); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_SET_USED(memory_order); + RTE_VERIFY(false); +#endif } /** @@ -399,7 +437,14 @@ __rte_experimental static inline void rte_bitset_atomic_set(uint64_t *bitset, size_t bit_num, int memory_order) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE_N(rte_bit_atomic_set, bitset, bit_num, memory_order); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_SET_USED(memory_order); + RTE_VERIFY(false); +#endif } /** @@ -428,7 +473,14 @@ __rte_experimental static inline void rte_bitset_atomic_clear(uint64_t *bitset, size_t bit_num, int memory_order) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE_N(rte_bit_atomic_clear, bitset, bit_num, memory_order); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_SET_USED(memory_order); + RTE_VERIFY(false); +#endif } /** @@ -459,7 +511,15 @@ __rte_experimental static inline void rte_bitset_atomic_assign(uint64_t *bitset, size_t bit_num, bool bit_value, int memory_order) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE_N(rte_bit_atomic_assign, bitset, bit_num, bit_value, memory_order); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_SET_USED(bit_value); + RTE_SET_USED(memory_order); + RTE_VERIFY(false); +#endif } /** @@ -488,7 +548,14 @@ __rte_experimental static inline void rte_bitset_atomic_flip(uint64_t *bitset, size_t bit_num, int memory_order) { +#ifdef ALLOW_EXPERIMENTAL_API __RTE_BITSET_DELEGATE_N(rte_bit_atomic_flip, bitset, bit_num, memory_order); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(bit_num); + RTE_SET_USED(memory_order); + RTE_VERIFY(false); +#endif } /** @@ -524,7 +591,13 @@ __rte_experimental static inline void rte_bitset_clear_all(uint64_t *bitset, size_t size) { +#ifdef ALLOW_EXPERIMENTAL_API rte_bitset_init(bitset, size); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_VERIFY(false); +#endif } /** @@ -576,7 +649,13 @@ __rte_experimental static inline size_t rte_bitset_count_clear(const uint64_t *bitset, size_t size) { +#ifdef ALLOW_EXPERIMENTAL_API return size - rte_bitset_count_set(bitset, size); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_VERIFY(false); +#endif } #define __RTE_BITSET_FIND_FLAG_FIND_CLEAR (1U << 0) @@ -635,6 +714,7 @@ static inline ssize_t __rte_bitset_find(const uint64_t *bitset, size_t size, size_t start_bit, size_t len, unsigned int flags) { +#ifdef ALLOW_EXPERIMENTAL_API bool find_clear = flags & __RTE_BITSET_FIND_FLAG_FIND_CLEAR; bool may_wrap = flags & __RTE_BITSET_FIND_FLAG_WRAP; bool does_wrap = (start_bit + len) > size; @@ -655,6 +735,14 @@ __rte_bitset_find(const uint64_t *bitset, size_t size, size_t start_bit, size_t rc = __rte_bitset_find_nowrap(bitset, size, start_bit, len, find_clear); return rc; +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_SET_USED(start_bit); + RTE_SET_USED(len); + RTE_SET_USED(flags); + RTE_VERIFY(false); +#endif } /** @@ -678,7 +766,13 @@ __rte_experimental static inline ssize_t rte_bitset_find_first_set(const uint64_t *bitset, size_t size) { +#ifdef ALLOW_EXPERIMENTAL_API return __rte_bitset_find(bitset, size, 0, size, 0); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_VERIFY(false); +#endif } /** @@ -708,7 +802,15 @@ __rte_experimental static inline ssize_t rte_bitset_find_set(const uint64_t *bitset, size_t size, size_t start_bit, size_t len) { +#ifdef ALLOW_EXPERIMENTAL_API return __rte_bitset_find(bitset, size, start_bit, len, 0); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_SET_USED(start_bit); + RTE_SET_USED(len); + RTE_VERIFY(false); +#endif } /** @@ -739,7 +841,15 @@ __rte_experimental static inline ssize_t rte_bitset_find_set_wrap(const uint64_t *bitset, size_t size, size_t start_bit, size_t len) { +#ifdef ALLOW_EXPERIMENTAL_API return __rte_bitset_find(bitset, size, start_bit, len, __RTE_BITSET_FIND_FLAG_WRAP); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_SET_USED(start_bit); + RTE_SET_USED(len); + RTE_VERIFY(false); +#endif } /** @@ -763,7 +873,13 @@ __rte_experimental static inline ssize_t rte_bitset_find_first_clear(const uint64_t *bitset, size_t size) { +#ifdef ALLOW_EXPERIMENTAL_API return __rte_bitset_find(bitset, size, 0, size, __RTE_BITSET_FIND_FLAG_FIND_CLEAR); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_VERIFY(false); +#endif } /** @@ -793,7 +909,15 @@ __rte_experimental static inline ssize_t rte_bitset_find_clear(const uint64_t *bitset, size_t size, size_t start_bit, size_t len) { +#ifdef ALLOW_EXPERIMENTAL_API return __rte_bitset_find(bitset, size, start_bit, len, __RTE_BITSET_FIND_FLAG_FIND_CLEAR); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_SET_USED(start_bit); + RTE_SET_USED(len); + RTE_VERIFY(false); +#endif } /** @@ -824,8 +948,16 @@ __rte_experimental static inline ssize_t rte_bitset_find_clear_wrap(const uint64_t *bitset, size_t size, size_t start_bit, size_t len) { +#ifdef ALLOW_EXPERIMENTAL_API return __rte_bitset_find(bitset, size, start_bit, len, __RTE_BITSET_FIND_FLAG_FIND_CLEAR | __RTE_BITSET_FIND_FLAG_WRAP); +#else + RTE_SET_USED(bitset); + RTE_SET_USED(size); + RTE_SET_USED(start_bit); + RTE_SET_USED(len); + RTE_VERIFY(false); +#endif } /** -- 2.46.2