2023-12-21 06:04:14

by Jing Zhang

Subject: [PATCH] perf vendor events: Remove UTF-8 characters from cmn.json

cmn.json contains UTF-8 characters in brief description which
could break the perf build on some distros.

Fix this issue by removing the UTF-8 characters from cmn.json.

without the fix:
$find tools/perf/pmu-events/ -name "*.json" | xargs file -i | grep -v us-ascii
tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json: application/json; charset=utf-8

with the fix:
$file -i tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json: text/plain; charset=us-ascii

Fixes: 0b4de7bdf46c5215 ("perf jevents: Add support for Arm CMN PMU aliasing")
Reported-by: Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by: Jing Zhang <[email protected]>
---
tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json b/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
index 428605c..5ec157c 100644
--- a/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
+++ b/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
@@ -107,7 +107,7 @@
"EventName": "hnf_qos_hh_retry",
"EventidCode": "0xe",
"NodeType": "0x5",
- "BriefDescription": "Counts number of times a HighHigh priority request is protocolretried at the HN‑F.",
+ "BriefDescription": "Counts number of times a HighHigh priority request is protocolretried at the HN-F.",
"Unit": "arm_cmn",
"Compat": "(434|436|43c|43a).*"
},
--
1.8.3.1

2023-12-21 15:55:50

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf vendor events: Remove UTF-8 characters from cmn.json

Em Thu, Dec 21, 2023 at 02:03:13PM +0800, Jing Zhang escreveu:
> cmn.json contains UTF-8 characters in brief description which
> could break the perf build on some distros.
>
> Fix this issue by removing the UTF-8 characters from cmn.json.
>
> without the fix:
> $find tools/perf/pmu-events/ -name "*.json" | xargs file -i | grep -v us-ascii
> tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json: application/json; charset=utf-8
>
> with the fix:
> $file -i tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
> tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json: text/plain; charset=us-ascii

Thanks, applied!

- Arnaldo

> Fixes: 0b4de7bdf46c5215 ("perf jevents: Add support for Arm CMN PMU aliasing")
> Reported-by: Arnaldo Carvalho de Melo <[email protected]>
> Signed-off-by: Jing Zhang <[email protected]>
> ---
> tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json b/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
> index 428605c..5ec157c 100644
> --- a/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
> +++ b/tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json
> @@ -107,7 +107,7 @@
> "EventName": "hnf_qos_hh_retry",
> "EventidCode": "0xe",
> "NodeType": "0x5",
> - "BriefDescription": "Counts number of times a HighHigh priority request is protocolretried at the HN‑F.",
> + "BriefDescription": "Counts number of times a HighHigh priority request is protocolretried at the HN-F.",
> "Unit": "arm_cmn",
> "Compat": "(434|436|43c|43a).*"
> },
> --
> 1.8.3.1
>

--

- Arnaldo