[PATCH v2 0/3] perf vendor events arm64: Do some cleanup for Hisi hip08 json

[PATCH v2 0/3] perf vendor events arm64: Do some cleanup for Hisi hip08 json

[Junhao He]

Add missing field for Hisi hip08 json and list hisilicon pmu json
events under the its entry to MAINTAINERS.

Changes in v2:
- drop this PublicDescription addressed James's comment
- fix commit of patch 2
- add new patch to drop other hip08 uncore PMU PublicDescriptions

Junhao He (3):
  perf vendor events arm64: Fill up Desc field for Hisi hip08 hha pmu
  perf vendor events arm64: Drop hip08 PublicDescription if same as
    BriefDescription
  MAINTAINERS: Add hisilicon pmu json events under its entry

 MAINTAINERS                                   |  1 +
 .../arm64/hisilicon/hip08/uncore-ddrc.json    |  8 ------
 .../arm64/hisilicon/hip08/uncore-hha.json     | 26 ++++++++++++-------
 .../arm64/hisilicon/hip08/uncore-l3c.json     | 13 ----------
 4 files changed, 17 insertions(+), 31 deletions(-)

-- 
2.33.0

[PATCH v2 1/3] perf vendor events arm64: Fill up Desc field for Hisi hip08 hha pmu

[Junhao He]

In the same PMU, when some JSON events have the "BriefDescription" field
populated while others do not, the cmp_sevent() function will split these
two types of events into separate groups. As a result, when using perf
list to display events, the two types of events cannot be grouped together
in the output.

