Commit f20510d5 authored by Alexey Bayduraev's avatar Alexey Bayduraev Committed by Arnaldo Carvalho de Melo
Browse files

tools lib: Adopt bitmap_intersects() operation from the kernel sources 



Adopt bitmap_intersects() routine that tests whether bitmaps bitmap1 and
bitmap2 intersects. This routine will be used during thread masks
initialization.

Signed-off-by: default avatarAlexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Acked-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Antonov <alexander.antonov@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Budankov <abudankov@huawei.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Link: http://lore.kernel.org/lkml/f75aa738d8ff8f9cffd7532d671f3ef3deb97a7c.1625065643.git.alexey.v.bayduraev@linux.intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 857286e4

tools/include/linux/bitmap.h

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, 
int __bitmap_equal(const unsigned long *bitmap1,

		   const unsigned long *bitmap2, unsigned int bits);

void bitmap_clear(unsigned long *map, unsigned int start, int len);

int __bitmap_intersects(const unsigned long *bitmap1,

			const unsigned long *bitmap2, unsigned int bits);



#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))

#define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))
@@ -170,4 +172,13 @@ static inline int bitmap_equal(const unsigned long *src1, 
	return __bitmap_equal(src1, src2, nbits);

}



static inline int bitmap_intersects(const unsigned long *src1,

			const unsigned long *src2, unsigned int nbits)

{

	if (small_const_nbits(nbits))

		return ((*src1 & *src2) & BITMAP_LAST_WORD_MASK(nbits)) != 0;

	else

		return __bitmap_intersects(src1, src2, nbits);

}



#endif /* _PERF_BITOPS_H */

tools/lib/bitmap.c

+14 −0
Original line number Diff line number Diff line
@@ -86,3 +86,17 @@ int __bitmap_equal(const unsigned long *bitmap1, 


	return 1;

}



int __bitmap_intersects(const unsigned long *bitmap1,

			const unsigned long *bitmap2, unsigned int bits)

{

	unsigned int k, lim = bits/BITS_PER_LONG;

	for (k = 0; k < lim; ++k)

		if (bitmap1[k] & bitmap2[k])

			return 1;



	if (bits % BITS_PER_LONG)

		if ((bitmap1[k] & bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits))

			return 1;

	return 0;

}