Re: [PATCH v1 4/5] perf pmu-events: Remove duplicated riscv firmware event

Eric Lin
2024-08-06T03:55:02Z

Hi Ian,

I've sent a patch to fix it and the patch already merged. Thanks.
https://lore.kernel.org/all/20240719115018.27356-1-eric.lin@sifive.com/

Best regards,
Eric Lin

On Tue, Aug 6, 2024 at 3:44 AM Ian Rogers <irogers@google.com> wrote:
>
> FW_SFENCE_VMA_RECEIVED is repeated twice in the file which will break
> invariants in perf list as discussed in this thread:
> https://lore.kernel.org/linux-perf-users/20240719081651.24853-1-eric.lin@sifive.com/
>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json | 3 ---
> tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json | 3 ---
> .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json | 3 ---
> .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json | 3 ---
> 4 files changed, 12 deletions(-)
>
> diff --git a/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json
> index 9b4a032186a7..5a996fa4b837 100644
> --- a/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json
> +++ b/tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json
> @@ -35,9 +35,6 @@
> {
> "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> },
> - {
> - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> - },
> {
> "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
> },
> diff --git a/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json b/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json
> index 9b4a032186a7..5a996fa4b837 100644
> --- a/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json
> +++ b/tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json
> @@ -35,9 +35,6 @@
> {
> "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> },
> - {
> - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> - },
> {
> "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
> },
> diff --git a/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json b/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json
> index 9b4a032186a7..5a996fa4b837 100644
> --- a/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json
> +++ b/tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json
> @@ -35,9 +35,6 @@
> {
> "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> },
> - {
> - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> - },
> {
> "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
> },
> diff --git a/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json b/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json
> index 9b4a032186a7..5a996fa4b837 100644
> --- a/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json
> +++ b/tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json
> @@ -35,9 +35,6 @@
> {
> "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> },
> - {
> - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
> - },
> {
> "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
> },
> --
> 2.46.0.rc2.264.g509ed76dc8-goog
>