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 A7BA145B51; Wed, 16 Oct 2024 16:14:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28DAE40150; Wed, 16 Oct 2024 16:14:25 +0200 (CEST) Received: from mail.lysator.liu.se (mail.lysator.liu.se [130.236.254.3]) by mails.dpdk.org (Postfix) with ESMTP id 56603400D6 for ; Wed, 16 Oct 2024 16:14:23 +0200 (CEST) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id DEDD019229 for ; Wed, 16 Oct 2024 16:14:22 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id D043A191C5; Wed, 16 Oct 2024 16:14:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on hermod.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,AWL, T_SCC_BODY_TEXT_LINE autolearn=disabled version=4.0.0 X-Spam-Score: -1.2 Received: from [192.168.1.85] (h-62-63-215-114.A163.priv.bahnhof.se [62.63.215.114]) (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 mail.lysator.liu.se (Postfix) with ESMTPSA id 24B0B19132; Wed, 16 Oct 2024 16:14:20 +0200 (CEST) Message-ID: <56a2edd6-b464-47af-a56f-a8766e57cb2c@lysator.liu.se> Date: Wed, 16 Oct 2024 16:14:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/4] bitset: fix build for GCC without experimental API To: David Marchand , dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, ktraynor@redhat.com, =?UTF-8?Q?Morten_Br=C3=B8rup?= , =?UTF-8?Q?Mattias_R=C3=B6nnblom?= , Tyler Retzlaff References: <20241015121046.2556695-1-david.marchand@redhat.com> <20241016113817.3956187-1-david.marchand@redhat.com> <20241016113817.3956187-3-david.marchand@redhat.com> Content-Language: en-US From: =?UTF-8?Q?Mattias_R=C3=B6nnblom?= In-Reply-To: <20241016113817.3956187-3-david.marchand@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP 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 On 2024-10-16 13:38, David Marchand wrote: > 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 > Acked-by: Morten Brørup > --- > lib/eal/include/rte_bitset.h | 123 +++++++++++++++++++++++++++++++++++ > 1 file changed, 123 insertions(+) > > diff --git a/lib/eal/include/rte_bitset.h b/lib/eal/include/rte_bitset.h > index 74c643a72a..8ae8425fc2 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); > + return false; This is no RTE_VERIFY(0) here, because this is just dummy code, that will never be run. Is that correct? > +#endif > } > > /** > @@ -277,7 +283,12 @@ __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); > +#endif > } > > /** > @@ -299,7 +310,12 @@ __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); > +#endif > } > > /** > @@ -323,7 +339,13 @@ __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); > +#endif > } > > /** > @@ -345,7 +367,12 @@ __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); > +#endif > } > > /** > @@ -370,7 +397,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); > + return false; > +#endif > } > > /** > @@ -399,7 +433,13 @@ __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); > +#endif > } > > /** > @@ -428,7 +468,13 @@ __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); > +#endif > } > > /** > @@ -459,7 +505,14 @@ __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); > +#endif > } > > /** > @@ -488,7 +541,13 @@ __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); > +#endif > } > > /** > @@ -524,7 +583,12 @@ __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); > +#endif > } > > /** > @@ -576,7 +640,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); > + return 0; > +#endif > } > > #define __RTE_BITSET_FIND_FLAG_FIND_CLEAR (1U << 0) > @@ -638,6 +708,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; > @@ -658,6 +729,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); > + return 0; > +#endif > } > > /** > @@ -681,7 +760,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); > + return 0; > +#endif > } > > /** > @@ -711,7 +796,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); > + return 0; > +#endif > } > > /** > @@ -742,7 +835,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); > + return 0; > +#endif > } > > /** > @@ -766,7 +867,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); > + return 0; > +#endif > } > > /** > @@ -796,7 +903,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); > + return 0; > +#endif > } > > /** > @@ -827,8 +942,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); > + return 0; > +#endif > } > > /**