Re: [PATCH v3 1/4] bitset: fix build for GCC without experimental API

Mattias Rönnblom Mon, 21 Oct 2024 10:57:38 -0700

On 2024-10-21 18:04, 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 <david.march...@redhat.com>
---
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
  }

/**


Reviewed-by: Mattias Rönnblom <mattias.ronnb...@ericsson.com>

Re: [PATCH v3 1/4] bitset: fix build for GCC without experimental API

Reply via email to