mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
Use __builtin_popcount in __sched_cpucount [BZ #21696]
posix/sched_cpucount.c assumes that size of __cpu_mask == size of long, which is incorrect for x32. This patch uses __builtin_popcount, which is availabe in GCC 4.9, in posix/sched_cpucount.c. Tested on i686, x86-64 and x32 with multi-arch disabled. [BZ #21696] * posix/sched_cpucount.c: Don't include <limits.h>. (__sched_cpucount): Use __builtin_popcount.
This commit is contained in:
parent
47ea614b9a
commit
8dc6133eff
@ -1,3 +1,10 @@
|
|||||||
|
2017-07-01 Florian Weimer <fweimer@redhat.com>
|
||||||
|
H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
[BZ #21696]
|
||||||
|
* posix/sched_cpucount.c: Don't include <limits.h>.
|
||||||
|
(__sched_cpucount): Use __builtin_popcount.
|
||||||
|
|
||||||
2017-07-01 Ramana Radhakrishnan <ramana.gcc@googlemail.com>
|
2017-07-01 Ramana Radhakrishnan <ramana.gcc@googlemail.com>
|
||||||
|
|
||||||
* sysdeps/unix/sysv/aarch64/cpu-features.c (init_cpu_features):
|
* sysdeps/unix/sysv/aarch64/cpu-features.c (init_cpu_features):
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
License along with the GNU C Library; if not, see
|
License along with the GNU C Library; if not, see
|
||||||
<http://www.gnu.org/licenses/>. */
|
<http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
#include <limits.h>
|
|
||||||
#include <sched.h>
|
#include <sched.h>
|
||||||
|
|
||||||
|
|
||||||
@ -36,22 +35,16 @@ __sched_cpucount (size_t setsize, const cpu_set_t *setp)
|
|||||||
if (l == 0)
|
if (l == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
# if LONG_BIT > 32
|
_Static_assert (sizeof (l) == sizeof (unsigned int)
|
||||||
l = (l & 0x5555555555555555ul) + ((l >> 1) & 0x5555555555555555ul);
|
|| sizeof (l) == sizeof (unsigned long)
|
||||||
l = (l & 0x3333333333333333ul) + ((l >> 2) & 0x3333333333333333ul);
|
|| sizeof (l) == sizeof (unsigned long long),
|
||||||
l = (l & 0x0f0f0f0f0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0f0f0f0f0ful);
|
"sizeof (__cpu_mask");
|
||||||
l = (l & 0x00ff00ff00ff00fful) + ((l >> 8) & 0x00ff00ff00ff00fful);
|
if (sizeof (__cpu_mask) == sizeof (unsigned int))
|
||||||
l = (l & 0x0000ffff0000fffful) + ((l >> 16) & 0x0000ffff0000fffful);
|
s += __builtin_popcount (l);
|
||||||
l = (l & 0x00000000fffffffful) + ((l >> 32) & 0x00000000fffffffful);
|
else if (sizeof (__cpu_mask) == sizeof (unsigned long))
|
||||||
# else
|
s += __builtin_popcountl (l);
|
||||||
l = (l & 0x55555555ul) + ((l >> 1) & 0x55555555ul);
|
else
|
||||||
l = (l & 0x33333333ul) + ((l >> 2) & 0x33333333ul);
|
s += __builtin_popcountll (l);
|
||||||
l = (l & 0x0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0ful);
|
|
||||||
l = (l & 0x00ff00fful) + ((l >> 8) & 0x00ff00fful);
|
|
||||||
l = (l & 0x0000fffful) + ((l >> 16) & 0x0000fffful);
|
|
||||||
# endif
|
|
||||||
|
|
||||||
s += l;
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user