before patch:
 $ perf list pmu
 ...
 uncore hha:
   hisi_sccl1_hha2/sdir-hit/
   hisi_sccl1_hha2/sdir-lookup/
 ...
 uncore hha:
   edir-hit
      [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
 ...

after patch:
 $ perf list pmu
 ...
 uncore hha:
   edir-hit
      [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
   sdir-hit
      [Count of The number of HHA S-Dir hit operations. Unit: hisi_sccl1_hha2]
   sdir-lookup
      [Count of the number of HHA S-Dir lookup operations. Unit: hisi_sccl1_hha2]
 ...

Signed-off-by: Junhao He <hejunhao3@huawei.com>
Reviewed-by: James Clark <james.clark@linaro.org>
---
 .../arch/arm64/hisilicon/hip08/uncore-hha.json   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
index 9a7ec7af2060..b52f056d0255 100644
--- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
+++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
@@ -30,15 +30,18 @@
    {
 	    "ConfigCode": "0x4",
 	    "EventName": "rx_wbi",
+	    "BriefDescription": "Count of the number of WriteBackI operations that HHA has received",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x5",
 	    "EventName": "rx_wbip",
+	    "BriefDescription": "Count of the number of WriteBackIPtl operations that HHA has received",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x11",
+	    "BriefDescription": "Count of the number of WriteThruIStash operations that HHA has received",
 	    "EventName": "rx_wtistash",
 	    "Unit": "hisi_sccl,hha"
    },
@@ -87,66 +90,79 @@
    {
 	    "ConfigCode": "0x23",
 	    "EventName": "bi_num",
+	    "BriefDescription": "Count of the number of HHA BackInvalid operations",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x32",
 	    "EventName": "mediated_num",
+	    "BriefDescription": "Count of the number of Mediated operations that the HHA has forwarded",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x33",
 	    "EventName": "tx_snp_num",
+	    "BriefDescription": "Count of the number of Snoop operations that the HHA has sent",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x34",
 	    "EventName": "tx_snp_outer",
+	    "BriefDescription": "Count of the number of Snoop operations that the HHA has sent to another socket",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x35",
 	    "EventName": "tx_snp_ccix",
+	    "BriefDescription": "Count of the number of Snoop operations that the HHA has sent to CCIX",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x38",
 	    "EventName": "rx_snprspdata",
+	    "BriefDescription": "Count of the number of SnprspData flit operations that HHA has received",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x3c",
 	    "EventName": "rx_snprsp_outer",
+	    "BriefDescription": "Count of the number of SnprspData operations that HHA has received from another socket",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x40",
 	    "EventName": "sdir-lookup",
+	    "BriefDescription": "Count of the number of HHA S-Dir lookup operations",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x41",
 	    "EventName": "edir-lookup",
+	    "BriefDescription": "Count of the number of HHA E-Dir lookup operations",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x42",
 	    "EventName": "sdir-hit",
+	    "BriefDescription": "Count of the number of HHA S-Dir hit operations",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x43",
 	    "EventName": "edir-hit",
+	    "BriefDescription": "Count of the number of HHA E-Dir hit operations",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x4c",
 	    "EventName": "sdir-home-migrate",
+	    "BriefDescription": "Count of the number of HHA S-Dir read home migrate operations",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x4d",
 	    "EventName": "edir-home-migrate",
+	    "BriefDescription": "Count of the number of HHA E-Dir read home migrate operations",
 	    "Unit": "hisi_sccl,hha"
    }
 ]
-- 
2.33.0

[PATCH v2 2/3] perf vendor events arm64: Drop hip08 PublicDescription if same as BriefDescription

[Junhao He]

If BriefDescription and PublicDescription are the same, only
BriefDescription is needed. It will be used for both long and
short format outputs.

Signed-off-by: Junhao He <hejunhao3@huawei.com>
---
 .../arch/arm64/hisilicon/hip08/uncore-ddrc.json     |  8 --------
 .../arch/arm64/hisilicon/hip08/uncore-hha.json      | 10 ----------
 .../arch/arm64/hisilicon/hip08/uncore-l3c.json      | 13 -------------
 3 files changed, 31 deletions(-)

diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
index 2b3cb55df288..014454d78293 100644
--- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
+++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
@@ -3,56 +3,48 @@
 	    "ConfigCode": "0x00",
 	    "EventName": "flux_wr",
 	    "BriefDescription": "DDRC total write operations",
-	    "PublicDescription": "DDRC total write operations",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x01",
 	    "EventName": "flux_rd",
 	    "BriefDescription": "DDRC total read operations",
-	    "PublicDescription": "DDRC total read operations",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x02",
 	    "EventName": "flux_wcmd",
 	    "BriefDescription": "DDRC write commands",
-	    "PublicDescription": "DDRC write commands",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x03",
 	    "EventName": "flux_rcmd",
 	    "BriefDescription": "DDRC read commands",
-	    "PublicDescription": "DDRC read commands",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x04",
 	    "EventName": "pre_cmd",
 	    "BriefDescription": "DDRC precharge commands",
-	    "PublicDescription": "DDRC precharge commands",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x05",
 	    "EventName": "act_cmd",
 	    "BriefDescription": "DDRC active commands",
-	    "PublicDescription": "DDRC active commands",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x06",
 	    "EventName": "rnk_chg",
 	    "BriefDescription": "DDRC rank commands",
-	    "PublicDescription": "DDRC rank commands",
 	    "Unit": "hisi_sccl,ddrc"
    },
    {
 	    "ConfigCode": "0x07",
 	    "EventName": "rw_chg",
 	    "BriefDescription": "DDRC read and write changes",
-	    "PublicDescription": "DDRC read and write changes",
 	    "Unit": "hisi_sccl,ddrc"
    }
 ]
diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
index b52f056d0255..b2b895fa670e 100644
--- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
+++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
@@ -3,28 +3,24 @@
 	    "ConfigCode": "0x00",
 	    "EventName": "rx_ops_num",
 	    "BriefDescription": "The number of all operations received by the HHA",
-	    "PublicDescription": "The number of all operations received by the HHA",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x01",
 	    "EventName": "rx_outer",
 	    "BriefDescription": "The number of all operations received by the HHA from another socket",
-	    "PublicDescription": "The number of all operations received by the HHA from another socket",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x02",
 	    "EventName": "rx_sccl",
 	    "BriefDescription": "The number of all operations received by the HHA from another SCCL in this socket",
