driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ICRSOQ ---------------------------------------------------------------------- After the 0x80-8f event enabled, dfx_en is pulled down. If the same counter is used to collect statistics on the 0x80 to 0x8F events, the statistics may be inaccurate and a counter overflow interrupt is reported. The hardware frequently reports overflow interrupts. As a result, the kernel does not even reset the watchdog. calltrace occured. 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/hip12/uncore-l3c-metric.json | 158 +----------------- .../arm64/hisilicon/hipxx/sys/uncore-l3c.json | 80 --------- 2 files changed, 9 insertions(+), 229 deletions(-) diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-l3c-metric.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-l3c-metric.json index 9b1846bd6fea..3feb20e8a08a 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-l3c-metric.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip12/uncore-l3c-metric.json @@ -1,205 +1,65 @@ [ - { - "MetricName": "l3t_dvmop_ost", - "MetricExpr": "l3t_dvmop_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding DVMOp requests in L3T per cycle", - "ScaleUnit": "per cycle" - }, { "MetricName": "l3t_dvmop_thp", "MetricExpr": "l3t_dvmop_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of DVMOp requests processed by L3T per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_dvmop_lat", - "MetricExpr": "l3t_dvmop_sum / l3t_dvmop_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of DVMOp requests processed by L3T", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_aq_time_ost", - "MetricExpr": "l3t_aq_time_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding AQ buffer time per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_aq_time_thp", "MetricExpr": "l3t_aq_time_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of AQ buffer time per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_aq_time_lat", - "MetricExpr": "l3t_aq_time_sum / l3t_aq_time_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of AQ buffer time", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_pq_time_ost", - "MetricExpr": "l3t_pq_time_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding PQ buffer time per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_pq_time_thp", "MetricExpr": "l3t_pq_time_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of PQ buffer time per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_pq_time_lat", - "MetricExpr": "l3t_pq_time_sum / l3t_pq_time_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of PQ buffer time", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_snp_cpu_ost", - "MetricExpr": "l3t_snp_cpu_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding SNPs sent to CPU per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_snp_cpu_thp", "MetricExpr": "l3t_snp_cpu_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of SNPs sent to CPU per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_snp_cpu_lat", - "MetricExpr": "l3t_snp_cpu_sum / l3t_snp_cpu_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of SNPs sent to CPU", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_rxsnp_l3t_ost", - "MetricExpr": "l3t_rxsnp_l3t_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding SNPs received by L3T per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_rxsnp_l3t_thp", "MetricExpr": "l3t_rxsnp_l3t_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of SNPs received by L3T per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_rxsnp_l3t_lat", - "MetricExpr": "l3t_rxsnp_l3t_sum / l3t_rxsnp_l3t_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of SNPs received by L3T", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_rxhydrasnp_l3t_ost", - "MetricExpr": "l3t_rxhydrasnp_l3t_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding HYDRASNPs received by L3T per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_rxhydrasnp_l3t_thp", "MetricExpr": "l3t_rxhydrasnp_l3t_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of HYDRASNPs received by L3T per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_rxhydrasnp_l3t_lat", - "MetricExpr": "l3t_rxhydrasnp_l3t_sum / l3t_rxhydrasnp_l3t_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of HYDRASNPs received by L3T", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_dbid_l3t_ost", - "MetricExpr": "l3t_dbid_l3t_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding DBIDs returned to CPU per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_dbid_l3t_thp", "MetricExpr": "l3t_dbid_l3t_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of DBIDs returned to CPU per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_dbid_l3t_lat", - "MetricExpr": "l3t_dbid_l3t_sum / l3t_dbid_l3t_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of DBIDs returned to CPU", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_wrnotram_ost", - "MetricExpr": "l3t_wrnotram_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding write requests to MATA per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_wrnotram_thp", "MetricExpr": "l3t_wrnotram_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of write requests to MATA per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_wrnotram_lat", - "MetricExpr": "l3t_wrnotram_sum / l3t_wrnotram_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of write requests to MATA", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_retry_ost", - "MetricExpr": "l3t_retry_sum / l3c_cycles", - "MetricGroup": "L3C_OST", - "BriefDescription": "Average number of outstanding retry requests per cycle", - "ScaleUnit": "per cycle" + "ScaleUnit": "ops/cycle" }, { "MetricName": "l3t_retry_thp", "MetricExpr": "l3t_retry_alloc / l3c_cycles", "MetricGroup": "L3C_THP", "BriefDescription": "Average throughput of retry requests per cycle", - "ScaleUnit": "per cycle" - }, - { - "MetricName": "l3t_retry_lat", - "MetricExpr": "l3t_retry_sum / l3t_retry_alloc", - "MetricGroup": "L3C_LAT", - "BriefDescription": "Average latency of retry requests", - "ScaleUnit": "cycles" - }, - { - "MetricName": "l3t_ret_cpu_bw", - "MetricExpr": "l3t_ret_cpu_sum * 64 / l3c_cycles", - "MetricGroup": "L3C_BW", - "BriefDescription": "Bandwidth of data returned to CPU from L3T (64B)", - "ScaleUnit": "B/s" - }, - { - "MetricName": "l3t_ret_ring_bw", - "MetricExpr": "l3t_ret_ring_sum * 64 / l3c_cycles", - "MetricGroup": "L3C_BW", - "BriefDescription": "Bandwidth of data returned to RING from L3T (64B)", - "ScaleUnit": "B/s" + "ScaleUnit": "ops/cycle" } ] diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c.json index 889b49527571..99e434cf915a 100644 --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c.json +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hipxx/sys/uncore-l3c.json @@ -90,22 +90,6 @@ "Compat": "0x000000(30|40)", "Unit": "hisi_sccl,l3c" }, - { - "EventCode": "0x80", - "EventName": "cpu_read_l3c_lat", - "Filter": "tt_core=0xff", - "BriefDescription": "Count the total latency that L3C completes the cluster CPU read requests", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x83", - "EventName": "l3c_read_hha_lat", - "Filter": "tt_core=0xff,tt_req=0x4", - "BriefDescription": "Count the total latency that HHA completes the L3C read requests", - "Compat": "0x000000(30|40)", - "Unit": "hisi_sccl,l3c" - }, { "EventCode": "0xb8", "EventName": "l3c_ref", @@ -170,70 +154,6 @@ "Compat": "0x000000(30|40)", "Unit": "hisi_sccl,l3c" }, - { - "EventCode": "0x81", - "EventName": "l3t_dvmop_sum", - "Filter": "tt_req=0x3", - "BriefDescription": "Total time spent by L3T on DVMOp requests", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x84", - "EventName": "l3t_aq_time_sum", - "BriefDescription": "Total time spent by marked requests in AQ buffer", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x85", - "EventName": "l3t_pq_time_sum", - "BriefDescription": "Total time spent by marked requests in PQ buffer", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x86", - "EventName": "l3t_snp_cpu_sum", - "BriefDescription": "Total time spent by L3T on sending SNPs to CPU", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x88", - "EventName": "l3t_rxsnp_l3t_sum", - "BriefDescription": "Total time spent by L3T receiving SNPs from RING", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x8a", - "EventName": "l3t_rxhydrasnp_l3t_sum", - "BriefDescription": "Total time spent by L3T receiving HYDRASNPs from RING", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x8b", - "EventName": "l3t_dbid_l3t_sum", - "BriefDescription": "Total time spent by L3T returning DBIDs to CPU", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x8d", - "EventName": "l3t_wrnotram_sum", - "BriefDescription": "Total time spent by L3T on sending writes to MATA", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, - { - "EventCode": "0x8e", - "EventName": "l3t_retry_sum", - "BriefDescription": "Total time spent by L3T on sending retries to CPU", - "Compat": "0x00000040", - "Unit": "hisi_sccl,l3c" - }, { "EventCode": "0xc1", "EventName": "l3t_dvmop_alloc", -- 2.43.0