Commit fdae96a3 authored by Yury Norov's avatar Yury Norov

lib/find: optimize for_each() macros

Moving an iterator of the macros inside conditional part of for-loop
helps to generate a better code. It had been first implemented in commit
7baac8b9 ("cpumask: make for_each_cpu_mask a bit smaller").

Now that cpumask for-loops are the aliases to bitmap loops, it's worth
to optimize them the same way.

Bloat-o-meter says:
add/remove: 8/12 grow/shrink: 147/592 up/down: 4876/-24416 (-19540)
Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent 4fe49b3b
...@@ -458,31 +458,25 @@ unsigned long find_next_bit_le(const void *addr, unsigned ...@@ -458,31 +458,25 @@ unsigned long find_next_bit_le(const void *addr, unsigned
#endif #endif
#define for_each_set_bit(bit, addr, size) \ #define for_each_set_bit(bit, addr, size) \
for ((bit) = find_next_bit((addr), (size), 0); \ for ((bit) = 0; (bit) = find_next_bit((addr), (size), (bit)), (bit) < (size); (bit)++)
(bit) < (size); \
(bit) = find_next_bit((addr), (size), (bit) + 1))
#define for_each_and_bit(bit, addr1, addr2, size) \ #define for_each_and_bit(bit, addr1, addr2, size) \
for ((bit) = find_next_and_bit((addr1), (addr2), (size), 0); \ for ((bit) = 0; \
(bit) < (size); \ (bit) = find_next_and_bit((addr1), (addr2), (size), (bit)), (bit) < (size);\
(bit) = find_next_and_bit((addr1), (addr2), (size), (bit) + 1)) (bit)++)
/* same as for_each_set_bit() but use bit as value to start with */ /* same as for_each_set_bit() but use bit as value to start with */
#define for_each_set_bit_from(bit, addr, size) \ #define for_each_set_bit_from(bit, addr, size) \
for ((bit) = find_next_bit((addr), (size), (bit)); \ for (; (bit) = find_next_bit((addr), (size), (bit)), (bit) < (size); (bit)++)
(bit) < (size); \
(bit) = find_next_bit((addr), (size), (bit) + 1))
#define for_each_clear_bit(bit, addr, size) \ #define for_each_clear_bit(bit, addr, size) \
for ((bit) = find_next_zero_bit((addr), (size), 0); \ for ((bit) = 0; \
(bit) < (size); \ (bit) = find_next_zero_bit((addr), (size), (bit)), (bit) < (size); \
(bit) = find_next_zero_bit((addr), (size), (bit) + 1)) (bit)++)
/* same as for_each_clear_bit() but use bit as value to start with */ /* same as for_each_clear_bit() but use bit as value to start with */
#define for_each_clear_bit_from(bit, addr, size) \ #define for_each_clear_bit_from(bit, addr, size) \
for ((bit) = find_next_zero_bit((addr), (size), (bit)); \ for (; (bit) = find_next_zero_bit((addr), (size), (bit)), (bit) < (size); (bit)++)
(bit) < (size); \
(bit) = find_next_zero_bit((addr), (size), (bit) + 1))
/** /**
* for_each_set_bitrange - iterate over all set bit ranges [b; e) * for_each_set_bitrange - iterate over all set bit ranges [b; e)
...@@ -492,11 +486,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned ...@@ -492,11 +486,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned
* @size: bitmap size in number of bits * @size: bitmap size in number of bits
*/ */
#define for_each_set_bitrange(b, e, addr, size) \ #define for_each_set_bitrange(b, e, addr, size) \
for ((b) = find_next_bit((addr), (size), 0), \ for ((b) = 0; \
(e) = find_next_zero_bit((addr), (size), (b) + 1); \ (b) = find_next_bit((addr), (size), b), \
(e) = find_next_zero_bit((addr), (size), (b) + 1), \
(b) < (size); \ (b) < (size); \
(b) = find_next_bit((addr), (size), (e) + 1), \ (b) = (e) + 1)
(e) = find_next_zero_bit((addr), (size), (b) + 1))
/** /**
* for_each_set_bitrange_from - iterate over all set bit ranges [b; e) * for_each_set_bitrange_from - iterate over all set bit ranges [b; e)
...@@ -506,11 +500,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned ...@@ -506,11 +500,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned
* @size: bitmap size in number of bits * @size: bitmap size in number of bits
*/ */
#define for_each_set_bitrange_from(b, e, addr, size) \ #define for_each_set_bitrange_from(b, e, addr, size) \
for ((b) = find_next_bit((addr), (size), (b)), \ for (; \
(e) = find_next_zero_bit((addr), (size), (b) + 1); \ (b) = find_next_bit((addr), (size), (b)), \
(e) = find_next_zero_bit((addr), (size), (b) + 1), \
(b) < (size); \ (b) < (size); \
(b) = find_next_bit((addr), (size), (e) + 1), \ (b) = (e) + 1)
(e) = find_next_zero_bit((addr), (size), (b) + 1))
/** /**
* for_each_clear_bitrange - iterate over all unset bit ranges [b; e) * for_each_clear_bitrange - iterate over all unset bit ranges [b; e)
...@@ -520,11 +514,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned ...@@ -520,11 +514,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned
* @size: bitmap size in number of bits * @size: bitmap size in number of bits
*/ */
#define for_each_clear_bitrange(b, e, addr, size) \ #define for_each_clear_bitrange(b, e, addr, size) \
for ((b) = find_next_zero_bit((addr), (size), 0), \ for ((b) = 0; \
(e) = find_next_bit((addr), (size), (b) + 1); \ (b) = find_next_zero_bit((addr), (size), (b)), \
(e) = find_next_bit((addr), (size), (b) + 1), \
(b) < (size); \ (b) < (size); \
(b) = find_next_zero_bit((addr), (size), (e) + 1), \ (b) = (e) + 1)
(e) = find_next_bit((addr), (size), (b) + 1))
/** /**
* for_each_clear_bitrange_from - iterate over all unset bit ranges [b; e) * for_each_clear_bitrange_from - iterate over all unset bit ranges [b; e)
...@@ -534,11 +528,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned ...@@ -534,11 +528,11 @@ unsigned long find_next_bit_le(const void *addr, unsigned
* @size: bitmap size in number of bits * @size: bitmap size in number of bits
*/ */
#define for_each_clear_bitrange_from(b, e, addr, size) \ #define for_each_clear_bitrange_from(b, e, addr, size) \
for ((b) = find_next_zero_bit((addr), (size), (b)), \ for (; \
(e) = find_next_bit((addr), (size), (b) + 1); \ (b) = find_next_zero_bit((addr), (size), (b)), \
(e) = find_next_bit((addr), (size), (b) + 1), \
(b) < (size); \ (b) < (size); \
(b) = find_next_zero_bit((addr), (size), (e) + 1), \ (b) = (e) + 1)
(e) = find_next_bit((addr), (size), (b) + 1))
/** /**
* for_each_set_bit_wrap - iterate over all set bits starting from @start, and * for_each_set_bit_wrap - iterate over all set bits starting from @start, and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment