2024-05-06 08:40:35

by Zhenyu Wang

Subject: [PATCH] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest.
So add it support in srf_cstates.

Cc: Rui Zhang <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Wendy Wang <[email protected]>
Fixes: 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
Signed-off-by: Zhenyu Wang <[email protected]>
---
arch/x86/events/intel/cstate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 08bba679678c..cdf44500783e 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -64,7 +64,7 @@
* perf code: 0x00
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- * RPL,SPR,MTL
+ * RPL,SPR,MTL,SRF
* Scope: Package (physical package)
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
* perf code: 0x01
@@ -689,7 +689,8 @@ static const struct cstate_model srf_cstates __initconst = {
.core_events = BIT(PERF_CSTATE_CORE_C1_RES) |
BIT(PERF_CSTATE_CORE_C6_RES),

- .pkg_events = BIT(PERF_CSTATE_PKG_C6_RES),
+ .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
+ BIT(PERF_CSTATE_PKG_C6_RES),

.module_events = BIT(PERF_CSTATE_MODULE_C6_RES),
};
--
2.43.0

2024-05-15 03:13:27

by Zhenyu Wang

Subject: [PATCH RESEND] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest.
So add it support in srf_cstates.

Cc: Rui Zhang <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Wendy Wang <[email protected]>
Fixes: 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
Signed-off-by: Zhenyu Wang <[email protected]>
---
arch/x86/events/intel/cstate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index e64eaa8dda5a..4cd36848cfff 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -64,7 +64,7 @@
* perf code: 0x00
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- * RPL,SPR,MTL
+ * RPL,SPR,MTL,SRF
* Scope: Package (physical package)
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
* perf code: 0x01
@@ -683,7 +683,8 @@ static const struct cstate_model srf_cstates __initconst = {
.core_events = BIT(PERF_CSTATE_CORE_C1_RES) |
BIT(PERF_CSTATE_CORE_C6_RES),

- .pkg_events = BIT(PERF_CSTATE_PKG_C6_RES),
+ .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
+ BIT(PERF_CSTATE_PKG_C6_RES),

.module_events = BIT(PERF_CSTATE_MODULE_C6_RES),
};
--
2.43.0

2024-05-15 13:02:24

by Wendy Wang

Subject: RE: [PATCH RESEND] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Verified on SRF-SP, the Perf PC2 counter is updated:

[root@p-srf07 ~]# perf stat --per-socket -e cstate_pkg/c2-residency/ sleep 20

Performance counter stats for 'system wide':

S0 1 9,589,297,024 cstate_pkg/c2-residency/
S1 1 10,204,349,952 cstate_pkg/c2-residency/

20.003533150 seconds time elapsed

[root@p-srf07 ~]# perf stat --per-socket -e cstate_pkg/c2-residency/ sleep 20

Performance counter stats for 'system wide':

S0 1 9,309,806,784 cstate_pkg/c2-residency/
S1 1 10,897,684,928 cstate_pkg/c2-residency/

20.004747926 seconds time elapsed

Tested-by: Wendy Wang <[email protected]>


-----Original Message-----
From: Zhenyu Wang <[email protected]>
Sent: Wednesday, May 15, 2024 11:22 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Zhang, Rui <[email protected]>; Bityutskiy, Artem <[email protected]>; Wang, Wendy <[email protected]>
Subject: [PATCH RESEND] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest.
So add it support in srf_cstates.

Cc: Rui Zhang <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Wendy Wang <[email protected]>
Fixes: 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
Signed-off-by: Zhenyu Wang <[email protected]>
---
arch/x86/events/intel/cstate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c index e64eaa8dda5a..4cd36848cfff 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -64,7 +64,7 @@
* perf code: 0x00
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- * RPL,SPR,MTL
+ * RPL,SPR,MTL,SRF
* Scope: Package (physical package)
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
* perf code: 0x01
@@ -683,7 +683,8 @@ static const struct cstate_model srf_cstates __initconst = {
.core_events = BIT(PERF_CSTATE_CORE_C1_RES) |
BIT(PERF_CSTATE_CORE_C6_RES),

- .pkg_events = BIT(PERF_CSTATE_PKG_C6_RES),
+ .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
+ BIT(PERF_CSTATE_PKG_C6_RES),

.module_events = BIT(PERF_CSTATE_MODULE_C6_RES),
};
--
2.43.0

2024-06-12 07:59:54

by Zhenyu Wang

Subject: [PATCH RESEND AGAIN] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest.
So add it support in srf_cstates.

Cc: Rui Zhang <[email protected]>
Cc: Artem Bityutskiy <[email protected]>
Cc: Wendy Wang <[email protected]>
Tested-by: Wendy Wang <[email protected]>
Fixes: 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
Signed-off-by: Zhenyu Wang <[email protected]>
---
arch/x86/events/intel/cstate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 9d6e8f13d13a..b1a822af25d0 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -64,7 +64,7 @@
* perf code: 0x00
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- * RPL,SPR,MTL
+ * RPL,SPR,MTL,SRF
* Scope: Package (physical package)
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
* perf code: 0x01
@@ -684,7 +684,8 @@ static const struct cstate_model srf_cstates __initconst = {
.core_events = BIT(PERF_CSTATE_CORE_C1_RES) |
BIT(PERF_CSTATE_CORE_C6_RES),

- .pkg_events = BIT(PERF_CSTATE_PKG_C6_RES),
+ .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
+ BIT(PERF_CSTATE_PKG_C6_RES),

.module_events = BIT(PERF_CSTATE_MODULE_C6_RES),
};
--
2.45.1