bitops: define const_*() versions of the non-atomics
Define const_*() variants of the non-atomic bitops to be used when the input arguments are compile-time constants, so that the compiler will be always able to resolve those to compile-time constants as well. Those are mostly direct aliases for generic_*() with one exception for const_test_bit(): the original one is declared atomic-safe and thus doesn't discard the `volatile` qualifier, so in order to let optimize code, define it separately disregarding the qualifier. Add them to the compile-time type checks as well just in case. Suggested-by: Marco Elver <elver@google.com> Signed-off-by: Alexander Lobakin <alexandr.lobakin@intel.com> Reviewed-by: Marco Elver <elver@google.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Yury Norov <yury.norov@gmail.com>
This commit is contained in:
committed by
Yury Norov
parent
0e862838f2
commit
bb7379bfa6
@@ -127,4 +127,35 @@ generic_test_bit(unsigned long nr, const volatile unsigned long *addr)
|
|||||||
return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));
|
return 1UL & (addr[BIT_WORD(nr)] >> (nr & (BITS_PER_LONG-1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* const_*() definitions provide good compile-time optimizations when
|
||||||
|
* the passed arguments can be resolved at compile time.
|
||||||
|
*/
|
||||||
|
#define const___set_bit generic___set_bit
|
||||||
|
#define const___clear_bit generic___clear_bit
|
||||||
|
#define const___change_bit generic___change_bit
|
||||||
|
#define const___test_and_set_bit generic___test_and_set_bit
|
||||||
|
#define const___test_and_clear_bit generic___test_and_clear_bit
|
||||||
|
#define const___test_and_change_bit generic___test_and_change_bit
|
||||||
|
|
||||||
|
/**
|
||||||
|
* const_test_bit - Determine whether a bit is set
|
||||||
|
* @nr: bit number to test
|
||||||
|
* @addr: Address to start counting from
|
||||||
|
*
|
||||||
|
* A version of generic_test_bit() which discards the `volatile` qualifier to
|
||||||
|
* allow a compiler to optimize code harder. Non-atomic and to be called only
|
||||||
|
* for testing compile-time constants, e.g. by the corresponding macros, not
|
||||||
|
* directly from "regular" code.
|
||||||
|
*/
|
||||||
|
static __always_inline bool
|
||||||
|
const_test_bit(unsigned long nr, const volatile unsigned long *addr)
|
||||||
|
{
|
||||||
|
const unsigned long *p = (const unsigned long *)addr + BIT_WORD(nr);
|
||||||
|
unsigned long mask = BIT_MASK(nr);
|
||||||
|
unsigned long val = *p;
|
||||||
|
|
||||||
|
return !!(val & mask);
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* __ASM_GENERIC_BITOPS_GENERIC_NON_ATOMIC_H */
|
#endif /* __ASM_GENERIC_BITOPS_GENERIC_NON_ATOMIC_H */
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ extern unsigned long __sw_hweight64(__u64 w);
|
|||||||
/* Check that the bitops prototypes are sane */
|
/* Check that the bitops prototypes are sane */
|
||||||
#define __check_bitop_pr(name) \
|
#define __check_bitop_pr(name) \
|
||||||
static_assert(__same_type(arch_##name, generic_##name) && \
|
static_assert(__same_type(arch_##name, generic_##name) && \
|
||||||
|
__same_type(const_##name, generic_##name) && \
|
||||||
__same_type(name, generic_##name))
|
__same_type(name, generic_##name))
|
||||||
|
|
||||||
__check_bitop_pr(__set_bit);
|
__check_bitop_pr(__set_bit);
|
||||||
|
|||||||
Reference in New Issue
Block a user