Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5048c2af authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20160718' of... 

Merge tag 'perf-core-for-mingo-20160718' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

 - Properly report when a function wildcard produces no matches in 'perf probe'
   (Masami Hiramatsu)

 - Balance opening and reading events in 'perf stat', which could cause
   it to get stuck trying to close invalid file descriptors (Mark Rutland)

Infrastructure changes:

 - Copy more headers from the kernel, this time for headers that
   were just including the contents of its kernel counterparts, should
   help resolving the problems with linux-next, where some uapi related
   patches seem to be breaking tools/object/ build. (Arnaldo Carvalho de Melo)

   Some more combing will be done, but at least it is possible to build
   perf out of tree, via a detached tarball (make help | grep perf),
   without including kernel files in its MANIFEST (Arnaldo Carvalho de Melo)

 - Fix smatch found errors that were not causing problems, but are
   mistakes nonetheless (Dan Carpenter)

 - Fix string vs. byte array resolving in the python script code (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 09211e25 988dd774

tools/include/asm-generic/bitops/__fls.h

+43 −1
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/__fls.h"
 
#ifndef _ASM_GENERIC_BITOPS___FLS_H_

#define _ASM_GENERIC_BITOPS___FLS_H_



#include <asm/types.h>



/**

 * __fls - find last (most-significant) set bit in a long word

 * @word: the word to search

 *

 * Undefined if no set bit exists, so code should check against 0 first.

 */

static __always_inline unsigned long __fls(unsigned long word)

{

	int num = BITS_PER_LONG - 1;



#if BITS_PER_LONG == 64

	if (!(word & (~0ul << 32))) {

		num -= 32;

		word <<= 32;

	}

#endif

	if (!(word & (~0ul << (BITS_PER_LONG-16)))) {

		num -= 16;

		word <<= 16;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-8)))) {

		num -= 8;

		word <<= 8;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-4)))) {

		num -= 4;

		word <<= 4;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-2)))) {

		num -= 2;

		word <<= 2;

	}

	if (!(word & (~0ul << (BITS_PER_LONG-1))))

		num -= 1;

	return num;

}



#endif /* _ASM_GENERIC_BITOPS___FLS_H_ */

tools/include/asm-generic/bitops/arch_hweight.h

+25 −1
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/arch_hweight.h"
 
#ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_

#define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_



#include <asm/types.h>



static inline unsigned int __arch_hweight32(unsigned int w)

{

	return __sw_hweight32(w);

}



static inline unsigned int __arch_hweight16(unsigned int w)

{

	return __sw_hweight16(w);

}



static inline unsigned int __arch_hweight8(unsigned int w)

{

	return __sw_hweight8(w);

}



static inline unsigned long __arch_hweight64(__u64 w)

{

	return __sw_hweight64(w);

}

#endif /* _ASM_GENERIC_BITOPS_HWEIGHT_H_ */

tools/include/asm-generic/bitops/const_hweight.h

+43 −1
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/const_hweight.h"
 
#ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_

#define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_



/*

 * Compile time versions of __arch_hweightN()

 */

#define __const_hweight8(w)		\

	((unsigned int)			\

	 ((!!((w) & (1ULL << 0))) +	\

	  (!!((w) & (1ULL << 1))) +	\

	  (!!((w) & (1ULL << 2))) +	\

	  (!!((w) & (1ULL << 3))) +	\

	  (!!((w) & (1ULL << 4))) +	\

	  (!!((w) & (1ULL << 5))) +	\

	  (!!((w) & (1ULL << 6))) +	\

	  (!!((w) & (1ULL << 7)))))



#define __const_hweight16(w) (__const_hweight8(w)  + __const_hweight8((w)  >> 8 ))

#define __const_hweight32(w) (__const_hweight16(w) + __const_hweight16((w) >> 16))

#define __const_hweight64(w) (__const_hweight32(w) + __const_hweight32((w) >> 32))



/*

 * Generic interface.

 */

#define hweight8(w)  (__builtin_constant_p(w) ? __const_hweight8(w)  : __arch_hweight8(w))

#define hweight16(w) (__builtin_constant_p(w) ? __const_hweight16(w) : __arch_hweight16(w))

#define hweight32(w) (__builtin_constant_p(w) ? __const_hweight32(w) : __arch_hweight32(w))

#define hweight64(w) (__builtin_constant_p(w) ? __const_hweight64(w) : __arch_hweight64(w))



/*

 * Interface for known constant arguments

 */

#define HWEIGHT8(w)  (BUILD_BUG_ON_ZERO(!__builtin_constant_p(w)) + __const_hweight8(w))

#define HWEIGHT16(w) (BUILD_BUG_ON_ZERO(!__builtin_constant_p(w)) + __const_hweight16(w))

#define HWEIGHT32(w) (BUILD_BUG_ON_ZERO(!__builtin_constant_p(w)) + __const_hweight32(w))

#define HWEIGHT64(w) (BUILD_BUG_ON_ZERO(!__builtin_constant_p(w)) + __const_hweight64(w))



/*

 * Type invariant interface to the compile time constant hweight functions.

 */

#define HWEIGHT(w)   HWEIGHT64((u64)w)



#endif /* _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_ */

tools/include/asm-generic/bitops/fls.h

+41 −1
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/fls.h"
 
#ifndef _ASM_GENERIC_BITOPS_FLS_H_

#define _ASM_GENERIC_BITOPS_FLS_H_



/**

 * fls - find last (most-significant) bit set

 * @x: the word to search

 *

 * This is defined the same way as ffs.

 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.

 */



static __always_inline int fls(int x)

{

	int r = 32;



	if (!x)

		return 0;

	if (!(x & 0xffff0000u)) {

		x <<= 16;

		r -= 16;

	}

	if (!(x & 0xff000000u)) {

		x <<= 8;

		r -= 8;

	}

	if (!(x & 0xf0000000u)) {

		x <<= 4;

		r -= 4;

	}

	if (!(x & 0xc0000000u)) {

		x <<= 2;

		r -= 2;

	}

	if (!(x & 0x80000000u)) {

		x <<= 1;

		r -= 1;

	}

	return r;

}



#endif /* _ASM_GENERIC_BITOPS_FLS_H_ */

tools/include/asm-generic/bitops/fls64.h

+36 −1
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/fls64.h"
 
#ifndef _ASM_GENERIC_BITOPS_FLS64_H_

#define _ASM_GENERIC_BITOPS_FLS64_H_



#include <asm/types.h>



/**

 * fls64 - find last set bit in a 64-bit word

 * @x: the word to search

 *

 * This is defined in a similar way as the libc and compiler builtin

 * ffsll, but returns the position of the most significant set bit.

 *

 * fls64(value) returns 0 if value is 0 or the position of the last

 * set bit if value is nonzero. The last (most significant) bit is

 * at position 64.

 */

#if BITS_PER_LONG == 32

static __always_inline int fls64(__u64 x)

{

	__u32 h = x >> 32;

	if (h)

		return fls(h) + 32;

	return fls(x);

}

#elif BITS_PER_LONG == 64

static __always_inline int fls64(__u64 x)

{

	if (x == 0)

		return 0;

	return __fls(x) + 1;

}

#else

#error BITS_PER_LONG not 32 or 64

#endif



#endif /* _ASM_GENERIC_BITOPS_FLS64_H_ */