-	    "PublicDescription": "The number of all operations received by the HHA from another SCCL in this socket",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x03",
 	    "EventName": "rx_ccix",
 	    "BriefDescription": "Count of the number of operations that HHA has received from CCIX",
-	    "PublicDescription": "Count of the number of operations that HHA has received from CCIX",
 	    "Unit": "hisi_sccl,hha"
    },
    {
@@ -49,42 +45,36 @@
 	    "ConfigCode": "0x1c",
 	    "EventName": "rd_ddr_64b",
 	    "BriefDescription": "The number of read operations sent by HHA to DDRC which size is 64 bytes",
-	    "PublicDescription": "The number of read operations sent by HHA to DDRC which size is 64bytes",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x1d",
 	    "EventName": "wr_ddr_64b",
 	    "BriefDescription": "The number of write operations sent by HHA to DDRC which size is 64 bytes",
-	    "PublicDescription": "The number of write operations sent by HHA to DDRC which size is 64 bytes",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x1e",
 	    "EventName": "rd_ddr_128b",
 	    "BriefDescription": "The number of read operations sent by HHA to DDRC which size is 128 bytes",
-	    "PublicDescription": "The number of read operations sent by HHA to DDRC which size is 128 bytes",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x1f",
 	    "EventName": "wr_ddr_128b",
 	    "BriefDescription": "The number of write operations sent by HHA to DDRC which size is 128 bytes",
-	    "PublicDescription": "The number of write operations sent by HHA to DDRC which size is 128 bytes",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x20",
 	    "EventName": "spill_num",
 	    "BriefDescription": "Count of the number of spill operations that the HHA has sent",
-	    "PublicDescription": "Count of the number of spill operations that the HHA has sent",
 	    "Unit": "hisi_sccl,hha"
    },
    {
 	    "ConfigCode": "0x21",
 	    "EventName": "spill_success",
 	    "BriefDescription": "Count of the number of successful spill operations that the HHA has sent",
-	    "PublicDescription": "Count of the number of successful spill operations that the HHA has sent",
 	    "Unit": "hisi_sccl,hha"
    },
    {
diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
index e3479b65be9a..d83c22eb1d15 100644
--- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
+++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
@@ -3,91 +3,78 @@
 	    "ConfigCode": "0x00",
 	    "EventName": "rd_cpipe",
 	    "BriefDescription": "Total read accesses",
-	    "PublicDescription": "Total read accesses",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x01",
 	    "EventName": "wr_cpipe",
 	    "BriefDescription": "Total write accesses",
-	    "PublicDescription": "Total write accesses",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x02",
 	    "EventName": "rd_hit_cpipe",
 	    "BriefDescription": "Total read hits",
-	    "PublicDescription": "Total read hits",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x03",
 	    "EventName": "wr_hit_cpipe",
 	    "BriefDescription": "Total write hits",
-	    "PublicDescription": "Total write hits",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x04",
 	    "EventName": "victim_num",
 	    "BriefDescription": "l3c precharge commands",
-	    "PublicDescription": "l3c precharge commands",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x20",
 	    "EventName": "rd_spipe",
 	    "BriefDescription": "Count of the number of read lines that come from this cluster of CPU core in spipe",
-	    "PublicDescription": "Count of the number of read lines that come from this cluster of CPU core in spipe",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x21",
 	    "EventName": "wr_spipe",
 	    "BriefDescription": "Count of the number of write lines that come from this cluster of CPU core in spipe",
-	    "PublicDescription": "Count of the number of write lines that come from this cluster of CPU core in spipe",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x22",
 	    "EventName": "rd_hit_spipe",
 	    "BriefDescription": "Count of the number of read lines that hits in spipe of this L3C",
-	    "PublicDescription": "Count of the number of read lines that hits in spipe of this L3C",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x23",
 	    "EventName": "wr_hit_spipe",
 	    "BriefDescription": "Count of the number of write lines that hits in spipe of this L3C",
-	    "PublicDescription": "Count of the number of write lines that hits in spipe of this L3C",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x29",
 	    "EventName": "back_invalid",
 	    "BriefDescription": "Count of the number of L3C back invalid operations",
-	    "PublicDescription": "Count of the number of L3C back invalid operations",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x40",
 	    "EventName": "retry_cpu",
 	    "BriefDescription": "Count of the number of retry that L3C suppresses the CPU operations",
-	    "PublicDescription": "Count of the number of retry that L3C suppresses the CPU operations",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x41",
 	    "EventName": "retry_ring",
 	    "BriefDescription": "Count of the number of retry that L3C suppresses the ring operations",
-	    "PublicDescription": "Count of the number of retry that L3C suppresses the ring operations",
 	    "Unit": "hisi_sccl,l3c"
    },
    {
 	    "ConfigCode": "0x42",
 	    "EventName": "prefetch_drop",
 	    "BriefDescription": "Count of the number of prefetch drops from this L3C",
-	    "PublicDescription": "Count of the number of prefetch drops from this L3C",
 	    "Unit": "hisi_sccl,l3c"
    }
 ]
