From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e28smtp07.in.ibm.com (e28smtp07.in.ibm.com [122.248.162.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e28smtp07.in.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 74BB22C00BE for ; Wed, 4 Dec 2013 21:33:56 +1100 (EST) Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Dec 2013 16:03:52 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id B4EE11258062 for ; Wed, 4 Dec 2013 16:04:53 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rB4AXjwP45940908 for ; Wed, 4 Dec 2013 16:03:45 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rB4AXlls010887 for ; Wed, 4 Dec 2013 16:03:49 +0530 From: Anshuman Khandual To: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH V4 10/10] powerpc, perf: Cleanup SW branch filter list look up Date: Wed, 4 Dec 2013 16:02:42 +0530 Message-Id: <1386153162-11225-11-git-send-email-khandual@linux.vnet.ibm.com> In-Reply-To: <1386153162-11225-1-git-send-email-khandual@linux.vnet.ibm.com> References: <1386153162-11225-1-git-send-email-khandual@linux.vnet.ibm.com> Cc: mikey@neuling.org, ak@linux.intel.com, eranian@google.com, michael@ellerman.id.au, acme@ghostprotocols.net, sukadev@linux.vnet.ibm.com, mingo@kernel.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This patch adds enumeration for all available SW branch filters in powerpc book3s code and also streamlines the look for the SW branch filter entries while trying to figure out which all branch filters can be supported in SW. Signed-off-by: Anshuman Khandual --- arch/powerpc/perf/core-book3s.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 54d39a5..42c6428 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -566,6 +566,12 @@ static int match_filters(u64 branch_sample_type, u64 filter_mask) return true; } +/* SW implemented branch filters */ +static unsigned int power_sw_filter[] = { PERF_SAMPLE_BRANCH_ANY_CALL, + PERF_SAMPLE_BRANCH_COND, + PERF_SAMPLE_BRANCH_ANY_RETURN, + PERF_SAMPLE_BRANCH_IND_CALL }; + /* * Required SW based branch filters * @@ -578,6 +584,7 @@ static u64 branch_filter_map(u64 branch_sample_type, u64 pmu_bhrb_filter, u64 *filter_mask) { u64 branch_sw_filter = 0; + unsigned int i; /* No branch filter requested */ if (branch_sample_type & PERF_SAMPLE_BRANCH_ANY) { @@ -593,34 +600,15 @@ static u64 branch_filter_map(u64 branch_sample_type, u64 pmu_bhrb_filter, * SW implemented filters. But right now, there is now way to * initimate the user about this decision. */ - if (branch_sample_type & PERF_SAMPLE_BRANCH_ANY_CALL) { - if (!(pmu_bhrb_filter & PERF_SAMPLE_BRANCH_ANY_CALL)) { - branch_sw_filter |= PERF_SAMPLE_BRANCH_ANY_CALL; - *filter_mask |= PERF_SAMPLE_BRANCH_ANY_CALL; - } - } - - if (branch_sample_type & PERF_SAMPLE_BRANCH_COND) { - if (!(pmu_bhrb_filter & PERF_SAMPLE_BRANCH_COND)) { - branch_sw_filter |= PERF_SAMPLE_BRANCH_COND; - *filter_mask |= PERF_SAMPLE_BRANCH_COND; - } - } - if (branch_sample_type & PERF_SAMPLE_BRANCH_ANY_RETURN) { - if (!(pmu_bhrb_filter & PERF_SAMPLE_BRANCH_ANY_RETURN)) { - branch_sw_filter |= PERF_SAMPLE_BRANCH_ANY_RETURN; - *filter_mask |= PERF_SAMPLE_BRANCH_ANY_RETURN; - } - } - - if (branch_sample_type & PERF_SAMPLE_BRANCH_IND_CALL) { - if (!(pmu_bhrb_filter & PERF_SAMPLE_BRANCH_IND_CALL)) { - branch_sw_filter |= PERF_SAMPLE_BRANCH_IND_CALL; - *filter_mask |= PERF_SAMPLE_BRANCH_IND_CALL; + for (i = 0; i < ARRAY_SIZE(power_sw_filter); i++) { + if (branch_sample_type & power_sw_filter[i]) { + if (!(pmu_bhrb_filter & power_sw_filter[i])) { + branch_sw_filter |= power_sw_filter[i]; + *filter_mask |= power_sw_filter[i]; + } } } - return branch_sw_filter; } -- 1.7.11.7