Skip to content

Commit 63ba5b0

Browse files
dslin1010palmer-dabbelt
authored andcommitted
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] Link: https://github.com/riscv-non-isa/riscv-sbi-doc/blob/master/src/ext-pmu.adoc#event-firmware-events-type-15 [1] Fixes: 8f0dcb4 ("perf arch events: riscv sbi firmware std event files") Fixes: c4f769d ("perf vendor events riscv: add Sifive U74 JSON file") Fixes: acbf6de ("perf vendor events riscv: Add StarFive Dubhe-80 JSON file") Fixes: 7340c6d ("perf vendor events riscv: add T-HEAD C9xx JSON file") Fixes: f5102e3 ("riscv: andes: Support specifying symbolic firmware and hardware raw event") Signed-off-by: Eric Lin <[email protected]> Reviewed-by: Samuel Holland <[email protected]> Reviewed-by: Nikita Shubin <[email protected]> Reviewed-by: Inochi Amaoto <[email protected]> Reviewed-by: Andrew Jones <[email protected]> Reviewed-by: Atish Patra <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent fb197c5 commit 63ba5b0

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
3737
},
3838
{
39-
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
39+
"ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
4040
},
4141
{
4242
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"

tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
{
7575
"PublicDescription": "Sent SFENCE.VMA with ASID request to other HART event",
7676
"ConfigCode": "0x800000000000000c",
77-
"EventName": "FW_SFENCE_VMA_RECEIVED",
77+
"EventName": "FW_SFENCE_VMA_ASID_SENT",
7878
"BriefDescription": "Sent SFENCE.VMA with ASID request to other HART event"
7979
},
8080
{

tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
3737
},
3838
{
39-
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
39+
"ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
4040
},
4141
{
4242
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"

tools/perf/pmu-events/arch/riscv/starfive/dubhe-80/firmware.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
3737
},
3838
{
39-
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
39+
"ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
4040
},
4141
{
4242
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"

tools/perf/pmu-events/arch/riscv/thead/c900-legacy/firmware.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
3737
},
3838
{
39-
"ArchStdEvent": "FW_SFENCE_VMA_RECEIVED"
39+
"ArchStdEvent": "FW_SFENCE_VMA_ASID_SENT"
4040
},
4141
{
4242
"ArchStdEvent": "FW_SFENCE_VMA_ASID_RECEIVED"

0 commit comments

Comments
 (0)