-- 
2.33.0

[PATCH v2 3/3] MAINTAINERS: Add hisilicon pmu json events under its entry

[Junhao He]

The all hisilicon pmu json events were missing to be listed there.

Signed-off-by: Junhao He <hejunhao3@huawei.com>
Reviewed-by: James Clark <james.clark@linaro.org>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 00ff21b955bc..bf9588a94919 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10474,6 +10474,7 @@ W:	http://www.hisilicon.com
 F:	Documentation/admin-guide/perf/hisi-pcie-pmu.rst
 F:	Documentation/admin-guide/perf/hisi-pmu.rst
 F:	drivers/perf/hisilicon
+F:	tools/perf/pmu-events/arch/arm64/hisilicon/
 
 HISILICON PTT DRIVER
 M:	Yicong Yang <yangyicong@hisilicon.com>
-- 
2.33.0

Re: [PATCH v2 1/3] perf vendor events arm64: Fill up Desc field for Hisi hip08 hha pmu

[Yicong Yang]

On 2025/4/18 15:08, Junhao He wrote:
> In the same PMU, when some JSON events have the "BriefDescription" field
> populated while others do not, the cmp_sevent() function will split these
> two types of events into separate groups. As a result, when using perf
> list to display events, the two types of events cannot be grouped together
> in the output.
> 
> before patch:
>  $ perf list pmu
>  ...
>  uncore hha:
>    hisi_sccl1_hha2/sdir-hit/
>    hisi_sccl1_hha2/sdir-lookup/
>  ...
>  uncore hha:
>    edir-hit
>       [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
>  ...
> 
> after patch:
>  $ perf list pmu
>  ...
>  uncore hha:
>    edir-hit
>       [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
>    sdir-hit
>       [Count of The number of HHA S-Dir hit operations. Unit: hisi_sccl1_hha2]
>    sdir-lookup
>       [Count of the number of HHA S-Dir lookup operations. Unit: hisi_sccl1_hha2]
>  ...
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> Reviewed-by: James Clark <james.clark@linaro.org>

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

> ---
>  .../arch/arm64/hisilicon/hip08/uncore-hha.json   | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 
> diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
> index 9a7ec7af2060..b52f056d0255 100644
> --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
> +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
> @@ -30,15 +30,18 @@
>     {
>  	    "ConfigCode": "0x4",
>  	    "EventName": "rx_wbi",
> +	    "BriefDescription": "Count of the number of WriteBackI operations that HHA has received",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x5",
>  	    "EventName": "rx_wbip",
> +	    "BriefDescription": "Count of the number of WriteBackIPtl operations that HHA has received",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x11",
> +	    "BriefDescription": "Count of the number of WriteThruIStash operations that HHA has received",
>  	    "EventName": "rx_wtistash",
>  	    "Unit": "hisi_sccl,hha"
>     },
> @@ -87,66 +90,79 @@
>     {
>  	    "ConfigCode": "0x23",
>  	    "EventName": "bi_num",
> +	    "BriefDescription": "Count of the number of HHA BackInvalid operations",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x32",
>  	    "EventName": "mediated_num",
> +	    "BriefDescription": "Count of the number of Mediated operations that the HHA has forwarded",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x33",
>  	    "EventName": "tx_snp_num",
> +	    "BriefDescription": "Count of the number of Snoop operations that the HHA has sent",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x34",
>  	    "EventName": "tx_snp_outer",
> +	    "BriefDescription": "Count of the number of Snoop operations that the HHA has sent to another socket",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x35",
>  	    "EventName": "tx_snp_ccix",
> +	    "BriefDescription": "Count of the number of Snoop operations that the HHA has sent to CCIX",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x38",
>  	    "EventName": "rx_snprspdata",
> +	    "BriefDescription": "Count of the number of SnprspData flit operations that HHA has received",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x3c",
>  	    "EventName": "rx_snprsp_outer",
> +	    "BriefDescription": "Count of the number of SnprspData operations that HHA has received from another socket",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x40",
>  	    "EventName": "sdir-lookup",
> +	    "BriefDescription": "Count of the number of HHA S-Dir lookup operations",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x41",
>  	    "EventName": "edir-lookup",
> +	    "BriefDescription": "Count of the number of HHA E-Dir lookup operations",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x42",
>  	    "EventName": "sdir-hit",
> +	    "BriefDescription": "Count of the number of HHA S-Dir hit operations",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x43",
>  	    "EventName": "edir-hit",
> +	    "BriefDescription": "Count of the number of HHA E-Dir hit operations",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x4c",
>  	    "EventName": "sdir-home-migrate",
> +	    "BriefDescription": "Count of the number of HHA S-Dir read home migrate operations",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x4d",
>  	    "EventName": "edir-home-migrate",
> +	    "BriefDescription": "Count of the number of HHA E-Dir read home migrate operations",
>  	    "Unit": "hisi_sccl,hha"
>     }
>  ]
> 

Re: [PATCH v2 2/3] perf vendor events arm64: Drop hip08 PublicDescription if same as BriefDescription

[Yicong Yang]

On 2025/4/18 15:08, Junhao He wrote:
> If BriefDescription and PublicDescription are the same, only
> BriefDescription is needed. It will be used for both long and
> short format outputs.
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>

Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>

> ---
>  .../arch/arm64/hisilicon/hip08/uncore-ddrc.json     |  8 --------
>  .../arch/arm64/hisilicon/hip08/uncore-hha.json      | 10 ----------
>  .../arch/arm64/hisilicon/hip08/uncore-l3c.json      | 13 -------------
>  3 files changed, 31 deletions(-)
> 
> diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
> index 2b3cb55df288..014454d78293 100644
> --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
> +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-ddrc.json
> @@ -3,56 +3,48 @@
>  	    "ConfigCode": "0x00",
>  	    "EventName": "flux_wr",
>  	    "BriefDescription": "DDRC total write operations",
> -	    "PublicDescription": "DDRC total write operations",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x01",
>  	    "EventName": "flux_rd",
>  	    "BriefDescription": "DDRC total read operations",
> -	    "PublicDescription": "DDRC total read operations",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x02",
>  	    "EventName": "flux_wcmd",
>  	    "BriefDescription": "DDRC write commands",
> -	    "PublicDescription": "DDRC write commands",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x03",
>  	    "EventName": "flux_rcmd",
>  	    "BriefDescription": "DDRC read commands",
> -	    "PublicDescription": "DDRC read commands",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x04",
>  	    "EventName": "pre_cmd",
>  	    "BriefDescription": "DDRC precharge commands",
> -	    "PublicDescription": "DDRC precharge commands",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x05",
>  	    "EventName": "act_cmd",
>  	    "BriefDescription": "DDRC active commands",
> -	    "PublicDescription": "DDRC active commands",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x06",
>  	    "EventName": "rnk_chg",
>  	    "BriefDescription": "DDRC rank commands",
> -	    "PublicDescription": "DDRC rank commands",
>  	    "Unit": "hisi_sccl,ddrc"
>     },
>     {
>  	    "ConfigCode": "0x07",
>  	    "EventName": "rw_chg",
>  	    "BriefDescription": "DDRC read and write changes",
> -	    "PublicDescription": "DDRC read and write changes",
>  	    "Unit": "hisi_sccl,ddrc"
>     }
>  ]
> diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
> index b52f056d0255..b2b895fa670e 100644
> --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
> +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-hha.json
> @@ -3,28 +3,24 @@
>  	    "ConfigCode": "0x00",
>  	    "EventName": "rx_ops_num",
>  	    "BriefDescription": "The number of all operations received by the HHA",
> -	    "PublicDescription": "The number of all operations received by the HHA",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x01",
>  	    "EventName": "rx_outer",
>  	    "BriefDescription": "The number of all operations received by the HHA from another socket",
> -	    "PublicDescription": "The number of all operations received by the HHA from another socket",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x02",
>  	    "EventName": "rx_sccl",
>  	    "BriefDescription": "The number of all operations received by the HHA from another SCCL in this socket",
> -	    "PublicDescription": "The number of all operations received by the HHA from another SCCL in this socket",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x03",
>  	    "EventName": "rx_ccix",
>  	    "BriefDescription": "Count of the number of operations that HHA has received from CCIX",
> -	    "PublicDescription": "Count of the number of operations that HHA has received from CCIX",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
> @@ -49,42 +45,36 @@
>  	    "ConfigCode": "0x1c",
>  	    "EventName": "rd_ddr_64b",
>  	    "BriefDescription": "The number of read operations sent by HHA to DDRC which size is 64 bytes",
> -	    "PublicDescription": "The number of read operations sent by HHA to DDRC which size is 64bytes",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x1d",
>  	    "EventName": "wr_ddr_64b",
>  	    "BriefDescription": "The number of write operations sent by HHA to DDRC which size is 64 bytes",
> -	    "PublicDescription": "The number of write operations sent by HHA to DDRC which size is 64 bytes",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x1e",
>  	    "EventName": "rd_ddr_128b",
>  	    "BriefDescription": "The number of read operations sent by HHA to DDRC which size is 128 bytes",
> -	    "PublicDescription": "The number of read operations sent by HHA to DDRC which size is 128 bytes",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x1f",
>  	    "EventName": "wr_ddr_128b",
>  	    "BriefDescription": "The number of write operations sent by HHA to DDRC which size is 128 bytes",
> -	    "PublicDescription": "The number of write operations sent by HHA to DDRC which size is 128 bytes",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x20",
>  	    "EventName": "spill_num",
>  	    "BriefDescription": "Count of the number of spill operations that the HHA has sent",
> -	    "PublicDescription": "Count of the number of spill operations that the HHA has sent",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x21",
>  	    "EventName": "spill_success",
>  	    "BriefDescription": "Count of the number of successful spill operations that the HHA has sent",
> -	    "PublicDescription": "Count of the number of successful spill operations that the HHA has sent",
>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
> diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
> index e3479b65be9a..d83c22eb1d15 100644
> --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
> +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/uncore-l3c.json
> @@ -3,91 +3,78 @@
>  	    "ConfigCode": "0x00",
>  	    "EventName": "rd_cpipe",
>  	    "BriefDescription": "Total read accesses",
> -	    "PublicDescription": "Total read accesses",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x01",
>  	    "EventName": "wr_cpipe",
>  	    "BriefDescription": "Total write accesses",
> -	    "PublicDescription": "Total write accesses",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x02",
>  	    "EventName": "rd_hit_cpipe",
>  	    "BriefDescription": "Total read hits",
> -	    "PublicDescription": "Total read hits",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x03",
>  	    "EventName": "wr_hit_cpipe",
>  	    "BriefDescription": "Total write hits",
> -	    "PublicDescription": "Total write hits",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x04",
>  	    "EventName": "victim_num",
>  	    "BriefDescription": "l3c precharge commands",
> -	    "PublicDescription": "l3c precharge commands",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x20",
>  	    "EventName": "rd_spipe",
>  	    "BriefDescription": "Count of the number of read lines that come from this cluster of CPU core in spipe",
> -	    "PublicDescription": "Count of the number of read lines that come from this cluster of CPU core in spipe",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x21",
>  	    "EventName": "wr_spipe",
>  	    "BriefDescription": "Count of the number of write lines that come from this cluster of CPU core in spipe",
> -	    "PublicDescription": "Count of the number of write lines that come from this cluster of CPU core in spipe",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x22",
>  	    "EventName": "rd_hit_spipe",
>  	    "BriefDescription": "Count of the number of read lines that hits in spipe of this L3C",
> -	    "PublicDescription": "Count of the number of read lines that hits in spipe of this L3C",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x23",
>  	    "EventName": "wr_hit_spipe",
>  	    "BriefDescription": "Count of the number of write lines that hits in spipe of this L3C",
> -	    "PublicDescription": "Count of the number of write lines that hits in spipe of this L3C",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x29",
>  	    "EventName": "back_invalid",
>  	    "BriefDescription": "Count of the number of L3C back invalid operations",
> -	    "PublicDescription": "Count of the number of L3C back invalid operations",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x40",
>  	    "EventName": "retry_cpu",
>  	    "BriefDescription": "Count of the number of retry that L3C suppresses the CPU operations",
> -	    "PublicDescription": "Count of the number of retry that L3C suppresses the CPU operations",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x41",
>  	    "EventName": "retry_ring",
>  	    "BriefDescription": "Count of the number of retry that L3C suppresses the ring operations",
> -	    "PublicDescription": "Count of the number of retry that L3C suppresses the ring operations",
>  	    "Unit": "hisi_sccl,l3c"
>     },
>     {
>  	    "ConfigCode": "0x42",
>  	    "EventName": "prefetch_drop",
>  	    "BriefDescription": "Count of the number of prefetch drops from this L3C",
> -	    "PublicDescription": "Count of the number of prefetch drops from this L3C",
>  	    "Unit": "hisi_sccl,l3c"
>     }
>  ]
> 

