Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp2467320ybc; Sun, 24 Nov 2019 22:09:45 -0800 (PST) X-Google-Smtp-Source: APXvYqxFpEGL7yXhiKA9r3pcDnlaXtTX0dTF7VuHPqZMkIHRxeM8ir12N1iDRYIg4bZnCv7RsdMl X-Received: by 2002:a17:906:bfe3:: with SMTP id vr3mr35007048ejb.273.1574662185795; Sun, 24 Nov 2019 22:09:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574662185; cv=none; d=google.com; s=arc-20160816; b=cURcwnfVx8E3c693yzzL/KJ+kAQxdSkhy+JHdngIrSMp6zbcmV9B+V7wL8bxiqJB9B JsMHyLTD+wOsXnwFwDT46g+koZRVZpUe4bhWiCA4drWcFd15n6vyBSFb9HM4lg/ZyBe7 9sZAco+15mROP8UpIw6EV4mIHkBdKoaPvZxi1zae9d63rmZLLafjQM5yo/3kWkVOKTQS MGvxI6Gdrj00JPN4NkzsP8WRXfZt7atpTN5GQiZccoKpCvEOjrlkVH2SoEb+/yoL0Df9 eQICFRwu/JZSMw5RfItaGQ0tvTavju+2rpXL01S2j9bdQ+zuRlzV0g4k8QHz45jYvLTv 74LQ== 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=K2B1BcmRFQFGKNX+emrzLP30RibSOxHKFOWcJxObv84=; b=phnTGu/40BL+yAYKhyLhkF/x3qRQp9QS1x8PAB+fS+M+NRmE5eVrng76a3/zsgzRxc Ubv7PNQzskIfPNbzmrojgeMd1l0nN0OmE4RT8s/KotYBNuTs/ATL++GYtZfNkJavmjmE geftlnUpwdVH5StU9Zhj/lVPM1XD+dOIq0BSw2N25zpvJWymQ4VroVBCTe9KpYdFKRVU QO9ZbN601sN0gAEYnO6he0Lrr8lzO6AWaYhb9J9XpkYNfzDe4h7c9ZzcigG+y3W8aUDu 6DM7g26nFWCH3WjnTFbBGuYvs79Fz55eOa34t32Sv6iCOLTPkCp8XvNKmTZdNLJJZIeR 9xCQ== 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 l26si5022563edt.143.2019.11.24.22.09.21; Sun, 24 Nov 2019 22:09:45 -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 S1725906AbfKYGHF (ORCPT + 99 others); Mon, 25 Nov 2019 01:07:05 -0500 Received: from mga04.intel.com ([192.55.52.120]:6576 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725468AbfKYGHE (ORCPT ); Mon, 25 Nov 2019 01:07:04 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Nov 2019 22:07:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,240,1571727600"; d="scan'208";a="202245372" Received: from linux.intel.com ([10.54.29.200]) by orsmga008.jf.intel.com with ESMTP; 24 Nov 2019 22:07:02 -0800 Received: from [10.251.82.176] (abudanko-mobl.ccr.corp.intel.com [10.251.82.176]) by linux.intel.com (Postfix) with ESMTP id 0252B580577; Sun, 24 Nov 2019 22:07:00 -0800 (PST) Subject: [PATCH v2 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: Date: Mon, 25 Nov 2019 09:06:59 +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 --- Changes in v2: - implemented bitmap_free() for symmetry with bitmap_alloc() --- 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