From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932878AbaEPN5J (ORCPT ); Fri, 16 May 2014 09:57:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54048 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755187AbaEPN5G (ORCPT ); Fri, 16 May 2014 09:57:06 -0400 Date: Fri, 16 May 2014 09:19:28 -0400 From: Don Zickus To: Andi Kleen Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH] x86, perf: Update Haswell PEBS event table Message-ID: <20140516131928.GB39585@redhat.com> References: <1397779424-10248-1-git-send-email-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1397779424-10248-1-git-send-email-andi@firstfloor.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 17, 2014 at 05:03:44PM -0700, Andi Kleen wrote: > From: Andi Kleen > > - We were allowing some sub events in c4 that are not in the event list. > Tighten the check slightly. > - We were missing some valid subevents in d1-d3. Allow all subevents. > > Signed-off-by: Andi Kleen > --- > arch/x86/kernel/cpu/perf_event_intel_ds.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c > index 7e9546a..07feaa0 100644 > --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c > +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c > @@ -641,7 +641,11 @@ struct event_constraint intel_hsw_pebs_event_constraints[] = { > INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PRECDIST */ > INTEL_PST_HSW_CONSTRAINT(0x01c2, 0xf), /* UOPS_RETIRED.ALL */ > INTEL_UEVENT_CONSTRAINT(0x02c2, 0xf), /* UOPS_RETIRED.RETIRE_SLOTS */ > - INTEL_EVENT_CONSTRAINT(0xc4, 0xf), /* BR_INST_RETIRED.* */ > + INTEL_UEVENT_CONSTRAINT(0x1c4, 0xf), /* BR_INST_RETIRED.CONDITIONAL */ > + INTEL_UEVENT_CONSTRAINT(0x2c4, 0xf), /* BR_INST_RETIRED.NEAR_CALL */ > + INTEL_UEVENT_CONSTRAINT(0x4c4, 0xf), /* BR_INST_RETIRED.ALL_BRANCHES */ > + INTEL_UEVENT_CONSTRAINT(0x8c4, 0xf), /* BR_INST_RETIRED.NEAR_RETURN */ > + INTEL_UEVENT_CONSTRAINT(0x20c4, 0xf), /* BR_INST_RETIRED.NEAR_TAKEN */ > INTEL_UEVENT_CONSTRAINT(0x01c5, 0xf), /* BR_MISP_RETIRED.CONDITIONAL */ > INTEL_UEVENT_CONSTRAINT(0x04c5, 0xf), /* BR_MISP_RETIRED.ALL_BRANCHES */ > INTEL_UEVENT_CONSTRAINT(0x20c5, 0xf), /* BR_MISP_RETIRED.NEAR_TAKEN */ > @@ -656,17 +660,10 @@ struct event_constraint intel_hsw_pebs_event_constraints[] = { > INTEL_UEVENT_CONSTRAINT(0x42d0, 0xf), > INTEL_UEVENT_CONSTRAINT(0x81d0, 0xf), /* MEM_UOPS_RETIRED.ALL_LOADS */ > INTEL_PST_HSW_CONSTRAINT(0x82d0, 0xf), /* MEM_UOPS_RETIRED.ALL_STORES */ > - INTEL_UEVENT_CONSTRAINT(0x01d1, 0xf), /* MEM_LOAD_UOPS_RETIRED.L1_HIT */ > - INTEL_UEVENT_CONSTRAINT(0x02d1, 0xf), /* MEM_LOAD_UOPS_RETIRED.L2_HIT */ > - INTEL_UEVENT_CONSTRAINT(0x04d1, 0xf), /* MEM_LOAD_UOPS_RETIRED.L3_HIT */ > - /* MEM_LOAD_UOPS_RETIRED.HIT_LFB */ > - INTEL_UEVENT_CONSTRAINT(0x40d1, 0xf), > - /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS */ > - INTEL_UEVENT_CONSTRAINT(0x01d2, 0xf), > - /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT */ > - INTEL_UEVENT_CONSTRAINT(0x02d2, 0xf), > - /* MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM */ > - INTEL_UEVENT_CONSTRAINT(0x01d3, 0xf), > + INTEL_EVENT_CONSTRAINT(0xd1, 0xf), /* MEM_LOAD_UOPS_RETIRED.* */ > + INTEL_EVENT_CONSTRAINT(0xd2, 0xf), /* MEM_LOAD_UOPS_L3_HIT_RETIRED.* */ > + INTEL_EVENT_CONSTRAINT(0xd3, 0xf), /* MEM_LOAD_UOPS_L3_MISS_RETIRED.* */ > + INTEL_EVENT_CONSTRAINT(0xd3, 0xf), /* MEM_LOAD_UOPS_L3_MISS_RETIRED.* */ It looks like the last line is duplicated here.. Cheers, Don > INTEL_UEVENT_CONSTRAINT(0x04c8, 0xf), /* HLE_RETIRED.Abort */ > INTEL_UEVENT_CONSTRAINT(0x04c9, 0xf), /* RTM_RETIRED.Abort */ > > -- > 1.8.5.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/