Re: [PATCH v2 3/3] MAINTAINERS: Add hisilicon pmu json events under its entry

[Yicong Yang]

On 2025/4/18 15:08, Junhao He wrote:
> The all hisilicon pmu json events were missing to be listed there.
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> Reviewed-by: James Clark <james.clark@linaro.org>

Acked-by: Yicong Yang <yangyicong@hisilicon.com>

> ---
>  MAINTAINERS | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 00ff21b955bc..bf9588a94919 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -10474,6 +10474,7 @@ W:	http://www.hisilicon.com
>  F:	Documentation/admin-guide/perf/hisi-pcie-pmu.rst
>  F:	Documentation/admin-guide/perf/hisi-pmu.rst
>  F:	drivers/perf/hisilicon
> +F:	tools/perf/pmu-events/arch/arm64/hisilicon/
>  
>  HISILICON PTT DRIVER
>  M:	Yicong Yang <yangyicong@hisilicon.com>
> 

Re: [PATCH v2 1/3] perf vendor events arm64: Fill up Desc field for Hisi hip08 hha pmu

[Jonathan Cameron]

On Fri, 18 Apr 2025 15:08:10 +0800
Junhao He <hejunhao3@huawei.com> wrote:

> In the same PMU, when some JSON events have the "BriefDescription" field
> populated while others do not, the cmp_sevent() function will split these
> two types of events into separate groups. As a result, when using perf
> list to display events, the two types of events cannot be grouped together
> in the output.
> 
> before patch:
>  $ perf list pmu
>  ...
>  uncore hha:
>    hisi_sccl1_hha2/sdir-hit/
>    hisi_sccl1_hha2/sdir-lookup/
>  ...
>  uncore hha:
>    edir-hit
>       [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
>  ...
> 
> after patch:
>  $ perf list pmu
>  ...
>  uncore hha:
>    edir-hit
>       [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
>    sdir-hit
>       [Count of The number of HHA S-Dir hit operations. Unit: hisi_sccl1_hha2]
>    sdir-lookup
>       [Count of the number of HHA S-Dir lookup operations. Unit: hisi_sccl1_hha2]
>  ...
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> Reviewed-by: James Clark <james.clark@linaro.org>
One trivial comment inline that might be good to tidy up.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

>     {
>  	    "ConfigCode": "0x38",
>  	    "EventName": "rx_snprspdata",
> +	    "BriefDescription": "Count of the number of SnprspData flit operations that HHA has received",

Not SnpRspData?  For Snoop Response Data flit ?


>  	    "Unit": "hisi_sccl,hha"
>     },
>     {
>  	    "ConfigCode": "0x3c",
>  	    "EventName": "rx_snprsp_outer",
> +	    "BriefDescription": "Count of the number of SnprspData operations that HHA has received from another socket",

Similar on the capitalization.

>  	    "Unit": "hisi_sccl,hha"
>     },

Re: [PATCH v2 2/3] perf vendor events arm64: Drop hip08 PublicDescription if same as BriefDescription

[Jonathan Cameron]

On Fri, 18 Apr 2025 15:08:11 +0800
Junhao He <hejunhao3@huawei.com> wrote:

> If BriefDescription and PublicDescription are the same, only
> BriefDescription is needed. It will be used for both long and
> short format outputs.
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
LGTM
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Re: [PATCH v2 3/3] MAINTAINERS: Add hisilicon pmu json events under its entry

[Jonathan Cameron]

On Fri, 18 Apr 2025 15:08:12 +0800
Junhao He <hejunhao3@huawei.com> wrote:

> The all hisilicon pmu json events were missing to be listed there.
> 
> Signed-off-by: Junhao He <hejunhao3@huawei.com>
> Reviewed-by: James Clark <james.clark@linaro.org>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Re: [PATCH v2 1/3] perf vendor events arm64: Fill up Desc field for Hisi hip08 hha pmu

[Arnaldo Carvalho de Melo]

On Fri, Apr 25, 2025 at 12:06:54PM +0100, Jonathan Cameron wrote:
> On Fri, 18 Apr 2025 15:08:10 +0800
> Junhao He <hejunhao3@huawei.com> wrote:
> 
> > In the same PMU, when some JSON events have the "BriefDescription" field
> > populated while others do not, the cmp_sevent() function will split these
> > two types of events into separate groups. As a result, when using perf
> > list to display events, the two types of events cannot be grouped together
> > in the output.
> > 
> > before patch:
> >  $ perf list pmu
> >  ...
> >  uncore hha:
> >    hisi_sccl1_hha2/sdir-hit/
> >    hisi_sccl1_hha2/sdir-lookup/
> >  ...
> >  uncore hha:
> >    edir-hit
> >       [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
> >  ...
> > 
> > after patch:
> >  $ perf list pmu
> >  ...
> >  uncore hha:
> >    edir-hit
> >       [Count of The number of HHA E-Dir hit operations. Unit: hisi_sccl1_hha2]
> >    sdir-hit
> >       [Count of The number of HHA S-Dir hit operations. Unit: hisi_sccl1_hha2]
> >    sdir-lookup
> >       [Count of the number of HHA S-Dir lookup operations. Unit: hisi_sccl1_hha2]
> >  ...
> > 
> > Signed-off-by: Junhao He <hejunhao3@huawei.com>
> > Reviewed-by: James Clark <james.clark@linaro.org>
> One trivial comment inline that might be good to tidy up.

These can come as a follow up patch, I think.

> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Applied.

- Arnaldo