x86: perf_counter check AMD performance monitoring support
PATCH 1/2 x86: perf_counter check AMD performance monitoring support
AMD supports performance monitoring from K7.
--- arch/x86/kernel/cpu/perf_counter.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -0
@@ -1452,6 +1452,10 @@ static int intel_pmu_init(void)static int amd_pmu_init (void ) { +/* performance-monitoring supported from K7 */ +if (boot_cpu_data.x86 <6 ) +return -ENODEV ; + x86_pmu = amd_pmu;switch (boot_cpu_data.x86) {
Signature · 1 line
1.6.0.6
PATCH 2/2 x86: perf_counter update AMD hw caching related event table
AMD shares same hw caching related event table.
--- arch/x86/kernel/cpu/perf_counter.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +15 -21
@@ -389,23 +389,23 @@ static u64 intel_pmu_raw_event(u64 event)return event &CORE_EVNTSEL_MASK ; } -static const u64 amd_0f_hw_cache_event_ids +static const u64 amd_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX ] = { [C (L1D ) ] = { [C (OP_READ ) ] = { - [C (RESULT_ACCESS ) ] =0 , - [C (RESULT_MISS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0040 ,/* Data Cache Accesses */ + [C (RESULT_MISS ) ] =0x0041 ,/* Data Cache Misses */ }, [C (OP_WRITE ) ] = { - [C (RESULT_ACCESS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0042 ,/* Data Cache Refills from L2 */ [C (RESULT_MISS ) ] =0 , }, [C (OP_PREFETCH ) ] = { - [C (RESULT_ACCESS ) ] =0 , - [C (RESULT_MISS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0267 ,/* Data Prefetcher :attempts */ + [C (RESULT_MISS ) ] =0x0167 ,/* Data Prefetcher :cancelled */ }, }, [C (L1I ) ] = {
@@ -418,17 +418,17 @@ static const u64 amd_0f_hw_cache_event_ids [ C(RESULT_MISS) ] = -1, }, [ C(OP_PREFETCH) ] = { - [ C(RESULT_ACCESS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x014B, /* Prefetch Instructions :Load */ [ C(RESULT_MISS) ] = 0, }, }, [ C(L2 ) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x037D, /* Requests to L2 Cache :IC+DC */ + [ C(RESULT_MISS) ] = 0x037E, /* L2 Cache Misses : IC+DC */ }, [ C(OP_WRITE) ] = { - [ C(RESULT_ACCESS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x017F, /* L2 Fill/Writeback */ [ C(RESULT_MISS) ] = 0, }, [ C(OP_PREFETCH) ] = {
@@ -438,8 +438,8 @@ static const u64 amd_0f_hw_cache_event_ids }, [ C(DTLB) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses */ + [ C(RESULT_MISS) ] = 0x0046, /* L1 DTLB and L2 DLTB Miss */ }, [ C(OP_WRITE) ] = { [ C(RESULT_ACCESS) ] = 0,
@@ -1458,16 +1458,10 @@ static int amd_pmu_init(void) x86_pmu = amd_pmu; -switch (boot_cpu_data.x86) { -case 0x0f : -case 0x10 : -case 0x11 : -memcpy (hw_cache_event_ids, amd_0f_hw_cache_event_ids, -sizeof (hw_cache_event_ids)); +/* Events are common for all AMDs */ +memcpy (hw_cache_event_ids, amd_hw_cache_event_ids, +sizeof (hw_cache_event_ids)); -pr_cont ("AMD Family 0f/10/11 events, " ); -break ; - }return 0 ; }
Signature · 1 line
1.6.0.6
Re: [PATCH 2/2 -tip] x86: perf_counter update AMD hw caching related event table
Quoted 6 lines · Jaswinder Singh Rajput
AMD shares same hw caching related event table.
Signed-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/kernel/cpu/perf_counter.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)
Looks good - but your patch does not apply anymore. (Neither to -git nor to -tip)
Ingo
Re: [PATCH 2/2 -tip] x86: perf_counter update AMD hw caching related event table
Quoted 4 lines · Ingo Molnar
Quoted 2 lines · Jaswinder Singh Rajput
AMD shares same hw caching related event table.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/kernel/cpu/perf_counter.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)Looks good - but your patch does not apply anymore. (Neither to -git nor to -tip)
It is because of L2 -> LL
Here are new patches :
[PATCH 1/2 -tip] x86: perf_counter check AMD performance monitoring support
AMD supports performance monitoring from K7.
--- arch/x86/kernel/cpu/perf_counter.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -0
@@ -1459,6 +1459,10 @@ static int intel_pmu_init(void)static int amd_pmu_init (void ) { +/* performance-monitoring supported from K7 */ +if (boot_cpu_data.x86 <6 ) +return -ENODEV ; + x86_pmu = amd_pmu;switch (boot_cpu_data.x86) {
Signature · 1 line
1.6.0.6
Re: [PATCH 2/2 -tip] x86: perf_counter update AMD hw caching related event table
Quoted 14 lines · Jaswinder Singh Rajput
Quoted 4 lines · Ingo Molnar
Quoted 2 lines · Jaswinder Singh Rajput
AMD shares same hw caching related event table.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Jaswinder Singh Rajput <[email protected]>--- arch/x86/kernel/cpu/perf_counter.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)Looks good - but your patch does not apply anymore. (Neither to -git nor to -tip)
Quoted 5 lines
It is because of L2 -> LL
Here are new patches :
[PATCH 1/2 -tip] x86:
perf_countercheck AMD performance monitoring support
[PATCH 2/2 -tip] x86: perf_counter update AMD hw caching related event table
AMD shares same hw caching related event table.
--- arch/x86/kernel/cpu/perf_counter.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +15 -21
@@ -389,23 +389,23 @@ static u64 intel_pmu_raw_event(u64 event)return event &CORE_EVNTSEL_MASK ; } -static const u64 amd_0f_hw_cache_event_ids +static const u64 amd_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX ] = { [C (L1D ) ] = { [C (OP_READ ) ] = { - [C (RESULT_ACCESS ) ] =0 , - [C (RESULT_MISS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0040 ,/* Data Cache Accesses */ + [C (RESULT_MISS ) ] =0x0041 ,/* Data Cache Misses */ }, [C (OP_WRITE ) ] = { - [C (RESULT_ACCESS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0042 ,/* Data Cache Refills from L2 */ [C (RESULT_MISS ) ] =0 , }, [C (OP_PREFETCH ) ] = { - [C (RESULT_ACCESS ) ] =0 , - [C (RESULT_MISS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0267 ,/* Data Prefetcher :attempts */ + [C (RESULT_MISS ) ] =0x0167 ,/* Data Prefetcher :cancelled */ }, }, [C (L1I ) ] = {
@@ -418,17 +418,17 @@ static const u64 amd_0f_hw_cache_event_ids [ C(RESULT_MISS) ] = -1, }, [ C(OP_PREFETCH) ] = { - [ C(RESULT_ACCESS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x014B, /* Prefetch Instructions :Load */ [ C(RESULT_MISS) ] = 0, }, }, [ C(LL ) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x037D, /* Requests to L2 Cache :IC+DC */ + [ C(RESULT_MISS) ] = 0x037E, /* L2 Cache Misses : IC+DC */ }, [ C(OP_WRITE) ] = { - [ C(RESULT_ACCESS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x017F, /* L2 Fill/Writeback */ [ C(RESULT_MISS) ] = 0, }, [ C(OP_PREFETCH) ] = {
@@ -438,8 +438,8 @@ static const u64 amd_0f_hw_cache_event_ids }, [ C(DTLB) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses */ + [ C(RESULT_MISS) ] = 0x0046, /* L1 DTLB and L2 DLTB Miss */ }, [ C(OP_WRITE) ] = { [ C(RESULT_ACCESS) ] = 0,
@@ -1465,16 +1465,10 @@ static int amd_pmu_init(void) x86_pmu = amd_pmu; -switch (boot_cpu_data.x86) { -case 0x0f : -case 0x10 : -case 0x11 : -memcpy (hw_cache_event_ids, amd_0f_hw_cache_event_ids, -sizeof (hw_cache_event_ids)); +/* Events are common for all AMDs */ +memcpy (hw_cache_event_ids, amd_hw_cache_event_ids, +sizeof (hw_cache_event_ids)); -pr_cont ("AMD Family 0f/10/11 events, " ); -break ; - }return 0 ; }
Signature · 1 line
1.6.0.6
Re: [PATCH 2/2 -tip] x86: perf_counter update AMD hw caching related event table
arch/x86/kernel/cpu/perf_counter.c static u64 intel_pmu_raw_event(u64 event) · line 400
Quoted 10 lines · Jaswinder Singh Rajput
[PATCH 2/2 -tip] x86:
perf_counterupdate AMD hw caching related event tableAMD shares same hw caching related event table.
Signed-off-by Jaswinder Singh Rajput <[email protected]>arch/x86/kernel/cpu/perf_counter.c +2
-2- [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses */ + [ C(RESULT_MISS) ] = 0x0041, /* Data Cache Misses */
How did you get to these numbers and have you tested them? (Such information needs to be in the changelog)
Ingo
[tip:perfcounters/core] perf_counter, x86: Update AMD hw caching related event table
In reply to Jaswinder Singh RajputCommit-ID: f4db43a38f7387c3b19c9565124c06ab0c5d6e9a Gitweb: http://git.kernel.org/tip/f4db43a38f7387c3b19c9565124c06ab0c5d6e9a Author: Jaswinder Singh Rajput <[email protected]> AuthorDate: Sat, 13 Jun 2009 01:06:21 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 13 Jun 2009 12:58:25 +0200
perf_counter, x86: Update AMD hw caching related event table
All AMD models share the same hw caching related event table.
Also complete the table with more events.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/cpu/perf_counter.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +15 -21
@@ -389,23 +389,23 @@ static u64 intel_pmu_raw_event(u64 event)return event &CORE_EVNTSEL_MASK ; } -static const u64 amd_0f_hw_cache_event_ids +static const u64 amd_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX ] [PERF_COUNT_HW_CACHE_OP_MAX ] [PERF_COUNT_HW_CACHE_RESULT_MAX ] = { [C (L1D ) ] = { [C (OP_READ ) ] = { - [C (RESULT_ACCESS ) ] =0 , - [C (RESULT_MISS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0040 ,/* Data Cache Accesses */ + [C (RESULT_MISS ) ] =0x0041 ,/* Data Cache Misses */ }, [C (OP_WRITE ) ] = { - [C (RESULT_ACCESS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0042 ,/* Data Cache Refills from L2 */ [C (RESULT_MISS ) ] =0 , }, [C (OP_PREFETCH ) ] = { - [C (RESULT_ACCESS ) ] =0 , - [C (RESULT_MISS ) ] =0 , + [C (RESULT_ACCESS ) ] =0x0267 ,/* Data Prefetcher :attempts */ + [C (RESULT_MISS ) ] =0x0167 ,/* Data Prefetcher :cancelled */ }, }, [C (L1I ) ] = {
@@ -418,17 +418,17 @@ static const u64 amd_0f_hw_cache_event_ids [ C(RESULT_MISS) ] = -1, }, [ C(OP_PREFETCH) ] = { - [ C(RESULT_ACCESS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x014B, /* Prefetch Instructions :Load */ [ C(RESULT_MISS) ] = 0, }, }, [ C(LL ) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x037D, /* Requests to L2 Cache :IC+DC */ + [ C(RESULT_MISS) ] = 0x037E, /* L2 Cache Misses : IC+DC */ }, [ C(OP_WRITE) ] = { - [ C(RESULT_ACCESS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x017F, /* L2 Fill/Writeback */ [ C(RESULT_MISS) ] = 0, }, [ C(OP_PREFETCH) ] = {
@@ -438,8 +438,8 @@ static const u64 amd_0f_hw_cache_event_ids }, [ C(DTLB) ] = { [ C(OP_READ) ] = { - [ C(RESULT_ACCESS) ] = 0, - [ C(RESULT_MISS) ] = 0, + [ C(RESULT_ACCESS) ] = 0x0040, /* Data Cache Accesses */ + [ C(RESULT_MISS) ] = 0x0046, /* L1 DTLB and L2 DLTB Miss */ }, [ C(OP_WRITE) ] = { [ C(RESULT_ACCESS) ] = 0,
@@ -1465,16 +1465,10 @@ static int amd_pmu_init(void) x86_pmu = amd_pmu; -switch (boot_cpu_data.x86) { -case 0x0f : -case 0x10 : -case 0x11 : -memcpy (hw_cache_event_ids, amd_0f_hw_cache_event_ids, -sizeof (hw_cache_event_ids)); +/* Events are common for all AMDs */ +memcpy (hw_cache_event_ids, amd_hw_cache_event_ids, +sizeof (hw_cache_event_ids)); -pr_cont ("AMD Family 0f/10/11 events, " ); -break ; - }return 0 ; }
[tip:perfcounters/core] perf_counter, x86: Check old-AMD performance monitoring support
In reply to Jaswinder Singh RajputCommit-ID: 4d2be1267fcfb3a4d2198fd696aec5e3dcbce60e Gitweb: http://git.kernel.org/tip/4d2be1267fcfb3a4d2198fd696aec5e3dcbce60e Author: Jaswinder Singh Rajput <[email protected]> AuthorDate: Thu, 11 Jun 2009 15:28:09 +0530 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 13 Jun 2009 12:58:25 +0200
perf_counter, x86: Check old-AMD performance monitoring support
AMD supports performance monitoring start from K7 (i.e. family 6), so disable it for earlier AMD CPUs.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/cpu/perf_counter.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/kernel/cpu/perf_counter.c +4 -0
@@ -1459,6 +1459,10 @@ static int intel_pmu_init(void)static int amd_pmu_init (void ) { +/* Performance-monitoring supported from K7 and later: */ +if (boot_cpu_data.x86 <6 ) +return -ENODEV ; + x86_pmu = amd_pmu;switch (boot_cpu_data.x86) {