perf/x86: Add Intel Raptor Lake support
Subsystems (2)
PATCH v2 1/4 perf/x86: Add Intel Raptor Lake support
From: Kan Liang <[email protected]>
From PMU's perspective, Raptor Lake is the same as the Alder Lake. The only difference is the event list, which will be supported in the perf tool later.
---
No changes since V1
arch/x86/events/intel/core.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/core.c +1 -0
@@ -6199,6 +6199,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_RAPTORLAKE :/* * Alder Lake has 2 types of CPU, core and atom. *
Signature · 1 line
2.7.4
PATCH v2 2/4 perf/x86/cstate: Add Raptor Lake support
From: Kan Liang <[email protected]>
Raptor Lake is Intel's successor to Alder lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Alder lake.
Share adl_cstates with Alder lake.
Update the comments for Raptor Lake.
---
No changes since V1
arch/x86/events/intel/cstate.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/x86/events/intel/cstate.c +12 -10
@@ -40,7 +40,7 @@* Model specific counters: * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL +* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -51,49 +51,50 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL +* TGL,TNT,RKL,ADL,RPL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL,RKL,ADL +* ICL,TGL,RKL,ADL,RPL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, -* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL +* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, +* RPL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, * GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL, -* ADL +* ADL,RPL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL +* TGL,TNT,RKL,ADL,RPL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, -* KBL,CML,ICL,TGL,RKL,ADL +* KBL,CML,ICL,TGL,RKL,ADL,RPL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL +* ADL,RPL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL +* ADL,RPL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT,RKL,ADL +* TNT,RKL,ADL,RPL * Scope: Package (physical package) * */
@@ -680,6 +681,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
Signature · 1 line
2.7.4
[tip: perf/urgent] perf/x86/cstate: Add Raptor Lake support
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 2da202aa1c38bfe8841611a3d339892eb5579e2b Gitweb: https://git.kernel.org/tip/2da202aa1c38bfe8841611a3d339892eb5579e2b Author: Kan Liang <[email protected]> AuthorDate: Tue, 15 Mar 2022 10:45:58 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 05 Apr 2022 09:59:43 +02:00
perf/x86/cstate: Add Raptor Lake support
Raptor Lake is Intel's successor to Alder lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Alder lake.
Share adl_cstates with Alder lake.
Update the comments for Raptor Lake.
--- arch/x86/events/intel/cstate.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/x86/events/intel/cstate.c +12 -10
@@ -40,7 +40,7 @@* Model specific counters: * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL +* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -51,49 +51,50 @@* perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL +* TGL,TNT,RKL,ADL,RPL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03 * Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML, -* ICL,TGL,RKL,ADL +* ICL,TGL,RKL,ADL,RPL * Scope: Core * MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, -* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL +* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL, +* RPL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL, * GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL, -* ADL +* ADL,RPL * Scope: Package (physical package) * MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter. * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, * SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, -* TGL,TNT,RKL,ADL +* TGL,TNT,RKL,ADL,RPL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03 * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL, -* KBL,CML,ICL,TGL,RKL,ADL +* KBL,CML,ICL,TGL,RKL,ADL,RPL * Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL +* ADL,RPL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL, -* ADL +* ADL,RPL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 * Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL, -* TNT,RKL,ADL +* TNT,RKL,ADL,RPL * Scope: Package (physical package) * */
@@ -680,6 +681,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
PATCH v2 3/4 perf/x86/msr: Add Raptor Lake CPU support
In reply to [email protected]From: Kan Liang <[email protected]>
Raptor Lake is Intel's successor to Alder lake. PPERF and SMI_COUNT MSRs are also supported.
---
No changes since V1
arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -103,6 +103,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ROCKETLAKE :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_RAPTORLAKE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
Signature · 1 line
2.7.4
[tip: perf/urgent] perf/x86/msr: Add Raptor Lake CPU support
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 82cd83047a9a80e52c0849e56885279166215310 Gitweb: https://git.kernel.org/tip/82cd83047a9a80e52c0849e56885279166215310 Author: Kan Liang <[email protected]> AuthorDate: Tue, 15 Mar 2022 10:45:59 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 05 Apr 2022 09:59:43 +02:00
perf/x86/msr: Add Raptor Lake CPU support
Raptor Lake is Intel's successor to Alder lake. PPERF and SMI_COUNT MSRs are also supported.
--- arch/x86/events/msr.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/msr.c +1 -0
@@ -103,6 +103,7 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_ROCKETLAKE :case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_RAPTORLAKE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
PATCH v2 4/4 perf/x86/uncore: Add Raptor Lake uncore support
In reply to [email protected]From: Kan Liang <[email protected]>
The uncore PMU of the Raptor Lake is the same as Alder Lake. Add new PCIIDs of IMC for Raptor Lake.
---
Changes since V1:
- Add one more PCIID
arch/x86/events/intel/uncore.c | 1 + arch/x86/events/intel/uncore_snb.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
arch/x86/events/intel/uncore.c +1 -0
@@ -1828,6 +1828,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {},
arch/x86/events/intel/uncore_snb.c +20 -0
@@ -79,6 +79,10 @@#define PCI_DEVICE_ID_INTEL_ADL_14_IMC 0x4650#define PCI_DEVICE_ID_INTEL_ADL_15_IMC 0x4668#define PCI_DEVICE_ID_INTEL_ADL_16_IMC 0x4670 +#define PCI_DEVICE_ID_INTEL_RPL_1_IMC 0xA700 +#define PCI_DEVICE_ID_INTEL_RPL_2_IMC 0xA702 +#define PCI_DEVICE_ID_INTEL_RPL_3_IMC 0xA706 +#define PCI_DEVICE_ID_INTEL_RPL_4_IMC 0xA709/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -1406,6 +1410,22 @@ static const struct pci_device_id tgl_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ADL_16_IMC), .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), }, + {/* IMC */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RPL_1_IMC), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_2_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_3_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_4_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, { /* end: all zeroes */ } };
Signature · 1 line
2.7.4
[tip: perf/urgent] perf/x86/uncore: Add Raptor Lake uncore support
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: ad4878d4d71d9ada913be2ad5b6d7f526a695b6f Gitweb: https://git.kernel.org/tip/ad4878d4d71d9ada913be2ad5b6d7f526a695b6f Author: Kan Liang <[email protected]> AuthorDate: Tue, 15 Mar 2022 10:46:00 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 05 Apr 2022 09:59:43 +02:00
perf/x86/uncore: Add Raptor Lake uncore support
The uncore PMU of the Raptor Lake is the same as Alder Lake. Add new PCIIDs of IMC for Raptor Lake.
--- arch/x86/events/intel/uncore.c | 1 + arch/x86/events/intel/uncore_snb.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+)
arch/x86/events/intel/uncore.c +1 -0
@@ -1828,6 +1828,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ROCKETLAKE , &rkl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (ALDERLAKE_L , &adl_uncore_init), +X86_MATCH_INTEL_FAM6_MODEL (RAPTORLAKE , &adl_uncore_init),X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &spr_uncore_init), X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D, &snr_uncore_init), {},
arch/x86/events/intel/uncore_snb.c +20 -0
@@ -79,6 +79,10 @@#define PCI_DEVICE_ID_INTEL_ADL_14_IMC 0x4650#define PCI_DEVICE_ID_INTEL_ADL_15_IMC 0x4668#define PCI_DEVICE_ID_INTEL_ADL_16_IMC 0x4670 +#define PCI_DEVICE_ID_INTEL_RPL_1_IMC 0xA700 +#define PCI_DEVICE_ID_INTEL_RPL_2_IMC 0xA702 +#define PCI_DEVICE_ID_INTEL_RPL_3_IMC 0xA706 +#define PCI_DEVICE_ID_INTEL_RPL_4_IMC 0xA709/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -1406,6 +1410,22 @@ static const struct pci_device_id tgl_uncore_pci_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ADL_16_IMC), .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), }, + {/* IMC */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_RPL_1_IMC), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_2_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_3_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, + { /* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_RPL_4_IMC ), + .driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0), + }, { /* end: all zeroes */ } };
Peter Zijlstra
maintainerQuoted 5 lines · On Tue, Mar 15, 2022 at 10:45:57AM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
From PMU's perspective, Raptor Lake is the same as the Alder Lake. The only difference is the event list, which will be supported in the perf tool later.
Thanks!
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: c61759e581576d3330bd1d9490b4d7552e24da6b Gitweb: https://git.kernel.org/tip/c61759e581576d3330bd1d9490b4d7552e24da6b Author: Kan Liang <[email protected]> AuthorDate: Tue, 15 Mar 2022 10:45:57 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 05 Apr 2022 09:59:43 +02:00
perf/x86: Add Intel Raptor Lake support
Quoted 1 line
From PMU's perspective, Raptor Lake is the same as the Alder Lake. The
only difference is the event list, which will be supported in the perf tool later.
--- arch/x86/events/intel/core.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/events/intel/core.c +1 -0
@@ -6212,6 +6212,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ALDERLAKE :case INTEL_FAM6_ALDERLAKE_L : +case INTEL_FAM6_RAPTORLAKE :/* * Alder Lake has 2 types of CPU, core and atom. *