driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ICRSOQ ---------------------------------------------------------------------- Synchronized metrics cpa,ddrc,hha,pa,sllc from hip09 to hip12. Signed-off-by: Qinxin Xia <xiaqinxin@huawei.como> Signed-off-by: Qizhi Zhang <zhangqizhi3@h-partners.com> Signed-off-by: JiangShui Yang <yangjiangshui@h-partners.com> --- .../hisilicon/hip12/uncore-cpa-metric.json | 20 ++++ .../hisilicon/hip12/uncore-ddrc-metric.json | 56 +++++++++++ .../hisilicon/hip12/uncore-hha-metric.json | 65 +++++++++++++ .../hisilicon/hip12/uncore-pa-metric.json | 92 +++++++++++++++++++ .../hisilicon/hip12/uncore-sllc-metric.json | 74 +++++++++++++++ 5 files changed, 307 insertions(+) create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-cpa-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-ddrc-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-hha-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-pa-metric.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-sllc-metric.json diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-cpa-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-cpa-metric.json new file mode 100644 index 000000000000..1ead2819abe0 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/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/hip12/uncore-ddrc-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-ddrc-metric.json new file mode 100644 index 000000000000..b4a95fd53b76 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/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/hip12/uncore-hha-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-hha-metric.json new file mode 100644 index 000000000000..1232f30f5b0a --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/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/hip12/uncore-pa-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-pa-metric.json new file mode 100644 index 000000000000..94846f1812c0 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/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/hip12/uncore-sllc-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-sllc-metric.json new file mode 100644 index 000000000000..62f9abc078d2 --- /dev/null +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/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" + } +] -- 2.43.0