Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1200902ybl; Sun, 1 Dec 2019 22:59:27 -0800 (PST) X-Google-Smtp-Source: APXvYqwdd97oSDUhVLXHD8ilPj/+ZDnu+moOVeUPn/TuHJsOiuuMAqfq/TYIpMISFCVoYmJaJ7Xv X-Received: by 2002:a17:906:5606:: with SMTP id f6mr11217222ejq.179.1575269967401; Sun, 01 Dec 2019 22:59:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575269967; cv=none; d=google.com; s=arc-20160816; b=jm71kdHreBBj03UyAmMPqagKQBNmEjLjBrnWUAhSLkxqJ7CYGVEI6YsU6wy1IYs+TK XVlNhD5f4HACycxDXX8QIkbmzBiotSPhnSV6AraFmtv5/8cVb8E+/Au7i6DEytja4jRJ 42mqn2kmD/0EAJi+vU+d/wZdG9ZjJSUnb/RVpW8Tn7bbHOxlH/c738bToVyxRtPjy3UL 0m86xbzd4uLj5VMKwbt+IYPk10IKFhuq9SQ4335jbbI6nnlnPgGMAR6+LouHxoDoDX4P kYCzZHZDIn4wnO1qmXO7KDZOVxIvJi07JVjr+aPxOkPRpzm+lORd/vWgAGrVpiJCO5vq 51NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:references:cc:to:from:subject; bh=4N0t83ocMmrvl9/Thjyor4sfuejYaqQj7ANoSIaSlEs=; b=GhFkhplzbtBG4JjoATsMs25BnkKiNKC1OfEqetw9JX3ynxjuBDDdzz73JB+/ukq+wr LCRFhOWwni2Bjb7IsVe62H2oGnK4ZCjGET8ySKgrX9RLRS3FArbMQn1uy6JMyUp1iFCw WtxBCgIT19032iQ4n1v6u8MILG3VW3MgDqicyHPMJuwUR+uVs8kRNFhiTrUwe3tjNkav rNqnkwIjf1LJC6vPgUQraY3LGFB20wCqcYL5I4YLwpcOWoZPIBcEk7KA7x4M2Fvm5Zfh Dk0ng408y6AY9kmzDCIrmkYAm+71aJ/pPHGImOz8p6S0SpXs8ZpMYNyHmssImnssTchJ hrfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id en9si11421691ejb.410.2019.12.01.22.59.02; Sun, 01 Dec 2019 22:59:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726179AbfLBG5S (ORCPT + 99 others); Mon, 2 Dec 2019 01:57:18 -0500 Received: from mga14.intel.com ([192.55.52.115]:61256 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725976AbfLBG5S (ORCPT ); Mon, 2 Dec 2019 01:57:18 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 22:57:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="384762976" Received: from linux.intel.com ([10.54.29.200]) by orsmga005.jf.intel.com with ESMTP; 01 Dec 2019 22:57:17 -0800 Received: from [10.252.19.98] (abudanko-mobl.ccr.corp.intel.com [10.252.19.98]) by linux.intel.com (Postfix) with ESMTP id DB3955802BC; Sun, 1 Dec 2019 22:57:14 -0800 (PST) Subject: [PATCH v4 1/3] tools bitmap: implement bitmap_equal() operation at bitmap API From: Alexey Budankov To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , Andi Kleen , linux-kernel References: Organization: Intel Corp. Message-ID: <27ed6554-65d3-7c1e-38ef-63ef044e7063@linux.intel.com> Date: Mon, 2 Dec 2019 09:57:12 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extend tools bitmap API with bitmap_equal() implementation. The implementation has been derived from the kernel. Extend tools bitmap API with bitmap_free() implementation for symmetry with bitmap_alloc() function. Signed-off-by: Alexey Budankov --- tools/include/linux/bitmap.h | 30 ++++++++++++++++++++++++++++++ tools/lib/bitmap.c | 15 +++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index 05dca5c203f3..477a1cae513f 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -15,6 +15,8 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, const unsigned long *bitmap2, int bits); int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, const unsigned long *bitmap2, unsigned int bits); +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); #define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1))) @@ -123,6 +125,15 @@ static inline unsigned long *bitmap_alloc(int nbits) return calloc(1, BITS_TO_LONGS(nbits) * sizeof(unsigned long)); } +/* + * bitmap_free - Free bitmap + * @bitmap: pointer to bitmap + */ +static inline void bitmap_free(unsigned long *bitmap) +{ + free(bitmap); +} + /* * bitmap_scnprintf - print bitmap list into buffer * @bitmap: bitmap @@ -148,4 +159,23 @@ static inline int bitmap_and(unsigned long *dst, const unsigned long *src1, return __bitmap_and(dst, src1, src2, nbits); } +#ifdef __LITTLE_ENDIAN +#define BITMAP_MEM_ALIGNMENT 8 +#else +#define BITMAP_MEM_ALIGNMENT (8 * sizeof(unsigned long)) +#endif +#define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1) +#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) + +static inline int bitmap_equal(const unsigned long *src1, + const unsigned long *src2, unsigned int nbits) +{ + if (small_const_nbits(nbits)) + return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); + if (__builtin_constant_p(nbits & BITMAP_MEM_MASK) && + IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT)) + return !memcmp(src1, src2, nbits / 8); + return __bitmap_equal(src1, src2, nbits); +} + #endif /* _PERF_BITOPS_H */ diff --git a/tools/lib/bitmap.c b/tools/lib/bitmap.c index 38494782be06..5043747ef6c5 100644 --- a/tools/lib/bitmap.c +++ b/tools/lib/bitmap.c @@ -71,3 +71,18 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, BITMAP_LAST_WORD_MASK(bits)); return result != 0; } + +int __bitmap_equal(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 0; + + if (bits % BITS_PER_LONG) + if ((bitmap1[k] ^ bitmap2[k]) & BITMAP_LAST_WORD_MASK(bits)) + return 0; + + return 1; +} -- 2.20.1