The SDM states the HSW/BDW supplier and snoop info are identical to SNB/IVB, make it so.
Furthermore, it states you have to minimally program a request and supplier type, but the current code does not set a supplier for the ACCESS events. This significantly alters the actual events and does away with some of the weirdness found by decoding the magic numbers. If this breaks things someone needs to go explain things and augment the SDM. Cc: Andi Kleen <[email protected]> Cc: Stephane Eranian <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: http://lkml.kernel.org/n/[email protected] --- arch/x86/kernel/cpu/perf_event_intel.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -544,11 +544,6 @@ static __initconst const u64 hsw_hw_cach #define HSW_DMND_WRITE (HSW_DMND_RFO|SNB_LLC_RFO) #define HSW_DMND_PREFETCH (HSW_PF_DATA_RD|HSW_PF_RFO|HSW_PF_IFETCH) -#define HSW_DRAM_ANY (SNB_NO_SUPP|SNB_SNP_ANY|(0x78ULL << 23)) /* WTF */ - -#define HSW_L3_ACCESS (0) /* XXX no supplier! */ -#define NSW_L3_MISS (HSW_DRAM_ANY|SNB_NON_DRAM) - static __initconst const u64 hsw_hw_cache_extra_regs [PERF_COUNT_HW_CACHE_MAX] [PERF_COUNT_HW_CACHE_OP_MAX] @@ -556,16 +551,16 @@ static __initconst const u64 hsw_hw_cach { [ C(LL ) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = HSW_DMND_READ|HSW_L3_ACCESS, - [ C(RESULT_MISS) ] = HSW_DMND_READ|HSW_L3_MISS, + [ C(RESULT_ACCESS) ] = HSW_DMND_READ|SNB_L3_ACCESS, + [ C(RESULT_MISS) ] = HSW_DMND_READ|SNB_L3_MISS, }, [ C(OP_WRITE) ] = { - [ C(RESULT_ACCESS) ] = HSW_DMND_WRITE|HSW_L3_ACCESS, - [ C(RESULT_MISS) ] = HSW_DMND_WRITE|HSW_L3_MISS, + [ C(RESULT_ACCESS) ] = HSW_DMND_WRITE|SNB_L3_ACCESS, + [ C(RESULT_MISS) ] = HSW_DMND_WRITE|SNB_L3_MISS, }, [ C(OP_PREFETCH) ] = { - [ C(RESULT_ACCESS) ] = HSW_DMND_PREFETCH|HSW_L3_ACCESS, - [ C(RESULT_MISS) ] = HSW_DMND_PREFETCH|HSW_L3_MISS, + [ C(RESULT_ACCESS) ] = HSW_DMND_PREFETCH|SNB_L3_ACCESS, + [ C(RESULT_MISS) ] = HSW_DMND_PREFETCH|SNB_L3_MISS, }, }, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
