From: "Mattias Rönnblom" <mattias.ronnblom@ericsson.com>
To: <dev@dpdk.org>
Cc: "Mattias Rönnblom" <hofors@lysator.liu.se>,
"David Marchand" <david.marchand@redhat.com>,
"Thomas Monjalon" <thomas@monjalon.net>,
"Morten Brørup" <mb@smartsharesystems.com>,
"Mattias Rönnblom" <mattias.ronnblom@ericsson.com>
Subject: [PATCH 2/3] bitset: remove experimental bitops workaround
Date: Sun, 18 May 2025 10:05:55 +0200 [thread overview]
Message-ID: <20250518080556.675092-2-mattias.ronnblom@ericsson.com> (raw)
In-Reply-To: <20250518080556.675092-1-mattias.ronnblom@ericsson.com>
With bitops APIs used by bitset stable, the workaround required to fix
build for GCC without experimental API is no longer needed.
Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
---
lib/eal/include/rte_bitset.h | 132 -----------------------------------
1 file changed, 132 deletions(-)
diff --git a/lib/eal/include/rte_bitset.h b/lib/eal/include/rte_bitset.h
index 116121eec4..27b7a2e34d 100644
--- a/lib/eal/include/rte_bitset.h
+++ b/lib/eal/include/rte_bitset.h
@@ -255,13 +255,7 @@ __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
}
/**
@@ -283,13 +277,7 @@ __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
}
/**
@@ -311,13 +299,7 @@ __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
}
/**
@@ -341,14 +323,7 @@ __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
}
/**
@@ -370,13 +345,7 @@ __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
}
/**
@@ -401,14 +370,7 @@ __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
}
/**
@@ -437,14 +399,7 @@ __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
}
/**
@@ -473,14 +428,7 @@ __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
}
/**
@@ -511,15 +459,7 @@ __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
}
/**
@@ -548,14 +488,7 @@ __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
}
/**
@@ -591,13 +524,7 @@ __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
}
/**
@@ -649,13 +576,7 @@ __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)
@@ -714,7 +635,6 @@ 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;
@@ -735,14 +655,6 @@ __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
}
/**
@@ -766,13 +678,7 @@ __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
}
/**
@@ -802,15 +708,7 @@ __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
}
/**
@@ -841,15 +739,7 @@ __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
}
/**
@@ -873,13 +763,7 @@ __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
}
/**
@@ -909,15 +793,7 @@ __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
}
/**
@@ -948,16 +824,8 @@ __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.43.0
next prev parent reply other threads:[~2025-05-18 8:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-18 8:05 [PATCH 1/3] bitops: promote bit manipulation API to stable Mattias Rönnblom
2025-05-18 8:05 ` Mattias Rönnblom [this message]
2025-05-18 8:05 ` [PATCH 3/3] bitset: promote API stable Mattias Rönnblom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250518080556.675092-2-mattias.ronnblom@ericsson.com \
--to=mattias.ronnblom@ericsson.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=hofors@lysator.liu.se \
--cc=mb@smartsharesystems.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).