[RFC,9/9] perf vendor events arm64: Remove unnecessary metric Unit and Compat specifiers

Commit Message

John Garry June 28, 2023, 10:29 a.m. UTC

It is now not necessary to specify Unit and Compat for metrics which
reference events for the same system, so remove them.

Signed-off-by: John Garry <[e-mail]>
---
 .../pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json   | 4 ----
 .../pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json   | 4 ----
 .../pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json   | 4 ----
 .../pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json | 4 ----
 4 files changed, 16 deletions(-)

Patch

diff --git a/tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json b/tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json
index f416fa052337..574aeb964efd 100644
--- a/tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json
+++ b/tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json
@@ -4,15 +4,11 @@ 
 	    "MetricName": "imx8mm_ddr_read.all",
 	    "MetricExpr": "imx8mm_ddr.read_cycles * 4 * 4",
 	    "ScaleUnit": "9.765625e-4KB",
-	    "Unit": "imx8_ddr",
-	    "Compat": "i.MX8MM"
    },
    {
 	    "BriefDescription": "bytes all masters write to ddr based on write-cycles event",
 	    "MetricName": "imx8mm_ddr_write.all",
 	    "MetricExpr": "imx8mm_ddr.write_cycles * 4 * 4",
 	    "ScaleUnit": "9.765625e-4KB",
-	    "Unit": "imx8_ddr",
-	    "Compat": "i.MX8MM"
    }
 ]
diff --git a/tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json b/tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json
index 2bbba4d8ea5b..d81e7d562b65 100644
--- a/tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json
+++ b/tools/perf/pmu-events/arch/arm64/freescale/imx8mn/sys/metrics.json
@@ -4,15 +4,11 @@ 
 	    "MetricName": "imx8mn_ddr_read.all",
 	    "MetricExpr": "imx8mn_ddr.read_cycles * 4 * 2",
 	    "ScaleUnit": "9.765625e-4KB",
-	    "Unit": "imx8_ddr",
-	    "Compat": "i.MX8MN"
    },
    {
 	    "BriefDescription": "bytes all masters write to ddr based on write-cycles event",
 	    "MetricName": "imx8mn_ddr_write.all",
 	    "MetricExpr": "imx8mn_ddr.write_cycles * 4 * 2",
 	    "ScaleUnit": "9.765625e-4KB",
-	    "Unit": "imx8_ddr",
-	    "Compat": "i.MX8MN"
    }
 ]
diff --git a/tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json b/tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json
index 862c98171e0d..d2a71b02ab59 100644
--- a/tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json
+++ b/tools/perf/pmu-events/arch/arm64/freescale/imx8mq/sys/metrics.json
@@ -4,15 +4,11 @@ 
 	    "MetricName": "imx8mq_ddr_read.all",
 	    "MetricExpr": "imx8mq_ddr.read_cycles * 4 * 4",
 	    "ScaleUnit": "9.765625e-4KB",
-	    "Unit": "imx8_ddr",
-	    "Compat": "i.MX8MQ"
    },
    {
 	    "BriefDescription": "bytes all masters write to ddr based on write-cycles event",
 	    "MetricName": "imx8mq_ddr_write.all",
 	    "MetricExpr": "imx8mq_ddr.write_cycles * 4 * 4",
 	    "ScaleUnit": "9.765625e-4KB",
-	    "Unit": "imx8_ddr",
-	    "Compat": "i.MX8MQ"
     }
 ]
diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json
index 7bcddec8a84f..c2ff0d85c354 100644
--- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json
+++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-cpa.json
@@ -67,15 +67,11 @@ 
 		"BriefDescription": "Average bandwidth of CPA Port 1",
 		"MetricGroup": "CPA",
 		"MetricName": "cpa_p1_avg_bw",
-		"Compat": "0x00000030",
-		"Unit": "hisi_sicl,cpa"
 	},
 	{
 		"MetricExpr": "(cpa_p0_wr_dat * 64 + cpa_p0_rd_dat_64b * 64 + cpa_p0_rd_dat_32b * 32) / cpa_cycles",
 		"BriefDescription": "Average bandwidth of CPA Port 0",
 		"MetricGroup": "CPA",
 		"MetricName": "cpa_p0_avg_bw",
-		"Compat": "0x00000030",
-		"Unit": "hisi_sicl,cpa"
 	}
 ]