perf arch events: Fix duplicate RISC-V SBI firmware event name
Subsystems (3)
PATCH 1/1 perf arch events: Fix duplicate RISC-V SBI firmware event name
Currently, the RISC-V firmware JSON file has duplicate event name "FW_SFENCE_VMA_RECEIVED". According to the RISC-V SBI PMU extension[1], the event name should be "FW_SFENCE_VMA_ASID_SENT".
Before this patch:
$ perf list
firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_received
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
After this patch:
$ perf list
firmware:
fw_access_load
[Load access trap event. Unit: cpu]
fw_access_store
[Store access trap event. Unit: cpu]
.....
fw_set_timer
[Set timer event. Unit: cpu]
fw_sfence_vma_asid_received
[Received SFENCE.VMA with ASID request from other HART event. Unit: cpu]
fw_sfence_vma_asid_sent
[Sent SFENCE.VMA with ASID request to other HART event. Unit: cpu]
fw_sfence_vma_received
[Received SFENCE.VMA request from other HART event. Unit: cpu]
--- tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json | 2 +- tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json | 2 +- tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json | 2 +- .../perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json | 2 +- .../perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json +1 -1
@@ -36,7 +36,7 @@ "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT" }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json +1 -1
@@ -74,7 +74,7 @@ { "PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event", "ConfigCode": "0x800000000000000c", - "EventName": "FW_SFENCE_VMA_RECEIVED", + "EventName": "FW_SFENCE_VMA_ASID_SENT", "BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event" }, {
tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json +1 -1
@@ -36,7 +36,7 @@ "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT" }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json +1 -1
@@ -36,7 +36,7 @@ "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT" }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json +1 -1
@@ -36,7 +36,7 @@ "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" }, { - "ArchStdEvent": "FW_SFENCE_VMA_RECEIVED" + "ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT" }, { "ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"
Signature · 1 line
2.43.2
Hi Eric,
Nice catch!
Shouldn't it fix every patch that copied affected 'firmware.json' by the way ?
Something like:
files")
file")
JSON file")
file")
firmware and hardware raw event")
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Hi Nikita,
Quoted 14 lines · Nikita Shubin
Hi Eric,
Nice catch!
Shouldn't it fix every patch that copied affected 'firmware.json' by the way ?
Something like:
Fixes 8f0dcb4e7364 ("perf arch events: riscv sbi firmware std eventfiles")
Fixes c4f769d4093d ("perf vendor events riscv: add Sifive U74 JSONfile")
Quoted 8 lines
Fixes acbf6de674ef ("perf vendor events riscv: Add StarFive Dubhe-80JSON file")
Fixes 7340c6df49df ("perf vendor events riscv: add T-HEAD C9xx JSONfile")
Fixes f5102e31c209 ("riscv: andes: Support specifying symbolicfirmware and hardware raw event")
Reviewed-by Nikita Shubin <[email protected]>
OK, I'll add every patch "Fixes:" in the commit message and send the v2 patch. Thanks for the review.
Regards,
Eric Lin