driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ICRSOQ ---------------------------------------------------------------------- The pmu-event architecture is adjusted. The sys field is used to match events and the cpuid field is used to match metrics. Signed-off-by: Qinxin Xia <xiaqinxin@huawei.com> Signed-off-by: Qizhi Zhang <zhangqizhi3@h-partners.com> Signed-off-by: JiangShui Yang <yangjiangshui@h-partners.com> --- .../hisilicon/hip09/uncore-cpa-metric.json | 20 +++ .../hisilicon/hip09/uncore-ddrc-metric.json | 56 +++++++ .../hisilicon/hip09/uncore-hha-metric.json | 65 ++++++++ .../hisilicon/hip09/uncore-l3c-metric.json | 38 +++++ .../hisilicon/hip09/uncore-pa-metric.json | 92 +++++++++++ .../hisilicon/hip09/uncore-sllc-metric.json | 74 +++++++++ .../hisilicon/hip09/uncore-uc-metric.json | 146 ++++++++++++++++++ .../hisilicon/hip12/uncore-noc-metric.json | 38 +++++ .../sys/uncore-cpa-event.json} | 18 --- .../sys/uncore-ddrc-event.json} | 54 ------- .../sys/uncore-hha-event.json} | 63 -------- .../sys/uncore-l3c-event.json} | 36 ----- .../sys/uncore-mn-event.json} | 0 .../sys/uncore-noc-event.json} | 36 ----- .../sys/uncore-pa-event.json} | 90 ----------- .../sys/uncore-sllc-event.json} | 72 --------- .../sys/uncore-uc-event.json} | 146 +----------------- 17 files changed, 530 insertions(+), 514 deletions(-) create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-cpa-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-ddrc-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-hha-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-l3c-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-pa-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-sllc-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-uc-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-noc-metric.json rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-cpa.json => hipxx/sys/uncore-cpa-event.json} (73%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-ddrc.json => hipxx/sys/uncore-ddrc-event.json} (59%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-hha.json => hipxx/sys/uncore-hha-event.json} (64%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-l3c.json => hipxx/sys/uncore-l3c-event.json} (71%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-mn.json => hipxx/sys/uncore-mn-event.json} (100%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip12/sys/uncore-noc.json => hipxx/sys/uncore-noc-event.json} (89%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-pa.json => hipxx/sys/uncore-pa-event.json} (62%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-sllc.json => hipxx/sys/uncore-sllc-event.json} (59%) rename tools/perf/pmu-events/arch/arm64/hisilicon/{hip09/sys/uncore-uc.json => hipxx/sys/uncore-uc-event.json} (73%) diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-cpa-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-cpa-metric.json new file mode 100644 index 000000000000..1ead2819abe0 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-cpa-metric.json @@ -0,0 +1,20 @@ +[ + { + "MetricName": "cpa_p1_avg_bw", + "MetricExpr": "(cpa_p1_wr_dat * 64 + cpa_p1_rd_dat_64b * 64 + cpa_p1_rd_dat_32b * 32) / duration_time / 1e6", + "BriefDescription": "Average bandwidth of CPA Port 1", + "MetricGroup": "CPA_bw", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sicl,cpa" + }, + { + "MetricName": "cpa_p0_avg_bw", + "MetricExpr": "(cpa_p0_wr_dat * 64 + cpa_p0_rd_dat_64b * 64 + cpa_p0_rd_dat_32b * 32) / duration_time / 1e6", + "BriefDescription": "Average bandwidth of CPA Port 0", + "MetricGroup": "CPA_bw", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sicl,cpa" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-ddrc-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-ddrc-metric.json new file mode 100644 index 000000000000..b4a95fd53b76 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-ddrc-metric.json @@ -0,0 +1,56 @@ +[ + { + "MetricName": "ddrc_write_bw", + "MetricExpr": "flux_wr * 32 / duration_time / 1e6", + "MetricGroup": "DDRC_bw", + "BriefDescription": "Average bandwidth of write DDRC memory", + "ScaleUnit": "1MB/s", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,ddrc" + }, + { + "MetricName": "ddrc_read_bw", + "MetricExpr": "flux_rd * 32 / duration_time / 1e6", + "MetricGroup": "DDRC_bw", + "BriefDescription": "Average bandwidth of read DDRC memory", + "ScaleUnit": "1MB/s", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,ddrc" + }, + { + "MetricName": "ddrc_rdwr_bw", + "MetricExpr": "(flux_wr + flux_rd) * 32 / duration_time / 1e6", + "MetricGroup": "DDRC_bw", + "BriefDescription": "Average bandwidth of DDRC (including memory read and write)", + "ScaleUnit": "1MB/s", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,ddrc" + }, + { + "MetricName": "ddrc_read_lat", + "MetricExpr": "ddrc_read_cmd_occupancy / ddrc_read_cmd * (duration_time * 1e9 / ddrc_cycles)", + "MetricGroup": "DDRC_lat", + "BriefDescription": "Average scheduling latency of DDRC read command", + "ScaleUnit": "1ns", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,ddrc" + }, + { + "MetricName": "ddrc_write_lat", + "MetricExpr": "ddrc_write_cmd_occupancy / ddrc_write_cmd * (duration_time * 1e9 / ddrc_cycles)", + "MetricGroup": "DDRC_lat", + "BriefDescription": "Average scheduling of DDRC write command", + "ScaleUnit": "1ns", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,ddrc" + }, + { + "MetricName": "ddrc_rowhit_rate", + "MetricExpr": "1 - ddrc_active_cmd / ddrc_cas_cmd", + "MetricGroup": "DDRC", + "BriefDescription": "Row hit rate of DDRC", + "ScaleUnit": "100%", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,ddrc" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-hha-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-hha-metric.json new file mode 100644 index 000000000000..1232f30f5b0a --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-hha-metric.json @@ -0,0 +1,65 @@ +[ + { + "MetricName": "hha_read_ddrc_bw", + "MetricExpr": "(hha_rd_ddr_64b * 64 + hha_rd_ddr_128b * 128) / duration_time / 1e6", + "MetricGroup": "HHA_bw", + "BriefDescription": "Average bandwidth of reading DDRC", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + }, + { + "MetricName": "hha_write_ddrc_bw", + "MetricExpr": "(hha_wr_ddr_64b * 64 + hha_wr_ddr_128b * 128) / duration_time / 1e6", + "MetricGroup": "HHA_bw", + "BriefDescription": "Average bandwidth of writing DDRC", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + }, + { + "MetricName": "hha_cross_chip_ops_rate", + "MetricExpr": "rx_outer / rx_ops_num", + "MetricGroup": "HHA", + "BriefDescription": "Rate of cross-chip operations received by HHA", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + }, + { + "MetricName": "hha_cross_die_ops_rate", + "MetricExpr": "rx_sccl / rx_ops_num", + "MetricGroup": "HHA", + "BriefDescription": "Rate of cross-die operations received by HHA", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + }, + { + "MetricName": "hha_channel0_ops_rate", + "MetricExpr": "hha_rx_ch0 / rx_ops_num", + "MetricGroup": "HHA", + "BriefDescription": "Rate of channel 0 operations received by HHA", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + }, + { + "MetricName": "hha_channel1_ops_rate", + "MetricExpr": "hha_rx_ch1 / rx_ops_num", + "MetricGroup": "HHA_lat", + "BriefDescription": "Rate of channel 1 operations received by HHA", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + }, + { + "MetricName": "hha_req_average_lat", + "MetricExpr": "hha_req_lat / hha_req_cnt * (duration_time * 1e9 / hha_cycles)", + "MetricGroup": "HHA_lat", + "BriefDescription": "Average latency that HHA completes all requests", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,hha" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-l3c-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-l3c-metric.json new file mode 100644 index 000000000000..86cdb39501a1 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-l3c-metric.json @@ -0,0 +1,38 @@ +[ + { + "MetricName": "l3c_hit_rate", + "MetricExpr": "l3c_hit / l3c_ref", + "MetricGroup": "L3C", + "BriefDescription": "hit rate of L3C", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,l3c" + }, + { + "MetricName": "l3c_access_bw", + "MetricExpr": "l3c_ref * 64 / duration_time / 1e6", + "MetricGroup": "L3C_bw", + "BriefDescription": "Average bandwidth of CPU access L3C", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,l3c" + }, + { + "MetricName": "cpu_read_l3c_average_lat", + "MetricExpr": "cpu_read_l3c_lat / cpu_read_l3c_sum * (duration_time * 1e9 / l3c_cycles)", + "MetricGroup": "L3C_lat", + "BriefDescription": "Average latency of CPU reading L3C", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,l3c" + }, + { + "MetricName": "l3c_read_hha_average_lat", + "MetricExpr": "l3c_read_hha_lat / l3c_read_hha_sum * (duration_time * 1e9 / l3c_cycles)", + "MetricGroup": "L3C_lat", + "BriefDescription": "Average latency of L3C reading HHA", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,l3c" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-pa-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-pa-metric.json new file mode 100644 index 000000000000..94846f1812c0 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-pa-metric.json @@ -0,0 +1,92 @@ +[ + { + "MetricName": "pa_rx_bw", + "MetricExpr": "(pa_rx_data_link0 + pa_rx_data_link1 + pa_rx_data_link2 + pa_rx_data_link3) * 20 / duration_time / 1e6", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth from Ring to PA", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_tx_bw", + "MetricExpr": "(pa_tx_data_link0 + pa_tx_data_link1 + pa_tx_data_link2 + pa_tx_data_link3) * 20 / duration_time / 1e6", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth from PA to Ring", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_rx_link0_bw_occupancy", + "MetricExpr": "pa_rx_data_link0 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from Ring to PA link0", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_rx_link1_bw_occupancy", + "MetricExpr": "pa_rx_data_link1 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from Ring to PA link1", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_rx_link2_bw_occupancy", + "MetricExpr": "pa_rx_data_link2 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from Ring to PA link2", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_rx_link3_bw_occupancy", + "MetricExpr": "pa_rx_data_link3 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from Ring to PA link3", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_tx_link0_bw_occupancy", + "MetricExpr": "pa_tx_data_link0 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from PA link0 to Ring", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_tx_link1_bw_occupancy", + "MetricExpr": "pa_tx_data_link1 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from PA link1 to Ring", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_tx_link2_bw_occupancy", + "MetricExpr": "pa_tx_data_link2 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from PA link2 to Ring", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + }, + { + "MetricName": "pa_tx_link3_bw_occupancy", + "MetricExpr": "pa_tx_data_link3 / pa_cycles", + "MetricGroup": "PA_bw", + "BriefDescription": "Average data bandwidth occupancy from PA link3 to Ring", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sicl,pa" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-sllc-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-sllc-metric.json new file mode 100644 index 000000000000..62f9abc078d2 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-sllc-metric.json @@ -0,0 +1,74 @@ +[ + { + "MetricName": "sllc_rx_req_average_lat", + "MetricExpr": "sllc_rx_req_lat / sllc_rx_req * (duration_time * 1e9 / sllc_cycles)", + "MetricGroup": "sllc_lat", + "BriefDescription": "Average latency of SLLC receive requests", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_rx_data_average_lat", + "MetricExpr": "sllc_rx_data_lat / sllc_rx_data * (duration_time * 1e9 / sllc_cycles)", + "MetricGroup": "sllc_lat", + "BriefDescription": "Average latency of SLLC receive data", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_tx_req_average_lat", + "MetricExpr": "sllc_tx_req_lat / sllc_tx_req * (duration_time * 1e9 / sllc_cycles)", + "MetricGroup": "sllc_lat", + "BriefDescription": "Average latency of SLLC transmit requests", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_tx_data_average_lat", + "MetricExpr": "sllc_tx_data_lat / sllc_tx_data * (duration_time * 1e9 / sllc_cycles)", + "MetricGroup": "sllc_lat", + "BriefDescription": "Average latency of SLLC transmit data", + "ScaleUnit": "1ns", + "Compat": "0x00000030", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_rx_bw", + "MetricExpr": "sllc_rx_data * 64 / duration_time / 1e6", + "MetricGroup": "sllc_bw", + "BriefDescription": "Average bandwidth of SLLC receive data", + "ScaleUnit": "1MB/s", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_rx_bw_occupancy", + "MetricExpr": "sllc_rx_data / sllc_cycles", + "MetricGroup": "sllc_bw", + "BriefDescription": "Average bandwidth occupancy of SLLC receive data", + "ScaleUnit": "100%", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_tx_bw", + "MetricExpr": "sllc_tx_data * 64 / duration_time / 1e6", + "MetricGroup": "sllc_bw", + "BriefDescription": "Average bandwidth of SLLC transmit data", + "ScaleUnit": "1MB/s", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,sllc" + }, + { + "MetricName": "sllc_tx_bw_occupancy", + "MetricExpr": "sllc_tx_data / sllc_cycles", + "MetricGroup": "sllc_bw", + "BriefDescription": "Average bandwidth occupancy of SLLC transmit data", + "ScaleUnit": "100%", + "Compat": "0x000000(30|40)", + "Unit": "hisi_sccl,sllc" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-uc-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-uc-metric.json new file mode 100644 index 000000000000..5e1be1623c2b --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/uncore-uc-metric.json @@ -0,0 +1,146 @@ +[ + { + "MetricName": "uc2cring_rxdat_bw", + "MetricExpr": "cring_rxdat_cnt * 64 / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of UC access CRing", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2cring_txdat_bw", + "MetricExpr": "cring_txdat_cnt * 64 / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of CPU access L3C", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2uring_rxdat_bw", + "MetricExpr": "uring_rxdat_cnt * 64 / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of CPU access L3C", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2uring_txdat_bw", + "MetricExpr": "uring_txdat_cnt * 64 / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of CPU access L3C", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2uring_rx_merge_dat_bw", + "MetricExpr": "uring_rxreqdat_cnt * 64 / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of UC received merged data bandwidth", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2uring_tx_merge_dat_bw", + "MetricExpr": "uring_txreqdat_cnt * 64 / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of UC transmit merged data bandwidth", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2hbm_rd_bw", + "MetricExpr": "(uc2hbm_bank0_rd64 * 64 + uc2hbm_bank0_rd128 * 128 + uc2hbm_bank1_rd64 * 64 + uc2hbm_bank1_rd128 * 128) / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of UC reading HBM", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uc2hbm_wr_bw", + "MetricExpr": "(uc2hbm_bank0_wr64 * 64 + uc2hbm_bank0_wr128 * 128 + uc2hbm_bank1_wr64 * 64 + uc2hbm_bank1_wr128 * 128) / duration_time / 1e6", + "MetricGroup": "UC_bw", + "BriefDescription": "Average bandwidth of UC writing HBM", + "ScaleUnit": "1MB/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "spipe_hit_ratio", + "MetricExpr": "spipe_hit / spipe_lookup", + "MetricGroup": "UC_hit_ratio", + "BriefDescription": "Hit ratio of SPIPE", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "hpipe_hit_ratio", + "MetricExpr": "hpipe_hit / hpipe_lookup", + "MetricGroup": "UC_hit_ratio", + "BriefDescription": "Hit ratio of HPIPE", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "hc_pipe_hit_ratio", + "MetricExpr": "hc_pipe_hit_1k / hc_pipe_lookup", + "MetricGroup": "UC_hit_ratio", + "BriefDescription": "Hit ratio of HC_PIPE", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "sc_pipe_hit_ratio", + "MetricExpr": "sc_pipe_hit_sector / sc_pipe_lookup", + "MetricGroup": "UC_hit_ratio", + "BriefDescription": "Hit ratio of SC_PIPE", + "ScaleUnit": "100%", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "cring_rd_concurrency_numa", + "MetricExpr": "(cpu_rd64 + cpu_rd128 + cpu_rs64 + cpu_rs128 + cpu_mru) / duration_time", + "MetricGroup": "UC_concurrency", + "BriefDescription": "Concurrency of read requests from UC cring on NUMA mode", + "ScaleUnit": "1req/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "cring_rd_concurrency_uma", + "MetricExpr": "(cpu_rd64 + cpu_rd128 + cpu_rs64 + cpu_rs128 + cpu_mru) * cring_txdat_cnt / duration_time / (cring_txdat_cnt + uring_txdat_cnt)", + "MetricGroup": "UC_concurrency", + "BriefDescription": "Concurrency of read requests from UC cring on UMA mode", + "ScaleUnit": "1req/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "uring_rd_concurrency_numa", + "MetricExpr": "(ext2uc_ru64 + ext2uc_ru128 + ext2uc_rs64 + ext2uc_rs128) / duration_time", + "MetricGroup": "UC_concurrency", + "BriefDescription": "Concurrency of read requests from UC uring on UMA mode", + "ScaleUnit": "1req/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + }, + { + "MetricName": "hbm_read_concurrency", + "MetricExpr": "(2 * (uc2hbm_bank0_rd128 + uc2hbm_bank1_rd128) + uc2hbm_bank0_rd64 + uc2hbm_bank1_rd64) / duration_time", + "MetricGroup": "UC_concurrency", + "BriefDescription": "Concurrency of read requests from UC uring on UMA mode", + "ScaleUnit": "1req/s", + "Compat": "0x00000030", + "Unit": "hisi_sccl,uc" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-noc-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-noc-metric.json new file mode 100644 index 000000000000..4cee78c5880c --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-noc-metric.json @@ -0,0 +1,38 @@ +[ + { + "MetricName": "ingress_flow_bw", + "MetricExpr": "ingress_flow_sum * 64 / duration_time / 1e6", + "MetricGroup": "NoC_bw", + "BriefDescription": "Average data bandwidth from subsys to Ring", + "ScaleUnit": "1MB/s", + "Compat": "0x00000000", + "Unit": "hisi_scl,noc" + }, + { + "MetricName": "egress_flow_bw", + "MetricExpr": "egress_flow_sum * 64 / duration_time / 1e6", + "MetricGroup": "NoC_bw", + "BriefDescription": "Average data bandwidth from Ring to subsys", + "ScaleUnit": "1MB/s", + "Compat": "0x00000000", + "Unit": "hisi_scl,noc" + }, + { + "MetricName": "cw_main_flow_bw", + "MetricExpr": "cw_main_flow_sum * 64 / duration_time / 1e6", + "MetricGroup": "NoC_bw", + "BriefDescription": "Average data bandwidth of clockwise main Ring", + "ScaleUnit": "1MB/s", + "Compat": "0x00000000", + "Unit": "hisi_scl,noc" + }, + { + "MetricName": "cc_main_flow_bw", + "MetricExpr": "cc_main_flow_sum * 64 / duration_time / 1e6", + "MetricGroup": "NoC_bw", + "BriefDescription": "Average data bandwidth of counterclockwise main Ring", + "ScaleUnit": "1MB/s", + "Compat": "0x00000000", + "Unit": "hisi_scl,noc" + } +] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-cpa-event.json similarity index 73% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-cpa-event.json index 705efb48f99b..1103741b921b 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-cpa-event.json @@ -61,23 +61,5 @@ "BriefDescription": "Number of read ops transmitted by the P0 port which size is 32 bytes", "Compat": "0x00000030", "Unit": "hisi_sicl,cpa" - }, - { - "MetricName": "cpa_p1_avg_bw", - "MetricExpr": "(cpa_p1_wr_dat * 64 + cpa_p1_rd_dat_64b * 64 + cpa_p1_rd_dat_32b * 32) / duration_time / 1e6", - "BriefDescription": "Average bandwidth of CPA Port 1", - "MetricGroup": "CPA_bw", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sicl,cpa" - }, - { - "MetricName": "cpa_p0_avg_bw", - "MetricExpr": "(cpa_p0_wr_dat * 64 + cpa_p0_rd_dat_64b * 64 + cpa_p0_rd_dat_32b * 32) / duration_time / 1e6", - "BriefDescription": "Average bandwidth of CPA Port 0", - "MetricGroup": "CPA_bw", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sicl,cpa" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-ddrc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-ddrc-event.json similarity index 59% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-ddrc.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-ddrc-event.json index 8facfb35ea89..d172125518f1 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-ddrc.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-ddrc-event.json @@ -96,59 +96,5 @@ "BriefDescription": "Count of DDRC read commands", "Compat": "0x000000(30|40)", "Unit": "hisi_sccl,ddrc" - }, - { - "MetricName": "ddrc_write_bw", - "MetricExpr": "flux_wr * 32 / duration_time / 1e6", - "MetricGroup": "DDRC_bw", - "BriefDescription": "Average bandwidth of write DDRC memory", - "ScaleUnit": "1MB/s", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,ddrc" - }, - { - "MetricName": "ddrc_read_bw", - "MetricExpr": "flux_rd * 32 / duration_time / 1e6", - "MetricGroup": "DDRC_bw", - "BriefDescription": "Average bandwidth of read DDRC memory", - "ScaleUnit": "1MB/s", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,ddrc" - }, - { - "MetricName": "ddrc_rdwr_bw", - "MetricExpr": "(flux_wr + flux_rd) * 32 / duration_time / 1e6", - "MetricGroup": "DDRC_bw", - "BriefDescription": "Average bandwidth of DDRC (including memory read and write)", - "ScaleUnit": "1MB/s", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,ddrc" - }, - { - "MetricName": "ddrc_read_lat", - "MetricExpr": "ddrc_read_cmd_occupancy / ddrc_read_cmd * (duration_time * 1e9 / ddrc_cycles)", - "MetricGroup": "DDRC_lat", - "BriefDescription": "Average scheduling latency of DDRC read command", - "ScaleUnit": "1ns", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,ddrc" - }, - { - "MetricName": "ddrc_write_lat", - "MetricExpr": "ddrc_write_cmd_occupancy / ddrc_write_cmd * (duration_time * 1e9 / ddrc_cycles)", - "MetricGroup": "DDRC_lat", - "BriefDescription": "Average scheduling of DDRC write command", - "ScaleUnit": "1ns", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,ddrc" - }, - { - "MetricName": "ddrc_rowhit_rate", - "MetricExpr": "1 - ddrc_active_cmd / ddrc_cas_cmd", - "MetricGroup": "DDRC", - "BriefDescription": "Row hit rate of DDRC", - "ScaleUnit": "100%", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,ddrc" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-hha.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-hha-event.json similarity index 64% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-hha.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-hha-event.json index c294aeecd2ca..78aed4f2641d 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-hha.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-hha-event.json @@ -124,68 +124,5 @@ "BriefDescription": "Count the total operations that HHA receives", "Compat": "0x00000030", "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_read_ddrc_bw", - "MetricExpr": "(hha_rd_ddr_64b * 64 + hha_rd_ddr_128b * 128) / duration_time / 1e6", - "MetricGroup": "HHA_bw", - "BriefDescription": "Average bandwidth of reading DDRC", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_write_ddrc_bw", - "MetricExpr": "(hha_wr_ddr_64b * 64 + hha_wr_ddr_128b * 128) / duration_time / 1e6", - "MetricGroup": "HHA_bw", - "BriefDescription": "Average bandwidth of writing DDRC", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_cross_chip_ops_rate", - "MetricExpr": "rx_outer / rx_ops_num", - "MetricGroup": "HHA", - "BriefDescription": "Rate of cross-chip operations received by HHA", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_cross_die_ops_rate", - "MetricExpr": "rx_sccl / rx_ops_num", - "MetricGroup": "HHA", - "BriefDescription": "Rate of cross-die operations received by HHA", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_channel0_ops_rate", - "MetricExpr": "hha_rx_ch0 / rx_ops_num", - "MetricGroup": "HHA", - "BriefDescription": "Rate of channel 0 operations received by HHA", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_channel1_ops_rate", - "MetricExpr": "hha_rx_ch1 / rx_ops_num", - "MetricGroup": "HHA_lat", - "BriefDescription": "Rate of channel 1 operations received by HHA", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" - }, - { - "MetricName": "hha_req_average_lat", - "MetricExpr": "hha_req_lat / hha_req_cnt * (duration_time * 1e9 / hha_cycles)", - "MetricGroup": "HHA_lat", - "BriefDescription": "Average latency that HHA completes all requests", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,hha" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-l3c.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c-event.json similarity index 71% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-l3c.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c-event.json index 1d905beec448..5cdc5a5db533 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-l3c.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c-event.json @@ -102,41 +102,5 @@ "BriefDescription": "Count of the L3C retry CPU", "Compat": "0x00000030", "Unit": "hisi_sccl,l3c" - }, - { - "MetricName": "l3c_hit_rate", - "MetricExpr": "l3c_hit / l3c_ref", - "MetricGroup": "L3C", - "BriefDescription": "hit rate of L3C", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,l3c" - }, - { - "MetricName": "l3c_access_bw", - "MetricExpr": "l3c_ref * 64 / duration_time / 1e6", - "MetricGroup": "L3C_bw", - "BriefDescription": "Average bandwidth of CPU access L3C", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,l3c" - }, - { - "MetricName": "cpu_read_l3c_average_lat", - "MetricExpr": "cpu_read_l3c_lat / cpu_read_l3c_sum * (duration_time * 1e9 / l3c_cycles)", - "MetricGroup": "L3C_lat", - "BriefDescription": "Average latency of CPU reading L3C", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,l3c" - }, - { - "MetricName": "l3c_read_hha_average_lat", - "MetricExpr": "l3c_read_hha_lat / l3c_read_hha_sum * (duration_time * 1e9 / l3c_cycles)", - "MetricGroup": "L3C_lat", - "BriefDescription": "Average latency of L3C reading HHA", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,l3c" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-mn.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-mn-event.json similarity index 100% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-mn.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-mn-event.json diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/sys/uncore-noc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-noc-event.json similarity index 89% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip12/sys/uncore-noc.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-noc-event.json index bcdcac9e25ab..5d998dbe963b 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/sys/uncore-noc.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-noc-event.json @@ -325,41 +325,5 @@ "BriefDescription": "Count the number of data channel retry data flits counterclockwise from Ring to subsys", "Compat": "0x00000000", "Unit": "hisi_scl,noc" - }, - { - "MetricName": "ingress_flow_bw", - "MetricExpr": "ingress_flow_sum * 64 / duration_time / 1e6", - "MetricGroup": "NoC_bw", - "BriefDescription": "Average data bandwidth from subsys to Ring", - "ScaleUnit": "1MB/s", - "Compat": "0x00000000", - "Unit": "hisi_scl,noc" - }, - { - "MetricName": "egress_flow_bw", - "MetricExpr": "egress_flow_sum * 64 / duration_time / 1e6", - "MetricGroup": "NoC_bw", - "BriefDescription": "Average data bandwidth from Ring to subsys", - "ScaleUnit": "1MB/s", - "Compat": "0x00000000", - "Unit": "hisi_scl,noc" - }, - { - "MetricName": "cw_main_flow_bw", - "MetricExpr": "cw_main_flow_sum * 64 / duration_time / 1e6", - "MetricGroup": "NoC_bw", - "BriefDescription": "Average data bandwidth of clockwise main Ring", - "ScaleUnit": "1MB/s", - "Compat": "0x00000000", - "Unit": "hisi_scl,noc" - }, - { - "MetricName": "cc_main_flow_bw", - "MetricExpr": "cc_main_flow_sum * 64 / duration_time / 1e6", - "MetricGroup": "NoC_bw", - "BriefDescription": "Average data bandwidth of counterclockwise main Ring", - "ScaleUnit": "1MB/s", - "Compat": "0x00000000", - "Unit": "hisi_scl,noc" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-pa.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-pa-event.json similarity index 62% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-pa.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-pa-event.json index 0126043edb77..b74dc7801142 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-pa.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-pa-event.json @@ -180,95 +180,5 @@ "BriefDescription": "Count of the data flit from PA link3 to Ring", "Compat": "0x00000030", "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_rx_bw", - "MetricExpr": "(pa_rx_data_link0 + pa_rx_data_link1 + pa_rx_data_link2 + pa_rx_data_link3) * 20 / duration_time / 1e6", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth from Ring to PA", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_tx_bw", - "MetricExpr": "(pa_tx_data_link0 + pa_tx_data_link1 + pa_tx_data_link2 + pa_tx_data_link3) * 20 / duration_time / 1e6", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth from PA to Ring", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_rx_link0_bw_occupancy", - "MetricExpr": "pa_rx_data_link0 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from Ring to PA link0", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_rx_link1_bw_occupancy", - "MetricExpr": "pa_rx_data_link1 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from Ring to PA link1", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_rx_link2_bw_occupancy", - "MetricExpr": "pa_rx_data_link2 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from Ring to PA link2", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_rx_link3_bw_occupancy", - "MetricExpr": "pa_rx_data_link3 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from Ring to PA link3", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_tx_link0_bw_occupancy", - "MetricExpr": "pa_tx_data_link0 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from PA link0 to Ring", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_tx_link1_bw_occupancy", - "MetricExpr": "pa_tx_data_link1 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from PA link1 to Ring", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_tx_link2_bw_occupancy", - "MetricExpr": "pa_tx_data_link2 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from PA link2 to Ring", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" - }, - { - "MetricName": "pa_tx_link3_bw_occupancy", - "MetricExpr": "pa_tx_data_link3 / pa_cycles", - "MetricGroup": "PA_bw", - "BriefDescription": "Average data bandwidth occupancy from PA link3 to Ring", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sicl,pa" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-sllc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-sllc-event.json similarity index 59% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-sllc.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-sllc-event.json index 18b18e46c4ec..745d649501fc 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-sllc.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-sllc-event.json @@ -128,77 +128,5 @@ "BriefDescription": "Count of the response transmitted by SLLC", "Compat": "0x000000(30|40)", "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_rx_req_average_lat", - "MetricExpr": "sllc_rx_req_lat / sllc_rx_req * (duration_time * 1e9 / sllc_cycles)", - "MetricGroup": "sllc_lat", - "BriefDescription": "Average latency of SLLC receive requests", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_rx_data_average_lat", - "MetricExpr": "sllc_rx_data_lat / sllc_rx_data * (duration_time * 1e9 / sllc_cycles)", - "MetricGroup": "sllc_lat", - "BriefDescription": "Average latency of SLLC receive data", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_tx_req_average_lat", - "MetricExpr": "sllc_tx_req_lat / sllc_tx_req * (duration_time * 1e9 / sllc_cycles)", - "MetricGroup": "sllc_lat", - "BriefDescription": "Average latency of SLLC transmit requests", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_tx_data_average_lat", - "MetricExpr": "sllc_tx_data_lat / sllc_tx_data * (duration_time * 1e9 / sllc_cycles)", - "MetricGroup": "sllc_lat", - "BriefDescription": "Average latency of SLLC transmit data", - "ScaleUnit": "1ns", - "Compat": "0x00000030", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_rx_bw", - "MetricExpr": "sllc_rx_data * 64 / duration_time / 1e6", - "MetricGroup": "sllc_bw", - "BriefDescription": "Average bandwidth of SLLC receive data", - "ScaleUnit": "1MB/s", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_rx_bw_occupancy", - "MetricExpr": "sllc_rx_data / sllc_cycles", - "MetricGroup": "sllc_bw", - "BriefDescription": "Average bandwidth occupancy of SLLC receive data", - "ScaleUnit": "100%", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_tx_bw", - "MetricExpr": "sllc_tx_data * 64 / duration_time / 1e6", - "MetricGroup": "sllc_bw", - "BriefDescription": "Average bandwidth of SLLC transmit data", - "ScaleUnit": "1MB/s", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,sllc" - }, - { - "MetricName": "sllc_tx_bw_occupancy", - "MetricExpr": "sllc_tx_data / sllc_cycles", - "MetricGroup": "sllc_bw", - "BriefDescription": "Average bandwidth occupancy of SLLC transmit data", - "ScaleUnit": "100%", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,sllc" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-uc.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-uc-event.json similarity index 73% rename from tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-uc.json rename to tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-uc-event.json index 27c7625e2638..076b81ca7a21 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-uc.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-uc-event.json @@ -458,149 +458,5 @@ "BriefDescription": "Count of the number of data combination requests sent by the UC to the uring module", "Compat": "0x00000030", "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2cring_rxdat_bw", - "MetricExpr": "cring_rxdat_cnt * 64 / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of UC access CRing", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2cring_txdat_bw", - "MetricExpr": "cring_txdat_cnt * 64 / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of CPU access L3C", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2uring_rxdat_bw", - "MetricExpr": "uring_rxdat_cnt * 64 / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of CPU access L3C", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2uring_txdat_bw", - "MetricExpr": "uring_txdat_cnt * 64 / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of CPU access L3C", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2uring_rx_merge_dat_bw", - "MetricExpr": "uring_rxreqdat_cnt * 64 / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of UC received merged data bandwidth", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2uring_tx_merge_dat_bw", - "MetricExpr": "uring_txreqdat_cnt * 64 / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of UC transmit merged data bandwidth", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2hbm_rd_bw", - "MetricExpr": "(uc2hbm_bank0_rd64 * 64 + uc2hbm_bank0_rd128 * 128 + uc2hbm_bank1_rd64 * 64 + uc2hbm_bank1_rd128 * 128) / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of UC reading HBM", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uc2hbm_wr_bw", - "MetricExpr": "(uc2hbm_bank0_wr64 * 64 + uc2hbm_bank0_wr128 * 128 + uc2hbm_bank1_wr64 * 64 + uc2hbm_bank1_wr128 * 128) / duration_time / 1e6", - "MetricGroup": "UC_bw", - "BriefDescription": "Average bandwidth of UC writing HBM", - "ScaleUnit": "1MB/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "spipe_hit_ratio", - "MetricExpr": "spipe_hit / spipe_lookup", - "MetricGroup": "UC_hit_ratio", - "BriefDescription": "Hit ratio of SPIPE", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "hpipe_hit_ratio", - "MetricExpr": "hpipe_hit / hpipe_lookup", - "MetricGroup": "UC_hit_ratio", - "BriefDescription": "Hit ratio of HPIPE", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "hc_pipe_hit_ratio", - "MetricExpr": "hc_pipe_hit_1k / hc_pipe_lookup", - "MetricGroup": "UC_hit_ratio", - "BriefDescription": "Hit ratio of HC_PIPE", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "sc_pipe_hit_ratio", - "MetricExpr": "sc_pipe_hit_sector / sc_pipe_lookup", - "MetricGroup": "UC_hit_ratio", - "BriefDescription": "Hit ratio of SC_PIPE", - "ScaleUnit": "100%", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "cring_rd_concurrency_numa", - "MetricExpr": "(cpu_rd64 + cpu_rd128 + cpu_rs64 + cpu_rs128 + cpu_mru) / duration_time", - "MetricGroup": "UC_concurrency", - "BriefDescription": "Concurrency of read requests from UC cring on NUMA mode", - "ScaleUnit": "1req/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "cring_rd_concurrency_uma", - "MetricExpr": "(cpu_rd64 + cpu_rd128 + cpu_rs64 + cpu_rs128 + cpu_mru) * cring_txdat_cnt / duration_time / (cring_txdat_cnt + uring_txdat_cnt)", - "MetricGroup": "UC_concurrency", - "BriefDescription": "Concurrency of read requests from UC cring on UMA mode", - "ScaleUnit": "1req/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "uring_rd_concurrency_numa", - "MetricExpr": "(ext2uc_ru64 + ext2uc_ru128 + ext2uc_rs64 + ext2uc_rs128) / duration_time", - "MetricGroup": "UC_concurrency", - "BriefDescription": "Concurrency of read requests from UC uring on UMA mode", - "ScaleUnit": "1req/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - }, - { - "MetricName": "hbm_read_concurrency", - "MetricExpr": "(2 * (uc2hbm_bank0_rd128 + uc2hbm_bank1_rd128) + uc2hbm_bank0_rd64 + uc2hbm_bank1_rd64) / duration_time", - "MetricGroup": "UC_concurrency", - "BriefDescription": "Concurrency of read requests from UC uring on UMA mode", - "ScaleUnit": "1req/s", - "Compat": "0x00000030", - "Unit": "hisi_sccl,uc" - } + } ] -- 2.43.0