Improve PMU support
Subsystems (2)
v4 cover Improve PMU support
The latest version of the SBI specification includes a Performance Monitoring Unit(PMU) extension[1] which allows the supervisor to start/stop/configure various PMU events. The Sscofpmf ('Ss' for Privileged arch and Supervisor-level extensions, and 'cofpmf' for Count OverFlow and Privilege Mode Filtering) extension[2] allows the perf like tool to handle overflow interrupts and filtering support.
This series implements full PMU infrastructure to support PMU in virt machine. This will allow us to add any PMU events in future.
Currently, this series enables the following omu events.
1. cycle count
2. instruction count
3. DTLB load/store miss
4. ITLB prefetch miss
The first two are computed using host ticks while last three are counted during cpu_tlb_fill. We can do both sampling and count from guest userspace. This series has been tested on both RV64 and RV32. Both Linux[3] and Opensbi[4] patches are required to get the perf working.
Here is an output of perf stat/report while running hackbench with OpenSBI & Linux kernel patches applied [3].
Perf stat:
==========
[root@fedora-riscv ~]# perf stat -e cycles -e instructions -e dTLB-load-misses -e dTLB-store-misses -e iTLB-load-misses \
Quoted 1 line
perf bench sched messaging -g 1 -l 10
# Running 'sched/messaging' benchmark:
# 20 sender and receiver processes per group
# 1 groups == 40 processes run
Total time: 0.265 [sec]
Performance counter stats for 'perf bench sched messaging -g 1 -l 10':
4,167,825,362 cycles
4,166,609,256 instructions # 1.00 insn per cycle
3,092,026 dTLB-load-misses
258,280 dTLB-store-misses
2,068,966 iTLB-load-misses 0.585791767 seconds time elapsed
0.373802000 seconds user
1.042359000 seconds sysPerf record:
============
[root@fedora-riscv ~]# perf record -e cycles -e instructions \
Quoted 2 lines
-e dTLB-load-misses -e dTLB-store-misses -e iTLB-load-misses -c 10000 \
perf bench sched messaging -g 1 -l 10
# Running 'sched/messaging' benchmark:
# 20 sender and receiver processes per group
# 1 groups == 40 processes run
Total time: 1.397 [sec]
[ perf record: Woken up 10 times to write data ]
Check IO/CPU overload!
[ perf record: Captured and wrote 8.211 MB perf.data (214486 samples) ]
[root@fedora-riscv riscv]# perf report
Available samples
107K cycles ◆ 107K instructions ▒ 250 dTLB-load-misses ▒ 13 dTLB-store-misses ▒
172 iTLB-load-misses
..
Changes from v3->v4:
1. Removed the dummy events from pmu DT node.
2. Fixed pmu_avail_counters mask generation.
3. Added a patch to simplify the predicate function for counters.
Changes from v2->v3:
1. Addressed all the comments on PATCH1-4.
2. Split patch1 into two separate patches.
3. Added explicit comments to explain the event types in DT node.
4. Rebased on latest Qemu.
Changes from v1->v2:
1. Dropped the ACks from v1 as signficant changes happened after v1.
2. sscofpmf support.
3. A generic counter management framework.
[1] https://github.com/riscv-non-isa/riscv-sbi-doc/blob/master/riscv-sbi.adoc
[2] https://drive.google.com/file/d/171j4jFjIkKdj5LWcExphq4xG_2sihbfd/edit
[3] https://github.com/atishp04/linux/tree/riscv_pmu_v5
[4] https://github.com/atishp04/qemu/tree/riscv_pmu_v4
Atish Patra (11):
target/riscv: Fix PMU CSR predicate function target/riscv: Implement PMU CSR predicate function for S-mode target/riscv: pmu: Rename the counters extension to pmu target/riscv: pmu: Make number of counters configurable target/riscv: Implement mcountinhibit CSR target/riscv: Add support for hpmcounters/hpmevents target/riscv: Support mcycle/minstret write operation target/riscv: Add sscofpmf extension support target/riscv: Simplify counter predicate function target/riscv: Add few cache related PMU events hw/riscv: virt: Add PMU DT node to the device tree
hw/riscv/virt.c | 38 ++ target/riscv/cpu.c | 14 +- target/riscv/cpu.h | 50 ++- target/riscv/cpu_bits.h | 59 +++ target/riscv/cpu_helper.c | 26 ++ target/riscv/csr.c | 828 +++++++++++++++++++++++++++----------- target/riscv/machine.c | 26 ++ target/riscv/meson.build | 1 + target/riscv/pmu.c | 419 +++++++++++++++++++ target/riscv/pmu.h | 37 ++ 10 files changed, 1268 insertions(+), 230 deletions(-)
create mode 100644 target/riscv/pmu.c
create mode 100644 target/riscv/pmu.h
--
2.30.2
PATCH v4 1/11 target/riscv: Fix PMU CSR predicate function
From: Atish Patra <[email protected]>
The predicate function calculates the counter index incorrectly for hpmcounterx. Fix the counter index to reflect correct CSR number.
--- target/riscv/csr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
target/riscv/csr.c +6 -4
@@ -90,8 +90,9 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->hcounteren,1 << (csrno -CSR_HPMCOUNTER3 )) && -get_field (env->mcounteren,1 << (csrno -CSR_HPMCOUNTER3 ))) { + ctr_index = csrno -CSR_CYCLE ; +if (!get_field (env->hcounteren,1 << ctr_index) && +get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }break ;
@@ -117,8 +118,9 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->hcounteren,1 << (csrno -CSR_HPMCOUNTER3H )) && -get_field (env->mcounteren,1 << (csrno -CSR_HPMCOUNTER3H ))) { + ctr_index = csrno -CSR_CYCLEH ; +if (!get_field (env->hcounteren,1 << ctr_index) && +get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; }break ;
Signature · 1 line
2.30.2
PATCH v4 2/11 target/riscv: Implement PMU CSR predicate function for S-mode
In reply to Atish PatraFrom: Atish Patra <[email protected]>
Currently, the predicate function for PMU related CSRs only works if virtualization is enabled. It also does not check mcounteren bits before before cycle/minstret/hpmcounterx access.
Support supervisor mode access in the predicate function as well.
--- target/riscv/csr.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
target/riscv/csr.c +52 -0
@@ -63,12 +63,64 @@ static RISCVException ctr(CPURISCVState *env, int csrno)#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs); +int ctr_index;if (!cpu->cfg.ext_counters) {/* The Counters extensions is not enabled */ return RISCV_EXCP_ILLEGAL_INST ; } +if (env->priv ==PRV_S ) { +switch (csrno) { +case CSR_CYCLE : +if (!get_field (env->mcounteren,COUNTEREN_CY )) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; +case CSR_TIME : +if (!get_field (env->mcounteren,COUNTEREN_TM )) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; +case CSR_INSTRET : +if (!get_field (env->mcounteren,COUNTEREN_IR )) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; + case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: + ctr_index = csrno -CSR_CYCLE ; +if (!get_field (env->mcounteren,1 << ctr_index)) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; + } +if (riscv_cpu_is_32bit (env)) { +switch (csrno) { +case CSR_CYCLEH : +if (!get_field (env->mcounteren,COUNTEREN_CY )) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; +case CSR_TIMEH : +if (!get_field (env->mcounteren,COUNTEREN_TM )) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; +case CSR_INSTRETH : +if (!get_field (env->mcounteren,COUNTEREN_IR )) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; + case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: + ctr_index = csrno -CSR_CYCLEH ; +if (!get_field (env->mcounteren,1 << ctr_index)) { +return RISCV_EXCP_ILLEGAL_INST ; + } +break ; + } + } + } +if (riscv_cpu_virt_enabled (env)) {switch (csrno) {case CSR_CYCLE :
Signature · 1 line
2.30.2
Re: [PATCH v4 02/11] target/riscv: Implement PMU CSR predicate function for S-mode
Quoted 7 lines · Atish Patra
From: Atish Patra <[email protected]>
Currently, the predicate function for PMU related CSRs only works if virtualization is enabled. It also does not check mcounteren bits before before cycle/minstret/hpmcounterx access.
Quoted 9 lines
Support supervisor mode access in the predicate function as well.
Reviewed-by Alistair Francis <[email protected]>Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/csr.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
PATCH v4 3/11 target/riscv: pmu: Rename the counters extension to pmu
In reply to Atish PatraFrom: Atish Patra <[email protected]>
The PMU counters are supported via cpu config "Counters" which doesn't indicate the correct purpose of those counters.
Rename the config property to pmu to indicate that these counters are performance monitoring counters. This aligns with cpu options for ARM architecture as well.
--- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 2 +- target/riscv/csr.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
target/riscv/cpu.c +1 -1
@@ -627,7 +627,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false), -DEFINE_PROP_BOOL ("Counters" ,RISCVCPU , cfg.ext_counters, true), +DEFINE_PROP_BOOL ("pmu" ,RISCVCPU , cfg.ext_pmu, true),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zfh", RISCVCPU, cfg.ext_zfh, false),
target/riscv/cpu.h +1 -1
@@ -312,7 +312,7 @@ struct RISCVCPU {bool ext_zbb;bool ext_zbc;bool ext_zbs; -bool ext_counters; +bool ext_pmu;bool ext_ifencei;bool ext_icsr;bool ext_zfh;
target/riscv/csr.c +2 -2
@@ -65,8 +65,8 @@ static RISCVException ctr(CPURISCVState *env, int csrno)RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; -if (!cpu->cfg.ext_counters) { -/* The Counters extensions is not enabled */ +if (!cpu->cfg.ext_pmu) { +/* The PMU extension is not enabled */ return RISCV_EXCP_ILLEGAL_INST ; }
Signature · 1 line
2.30.2
PATCH v4 4/11 target/riscv: pmu: Make number of counters configurable
In reply to Atish PatraThe RISC-V privilege specification provides flexibility to implement any number of counters from 29 programmable counters. However, the QEMU implements all the counters.
Make it configurable through pmu config parameter which now will indicate how many programmable counters should be implemented by the cpu.
--- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 2 +- target/riscv/csr.c | 96 ++++++++++++++++++++++++++++++---------------- 3 files changed, 65 insertions(+), 35 deletions(-)
target/riscv/cpu.c +1 -1
@@ -627,7 +627,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false), -DEFINE_PROP_BOOL ("pmu" ,RISCVCPU , cfg.ext_pmu, true), +DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zfh", RISCVCPU, cfg.ext_zfh, false),
target/riscv/cpu.h +1 -1
@@ -312,12 +312,12 @@ struct RISCVCPU {bool ext_zbb;bool ext_zbc;bool ext_zbs; -bool ext_pmu;bool ext_ifencei;bool ext_icsr;bool ext_zfh;bool ext_zfhmin; +uint8_t pmu_num;char *priv_spec;char *user_spec;char *bext_spec;
target/riscv/csr.c +63 -33
127 lines not on this page · raw message
Signature · 1 line
2.30.2
Re: [PATCH v4 04/11] target/riscv: pmu: Make number of counters configurable
Quoted 8 lines · Atish Patra
The RISC-V privilege specification provides flexibility to implement any number of counters from 29 programmable counters. However, the QEMU implements all the counters.
Make it configurable through pmu config parameter which now will indicate how many programmable counters should be implemented by the cpu.
Quoted 8 lines
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 2 +- target/riscv/csr.c | 96 ++++++++++++++++++++++++++++++---------------- 3 files changed, 65 insertions(+), 35 deletions(-)
Re: [PATCH v4 04/11] target/riscv: pmu: Make number of counters configurable
In reply to Atish PatraQuoted 10 lines · Atish Patra
The RISC-V privilege specification provides flexibility to implement any number of counters from 29 programmable counters. However, the QEMU implements all the counters.
Make it configurable through pmu config parameter which now will indicate how many programmable counters should be implemented by the cpu.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>
Alistair
Quoted 176 lines
--- target/riscv/cpu.c | 2 +- target/riscv/cpu.h | 2 +- target/riscv/csr.c | 96 ++++++++++++++++++++++++++++++---------------- 3 files changed, 65 insertions(+), 35 deletions(-)target/riscv/cpu.c +1
-1@@ -627,7 +627,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("s" ,RISCVCPU , cfg.ext_s, true),DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false), -DEFINE_PROP_BOOL ("pmu" ,RISCVCPU , cfg.ext_pmu, true), +DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zfh", RISCVCPU, cfg.ext_zfh, false),target/riscv/cpu.h +1
-1@@ -312,12 +312,12 @@ struct RISCVCPU {bool ext_zbb;bool ext_zbc;bool ext_zbs; -bool ext_pmu;bool ext_ifencei;bool ext_icsr;bool ext_zfh;bool ext_zfhmin; +uint8_t pmu_num;char *priv_spec;char *user_spec;char *bext_spec;target/riscv/csr.c +63
-34@@ -58,15 +58,45 @@ static RISCVException vs(CPURISCVState *env, int csrno)return RISCV_EXCP_ILLEGAL_INST ; } +static RISCVException mctr (CPURISCVState *env,int csrno) +{ +#if !defined(CONFIG_USER_ONLY ) +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); +int ctr_index; +int base_csrno =CSR_MHPMCOUNTER3 ; + +if ((riscv_cpu_mxl (env) ==MXL_RV32 ) && csrno >=CSR_MCYCLEH ) { +/* Offset for RV32 mhpmcounternh counters */ + base_csrno +=0x80 ; + } + ctr_index = csrno - base_csrno; +if (!cpu->cfg.pmu_num || ctr_index >= cpu->cfg.pmu_num) { +/* The PMU is not enabled or counter is out of range*/ +return RISCV_EXCP_ILLEGAL_INST ; + } + +#endif +return RISCV_EXCP_NONE ; +} +static RISCVException ctr (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; +int base_csrno =CSR_HPMCOUNTER3 ; +bool rv32 =riscv_cpu_mxl (env) ==MXL_RV32 ? true : false; + +if (rv32 && csrno >=CSR_CYCLEH ) { +/* Offset for RV32 hpmcounternh counters */ + base_csrno +=0x80 ; + } + ctr_index = csrno - base_csrno; -if (!cpu->cfg.ext_pmu) { -/* The PMU extension is not enabled */ +if (!cpu->cfg.pmu_num || ctr_index >= (cpu->cfg.pmu_num)) { +/* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST ; }@@ -94,7 +124,7 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; } -if (riscv_cpu_is_32bit (env)) { +if (rv32) {switch (csrno) {case CSR_CYCLEH :if (!get_field (env->mcounteren,COUNTEREN_CY )) {@@ -149,7 +179,7 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; } -if (riscv_cpu_mxl (env) ==MXL_RV32 ) { +if (rv32) {switch (csrno) {case CSR_CYCLEH : if (!get_field(env->hcounteren, COUNTEREN_CY) &&@@ -2060,35 +2090,35 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_HPMCOUNTER30] = { "hpmcounter30", ctr, read_zero }, [CSR_HPMCOUNTER31] = { "hpmcounter31", ctr, read_zero }, - [CSR_MHPMCOUNTER3] = { "mhpmcounter3", any, read_zero }, - [CSR_MHPMCOUNTER4] = { "mhpmcounter4", any, read_zero }, - [CSR_MHPMCOUNTER5] = { "mhpmcounter5", any, read_zero }, - [CSR_MHPMCOUNTER6] = { "mhpmcounter6", any, read_zero }, - [CSR_MHPMCOUNTER7] = { "mhpmcounter7", any, read_zero }, - [CSR_MHPMCOUNTER8] = { "mhpmcounter8", any, read_zero }, - [CSR_MHPMCOUNTER9] = { "mhpmcounter9", any, read_zero }, - [CSR_MHPMCOUNTER10] = { "mhpmcounter10", any, read_zero }, - [CSR_MHPMCOUNTER11] = { "mhpmcounter11", any, read_zero }, - [CSR_MHPMCOUNTER12] = { "mhpmcounter12", any, read_zero }, - [CSR_MHPMCOUNTER13] = { "mhpmcounter13", any, read_zero }, - [CSR_MHPMCOUNTER14] = { "mhpmcounter14", any, read_zero }, - [CSR_MHPMCOUNTER15] = { "mhpmcounter15", any, read_zero }, - [CSR_MHPMCOUNTER16] = { "mhpmcounter16", any, read_zero }, - [CSR_MHPMCOUNTER17] = { "mhpmcounter17", any, read_zero }, - [CSR_MHPMCOUNTER18] = { "mhpmcounter18", any, read_zero }, - [CSR_MHPMCOUNTER19] = { "mhpmcounter19", any, read_zero }, - [CSR_MHPMCOUNTER20] = { "mhpmcounter20", any, read_zero }, - [CSR_MHPMCOUNTER21] = { "mhpmcounter21", any, read_zero }, - [CSR_MHPMCOUNTER22] = { "mhpmcounter22", any, read_zero }, - [CSR_MHPMCOUNTER23] = { "mhpmcounter23", any, read_zero }, - [CSR_MHPMCOUNTER24] = { "mhpmcounter24", any, read_zero }, - [CSR_MHPMCOUNTER25] = { "mhpmcounter25", any, read_zero }, - [CSR_MHPMCOUNTER26] = { "mhpmcounter26", any, read_zero }, - [CSR_MHPMCOUNTER27] = { "mhpmcounter27", any, read_zero }, - [CSR_MHPMCOUNTER28] = { "mhpmcounter28", any, read_zero }, - [CSR_MHPMCOUNTER29] = { "mhpmcounter29", any, read_zero }, - [CSR_MHPMCOUNTER30] = { "mhpmcounter30", any, read_zero }, - [CSR_MHPMCOUNTER31] = { "mhpmcounter31", any, read_zero }, + [CSR_MHPMCOUNTER3] = { "mhpmcounter3", mctr, read_zero }, + [CSR_MHPMCOUNTER4] = { "mhpmcounter4", mctr, read_zero }, + [CSR_MHPMCOUNTER5] = { "mhpmcounter5", mctr, read_zero }, + [CSR_MHPMCOUNTER6] = { "mhpmcounter6", mctr, read_zero }, + [CSR_MHPMCOUNTER7] = { "mhpmcounter7", mctr, read_zero }, + [CSR_MHPMCOUNTER8] = { "mhpmcounter8", mctr, read_zero }, + [CSR_MHPMCOUNTER9] = { "mhpmcounter9", mctr, read_zero }, + [CSR_MHPMCOUNTER10] = { "mhpmcounter10", mctr, read_zero }, + [CSR_MHPMCOUNTER11] = { "mhpmcounter11", mctr, read_zero }, + [CSR_MHPMCOUNTER12] = { "mhpmcounter12", mctr, read_zero }, + [CSR_MHPMCOUNTER13] = { "mhpmcounter13", mctr, read_zero }, + [CSR_MHPMCOUNTER14] = { "mhpmcounter14", mctr, read_zero }, + [CSR_MHPMCOUNTER15] = { "mhpmcounter15", mctr, read_zero }, + [CSR_MHPMCOUNTER16] = { "mhpmcounter16", mctr, read_zero }, + [CSR_MHPMCOUNTER17] = { "mhpmcounter17", mctr, read_zero }, + [CSR_MHPMCOUNTER18] = { "mhpmcounter18", mctr, read_zero }, + [CSR_MHPMCOUNTER19] = { "mhpmcounter19", mctr, read_zero }, + [CSR_MHPMCOUNTER20] = { "mhpmcounter20", mctr, read_zero }, + [CSR_MHPMCOUNTER21] = { "mhpmcounter21", mctr, read_zero }, + [CSR_MHPMCOUNTER22] = { "mhpmcounter22", mctr, read_zero }, + [CSR_MHPMCOUNTER23] = { "mhpmcounter23", mctr, read_zero }, + [CSR_MHPMCOUNTER24] = { "mhpmcounter24", mctr, read_zero }, + [CSR_MHPMCOUNTER25] = { "mhpmcounter25", mctr, read_zero }, + [CSR_MHPMCOUNTER26] = { "mhpmcounter26", mctr, read_zero }, + [CSR_MHPMCOUNTER27] = { "mhpmcounter27", mctr, read_zero }, + [CSR_MHPMCOUNTER28] = { "mhpmcounter28", mctr, read_zero }, + [CSR_MHPMCOUNTER29] = { "mhpmcounter29", mctr, read_zero }, + [CSR_MHPMCOUNTER30] = { "mhpmcounter30", mctr, read_zero }, + [CSR_MHPMCOUNTER31] = { "mhpmcounter31", mctr, read_zero }, [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_zero }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_zero }, --2.30.2
PATCH v4 5/11 target/riscv: Implement mcountinhibit CSR
In reply to Atish PatraFrom: Atish Patra <[email protected]>
As per the privilege specification v1.11, mcountinhibit allows to start/stop a pmu counter selectively.
--- target/riscv/cpu.h | 2 ++ target/riscv/cpu_bits.h | 4 ++++ target/riscv/csr.c | 25 +++++++++++++++++++++++++ target/riscv/machine.c | 1 + 4 files changed, 32 insertions(+)
target/riscv/cpu.h +2 -0
@@ -222,6 +222,8 @@ struct CPURISCVState {target_ulong scounteren;target_ulong mcounteren; +target_ulong mcountinhibit; +target_ulong sscratch;target_ulong mscratch;
target/riscv/cpu_bits.h +4 -0
@@ -283,6 +283,10 @@#define CSR_MHPMCOUNTER29 0xb1d#define CSR_MHPMCOUNTER30 0xb1e#define CSR_MHPMCOUNTER31 0xb1f + +/* Machine counter-inhibit register */ +#define CSR_MCOUNTINHIBIT 0x320 +#define CSR_MHPMEVENT3 0x323#define CSR_MHPMEVENT4 0x324#define CSR_MHPMEVENT5 0x325
target/riscv/csr.c +25 -0
@@ -834,6 +834,28 @@ static RISCVException write_mtvec(CPURISCVState *env, int csrno,return RISCV_EXCP_NONE ; } +static RISCVException read_mcountinhibit (CPURISCVState *env,int csrno, +target_ulong *val) +{ +if (env->priv_ver <PRIV_VERSION_1_11_0 ) { +return RISCV_EXCP_ILLEGAL_INST ; + } + + *val = env->mcountinhibit; +return RISCV_EXCP_NONE ; +} + +static RISCVException write_mcountinhibit (CPURISCVState *env,int csrno, +target_ulong val) +{ +if (env->priv_ver <PRIV_VERSION_1_11_0 ) { +return RISCV_EXCP_ILLEGAL_INST ; + } + + env->mcountinhibit = val; +return RISCV_EXCP_NONE ; +} +static RISCVException read_mcounteren (CPURISCVState *env,int csrno,target_ulong *val) {
@@ -2120,6 +2142,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMCOUNTER30] = { "mhpmcounter30", mctr, read_zero }, [CSR_MHPMCOUNTER31] = { "mhpmcounter31", mctr, read_zero }, + [CSR_MCOUNTINHIBIT] = { "mcountinhibit", any, read_mcountinhibit, + write_mcountinhibit }, + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_zero }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_zero }, [CSR_MHPMEVENT5] = { "mhpmevent5", any, read_zero },
target/riscv/machine.c +1 -0
@@ -205,6 +205,7 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINTTL (env.mtval,RISCVCPU ),VMSTATE_UINTTL (env.scounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcounteren,RISCVCPU ), +VMSTATE_UINTTL (env.mcountinhibit,RISCVCPU ),VMSTATE_UINTTL (env.sscratch,RISCVCPU ),VMSTATE_UINTTL (env.mscratch,RISCVCPU ), VMSTATE_UINT64(env.mfromhost, RISCVCPU),
Signature · 1 line
2.30.2
PATCH v4 6/11 target/riscv: Add support for hpmcounters/hpmevents
In reply to Atish PatraFrom: Atish Patra <[email protected]>
With SBI PMU extension, user can use any of the available hpmcounters to track any perf events based on the value written to mhpmevent csr. Add read/write functionality for these csrs.
--- target/riscv/cpu.h | 11 + target/riscv/csr.c | 468 ++++++++++++++++++++++++++++------------- target/riscv/machine.c | 3 + 3 files changed, 330 insertions(+), 152 deletions(-)
target/riscv/cpu.h +11 -0
@@ -101,6 +101,8 @@ typedef struct CPURISCVState CPURISCVState;#endif #define RV_VLEN_MAX 1024 +#define RV_MAX_MHPMEVENTS 29 +#define RV_MAX_MHPMCOUNTERS 32 FIELD(VTYPE, VLMUL, 0, 3)FIELD (VTYPE ,VSEW ,3 ,3 )
@@ -224,6 +226,15 @@ struct CPURISCVState {target_ulong mcountinhibit; +/* PMU counter configured values */ +target_ulong mhpmcounter_val[RV_MAX_MHPMCOUNTERS ]; + +/* for RV32 */ +target_ulong mhpmcounterh_val[RV_MAX_MHPMCOUNTERS ]; + +/* PMU event selector configured values */ +target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ]; +target_ulong sscratch;target_ulong mscratch;
target/riscv/csr.c +316 -152
494 lines not on this page · raw message
target/riscv/machine.c +3 -0
@@ -206,6 +206,9 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINTTL (env.scounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcountinhibit,RISCVCPU ), +VMSTATE_UINTTL_ARRAY (env.mhpmcounter_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_UINTTL_ARRAY (env.mhpmcounterh_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_UINTTL_ARRAY (env.mhpmevent_val,RISCVCPU ,RV_MAX_MHPMEVENTS ),VMSTATE_UINTTL (env.sscratch,RISCVCPU ),VMSTATE_UINTTL (env.mscratch,RISCVCPU ), VMSTATE_UINT64(env.mfromhost, RISCVCPU),
Signature · 1 line
2.30.2
Re: [PATCH v4 06/11] target/riscv: Add support for hpmcounters/hpmevents
Quoted 65 lines · Atish Patra
From: Atish Patra <[email protected]>
With SBI PMU extension, user can use any of the available hpmcounters to track any perf events based on the value written to mhpmevent csr. Add read/write functionality for these csrs.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.h | 11 + target/riscv/csr.c | 468 ++++++++++++++++++++++++++++------------- target/riscv/machine.c | 3 + 3 files changed, 330 insertions(+), 152 deletions(-)target/riscv/cpu.h +11
-0@@ -101,6 +101,8 @@ typedef struct CPURISCVState CPURISCVState;#endif #define RV_VLEN_MAX 1024 +#define RV_MAX_MHPMEVENTS 29 +#define RV_MAX_MHPMCOUNTERS 32 FIELD(VTYPE, VLMUL, 0, 3)FIELD (VTYPE ,VSEW ,3 ,3 )@@ -224,6 +226,15 @@ struct CPURISCVState {target_ulong mcountinhibit; +/* PMU counter configured values */ +target_ulong mhpmcounter_val[RV_MAX_MHPMCOUNTERS ]; + +/* for RV32 */ +target_ulong mhpmcounterh_val[RV_MAX_MHPMCOUNTERS ]; + +/* PMU event selector configured values */ +target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ]; +target_ulong sscratch;target_ulong mscratch;target/riscv/csr.c +9
-0@@ -80,6 +80,15 @@ static RISCVException mctr(CPURISCVState *env, int csrno)return RISCV_EXCP_NONE ; } +static RISCVException mctr32 (CPURISCVState *env,int csrno) +{ +if (riscv_cpu_mxl (env) !=MXL_RV32 ) { +return RISCV_EXCP_ILLEGAL_INST ; + } + +return mctr (env, csrno); +} +static RISCVException ctr (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY )
target/riscv/csr.c static RISCVException read_instret(CPURISCVState *env, int csrno, · line 476
Quoted 4 lines
target/riscv/csr.c +1
-0@@ -464,6 +473,7 @@ static RISCVException read_instret(CPURISCVState *env, int csrno,#else *val =cpu_get_host_ticks ();#endif +
nits: it looks like this change is unnecessary, and is causing a not-so-good git diff here, and below for read_instreth()
target/riscv/csr.c static RISCVException read_instreth(CPURISCVState *env, int csrno, · line 494
Quoted 10 lines
target/riscv/csr.c +3
-0return RISCV_EXCP_NONE ; }@@ -479,9 +489,76 @@ static RISCVException read_instreth(CPURISCVState *env, int csrno,#else *val =cpu_get_host_ticks () >>32 ;#endif + +return RISCV_EXCP_NONE ; +}
nits: ditto
Quoted 472 lines
target/riscv/csr.c +303
-152+ +static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) +{ +int evt_index = csrno -CSR_MHPMEVENT3 ; + + *val = env->mhpmevent_val[evt_index]; + +return RISCV_EXCP_NONE ; +} + +static int write_mhpmevent (CPURISCVState *env,int csrno,target_ulong val) +{ +int evt_index = csrno -CSR_MHPMEVENT3 ; + + env->mhpmevent_val[evt_index] = val; + +return RISCV_EXCP_NONE ; +} + +static int write_mhpmcounter (CPURISCVState *env,int csrno,target_ulong val) +{ +int ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; + + env->mhpmcounter_val[ctr_index] = val; +return RISCV_EXCP_NONE ; } +static int write_mhpmcounterh (CPURISCVState *env,int csrno,target_ulong val) +{ +int ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; + + env->mhpmcounterh_val[ctr_index] = val; + +return RISCV_EXCP_NONE ; +} + +static int read_hpmcounter (CPURISCVState *env,int csrno,target_ulong *val) +{ +int ctr_index; + +if (env->priv ==PRV_M ) { + ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; + }else { + ctr_index = csrno -CSR_HPMCOUNTER3 +3 ; + } + *val = env->mhpmcounter_val[ctr_index]; + +return RISCV_EXCP_NONE ; +} + +static int read_hpmcounterh (CPURISCVState *env,int csrno,target_ulong *val) +{ +int ctr_index; + +if (env->priv ==PRV_M ) { + ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; + }else { + ctr_index = csrno -CSR_HPMCOUNTER3H +3 ; + } + + *val = env->mhpmcounterh_val[ctr_index]; + +return RISCV_EXCP_NONE ; +} + +#if defined(CONFIG_USER_ONLY )static RISCVException read_time (CPURISCVState *env,int csrno,target_ulong *val)@@ -2082,157 +2159,244 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_SPMBASE] = { "spmbase", pointer_masking, read_spmbase, write_spmbase }, /* Performance Counters */ - [CSR_HPMCOUNTER3] = { "hpmcounter3", ctr, read_zero }, - [CSR_HPMCOUNTER4] = { "hpmcounter4", ctr, read_zero }, - [CSR_HPMCOUNTER5] = { "hpmcounter5", ctr, read_zero }, - [CSR_HPMCOUNTER6] = { "hpmcounter6", ctr, read_zero }, - [CSR_HPMCOUNTER7] = { "hpmcounter7", ctr, read_zero }, - [CSR_HPMCOUNTER8] = { "hpmcounter8", ctr, read_zero }, - [CSR_HPMCOUNTER9] = { "hpmcounter9", ctr, read_zero }, - [CSR_HPMCOUNTER10] = { "hpmcounter10", ctr, read_zero }, - [CSR_HPMCOUNTER11] = { "hpmcounter11", ctr, read_zero }, - [CSR_HPMCOUNTER12] = { "hpmcounter12", ctr, read_zero }, - [CSR_HPMCOUNTER13] = { "hpmcounter13", ctr, read_zero }, - [CSR_HPMCOUNTER14] = { "hpmcounter14", ctr, read_zero }, - [CSR_HPMCOUNTER15] = { "hpmcounter15", ctr, read_zero }, - [CSR_HPMCOUNTER16] = { "hpmcounter16", ctr, read_zero }, - [CSR_HPMCOUNTER17] = { "hpmcounter17", ctr, read_zero }, - [CSR_HPMCOUNTER18] = { "hpmcounter18", ctr, read_zero }, - [CSR_HPMCOUNTER19] = { "hpmcounter19", ctr, read_zero }, - [CSR_HPMCOUNTER20] = { "hpmcounter20", ctr, read_zero }, - [CSR_HPMCOUNTER21] = { "hpmcounter21", ctr, read_zero }, - [CSR_HPMCOUNTER22] = { "hpmcounter22", ctr, read_zero }, - [CSR_HPMCOUNTER23] = { "hpmcounter23", ctr, read_zero }, - [CSR_HPMCOUNTER24] = { "hpmcounter24", ctr, read_zero }, - [CSR_HPMCOUNTER25] = { "hpmcounter25", ctr, read_zero }, - [CSR_HPMCOUNTER26] = { "hpmcounter26", ctr, read_zero }, - [CSR_HPMCOUNTER27] = { "hpmcounter27", ctr, read_zero }, - [CSR_HPMCOUNTER28] = { "hpmcounter28", ctr, read_zero }, - [CSR_HPMCOUNTER29] = { "hpmcounter29", ctr, read_zero }, - [CSR_HPMCOUNTER30] = { "hpmcounter30", ctr, read_zero }, - [CSR_HPMCOUNTER31] = { "hpmcounter31", ctr, read_zero }, - - [CSR_MHPMCOUNTER3] = { "mhpmcounter3", mctr, read_zero }, - [CSR_MHPMCOUNTER4] = { "mhpmcounter4", mctr, read_zero }, - [CSR_MHPMCOUNTER5] = { "mhpmcounter5", mctr, read_zero }, - [CSR_MHPMCOUNTER6] = { "mhpmcounter6", mctr, read_zero }, - [CSR_MHPMCOUNTER7] = { "mhpmcounter7", mctr, read_zero }, - [CSR_MHPMCOUNTER8] = { "mhpmcounter8", mctr, read_zero }, - [CSR_MHPMCOUNTER9] = { "mhpmcounter9", mctr, read_zero }, - [CSR_MHPMCOUNTER10] = { "mhpmcounter10", mctr, read_zero }, - [CSR_MHPMCOUNTER11] = { "mhpmcounter11", mctr, read_zero }, - [CSR_MHPMCOUNTER12] = { "mhpmcounter12", mctr, read_zero }, - [CSR_MHPMCOUNTER13] = { "mhpmcounter13", mctr, read_zero }, - [CSR_MHPMCOUNTER14] = { "mhpmcounter14", mctr, read_zero }, - [CSR_MHPMCOUNTER15] = { "mhpmcounter15", mctr, read_zero }, - [CSR_MHPMCOUNTER16] = { "mhpmcounter16", mctr, read_zero }, - [CSR_MHPMCOUNTER17] = { "mhpmcounter17", mctr, read_zero }, - [CSR_MHPMCOUNTER18] = { "mhpmcounter18", mctr, read_zero }, - [CSR_MHPMCOUNTER19] = { "mhpmcounter19", mctr, read_zero }, - [CSR_MHPMCOUNTER20] = { "mhpmcounter20", mctr, read_zero }, - [CSR_MHPMCOUNTER21] = { "mhpmcounter21", mctr, read_zero }, - [CSR_MHPMCOUNTER22] = { "mhpmcounter22", mctr, read_zero }, - [CSR_MHPMCOUNTER23] = { "mhpmcounter23", mctr, read_zero }, - [CSR_MHPMCOUNTER24] = { "mhpmcounter24", mctr, read_zero }, - [CSR_MHPMCOUNTER25] = { "mhpmcounter25", mctr, read_zero }, - [CSR_MHPMCOUNTER26] = { "mhpmcounter26", mctr, read_zero }, - [CSR_MHPMCOUNTER27] = { "mhpmcounter27", mctr, read_zero }, - [CSR_MHPMCOUNTER28] = { "mhpmcounter28", mctr, read_zero }, - [CSR_MHPMCOUNTER29] = { "mhpmcounter29", mctr, read_zero }, - [CSR_MHPMCOUNTER30] = { "mhpmcounter30", mctr, read_zero }, - [CSR_MHPMCOUNTER31] = { "mhpmcounter31", mctr, read_zero }, - - [CSR_MCOUNTINHIBIT] = { "mcountinhibit", any, read_mcountinhibit, - write_mcountinhibit }, - - [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_zero }, - [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_zero }, - [CSR_MHPMEVENT5] = { "mhpmevent5", any, read_zero }, - [CSR_MHPMEVENT6] = { "mhpmevent6", any, read_zero }, - [CSR_MHPMEVENT7] = { "mhpmevent7", any, read_zero }, - [CSR_MHPMEVENT8] = { "mhpmevent8", any, read_zero }, - [CSR_MHPMEVENT9] = { "mhpmevent9", any, read_zero }, - [CSR_MHPMEVENT10] = { "mhpmevent10", any, read_zero }, - [CSR_MHPMEVENT11] = { "mhpmevent11", any, read_zero }, - [CSR_MHPMEVENT12] = { "mhpmevent12", any, read_zero }, - [CSR_MHPMEVENT13] = { "mhpmevent13", any, read_zero }, - [CSR_MHPMEVENT14] = { "mhpmevent14", any, read_zero }, - [CSR_MHPMEVENT15] = { "mhpmevent15", any, read_zero }, - [CSR_MHPMEVENT16] = { "mhpmevent16", any, read_zero }, - [CSR_MHPMEVENT17] = { "mhpmevent17", any, read_zero }, - [CSR_MHPMEVENT18] = { "mhpmevent18", any, read_zero }, - [CSR_MHPMEVENT19] = { "mhpmevent19", any, read_zero }, - [CSR_MHPMEVENT20] = { "mhpmevent20", any, read_zero }, - [CSR_MHPMEVENT21] = { "mhpmevent21", any, read_zero }, - [CSR_MHPMEVENT22] = { "mhpmevent22", any, read_zero }, - [CSR_MHPMEVENT23] = { "mhpmevent23", any, read_zero }, - [CSR_MHPMEVENT24] = { "mhpmevent24", any, read_zero }, - [CSR_MHPMEVENT25] = { "mhpmevent25", any, read_zero }, - [CSR_MHPMEVENT26] = { "mhpmevent26", any, read_zero }, - [CSR_MHPMEVENT27] = { "mhpmevent27", any, read_zero }, - [CSR_MHPMEVENT28] = { "mhpmevent28", any, read_zero }, - [CSR_MHPMEVENT29] = { "mhpmevent29", any, read_zero }, - [CSR_MHPMEVENT30] = { "mhpmevent30", any, read_zero }, - [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_zero }, - - [CSR_HPMCOUNTER3H] = { "hpmcounter3h", ctr32, read_zero }, - [CSR_HPMCOUNTER4H] = { "hpmcounter4h", ctr32, read_zero }, - [CSR_HPMCOUNTER5H] = { "hpmcounter5h", ctr32, read_zero }, - [CSR_HPMCOUNTER6H] = { "hpmcounter6h", ctr32, read_zero }, - [CSR_HPMCOUNTER7H] = { "hpmcounter7h", ctr32, read_zero }, - [CSR_HPMCOUNTER8H] = { "hpmcounter8h", ctr32, read_zero }, - [CSR_HPMCOUNTER9H] = { "hpmcounter9h", ctr32, read_zero }, - [CSR_HPMCOUNTER10H] = { "hpmcounter10h", ctr32, read_zero }, - [CSR_HPMCOUNTER11H] = { "hpmcounter11h", ctr32, read_zero }, - [CSR_HPMCOUNTER12H] = { "hpmcounter12h", ctr32, read_zero }, - [CSR_HPMCOUNTER13H] = { "hpmcounter13h", ctr32, read_zero }, - [CSR_HPMCOUNTER14H] = { "hpmcounter14h", ctr32, read_zero }, - [CSR_HPMCOUNTER15H] = { "hpmcounter15h", ctr32, read_zero }, - [CSR_HPMCOUNTER16H] = { "hpmcounter16h", ctr32, read_zero }, - [CSR_HPMCOUNTER17H] = { "hpmcounter17h", ctr32, read_zero }, - [CSR_HPMCOUNTER18H] = { "hpmcounter18h", ctr32, read_zero }, - [CSR_HPMCOUNTER19H] = { "hpmcounter19h", ctr32, read_zero }, - [CSR_HPMCOUNTER20H] = { "hpmcounter20h", ctr32, read_zero }, - [CSR_HPMCOUNTER21H] = { "hpmcounter21h", ctr32, read_zero }, - [CSR_HPMCOUNTER22H] = { "hpmcounter22h", ctr32, read_zero }, - [CSR_HPMCOUNTER23H] = { "hpmcounter23h", ctr32, read_zero }, - [CSR_HPMCOUNTER24H] = { "hpmcounter24h", ctr32, read_zero }, - [CSR_HPMCOUNTER25H] = { "hpmcounter25h", ctr32, read_zero }, - [CSR_HPMCOUNTER26H] = { "hpmcounter26h", ctr32, read_zero }, - [CSR_HPMCOUNTER27H] = { "hpmcounter27h", ctr32, read_zero }, - [CSR_HPMCOUNTER28H] = { "hpmcounter28h", ctr32, read_zero }, - [CSR_HPMCOUNTER29H] = { "hpmcounter29h", ctr32, read_zero }, - [CSR_HPMCOUNTER30H] = { "hpmcounter30h", ctr32, read_zero }, - [CSR_HPMCOUNTER31H] = { "hpmcounter31h", ctr32, read_zero }, - - [CSR_MHPMCOUNTER3H] = { "mhpmcounter3h", any32, read_zero }, - [CSR_MHPMCOUNTER4H] = { "mhpmcounter4h", any32, read_zero }, - [CSR_MHPMCOUNTER5H] = { "mhpmcounter5h", any32, read_zero }, - [CSR_MHPMCOUNTER6H] = { "mhpmcounter6h", any32, read_zero }, - [CSR_MHPMCOUNTER7H] = { "mhpmcounter7h", any32, read_zero }, - [CSR_MHPMCOUNTER8H] = { "mhpmcounter8h", any32, read_zero }, - [CSR_MHPMCOUNTER9H] = { "mhpmcounter9h", any32, read_zero }, - [CSR_MHPMCOUNTER10H] = { "mhpmcounter10h", any32, read_zero }, - [CSR_MHPMCOUNTER11H] = { "mhpmcounter11h", any32, read_zero }, - [CSR_MHPMCOUNTER12H] = { "mhpmcounter12h", any32, read_zero }, - [CSR_MHPMCOUNTER13H] = { "mhpmcounter13h", any32, read_zero }, - [CSR_MHPMCOUNTER14H] = { "mhpmcounter14h", any32, read_zero }, - [CSR_MHPMCOUNTER15H] = { "mhpmcounter15h", any32, read_zero }, - [CSR_MHPMCOUNTER16H] = { "mhpmcounter16h", any32, read_zero }, - [CSR_MHPMCOUNTER17H] = { "mhpmcounter17h", any32, read_zero }, - [CSR_MHPMCOUNTER18H] = { "mhpmcounter18h", any32, read_zero }, - [CSR_MHPMCOUNTER19H] = { "mhpmcounter19h", any32, read_zero }, - [CSR_MHPMCOUNTER20H] = { "mhpmcounter20h", any32, read_zero }, - [CSR_MHPMCOUNTER21H] = { "mhpmcounter21h", any32, read_zero }, - [CSR_MHPMCOUNTER22H] = { "mhpmcounter22h", any32, read_zero }, - [CSR_MHPMCOUNTER23H] = { "mhpmcounter23h", any32, read_zero }, - [CSR_MHPMCOUNTER24H] = { "mhpmcounter24h", any32, read_zero }, - [CSR_MHPMCOUNTER25H] = { "mhpmcounter25h", any32, read_zero }, - [CSR_MHPMCOUNTER26H] = { "mhpmcounter26h", any32, read_zero }, - [CSR_MHPMCOUNTER27H] = { "mhpmcounter27h", any32, read_zero }, - [CSR_MHPMCOUNTER28H] = { "mhpmcounter28h", any32, read_zero }, - [CSR_MHPMCOUNTER29H] = { "mhpmcounter29h", any32, read_zero }, - [CSR_MHPMCOUNTER30H] = { "mhpmcounter30h", any32, read_zero }, - [CSR_MHPMCOUNTER31H] = { "mhpmcounter31h", any32, read_zero }, + [CSR_HPMCOUNTER3] = { "hpmcounter3", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER4] = { "hpmcounter4", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER5] = { "hpmcounter5", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER6] = { "hpmcounter6", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER7] = { "hpmcounter7", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER8] = { "hpmcounter8", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER9] = { "hpmcounter9", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER10] = { "hpmcounter10", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER11] = { "hpmcounter11", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER12] = { "hpmcounter12", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER13] = { "hpmcounter13", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER14] = { "hpmcounter14", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER15] = { "hpmcounter15", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER16] = { "hpmcounter16", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER17] = { "hpmcounter17", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER18] = { "hpmcounter18", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER19] = { "hpmcounter19", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER20] = { "hpmcounter20", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER21] = { "hpmcounter21", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER22] = { "hpmcounter22", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER23] = { "hpmcounter23", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER24] = { "hpmcounter24", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER25] = { "hpmcounter25", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER26] = { "hpmcounter26", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER27] = { "hpmcounter27", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER28] = { "hpmcounter28", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER29] = { "hpmcounter29", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER30] = { "hpmcounter30", ctr, read_hpmcounter }, + [CSR_HPMCOUNTER31] = { "hpmcounter31", ctr, read_hpmcounter }, + + [CSR_MHPMCOUNTER3] = { "mhpmcounter3", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER4] = { "mhpmcounter4", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER5] = { "mhpmcounter5", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER6] = { "mhpmcounter6", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER7] = { "mhpmcounter7", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER8] = { "mhpmcounter8", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER9] = { "mhpmcounter9", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER10] = { "mhpmcounter10", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER11] = { "mhpmcounter11", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER12] = { "mhpmcounter12", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER13] = { "mhpmcounter13", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER14] = { "mhpmcounter14", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER15] = { "mhpmcounter15", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER16] = { "mhpmcounter16", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER17] = { "mhpmcounter17", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER18] = { "mhpmcounter18", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER19] = { "mhpmcounter19", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER20] = { "mhpmcounter20", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER21] = { "mhpmcounter21", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER22] = { "mhpmcounter22", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER23] = { "mhpmcounter23", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER24] = { "mhpmcounter24", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER25] = { "mhpmcounter25", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER26] = { "mhpmcounter26", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER27] = { "mhpmcounter27", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER28] = { "mhpmcounter28", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER29] = { "mhpmcounter29", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER30] = { "mhpmcounter30", mctr, read_hpmcounter, + write_mhpmcounter }, + [CSR_MHPMCOUNTER31] = { "mhpmcounter31", mctr, read_hpmcounter, + write_mhpmcounter }, + + [CSR_MCOUNTINHIBIT] = { "mcountinhibit", any, read_mcountinhibit, + write_mcountinhibit }, + + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT5] = { "mhpmevent5", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT6] = { "mhpmevent6", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT7] = { "mhpmevent7", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT8] = { "mhpmevent8", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT9] = { "mhpmevent9", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT10] = { "mhpmevent10", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT11] = { "mhpmevent11", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT12] = { "mhpmevent12", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT13] = { "mhpmevent13", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT14] = { "mhpmevent14", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT15] = { "mhpmevent15", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT16] = { "mhpmevent16", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT17] = { "mhpmevent17", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT18] = { "mhpmevent18", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT19] = { "mhpmevent19", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT20] = { "mhpmevent20", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT21] = { "mhpmevent21", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT22] = { "mhpmevent22", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT23] = { "mhpmevent23", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT24] = { "mhpmevent24", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT25] = { "mhpmevent25", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT26] = { "mhpmevent26", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT27] = { "mhpmevent27", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT28] = { "mhpmevent28", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT29] = { "mhpmevent29", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT30] = { "mhpmevent30", any, read_mhpmevent, + write_mhpmevent }, + [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_mhpmevent, + write_mhpmevent }, + + [CSR_HPMCOUNTER3H] = { "hpmcounter3h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER4H] = { "hpmcounter4h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER5H] = { "hpmcounter5h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER6H] = { "hpmcounter6h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER7H] = { "hpmcounter7h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER8H] = { "hpmcounter8h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER9H] = { "hpmcounter9h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER10H] = { "hpmcounter10h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER11H] = { "hpmcounter11h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER12H] = { "hpmcounter12h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER13H] = { "hpmcounter13h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER14H] = { "hpmcounter14h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER15H] = { "hpmcounter15h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER16H] = { "hpmcounter16h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER17H] = { "hpmcounter17h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER18H] = { "hpmcounter18h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER19H] = { "hpmcounter19h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER20H] = { "hpmcounter20h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER21H] = { "hpmcounter21h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER22H] = { "hpmcounter22h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER23H] = { "hpmcounter23h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER24H] = { "hpmcounter24h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER25H] = { "hpmcounter25h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER26H] = { "hpmcounter26h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER27H] = { "hpmcounter27h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER28H] = { "hpmcounter28h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER29H] = { "hpmcounter29h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER30H] = { "hpmcounter30h", ctr32, read_hpmcounterh }, + [CSR_HPMCOUNTER31H] = { "hpmcounter31h", ctr32, read_hpmcounterh }, + + [CSR_MHPMCOUNTER3H] = { "mhpmcounter3h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER4H] = { "mhpmcounter4h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER5H] = { "mhpmcounter5h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER6H] = { "mhpmcounter6h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER7H] = { "mhpmcounter7h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER8H] = { "mhpmcounter8h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER9H] = { "mhpmcounter9h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER10H] = { "mhpmcounter10h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER11H] = { "mhpmcounter11h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER12H] = { "mhpmcounter12h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER13H] = { "mhpmcounter13h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER14H] = { "mhpmcounter14h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER15H] = { "mhpmcounter15h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER16H] = { "mhpmcounter16h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER17H] = { "mhpmcounter17h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER18H] = { "mhpmcounter18h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER19H] = { "mhpmcounter19h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER20H] = { "mhpmcounter20h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER21H] = { "mhpmcounter21h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER22H] = { "mhpmcounter22h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER23H] = { "mhpmcounter23h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER24H] = { "mhpmcounter24h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER25H] = { "mhpmcounter25h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER26H] = { "mhpmcounter26h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER27H] = { "mhpmcounter27h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER28H] = { "mhpmcounter28h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER29H] = { "mhpmcounter29h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER30H] = { "mhpmcounter30h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, + [CSR_MHPMCOUNTER31H] = { "mhpmcounter31h", mctr32, read_hpmcounterh, + write_mhpmcounterh }, #endif /* !CONFIG_USER_ONLY */ };target/riscv/machine.c +0
-0
target/riscv/machine.c const VMStateDescription vmstate_riscv_cpu = {
Quoted 10 lines
target/riscv/machine.c +3
-1@@ -206,6 +206,9 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINTTL (env.scounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcountinhibit,RISCVCPU ), +VMSTATE_UINTTL_ARRAY (env.mhpmcounter_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_UINTTL_ARRAY (env.mhpmcounterh_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_UINTTL_ARRAY (env.mhpmevent_val,RISCVCPU ,RV_MAX_MHPMEVENTS ),VMSTATE_UINTTL (env.sscratch,RISCVCPU ),VMSTATE_UINTTL (env.mscratch,RISCVCPU ), VMSTATE_UINT64(env.mfromhost, RISCVCPU), --
Otherwise,
PATCH v4 7/11 target/riscv: Support mcycle/minstret write operation
In reply to Atish PatraFrom: Atish Patra <[email protected]>
mcycle/minstret are actually WARL registers and can be written with any given value. With SBI PMU extension, it will be used to store a initial value provided from supervisor OS. The Qemu also need prohibit the counter increment if mcountinhibit is set.
Support mcycle/minstret through generic counter infrastructure.
--- target/riscv/cpu.h | 24 +++++-- target/riscv/csr.c | 144 ++++++++++++++++++++++++++------------- target/riscv/machine.c | 26 ++++++- target/riscv/meson.build | 1 + target/riscv/pmu.c | 32 +++++++++ target/riscv/pmu.h | 28 ++++++++ 6 files changed, 200 insertions(+), 55 deletions(-) create mode 100644 target/riscv/pmu.c create mode 100644 target/riscv/pmu.h
target/riscv/cpu.h +17 -7
@@ -101,7 +101,7 @@ typedef struct CPURISCVState CPURISCVState;#endif #define RV_VLEN_MAX 1024 -#define RV_MAX_MHPMEVENTS 29 +#define RV_MAX_MHPMEVENTS 32#define RV_MAX_MHPMCOUNTERS 32FIELD (VTYPE ,VLMUL ,0 ,3 )
@@ -112,6 +112,19 @@ FIELD(VTYPE, VEDIV, 8, 2) FIELD(VTYPE, RESERVED, 10, sizeof(target_ulong) * 8 - 11) FIELD(VTYPE, VILL, sizeof(target_ulong) * 8 - 1, 1) +typedef struct PMUCTRState PMUCTRState ; +struct PMUCTRState { +/* Current value of a counter */ +target_ulong mhpmcounter_val; +/* Current value of a counter in RV32*/ +target_ulong mhpmcounterh_val; +/* Snapshot values of counter */ +target_ulong mhpmcounter_prev; +/* Snapshort value of a counter in RV32 */ +target_ulong mhpmcounterh_prev; +bool started; +}; +struct CPURISCVState {target_ulong gpr[32 ];uint64_t fpr[32 ];/* assume both F and D extensions */
@@ -226,13 +239,10 @@ struct CPURISCVState {target_ulong mcountinhibit; -/* PMU counter configured values */ -target_ulong mhpmcounter_val[RV_MAX_MHPMCOUNTERS ]; - -/* for RV32 */ -target_ulong mhpmcounterh_val[RV_MAX_MHPMCOUNTERS ]; +/* PMU counter state */ +PMUCTRState pmu_ctrs[RV_MAX_MHPMCOUNTERS ]; -/* PMU event selector configured values */ +/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ];target_ulong sscratch;
target/riscv/csr.c +98 -46
235 lines not on this page · raw message
target/riscv/machine.c +24 -2
@@ -164,6 +164,28 @@ static const VMStateDescription vmstate_pointermasking = { } }; +static bool pmu_needed (void *opaque) +{ +RISCVCPU *cpu = opaque; + +return cpu->cfg.pmu_num; +} + +static const VMStateDescription vmstate_pmu_ctr_state = { + .name ="cpu/pmu" , + .version_id =1 , + .minimum_version_id =1 , + .needed = pmu_needed, + .fields = (VMStateField []) { +VMSTATE_UINTTL (mhpmcounter_val, PMUCTRState), +VMSTATE_UINTTL (mhpmcounterh_val, PMUCTRState), +VMSTATE_UINTTL (mhpmcounter_prev, PMUCTRState), +VMSTATE_UINTTL (mhpmcounterh_prev, PMUCTRState), +VMSTATE_BOOL (started, PMUCTRState), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_riscv_cpu = { .name ="cpu" , .version_id =3 ,
@@ -206,8 +228,8 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINTTL (env.scounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcountinhibit,RISCVCPU ), -VMSTATE_UINTTL_ARRAY (env.mhpmcounter_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), -VMSTATE_UINTTL_ARRAY (env.mhpmcounterh_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_STRUCT_ARRAY (env.pmu_ctrs,RISCVCPU ,RV_MAX_MHPMCOUNTERS ,0 , + vmstate_pmu_ctr_state, PMUCTRState),VMSTATE_UINTTL_ARRAY (env.mhpmevent_val,RISCVCPU ,RV_MAX_MHPMEVENTS ),VMSTATE_UINTTL (env.sscratch,RISCVCPU ), VMSTATE_UINTTL(env.mscratch, RISCVCPU),
target/riscv/meson.build +1 -0
@@ -24,6 +24,7 @@ riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files( 'arch_dump.c', 'pmp.c', + 'pmu.c', 'monitor.c', 'machine.c' ))
target/riscv/pmu.c new file +32 -0
@@ -0,0 +1,32 @@ +/* +* RISC-V PMU file. +* +* Copyright (c) 2021 Western Digital Corporation or its affiliates. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "pmu.h" + +bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env, +uint32_t target_ctr) +{ +return (target_ctr ==0 ) ? true : false; +} + +bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr) +{ +return (target_ctr ==2 ) ? true : false; +}
target/riscv/pmu.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* RISC-V PMU header file. +* +* Copyright (c) 2021 Western Digital Corporation or its affiliates. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "cpu.h" +#include "qemu/main-loop.h" +#include "exec/exec-all.h" + +bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env, +uint32_t target_ctr); +bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env, +uint32_t target_ctr);
Signature · 1 line
2.30.2
Re: [PATCH v4 07/11] target/riscv: Support mcycle/minstret write operation
Quoted 37 lines · Atish Patra
From: Atish Patra <[email protected]>
mcycle/minstret are actually WARL registers and can be written with any given value. With SBI PMU extension, it will be used to store a initial value provided from supervisor OS. The Qemu also need prohibit the counter increment if mcountinhibit is set.
Support mcycle/minstret through generic counter infrastructure.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.h | 24 +++++-- target/riscv/csr.c | 144 ++++++++++++++++++++++++++------------- target/riscv/machine.c | 26 ++++++- target/riscv/meson.build | 1 + target/riscv/pmu.c | 32 +++++++++ target/riscv/pmu.h | 28 ++++++++ 6 files changed, 200 insertions(+), 55 deletions(-) create mode 100644 target/riscv/pmu.c create mode 100644 target/riscv/pmu.htarget/riscv/cpu.h +1
-1@@ -101,7 +101,7 @@ typedef struct CPURISCVState CPURISCVState;#endif #define RV_VLEN_MAX 1024 -#define RV_MAX_MHPMEVENTS 29 +#define RV_MAX_MHPMEVENTS 32#define RV_MAX_MHPMCOUNTERS 32FIELD (VTYPE ,VLMUL ,0 ,3 )
target/riscv/cpu.h FIELD(VTYPE, VEDIV, 8, 2) · line 115
Quoted 4 lines
target/riscv/cpu.h +1
-0@@ -112,6 +112,19 @@ FIELD(VTYPE, VEDIV, 8, 2) FIELD(VTYPE, RESERVED, 10, sizeof(target_ulong) * 8 - 11) FIELD(VTYPE, VILL, sizeof(target_ulong) * 8 - 1, 1) +typedef struct PMUCTRState PMUCTRState ;
This 'typedef' can be merged into the definition below
Quoted 45 lines
target/riscv/cpu.h +15
-6+struct PMUCTRState { +/* Current value of a counter */ +target_ulong mhpmcounter_val; +/* Current value of a counter in RV32*/ +target_ulong mhpmcounterh_val; +/* Snapshot values of counter */ +target_ulong mhpmcounter_prev; +/* Snapshort value of a counter in RV32 */ +target_ulong mhpmcounterh_prev; +bool started; +}; +struct CPURISCVState {target_ulong gpr[32 ];uint64_t fpr[32 ];/* assume both F and D extensions */ @@ -226,13 +239,10 @@ struct CPURISCVState {target_ulong mcountinhibit; -/* PMU counter configured values */ -target_ulong mhpmcounter_val[RV_MAX_MHPMCOUNTERS ]; - -/* for RV32 */ -target_ulong mhpmcounterh_val[RV_MAX_MHPMCOUNTERS ]; +/* PMU counter state */ +PMUCTRState pmu_ctrs[RV_MAX_MHPMCOUNTERS ]; -/* PMU event selector configured values */ +/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ];target_ulong sscratch;target/riscv/csr.c +1
-0@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" +#include "pmu.h" #include "qemu/main-loop.h" #include "exec/exec-all.h"
target/riscv/csr.c static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) · line 465
Quoted 6 lines
target/riscv/csr.c +1
-2@@ -461,41 +462,33 @@ static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) }/* User Timers and Counters */ -static RISCVException read_instret (CPURISCVState *env,int csrno, -target_ulong *val) +static target_ulong get_icount_ticks (bool brv32)
I would use 'rv32' instead of 'brv32'
Quoted 66 lines
target/riscv/csr.c +15
-21{ +int64_t val; +target_ulong result; +#if !defined(CONFIG_USER_ONLY )if (icount_enabled ()) { - *val =icount_get (); + val =icount_get (); }else { - *val =cpu_get_host_ticks (); + val =cpu_get_host_ticks (); }#else - *val =cpu_get_host_ticks (); + val =cpu_get_host_ticks ();#endif -return RISCV_EXCP_NONE ; -} - -static RISCVException read_instreth (CPURISCVState *env,int csrno, -target_ulong *val) -{ -#if !defined(CONFIG_USER_ONLY ) -if (icount_enabled ()) { - *val =icount_get () >>32 ; +if (brv32) { + result = val >>32 ; }else { - *val =cpu_get_host_ticks () >>32 ; + result = val; } -#else - *val =cpu_get_host_ticks () >>32 ; -#endif -return RISCV_EXCP_NONE ; +return result; }static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) { -int evt_index = csrno -CSR_MHPMEVENT3 ; +int evt_index = csrno -CSR_MCOUNTINHIBIT ; *val = env->mhpmevent_val[evt_index];@@ -504,7 +497,7 @@ static int read_mhpmevent(CPURISCVState *env, int csrno, target_ulong *val)static int write_mhpmevent (CPURISCVState *env,int csrno,target_ulong val) { -int evt_index = csrno -CSR_MHPMEVENT3 ; +int evt_index = csrno -CSR_MCOUNTINHIBIT ; env->mhpmevent_val[evt_index] = val;@@ -513,52 +506,99 @@ static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val)static int write_mhpmcounter (CPURISCVState *env,int csrno,target_ulong val) { -int ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; +int ctr_idx = csrno -CSR_MCYCLE ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; - env->mhpmcounter_val[ctr_index] = val; + counter->mhpmcounter_val = val;
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 521
Quoted 10 lines
target/riscv/csr.c +8
-1+if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + counter->mhpmcounter_prev =get_icount_ticks (false); + }else { +/* Other counters can keep incrementing from the given value */ + counter->mhpmcounter_prev = val; + } -return RISCV_EXCP_NONE ; +return RISCV_EXCP_NONE ;
The indentation is wrong, which should be 4 spaces. The same issue exists in above if .. else .. block.
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 532
Quoted 12 lines
target/riscv/csr.c +7
-1}static int write_mhpmcounterh (CPURISCVState *env,int csrno,target_ulong val) { -int ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; +int ctr_idx = csrno -CSR_MCYCLEH ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + + counter->mhpmcounterh_val = val; +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + counter->mhpmcounterh_prev =get_icount_ticks (false);
Should be get_icount_ticks(true)
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 541
Quoted 9 lines
target/riscv/csr.c +9
-0+ }else { + counter->mhpmcounterh_prev = val; + } + +return RISCV_EXCP_NONE ; +} + +static RISCVException riscv_pmu_read_ctr (CPURISCVState *env,target_ulong *val, +bool is_uh,uint32_t ctr_idx)
nits: %s/is_uh/upper_half to make it more intuitive?
Quoted 6 lines
target/riscv/csr.c +6
-0+{ +PMUCTRState counter = env->pmu_ctrs[ctr_idx]; +target_ulong ctr_prev = is_uh ? counter.mhpmcounterh_prev : + counter.mhpmcounter_prev; +target_ulong ctr_val = is_uh ? counter.mhpmcounterh_val : + counter.mhpmcounter_val;
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 556
Quoted 10 lines
target/riscv/csr.c +8
-1- env->mhpmcounterh_val[ctr_index] = val; +if (get_field (env->mcountinhibit,BIT (ctr_idx))) { +/** +* Counter should not increment if inhibit bit is set. We can't really +* stop the icount counting. Just return the previous value to indicate +* that counter was not incremented. +*/ +if (!counter.started) { + *val = ctr_val;
I think this should be *val = ctl_prev to match your comments?
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 567
Quoted 11 lines
target/riscv/csr.c +11
-0+return RISCV_EXCP_NONE ; + }else { +/* Mark that the counter has been stopped */ + counter.started = false; + } + } +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + *val =get_icount_ticks (is_uh); + }else { + *val = ctr_val;
*val = ctr_prev?
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 571
Quoted 4 lines
target/riscv/csr.c +4
-0+ } + +/* No need to handle the overflow here */ + *val = *val - ctr_prev + ctr_val;
I am not sure I understand the logic here.
For cycle/instret counters, this logic becomes: new get_icount_ticks()
- get_icount_ticks() last time when counter was written + the counter value last time when counter was written. This does not make sense.
Quoted 183 lines
target/riscv/csr.c +28
-20return RISCV_EXCP_NONE ; }static int read_hpmcounter (CPURISCVState *env,int csrno,target_ulong *val) { -int ctr_index; +uint16_t ctr_index;if (env->priv ==PRV_M ) { - ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; + ctr_index = csrno -CSR_MCYCLE ; }else { - ctr_index = csrno -CSR_HPMCOUNTER3 +3 ; + ctr_index = csrno -CSR_CYCLE ; } - *val = env->mhpmcounter_val[ctr_index]; -return RISCV_EXCP_NONE ; +return riscv_pmu_read_ctr (env, val, false, ctr_index); }static int read_hpmcounterh (CPURISCVState *env,int csrno,target_ulong *val) { -int ctr_index; +uint16_t ctr_index;if (env->priv ==PRV_M ) { - ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; + ctr_index = csrno -CSR_MCYCLEH ; }else { - ctr_index = csrno -CSR_HPMCOUNTER3H +3 ; + ctr_index = csrno -CSR_CYCLEH ; } - *val = env->mhpmcounterh_val[ctr_index]; - -return RISCV_EXCP_NONE ; +return riscv_pmu_read_ctr (env, val, true, ctr_index); } -#if defined(CONFIG_USER_ONLY )static RISCVException read_time (CPURISCVState *env,int csrno,target_ulong *val)@@ -925,11 +965,23 @@ static RISCVException read_mcountinhibit(CPURISCVState *env, int csrno,static RISCVException write_mcountinhibit (CPURISCVState *env,int csrno,target_ulong val) { +int cidx; +PMUCTRState *counter; +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return RISCV_EXCP_ILLEGAL_INST ; } env->mcountinhibit = val; + +/* Check if any other counter is also monitoring cycles/instructions */ +for (cidx =0 ; cidx <RV_MAX_MHPMCOUNTERS ; cidx++) { +if (!get_field (env->mcountinhibit,BIT (cidx))) { + counter = &env->pmu_ctrs[cidx]; + counter->started = true; + } + } +return RISCV_EXCP_NONE ; }@@ -2035,10 +2087,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_VTYPE] = { "vtype", vs, read_vtype }, [CSR_VLENB] = { "vlenb", vs, read_vlenb }, /* User Timers and Counters */ - [CSR_CYCLE] = { "cycle", ctr, read_instret }, - [CSR_INSTRET] = { "instret", ctr, read_instret }, - [CSR_CYCLEH] = { "cycleh", ctr32, read_instreth }, - [CSR_INSTRETH] = { "instreth", ctr32, read_instreth }, + [CSR_CYCLE] = { "cycle", ctr, read_hpmcounter }, + [CSR_INSTRET] = { "instret", ctr, read_hpmcounter }, + [CSR_CYCLEH] = { "cycleh", ctr32, read_hpmcounterh }, + [CSR_INSTRETH] = { "instreth", ctr32, read_hpmcounterh },/* * In privileged mode, the monitor will have to emulate TIME CSRs only if @@ -2049,10 +2101,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {#if !defined(CONFIG_USER_ONLY ) /* Machine Timers and Counters */ - [CSR_MCYCLE] = { "mcycle", any, read_instret }, - [CSR_MINSTRET] = { "minstret", any, read_instret }, - [CSR_MCYCLEH] = { "mcycleh", any32, read_instreth }, - [CSR_MINSTRETH] = { "minstreth", any32, read_instreth }, + [CSR_MCYCLE] = { "mcycle", any, read_hpmcounter, write_mhpmcounter}, + [CSR_MINSTRET] = { "minstret", any, read_hpmcounter, write_mhpmcounter}, + [CSR_MCYCLEH] = { "mcycleh", any32, read_hpmcounterh, write_mhpmcounterh}, + [CSR_MINSTRETH] = { "minstreth", any32, read_hpmcounterh, write_mhpmcounterh}, /* Machine Information Registers */ [CSR_MVENDORID] = { "mvendorid", any, read_zero },target/riscv/machine.c +24
-2@@ -164,6 +164,28 @@ static const VMStateDescription vmstate_pointermasking = { } }; +static bool pmu_needed (void *opaque) +{ +RISCVCPU *cpu = opaque; + +return cpu->cfg.pmu_num; +} + +static const VMStateDescription vmstate_pmu_ctr_state = { + .name ="cpu/pmu" , + .version_id =1 , + .minimum_version_id =1 , + .needed = pmu_needed, + .fields = (VMStateField []) { +VMSTATE_UINTTL (mhpmcounter_val, PMUCTRState), +VMSTATE_UINTTL (mhpmcounterh_val, PMUCTRState), +VMSTATE_UINTTL (mhpmcounter_prev, PMUCTRState), +VMSTATE_UINTTL (mhpmcounterh_prev, PMUCTRState), +VMSTATE_BOOL (started, PMUCTRState), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_riscv_cpu = { .name ="cpu" , .version_id =3 ,@@ -206,8 +228,8 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINTTL (env.scounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcountinhibit,RISCVCPU ), -VMSTATE_UINTTL_ARRAY (env.mhpmcounter_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), -VMSTATE_UINTTL_ARRAY (env.mhpmcounterh_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_STRUCT_ARRAY (env.pmu_ctrs,RISCVCPU ,RV_MAX_MHPMCOUNTERS ,0 , + vmstate_pmu_ctr_state, PMUCTRState),VMSTATE_UINTTL_ARRAY (env.mhpmevent_val,RISCVCPU ,RV_MAX_MHPMEVENTS ),VMSTATE_UINTTL (env.sscratch,RISCVCPU ), VMSTATE_UINTTL(env.mscratch, RISCVCPU),target/riscv/meson.build +1
-0@@ -24,6 +24,7 @@ riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files( 'arch_dump.c', 'pmp.c', + 'pmu.c', 'monitor.c', 'machine.c' ))target/riscv/pmu.c new file +22
-0@@ -0,0 +1,32 @@ +/* +* RISC-V PMU file. +* +* Copyright (c) 2021 Western Digital Corporation or its affiliates. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "pmu.h" +
target/riscv/pmu.c line 32
Quoted 10 lines
target/riscv/pmu.c new file +10
-0+bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env, +uint32_t target_ctr) +{ +return (target_ctr ==0 ) ? true : false; +} + +bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr) +{ +return (target_ctr ==2 ) ? true : false; +}
Maybe it makes sense to move all PMU CSRs read/write routine into this new pmu.c file? It looks odd to just add 2 simple functions here.
Quoted 25 lines
target/riscv/pmu.h new file +19
-0@@ -0,0 +1,28 @@ +/* +* RISC-V PMU header file. +* +* Copyright (c) 2021 Western Digital Corporation or its affiliates. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h"
target/riscv/pmu.h
Quoted 10 lines
target/riscv/pmu.h new file +9
-1+#include "qemu/log.h" +#include "cpu.h" +#include "qemu/main-loop.h" +#include "exec/exec-all.h" + +bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env, +uint32_t target_ctr); +bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env, +uint32_t target_ctr); --
Regards,
Bin
Re: [PATCH v4 07/11] target/riscv: Support mcycle/minstret write operation
Quoted 37 lines · Bin Meng
Quoted 35 lines · Atish Patra
From: Atish Patra <[email protected]>
mcycle/minstret are actually WARL registers and can be written with any given value. With SBI PMU extension, it will be used to store a initial value provided from supervisor OS. The Qemu also need prohibit the counter increment if mcountinhibit is set.
Support mcycle/minstret through generic counter infrastructure.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.h | 24 +++++-- target/riscv/csr.c | 144 ++++++++++++++++++++++++++------------- target/riscv/machine.c | 26 ++++++- target/riscv/meson.build | 1 + target/riscv/pmu.c | 32 +++++++++ target/riscv/pmu.h | 28 ++++++++ 6 files changed, 200 insertions(+), 55 deletions(-) create mode 100644 target/riscv/pmu.c create mode 100644 target/riscv/pmu.htarget/riscv/cpu.h +1
-1@@ -101,7 +101,7 @@ typedef struct CPURISCVState CPURISCVState;#endif #define RV_VLEN_MAX 1024 -#define RV_MAX_MHPMEVENTS 29 +#define RV_MAX_MHPMEVENTS 32#define RV_MAX_MHPMCOUNTERS 32
Quoted 9 lines
target/riscv/cpu.h FIELD(VTYPE, VEDIV, 8, 2) · line 115
Quoted 6 lines
target/riscv/cpu.h +1
-0FIELD (VTYPE ,VLMUL ,0 ,3 )@@ -112,6 +112,19 @@ FIELD(VTYPE, VEDIV, 8, 2) FIELD(VTYPE, RESERVED, 10, sizeof(target_ulong) * 8 - 11) FIELD(VTYPE, VILL, sizeof(target_ulong) * 8 - 1, 1) +typedef struct PMUCTRState PMUCTRState ;This 'typedef' can be merged into the definition below
Sure.
Quoted 48 lines
Quoted 48 lines
target/riscv/cpu.h +15
-6+struct PMUCTRState { +/* Current value of a counter */ +target_ulong mhpmcounter_val; +/* Current value of a counter in RV32*/ +target_ulong mhpmcounterh_val; +/* Snapshot values of counter */ +target_ulong mhpmcounter_prev; +/* Snapshort value of a counter in RV32 */ +target_ulong mhpmcounterh_prev; +bool started; +}; +struct CPURISCVState {target_ulong gpr[32 ];uint64_t fpr[32 ];/* assume both F and D extensions */ @@ -226,13 +239,10 @@ struct CPURISCVState {target_ulong mcountinhibit; -/* PMU counter configured values */ -target_ulong mhpmcounter_val[RV_MAX_MHPMCOUNTERS ]; - -/* for RV32 */ -target_ulong mhpmcounterh_val[RV_MAX_MHPMCOUNTERS ]; +/* PMU counter state */ +PMUCTRState pmu_ctrs[RV_MAX_MHPMCOUNTERS ]; -/* PMU event selector configured values */ +/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ];target_ulong sscratch;target/riscv/csr.c +1
-0@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" +#include "pmu.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" @@ -461,41 +462,33 @@ static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) }
Quoted 7 lines
target/riscv/csr.c static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) · line 465
Quoted 4 lines
target/riscv/csr.c +1
-2/* User Timers and Counters */ -static RISCVException read_instret (CPURISCVState *env,int csrno, -target_ulong *val) +static target_ulong get_icount_ticks (bool brv32)I would use 'rv32' instead of 'brv32'
ok.
Quoted 74 lines
Quoted 74 lines
target/riscv/csr.c +22
-21{ +int64_t val; +target_ulong result; +#if !defined(CONFIG_USER_ONLY )if (icount_enabled ()) { - *val =icount_get (); + val =icount_get (); }else { - *val =cpu_get_host_ticks (); + val =cpu_get_host_ticks (); }#else - *val =cpu_get_host_ticks (); + val =cpu_get_host_ticks ();#endif -return RISCV_EXCP_NONE ; -} - -static RISCVException read_instreth (CPURISCVState *env,int csrno, -target_ulong *val) -{ -#if !defined(CONFIG_USER_ONLY ) -if (icount_enabled ()) { - *val =icount_get () >>32 ; +if (brv32) { + result = val >>32 ; }else { - *val =cpu_get_host_ticks () >>32 ; + result = val; } -#else - *val =cpu_get_host_ticks () >>32 ; -#endif -return RISCV_EXCP_NONE ; +return result; }static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) { -int evt_index = csrno -CSR_MHPMEVENT3 ; +int evt_index = csrno -CSR_MCOUNTINHIBIT ; *val = env->mhpmevent_val[evt_index];@@ -504,7 +497,7 @@ static int read_mhpmevent(CPURISCVState *env, int csrno, target_ulong *val)static int write_mhpmevent (CPURISCVState *env,int csrno,target_ulong val) { -int evt_index = csrno -CSR_MHPMEVENT3 ; +int evt_index = csrno -CSR_MCOUNTINHIBIT ; env->mhpmevent_val[evt_index] = val;@@ -513,52 +506,99 @@ static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val)static int write_mhpmcounter (CPURISCVState *env,int csrno,target_ulong val) { -int ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; +int ctr_idx = csrno -CSR_MCYCLE ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; - env->mhpmcounter_val[ctr_index] = val; + counter->mhpmcounter_val = val; +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + counter->mhpmcounter_prev =get_icount_ticks (false); + }else { +/* Other counters can keep incrementing from the given value */ + counter->mhpmcounter_prev = val; + }
Quoted 6 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 521
Quoted 2 lines
target/riscv/csr.c +1
-1-return RISCV_EXCP_NONE ; +return RISCV_EXCP_NONE ;The indentation is wrong, which should be 4 spaces. The same issue exists in above if .. else .. block.
Oops. will fix it.
Quoted 13 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 532
Quoted 12 lines
target/riscv/csr.c +7
-1}static int write_mhpmcounterh (CPURISCVState *env,int csrno,target_ulong val) { -int ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; +int ctr_idx = csrno -CSR_MCYCLEH ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + + counter->mhpmcounterh_val = val; +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + counter->mhpmcounterh_prev =get_icount_ticks (false);
Quoted 2 lines
Should be
get_icount_ticks(true)
Yup. Thanks for catching that.
Quoted 12 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 541
Quoted 9 lines
target/riscv/csr.c +9
-0+ }else { + counter->mhpmcounterh_prev = val; + } + +return RISCV_EXCP_NONE ; +} + +static RISCVException riscv_pmu_read_ctr (CPURISCVState *env,target_ulong *val, +bool is_uh,uint32_t ctr_idx)nits: %s/is_uh/upper_half to make it more intuitive?
ok. will change it.
Quoted 17 lines
Quoted 6 lines
target/riscv/csr.c +6
-0+{ +PMUCTRState counter = env->pmu_ctrs[ctr_idx]; +target_ulong ctr_prev = is_uh ? counter.mhpmcounterh_prev : + counter.mhpmcounter_prev; +target_ulong ctr_val = is_uh ? counter.mhpmcounterh_val : + counter.mhpmcounter_val;target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 556
Quoted 10 lines
target/riscv/csr.c +8
-1- env->mhpmcounterh_val[ctr_index] = val; +if (get_field (env->mcountinhibit,BIT (ctr_idx))) { +/** +* Counter should not increment if inhibit bit is set. We can't really +* stop the icount counting. Just return the previous value to indicate +* that counter was not incremented. +*/ +if (!counter.started) { + *val = ctr_val;
Quoted 2 lines
I think this should be *val =
ctl_prevto match your comments?
ctr_val - has the value written from the supervisor previously ctr_prev - has the previous value read from the counter
As the kernel should see the exact same value it has written previously to the counter
it should ctr_val.
The comment probably doesn't explain it correctly. I will update it.
Quoted 12 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 567
Quoted 11 lines
target/riscv/csr.c +11
-0+return RISCV_EXCP_NONE ; + }else { +/* Mark that the counter has been stopped */ + counter.started = false; + } + } +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + *val =get_icount_ticks (is_uh); + }else { + *val = ctr_val;
Quoted 2 lines
*val =
ctr_prev?
Yeah if we want to retain the below line.
However, I think we can simplify by just moving the below line for if condition which is applicable only for cycles & instructions.
Quoted 11 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 571
Quoted 4 lines
target/riscv/csr.c +4
-0+ } + +/* No need to handle the overflow here */ + *val = *val - ctr_prev + ctr_val;I am not sure I understand the logic here.
For cycle/instret counters, this logic becomes: new
get_icount_ticks()
-get_icount_ticks()last time when counter was written + the counter value last time when counter was written. This does not make sense.
The kernel computes the perf delta by subtracting the current value from the value it initialized previously.
That's why we need to add the delta value (current get_icount_ticks()
- previous get_icount_ticks())
to the counter value it was written last time.
Let me know if I should add a comment about this to avoid further confusion.
Quoted 236 lines
Quoted 183 lines
target/riscv/csr.c +28
-20return RISCV_EXCP_NONE ; }static int read_hpmcounter (CPURISCVState *env,int csrno,target_ulong *val) { -int ctr_index; +uint16_t ctr_index;if (env->priv ==PRV_M ) { - ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; + ctr_index = csrno -CSR_MCYCLE ; }else { - ctr_index = csrno -CSR_HPMCOUNTER3 +3 ; + ctr_index = csrno -CSR_CYCLE ; } - *val = env->mhpmcounter_val[ctr_index]; -return RISCV_EXCP_NONE ; +return riscv_pmu_read_ctr (env, val, false, ctr_index); }static int read_hpmcounterh (CPURISCVState *env,int csrno,target_ulong *val) { -int ctr_index; +uint16_t ctr_index;if (env->priv ==PRV_M ) { - ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; + ctr_index = csrno -CSR_MCYCLEH ; }else { - ctr_index = csrno -CSR_HPMCOUNTER3H +3 ; + ctr_index = csrno -CSR_CYCLEH ; } - *val = env->mhpmcounterh_val[ctr_index]; - -return RISCV_EXCP_NONE ; +return riscv_pmu_read_ctr (env, val, true, ctr_index); } -#if defined(CONFIG_USER_ONLY )static RISCVException read_time (CPURISCVState *env,int csrno,target_ulong *val)@@ -925,11 +965,23 @@ static RISCVException read_mcountinhibit(CPURISCVState *env, int csrno,static RISCVException write_mcountinhibit (CPURISCVState *env,int csrno,target_ulong val) { +int cidx; +PMUCTRState *counter; +if (env->priv_ver <PRIV_VERSION_1_11_0 ) {return RISCV_EXCP_ILLEGAL_INST ; } env->mcountinhibit = val; + +/* Check if any other counter is also monitoring cycles/instructions */ +for (cidx =0 ; cidx <RV_MAX_MHPMCOUNTERS ; cidx++) { +if (!get_field (env->mcountinhibit,BIT (cidx))) { + counter = &env->pmu_ctrs[cidx]; + counter->started = true; + } + } +return RISCV_EXCP_NONE ; }@@ -2035,10 +2087,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_VTYPE] = { "vtype", vs, read_vtype }, [CSR_VLENB] = { "vlenb", vs, read_vlenb }, /* User Timers and Counters */ - [CSR_CYCLE] = { "cycle", ctr, read_instret }, - [CSR_INSTRET] = { "instret", ctr, read_instret }, - [CSR_CYCLEH] = { "cycleh", ctr32, read_instreth }, - [CSR_INSTRETH] = { "instreth", ctr32, read_instreth }, + [CSR_CYCLE] = { "cycle", ctr, read_hpmcounter }, + [CSR_INSTRET] = { "instret", ctr, read_hpmcounter }, + [CSR_CYCLEH] = { "cycleh", ctr32, read_hpmcounterh }, + [CSR_INSTRETH] = { "instreth", ctr32, read_hpmcounterh },/* * In privileged mode, the monitor will have to emulate TIME CSRs only if @@ -2049,10 +2101,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = {#if !defined(CONFIG_USER_ONLY ) /* Machine Timers and Counters */ - [CSR_MCYCLE] = { "mcycle", any, read_instret }, - [CSR_MINSTRET] = { "minstret", any, read_instret }, - [CSR_MCYCLEH] = { "mcycleh", any32, read_instreth }, - [CSR_MINSTRETH] = { "minstreth", any32, read_instreth }, + [CSR_MCYCLE] = { "mcycle", any, read_hpmcounter, write_mhpmcounter}, + [CSR_MINSTRET] = { "minstret", any, read_hpmcounter, write_mhpmcounter}, + [CSR_MCYCLEH] = { "mcycleh", any32, read_hpmcounterh, write_mhpmcounterh}, + [CSR_MINSTRETH] = { "minstreth", any32, read_hpmcounterh, write_mhpmcounterh}, /* Machine Information Registers */ [CSR_MVENDORID] = { "mvendorid", any, read_zero },target/riscv/machine.c +24
-2@@ -164,6 +164,28 @@ static const VMStateDescription vmstate_pointermasking = { } }; +static bool pmu_needed (void *opaque) +{ +RISCVCPU *cpu = opaque; + +return cpu->cfg.pmu_num; +} + +static const VMStateDescription vmstate_pmu_ctr_state = { + .name ="cpu/pmu" , + .version_id =1 , + .minimum_version_id =1 , + .needed = pmu_needed, + .fields = (VMStateField []) { +VMSTATE_UINTTL (mhpmcounter_val, PMUCTRState), +VMSTATE_UINTTL (mhpmcounterh_val, PMUCTRState), +VMSTATE_UINTTL (mhpmcounter_prev, PMUCTRState), +VMSTATE_UINTTL (mhpmcounterh_prev, PMUCTRState), +VMSTATE_BOOL (started, PMUCTRState), +VMSTATE_END_OF_LIST () + } +}; +const VMStateDescription vmstate_riscv_cpu = { .name ="cpu" , .version_id =3 ,@@ -206,8 +228,8 @@ const VMStateDescription vmstate_riscv_cpu = {VMSTATE_UINTTL (env.scounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcounteren,RISCVCPU ),VMSTATE_UINTTL (env.mcountinhibit,RISCVCPU ), -VMSTATE_UINTTL_ARRAY (env.mhpmcounter_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), -VMSTATE_UINTTL_ARRAY (env.mhpmcounterh_val,RISCVCPU ,RV_MAX_MHPMCOUNTERS ), +VMSTATE_STRUCT_ARRAY (env.pmu_ctrs,RISCVCPU ,RV_MAX_MHPMCOUNTERS ,0 , + vmstate_pmu_ctr_state, PMUCTRState),VMSTATE_UINTTL_ARRAY (env.mhpmevent_val,RISCVCPU ,RV_MAX_MHPMEVENTS ),VMSTATE_UINTTL (env.sscratch,RISCVCPU ), VMSTATE_UINTTL(env.mscratch, RISCVCPU),target/riscv/meson.build +1
-0@@ -24,6 +24,7 @@ riscv_softmmu_ss = ss.source_set() riscv_softmmu_ss.add(files( 'arch_dump.c', 'pmp.c', + 'pmu.c', 'monitor.c', 'machine.c' ))target/riscv/pmu.c new file +22
-0@@ -0,0 +1,32 @@ +/* +* RISC-V PMU file. +* +* Copyright (c) 2021 Western Digital Corporation or its affiliates. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "pmu.h" +target/riscv/pmu.c line 32
Quoted 10 lines
target/riscv/pmu.c new file +10
-0+bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env, +uint32_t target_ctr) +{ +return (target_ctr ==0 ) ? true : false; +} + +bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr) +{ +return (target_ctr ==2 ) ? true : false; +}Maybe it makes sense to move all PMU CSRs read/write routine into this new
pmu.cfile? It looks odd to just add 2 simple functions here.Quoted 25 lines
target/riscv/pmu.h new file +19
-0@@ -0,0 +1,28 @@ +/* +* RISC-V PMU header file. +* +* Copyright (c) 2021 Western Digital Corporation or its affiliates. +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2 or later, as published by the Free Software Foundation. +* +* This program is distributed in the hope it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along with +* this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" target/riscv/pmu.h
Quoted 10 lines
target/riscv/pmu.h new file +9
-1+#include "qemu/log.h" +#include "cpu.h" +#include "qemu/main-loop.h" +#include "exec/exec-all.h" + +bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env, +uint32_t target_ctr); +bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env, +uint32_t target_ctr); --Regards,
Bin
Signature · 2 lines
Regards, Atish
Re: [PATCH v4 07/11] target/riscv: Support mcycle/minstret write operation
Quoted 285 lines · Atish Patra
Quoted 37 lines · Bin Meng
Quoted 35 lines · Atish Patra
From: Atish Patra <[email protected]>
mcycle/minstret are actually WARL registers and can be written with any given value. With SBI PMU extension, it will be used to store a initial value provided from supervisor OS. The Qemu also need prohibit the counter increment if mcountinhibit is set.
Support mcycle/minstret through generic counter infrastructure.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.h | 24 +++++-- target/riscv/csr.c | 144 ++++++++++++++++++++++++++------------- target/riscv/machine.c | 26 ++++++- target/riscv/meson.build | 1 + target/riscv/pmu.c | 32 +++++++++ target/riscv/pmu.h | 28 ++++++++ 6 files changed, 200 insertions(+), 55 deletions(-) create mode 100644 target/riscv/pmu.c create mode 100644 target/riscv/pmu.htarget/riscv/cpu.h +1
-1@@ -101,7 +101,7 @@ typedef struct CPURISCVState CPURISCVState;#endif #define RV_VLEN_MAX 1024 -#define RV_MAX_MHPMEVENTS 29 +#define RV_MAX_MHPMEVENTS 32#define RV_MAX_MHPMCOUNTERS 32Quoted 9 lines
target/riscv/cpu.h FIELD(VTYPE, VEDIV, 8, 2) · line 115
Quoted 6 lines
target/riscv/cpu.h +1
-0FIELD (VTYPE ,VLMUL ,0 ,3 )@@ -112,6 +112,19 @@ FIELD(VTYPE, VEDIV, 8, 2) FIELD(VTYPE, RESERVED, 10, sizeof(target_ulong) * 8 - 11) FIELD(VTYPE, VILL, sizeof(target_ulong) * 8 - 1, 1) +typedef struct PMUCTRState PMUCTRState ;This 'typedef' can be merged into the definition below
Sure.
Quoted 48 lines
Quoted 48 lines
target/riscv/cpu.h +15
-6+struct PMUCTRState { +/* Current value of a counter */ +target_ulong mhpmcounter_val; +/* Current value of a counter in RV32*/ +target_ulong mhpmcounterh_val; +/* Snapshot values of counter */ +target_ulong mhpmcounter_prev; +/* Snapshort value of a counter in RV32 */ +target_ulong mhpmcounterh_prev; +bool started; +}; +struct CPURISCVState {target_ulong gpr[32 ];uint64_t fpr[32 ];/* assume both F and D extensions */ @@ -226,13 +239,10 @@ struct CPURISCVState {target_ulong mcountinhibit; -/* PMU counter configured values */ -target_ulong mhpmcounter_val[RV_MAX_MHPMCOUNTERS ]; - -/* for RV32 */ -target_ulong mhpmcounterh_val[RV_MAX_MHPMCOUNTERS ]; +/* PMU counter state */ +PMUCTRState pmu_ctrs[RV_MAX_MHPMCOUNTERS ]; -/* PMU event selector configured values */ +/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ];target_ulong sscratch;target/riscv/csr.c +1
-0@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" +#include "pmu.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" @@ -461,41 +462,33 @@ static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) }Quoted 7 lines
target/riscv/csr.c static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) · line 465
Quoted 4 lines
target/riscv/csr.c +1
-2/* User Timers and Counters */ -static RISCVException read_instret (CPURISCVState *env,int csrno, -target_ulong *val) +static target_ulong get_icount_ticks (bool brv32)I would use 'rv32' instead of 'brv32'
ok.
Quoted 74 lines
Quoted 74 lines
target/riscv/csr.c +22
-21{ +int64_t val; +target_ulong result; +#if !defined(CONFIG_USER_ONLY )if (icount_enabled ()) { - *val =icount_get (); + val =icount_get (); }else { - *val =cpu_get_host_ticks (); + val =cpu_get_host_ticks (); }#else - *val =cpu_get_host_ticks (); + val =cpu_get_host_ticks ();#endif -return RISCV_EXCP_NONE ; -} - -static RISCVException read_instreth (CPURISCVState *env,int csrno, -target_ulong *val) -{ -#if !defined(CONFIG_USER_ONLY ) -if (icount_enabled ()) { - *val =icount_get () >>32 ; +if (brv32) { + result = val >>32 ; }else { - *val =cpu_get_host_ticks () >>32 ; + result = val; } -#else - *val =cpu_get_host_ticks () >>32 ; -#endif -return RISCV_EXCP_NONE ; +return result; }static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) { -int evt_index = csrno -CSR_MHPMEVENT3 ; +int evt_index = csrno -CSR_MCOUNTINHIBIT ; *val = env->mhpmevent_val[evt_index];@@ -504,7 +497,7 @@ static int read_mhpmevent(CPURISCVState *env, int csrno, target_ulong *val)static int write_mhpmevent (CPURISCVState *env,int csrno,target_ulong val) { -int evt_index = csrno -CSR_MHPMEVENT3 ; +int evt_index = csrno -CSR_MCOUNTINHIBIT ; env->mhpmevent_val[evt_index] = val;@@ -513,52 +506,99 @@ static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val)static int write_mhpmcounter (CPURISCVState *env,int csrno,target_ulong val) { -int ctr_index = csrno -CSR_MHPMCOUNTER3 +3 ; +int ctr_idx = csrno -CSR_MCYCLE ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; - env->mhpmcounter_val[ctr_index] = val; + counter->mhpmcounter_val = val; +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + counter->mhpmcounter_prev =get_icount_ticks (false); + }else { +/* Other counters can keep incrementing from the given value */ + counter->mhpmcounter_prev = val; + }Quoted 6 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 521
Quoted 2 lines
target/riscv/csr.c +1
-1-return RISCV_EXCP_NONE ; +return RISCV_EXCP_NONE ;The indentation is wrong, which should be 4 spaces. The same issue exists in above if .. else .. block.
Oops. will fix it.
Quoted 13 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 532
Quoted 12 lines
target/riscv/csr.c +7
-1}static int write_mhpmcounterh (CPURISCVState *env,int csrno,target_ulong val) { -int ctr_index = csrno -CSR_MHPMCOUNTER3H +3 ; +int ctr_idx = csrno -CSR_MCYCLEH ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + + counter->mhpmcounterh_val = val; +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + counter->mhpmcounterh_prev =get_icount_ticks (false);Quoted 2 lines
Should be
get_icount_ticks(true)Yup. Thanks for catching that.
Quoted 12 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 541
Quoted 9 lines
target/riscv/csr.c +9
-0+ }else { + counter->mhpmcounterh_prev = val; + } + +return RISCV_EXCP_NONE ; +} + +static RISCVException riscv_pmu_read_ctr (CPURISCVState *env,target_ulong *val, +bool is_uh,uint32_t ctr_idx)nits: %s/is_uh/upper_half to make it more intuitive?
ok. will change it.
Quoted 17 lines
Quoted 6 lines
target/riscv/csr.c +6
-0+{ +PMUCTRState counter = env->pmu_ctrs[ctr_idx]; +target_ulong ctr_prev = is_uh ? counter.mhpmcounterh_prev : + counter.mhpmcounter_prev; +target_ulong ctr_val = is_uh ? counter.mhpmcounterh_val : + counter.mhpmcounter_val;target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 556
Quoted 10 lines
target/riscv/csr.c +8
-1- env->mhpmcounterh_val[ctr_index] = val; +if (get_field (env->mcountinhibit,BIT (ctr_idx))) { +/** +* Counter should not increment if inhibit bit is set. We can't really +* stop the icount counting. Just return the previous value to indicate +* that counter was not incremented. +*/ +if (!counter.started) { + *val = ctr_val;Quoted 2 lines
I think this should be *val =
ctl_prevto match your comments?
ctr_val- has the value written from the supervisor previouslyctr_prev- has the previous value read from the counterAs the kernel should see the exact same value it has written previously to the counter
it shouldctr_val.The comment probably doesn't explain it correctly. I will update it.
Quoted 12 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 567
Quoted 11 lines
target/riscv/csr.c +11
-0+return RISCV_EXCP_NONE ; + }else { +/* Mark that the counter has been stopped */ + counter.started = false; + } + } +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + *val =get_icount_ticks (is_uh); + }else { + *val = ctr_val;Quoted 2 lines
*val =
ctr_prev?Yeah if we want to retain the below line.
However, I think we can simplify by just moving the below line for if condition which is applicable only for cycles & instructions.Quoted 11 lines
target/riscv/csr.c static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) · line 571
Quoted 4 lines
target/riscv/csr.c +4
-0+ } + +/* No need to handle the overflow here */ + *val = *val - ctr_prev + ctr_val;I am not sure I understand the logic here.
For cycle/instret counters, this logic becomes: new
get_icount_ticks()
-get_icount_ticks()last time when counter was written + the counter value last time when counter was written. This does not make sense.
Quoted 9 lines
The kernel computes the perf delta by subtracting the current value from the value it initialized previously.
That's why we need to add the delta value (current
get_icount_ticks()
- previousget_icount_ticks())
to the counter value it was written last time.Let me know if I should add a comment about this to avoid further confusion.
Yes, adding some comments definitely helps.
Regards,
Bin
PATCH v4 8/11 target/riscv: Add sscofpmf extension support
In reply to Atish PatraThe Sscofpmf ('Ss' for Privileged arch and Supervisor-level extensions, and 'cofpmf' for Count OverFlow and Privilege Mode Filtering) extension allows the perf to handle overflow interrupts and filtering support. This patch provides a framework for programmable counters to leverage the extension. As the extension doesn't have any provision for the overflow bit for fixed counters, the fixed events can also be monitoring using programmable counters. The underlying counters for cycle and instruction counters are always running. Thus, a separate timer device is programmed to handle the overflow.
--- target/riscv/cpu.c | 12 ++ target/riscv/cpu.h | 25 +++ target/riscv/cpu_bits.h | 55 +++++++ target/riscv/csr.c | 156 ++++++++++++++++-- target/riscv/pmu.c | 346 +++++++++++++++++++++++++++++++++++++++- target/riscv/pmu.h | 8 + 6 files changed, 591 insertions(+), 11 deletions(-)
target/riscv/cpu.c +12 -0
@@ -22,6 +22,7 @@#include "qemu/ctype.h" #include "qemu/log.h" #include "cpu.h" +#include "pmu.h" #include "internals.h" #include "exec/exec-all.h" #include "qapi/error.h"
@@ -569,6 +570,16 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_misa (env, env->misa_mxl, ext); } +if (cpu->cfg.pmu_num) { +if (!riscv_pmu_init (cpu, cpu->cfg.pmu_num) && cpu->cfg.ext_sscof) { + cpu->pmu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + riscv_pmu_timer_cb, cpu); +if (!cpu->pmu_timer) { + cpu->cfg.ext_sscof = false; + } + } + } +riscv_cpu_register_gdb_regs_for_features (cs);qemu_init_vcpu (cs);
@@ -628,6 +639,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ), +DEFINE_PROP_BOOL ("sscof" ,RISCVCPU , cfg.ext_sscof, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zfh", RISCVCPU, cfg.ext_zfh, false),
target/riscv/cpu.h +25 -0
@@ -123,6 +123,8 @@ struct PMUCTRState {/* Snapshort value of a counter in RV32 */ target_ulong mhpmcounterh_prev;bool started; +/* Value beyond UINT32_MAX/UINT64_MAX before overflow interrupt trigger */ +target_ulong irq_overflow_left; };struct CPURISCVState {
@@ -245,6 +247,9 @@ struct CPURISCVState {/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ]; +/* PMU event selector configured values for RV32*/ +target_ulong mhpmeventh_val[RV_MAX_MHPMEVENTS ]; +target_ulong sscratch;target_ulong mscratch;
@@ -339,6 +344,7 @@ struct RISCVCPU {bool ext_icsr;bool ext_zfh;bool ext_zfhmin; +bool ext_sscof;uint8_t pmu_num;char *priv_spec;
@@ -352,6 +358,12 @@ struct RISCVCPU {bool epmp;uint64_t resetvec; } cfg; + +QEMUTimer *pmu_timer; +/* A bitmask of Available programmable counters */ +uint32_t pmu_avail_ctrs; +/* Mapping of events to counters */ +GHashTable *pmu_event_ctr_map; };static inline int riscv_has_ext (CPURISCVState *env,target_ulong ext)
@@ -526,6 +538,19 @@ enum { CSR_TABLE_SIZE = 0x1000 }; +/** +* The event id are encoded based on the encoding specified in the +* SBI specification v0.3 +*/ + +enum riscv_pmu_event_idx { +RISCV_PMU_EVENT_HW_CPU_CYCLES =0x01 , +RISCV_PMU_EVENT_HW_INSTRUCTIONS =0x02 , +RISCV_PMU_EVENT_CACHE_DTLB_READ_MISS =0x10019 , +RISCV_PMU_EVENT_CACHE_DTLB_WRITE_MISS =0x1001B , +RISCV_PMU_EVENT_CACHE_ITLB_PREFETCH_MISS =0x10021 , +}; +/* CSR function table */ extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE ];
target/riscv/cpu_bits.h +55 -0
88 lines not on this page · raw message
target/riscv/csr.c +147 -9
265 lines not on this page · raw message
target/riscv/pmu.c +344 -2
357 lines not on this page · raw message
target/riscv/pmu.h +8 -0
@@ -26,3 +26,11 @@ bool riscv_pmu_ctr_monitor_instructions(CPURISCVState *env, uint32_t target_ctr);bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr); +void riscv_pmu_timer_cb (void *priv); +int riscv_pmu_init (RISCVCPU *cpu,int num_counters); +int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx); +int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx); +target_ulong get_icount_ticks (bool brv32); +int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx);
Signature · 1 line
2.30.2
Re: [PATCH v4 08/11] target/riscv: Add sscofpmf extension support
Quoted 543 lines · Atish Patra
The Sscofpmf ('Ss' for Privileged arch and Supervisor-level extensions, and 'cofpmf' for Count OverFlow and Privilege Mode Filtering) extension allows the perf to handle overflow interrupts and filtering support. This patch provides a framework for programmable counters to leverage the extension. As the extension doesn't have any provision for the overflow bit for fixed counters, the fixed events can also be monitoring using programmable counters. The underlying counters for cycle and instruction counters are always running. Thus, a separate timer device is programmed to handle the overflow.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.c | 12 ++ target/riscv/cpu.h | 25 +++ target/riscv/cpu_bits.h | 55 +++++++ target/riscv/csr.c | 156 ++++++++++++++++-- target/riscv/pmu.c | 346 +++++++++++++++++++++++++++++++++++++++- target/riscv/pmu.h | 8 + 6 files changed, 591 insertions(+), 11 deletions(-)target/riscv/cpu.c +12
-0@@ -22,6 +22,7 @@#include "qemu/ctype.h" #include "qemu/log.h" #include "cpu.h" +#include "pmu.h" #include "internals.h" #include "exec/exec-all.h" #include "qapi/error.h" @@ -569,6 +570,16 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_misa (env, env->misa_mxl, ext); } +if (cpu->cfg.pmu_num) { +if (!riscv_pmu_init (cpu, cpu->cfg.pmu_num) && cpu->cfg.ext_sscof) { + cpu->pmu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + riscv_pmu_timer_cb, cpu); +if (!cpu->pmu_timer) { + cpu->cfg.ext_sscof = false; + } + } + } +riscv_cpu_register_gdb_regs_for_features (cs);qemu_init_vcpu (cs);@@ -628,6 +639,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ), +DEFINE_PROP_BOOL ("sscof" ,RISCVCPU , cfg.ext_sscof, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zfh", RISCVCPU, cfg.ext_zfh, false),target/riscv/cpu.h +25
-0@@ -123,6 +123,8 @@ struct PMUCTRState {/* Snapshort value of a counter in RV32 */ target_ulong mhpmcounterh_prev;bool started; +/* Value beyond UINT32_MAX/UINT64_MAX before overflow interrupt trigger */ +target_ulong irq_overflow_left; };struct CPURISCVState {@@ -245,6 +247,9 @@ struct CPURISCVState {/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ]; +/* PMU event selector configured values for RV32*/ +target_ulong mhpmeventh_val[RV_MAX_MHPMEVENTS ]; +target_ulong sscratch;target_ulong mscratch;@@ -339,6 +344,7 @@ struct RISCVCPU {bool ext_icsr;bool ext_zfh;bool ext_zfhmin; +bool ext_sscof;uint8_t pmu_num;char *priv_spec;@@ -352,6 +358,12 @@ struct RISCVCPU {bool epmp;uint64_t resetvec; } cfg; + +QEMUTimer *pmu_timer; +/* A bitmask of Available programmable counters */ +uint32_t pmu_avail_ctrs; +/* Mapping of events to counters */ +GHashTable *pmu_event_ctr_map; };static inline int riscv_has_ext (CPURISCVState *env,target_ulong ext)@@ -526,6 +538,19 @@ enum { CSR_TABLE_SIZE = 0x1000 }; +/** +* The event id are encoded based on the encoding specified in the +* SBI specification v0.3 +*/ + +enum riscv_pmu_event_idx { +RISCV_PMU_EVENT_HW_CPU_CYCLES =0x01 , +RISCV_PMU_EVENT_HW_INSTRUCTIONS =0x02 , +RISCV_PMU_EVENT_CACHE_DTLB_READ_MISS =0x10019 , +RISCV_PMU_EVENT_CACHE_DTLB_WRITE_MISS =0x1001B , +RISCV_PMU_EVENT_CACHE_ITLB_PREFETCH_MISS =0x10021 , +}; +/* CSR function table */ extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE ];target/riscv/cpu_bits.h +55
-0@@ -316,6 +316,37 @@#define CSR_MHPMEVENT29 0x33d#define CSR_MHPMEVENT30 0x33e#define CSR_MHPMEVENT31 0x33f + +#define CSR_MHPMEVENT3H 0x723 +#define CSR_MHPMEVENT4H 0x724 +#define CSR_MHPMEVENT5H 0x725 +#define CSR_MHPMEVENT6H 0x726 +#define CSR_MHPMEVENT7H 0x727 +#define CSR_MHPMEVENT8H 0x728 +#define CSR_MHPMEVENT9H 0x729 +#define CSR_MHPMEVENT10H 0x72a +#define CSR_MHPMEVENT11H 0x72b +#define CSR_MHPMEVENT12H 0x72c +#define CSR_MHPMEVENT13H 0x72d +#define CSR_MHPMEVENT14H 0x72e +#define CSR_MHPMEVENT15H 0x72f +#define CSR_MHPMEVENT16H 0x730 +#define CSR_MHPMEVENT17H 0x731 +#define CSR_MHPMEVENT18H 0x732 +#define CSR_MHPMEVENT19H 0x733 +#define CSR_MHPMEVENT20H 0x734 +#define CSR_MHPMEVENT21H 0x735 +#define CSR_MHPMEVENT22H 0x736 +#define CSR_MHPMEVENT23H 0x737 +#define CSR_MHPMEVENT24H 0x738 +#define CSR_MHPMEVENT25H 0x739 +#define CSR_MHPMEVENT26H 0x73a +#define CSR_MHPMEVENT27H 0x73b +#define CSR_MHPMEVENT28H 0x73c +#define CSR_MHPMEVENT29H 0x73d +#define CSR_MHPMEVENT30H 0x73e +#define CSR_MHPMEVENT31H 0x73f +#define CSR_MHPMCOUNTER3H 0xb83#define CSR_MHPMCOUNTER4H 0xb84#define CSR_MHPMCOUNTER5H 0xb85@@ -377,6 +408,7 @@#define CSR_VSMTE 0x2c0#define CSR_VSPMMASK 0x2c1#define CSR_VSPMBASE 0x2c2 +#define CSR_SCOUNTOVF 0xda0/* mstatus CSR bits */ #define MSTATUS_UIE 0x00000001@@ -538,6 +570,7 @@ typedef enum RISCVException {#define IRQ_S_EXT 9#define IRQ_VS_EXT 10#define IRQ_M_EXT 11 +#define IRQ_PMU_OVF 13/* mip masks */ #define MIP_USIP (1 << IRQ_U_SOFT)@@ -552,11 +585,13 @@ typedef enum RISCVException {#define MIP_SEIP (1 << IRQ_S_EXT)#define MIP_VSEIP (1 << IRQ_VS_EXT)#define MIP_MEIP (1 << IRQ_M_EXT) +#define MIP_LCOFIP (1 << IRQ_PMU_OVF)/* sip masks */ #define SIP_SSIP MIP_SSIP#define SIP_STIP MIP_STIP#define SIP_SEIP MIP_SEIP +#define SIP_LCOFIP MIP_LCOFIP/* MIE masks */ #define MIE_SEIE (1 << IRQ_S_EXT)@@ -629,4 +664,24 @@ typedef enum RISCVException {#define UMTE_U_PM_INSN U_PM_INSN#define UMTE_MASK (UMTE_U_PM_ENABLE | MMTE_U_PM_CURRENT | UMTE_U_PM_INSN) +/* PMU related bits */ +#define MIE_LCOFIE (1 << IRQ_PMU_OVF) + +#define MHPMEVENT_BIT_OF BIT(63) +#define MHPMEVENTH_BIT_OF BIT(31) +#define MHPMEVENT_BIT_MINH BIT(62) +#define MHPMEVENTH_BIT_MINH BIT(30) +#define MHPMEVENT_BIT_SINH BIT(61) +#define MHPMEVENTH_BIT_SINH BIT(29) +#define MHPMEVENT_BIT_UINH BIT(60) +#define MHPMEVENTH_BIT_UINH BIT(28) +#define MHPMEVENT_BIT_VSINH BIT(59) +#define MHPMEVENTH_BIT_VSINH BIT(27) +#define MHPMEVENT_BIT_VUINH BIT(58) +#define MHPMEVENTH_BIT_VUINH BIT(26) + +#define MHPMEVENT_SSCOF_MASK _ULL(0xFFFF000000000000) +#define MHPMEVENT_IDX_MASK 0xFFFFF +#define MHPMEVENT_SSCOF_RESVD 16 +#endif target/riscv/csr.c +147
-9@@ -90,13 +90,26 @@ static RISCVException mctr32(CPURISCVState *env, int csrno)return mctr (env, csrno); } +static RISCVException sscof (CPURISCVState *env,int csrno) +{ +#if !defined(CONFIG_USER_ONLY ) +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_sscof) { +return RISCV_EXCP_ILLEGAL_INST ; + } +#endif +return RISCV_EXCP_NONE ; +} +static RISCVException ctr (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; -int base_csrno =CSR_HPMCOUNTER3 ; +int base_csrno =CSR_CYCLE ;bool rv32 =riscv_cpu_mxl (env) ==MXL_RV32 ? true : false;if (rv32 && csrno >=CSR_CYCLEH ) {@@ -105,11 +118,18 @@ static RISCVException ctr(CPURISCVState *env, int csrno) } ctr_index = csrno - base_csrno; -if (!cpu->cfg.pmu_num || ctr_index >= (cpu->cfg.pmu_num)) { +if ((csrno >=CSR_CYCLE && csrno <=CSR_INSTRET ) || + (csrno >=CSR_CYCLEH && csrno <=CSR_INSTRETH )) { + goto skip_ext_pmu_check; + } + +if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs &BIT (ctr_index)))) {/* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST ; } +skip_ext_pmu_check: +if (env->priv ==PRV_S ) {switch (csrno) {case CSR_CYCLE :@@ -128,7 +148,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: - ctr_index = csrno -CSR_CYCLE ;if (!get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -152,7 +171,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: - ctr_index = csrno -CSR_CYCLEH ;if (!get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -182,7 +200,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: - ctr_index = csrno -CSR_CYCLE ;if (!get_field (env->hcounteren,1 << ctr_index) &&get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ;@@ -210,7 +227,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: - ctr_index = csrno -CSR_CYCLEH ;if (!get_field (env->hcounteren,1 << ctr_index) &&get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ;@@ -462,7 +478,7 @@ static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) }/* User Timers and Counters */ -static target_ulong get_icount_ticks (bool brv32) +target_ulong get_icount_ticks (bool brv32) {int64_t val;target_ulong result;@@ -499,11 +515,36 @@ static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) {int evt_index = csrno -CSR_MCOUNTINHIBIT ; +if (riscv_cpu_mxl (env) !=MXL_RV32 ) { +riscv_pmu_update_event_map (env, val, evt_index); + } env->mhpmevent_val[evt_index] = val;return RISCV_EXCP_NONE ; } +static int read_mhpmeventh (CPURISCVState *env,int csrno,target_ulong *val) +{ +int evt_index = csrno -CSR_MHPMEVENT3H +3 ; + + *val = env->mhpmevent_val[evt_index]; + +return RISCV_EXCP_NONE ; +} + +static int write_mhpmeventh (CPURISCVState *env,int csrno,target_ulong val) +{ +int evt_index = csrno -CSR_MHPMEVENT3H +3 ; +uint64_t mhpmevth_val = val; +uint64_t mhpmevt_val = env->mhpmevent_val[evt_index]; + + mhpmevt_val = mhpmevt_val | (mhpmevth_val <<32 ); +riscv_pmu_update_event_map (env, mhpmevt_val, evt_index); + env->mhpmeventh_val[evt_index] = val; + +return RISCV_EXCP_NONE ; +} +static int write_mhpmcounter (CPURISCVState *env,int csrno,target_ulong val) {int ctr_idx = csrno -CSR_MCYCLE ;@@ -513,6 +554,9 @@ static int write_mhpmcounter(CPURISCVState *env, int csrno, target_ulong val)if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) ||riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { counter->mhpmcounter_prev =get_icount_ticks (false); +if (ctr_idx >2 ) { +riscv_pmu_setup_timer (env, val, ctr_idx); + } }else {/* Other counters can keep incrementing from the given value */ counter->mhpmcounter_prev = val;@@ -525,11 +569,17 @@ static int write_mhpmcounterh(CPURISCVState *env, int csrno, target_ulong val) {int ctr_idx = csrno -CSR_MCYCLEH ;PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; +uint64_t mhpmctr_val = counter->mhpmcounter_val; +uint64_t mhpmctrh_val = val; counter->mhpmcounterh_val = val; + mhpmctr_val = mhpmctr_val | (mhpmctrh_val <<32 );if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) ||riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { counter->mhpmcounterh_prev =get_icount_ticks (false); +if (ctr_idx >2 ) { +riscv_pmu_setup_timer (env, mhpmctr_val, ctr_idx); + } }else { counter->mhpmcounterh_prev = val; }@@ -599,6 +649,32 @@ static int read_hpmcounterh(CPURISCVState *env, int csrno, target_ulong *val)return riscv_pmu_read_ctr (env, val, true, ctr_index); } +static int read_scountovf (CPURISCVState *env,int csrno,target_ulong *val) +{ +int mhpmevt_start =CSR_MHPMEVENT3 -CSR_MCOUNTINHIBIT ; +int i; + *val =0 ; +target_ulong *mhpm_evt_val; +uint64_t of_bit_mask; + +if (riscv_cpu_mxl (env) ==MXL_RV32 ) { + mhpm_evt_val = env->mhpmeventh_val; + of_bit_mask =MHPMEVENTH_BIT_OF ; + }else { + mhpm_evt_val = env->mhpmevent_val; + of_bit_mask =MHPMEVENT_BIT_OF ; + } + +for (i = mhpmevt_start; i <RV_MAX_MHPMEVENTS ; i++) { +if ((get_field (env->mcounteren,BIT (i))) && + (mhpm_evt_val[i] & of_bit_mask)) { + *val |=BIT (i); + } + } + +return RISCV_EXCP_NONE ; +} +#if defined(CONFIG_USER_ONLY )static RISCVException read_time (CPURISCVState *env,int csrno,target_ulong *val)@@ -645,7 +721,7 @@ static RISCVException read_timeh(CPURISCVState *env, int csrno,/* Machine constants */ #define M_MODE_INTERRUPTS (MIP_MSIP | MIP_MTIP | MIP_MEIP) -#define S_MODE_INTERRUPTS (MIP_SSIP | MIP_STIP | MIP_SEIP) +#define S_MODE_INTERRUPTS (MIP_SSIP | MIP_STIP | MIP_SEIP | MIP_LCOFIP)#define VS_MODE_INTERRUPTS (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP) static const target_ulong delegable_ints = S_MODE_INTERRUPTS |@@ -683,7 +759,8 @@ static const target_ulong vs_delegable_excps = DELEGABLE_EXCPS &static const target_ulong sstatus_v1_10_mask =SSTATUS_SIE |SSTATUS_SPIE |SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS |SSTATUS_SUM |SSTATUS_MXR |SSTATUS_VS ; -static const target_ulong sip_writable_mask =SIP_SSIP |MIP_USIP |MIP_UEIP ; +static const target_ulong sip_writable_mask =SIP_SSIP |MIP_USIP |MIP_UEIP | +SIP_LCOFIP ;static const target_ulong hip_writable_mask =MIP_VSSIP ;static const target_ulong hvip_writable_mask =MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ;static const target_ulong vsip_writable_mask =MIP_VSSIP ;@@ -2362,6 +2439,65 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_mhpmevent, write_mhpmevent }, + [CSR_MHPMEVENT3H] = { "mhpmevent3h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT4H] = { "mhpmevent4h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT5H] = { "mhpmevent5h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT6H] = { "mhpmevent6h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT7H] = { "mhpmevent7h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT8H] = { "mhpmevent8h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT9H] = { "mhpmevent9h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT10H] = { "mhpmevent10h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT11H] = { "mhpmevent11h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT12H] = { "mhpmevent12h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT13H] = { "mhpmevent13h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT14H] = { "mhpmevent14h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT15H] = { "mhpmevent15h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT16H] = { "mhpmevent16h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT17H] = { "mhpmevent17h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT18H] = { "mhpmevent18h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT19H] = { "mhpmevent19h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT20H] = { "mhpmevent20h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT21H] = { "mhpmevent21h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT22H] = { "mhpmevent22h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT23H] = { "mhpmevent23h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT24H] = { "mhpmevent24h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT25H] = { "mhpmevent25h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT26H] = { "mhpmevent26h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT27H] = { "mhpmevent27h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT28H] = { "mhpmevent28h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT29H] = { "mhpmevent29h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT30H] = { "mhpmevent30h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT31H] = { "mhpmevent31h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_HPMCOUNTER3H] = { "hpmcounter3h", ctr32, read_hpmcounterh }, [CSR_HPMCOUNTER4H] = { "hpmcounter4h", ctr32, read_hpmcounterh }, [CSR_HPMCOUNTER5H] = { "hpmcounter5h", ctr32, read_hpmcounterh },@@ -2450,5 +2586,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { write_mhpmcounterh }, [CSR_MHPMCOUNTER31H] = { "mhpmcounter31h", mctr32, read_hpmcounterh, write_mhpmcounterh }, + [CSR_SCOUNTOVF] = { "scountovf", sscof, read_scountovf }, + #endif /* !CONFIG_USER_ONLY */ };target/riscv/pmu.c +31
-0@@ -20,13 +20,355 @@#include "cpu.h" #include "pmu.h" +#define RISCV_TIMEBASE_FREQ 1000000000/* 1Ghz */ +#define MAKE_32BIT_MASK (shift, length) \ + (((uint32_t)(~0UL) >> (32 - (length))) << (shift)) + +static bool riscv_pmu_counter_valid (RISCVCPU *cpu,uint32_t ctr_idx) +{ +if (ctr_idx <3 || ctr_idx >=RV_MAX_MHPMCOUNTERS || + !(cpu->pmu_avail_ctrs &BIT (ctr_idx))) { +return false; + }else { +return true; + } +} + +static bool riscv_pmu_counter_enabled (RISCVCPU *cpu,uint32_t ctr_idx) +{ +CPURISCVState *env = &cpu->env; + +if (!riscv_pmu_counter_valid (cpu, ctr_idx) || + !get_field (env->mcounteren,BIT (ctr_idx))) { +return false; + }else { +return true; + } +} + +static int riscv_pmu_incr_ctr_rv32 (RISCVCPU *cpu,uint32_t ctr_idx) +{ +CPURISCVState *env = &cpu->env; +target_ulong max_val =UINT32_MAX ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx];
target/riscv/pmu.c line 63
Quoted 10 lines
target/riscv/pmu.c +10
-0+ +/* Privilege mode filtering */ +if ((env->priv ==PRV_M && + (env->mhpmeventh_val[ctr_idx] &MHPMEVENTH_BIT_MINH )) || + (env->priv ==PRV_S && + (env->mhpmeventh_val[ctr_idx] &MHPMEVENTH_BIT_SINH )) || + (env->priv ==PRV_U && + (env->mhpmeventh_val[ctr_idx] &MHPMEVENTH_BIT_UINH ))) { +return 0 ; + }
This does not consider VS/VU modes.
Please update it here and below as well.
Regards,
Anup
Quoted 333 lines
target/riscv/pmu.c +303
-2+ +/* Handle the overflow scenario */ +if (counter->mhpmcounter_val == max_val) { +if (counter->mhpmcounterh_val == max_val) { + counter->mhpmcounter_val =0 ; + counter->mhpmcounterh_val =0 ; +/* Generate interrupt only if OF bit is clear */ +if (!(env->mhpmeventh_val[ctr_idx] &MHPMEVENTH_BIT_OF )) { + env->mhpmeventh_val[ctr_idx] |=MHPMEVENTH_BIT_OF ; +riscv_cpu_update_mip (cpu,MIP_LCOFIP ,BOOL_TO_MASK (1 )); + } + }else { + counter->mhpmcounterh_val++; + } + }else { + counter->mhpmcounter_val++; + } + +return 0 ; +} + +static int riscv_pmu_incr_ctr_rv64 (RISCVCPU *cpu,uint32_t ctr_idx) +{ +CPURISCVState *env = &cpu->env; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; +uint64_t max_val =UINT64_MAX ; + +/* Privilege mode filtering */ +if ((env->priv ==PRV_M && + (env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_MINH )) || + (env->priv ==PRV_S && + (env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_SINH )) || + (env->priv ==PRV_U && + (env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_UINH ))) { +return 0 ; + } + +/* Handle the overflow scenario */ +if (counter->mhpmcounter_val == max_val) { + counter->mhpmcounter_val =0 ; +/* Generate interrupt only if OF bit is clear */ +if (!(env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_OF )) { + env->mhpmevent_val[ctr_idx] |=MHPMEVENT_BIT_OF ; +riscv_cpu_update_mip (cpu,MIP_LCOFIP ,BOOL_TO_MASK (1 )); + } + }else { + counter->mhpmcounter_val++; + } +return 0 ; +} + +int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx) +{ +uint32_t ctr_idx; +int ret; +CPURISCVState *env = &cpu->env; +gpointer value; + + value =g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx)); +if (!value) { +return -1 ; + } + + ctr_idx =GPOINTER_TO_UINT (value); +if (!riscv_pmu_counter_enabled (cpu, ctr_idx) || +get_field (env->mcountinhibit,BIT (ctr_idx))) { +return -1 ; + } + +if (riscv_cpu_mxl (env) ==MXL_RV32 ) { + ret =riscv_pmu_incr_ctr_rv32 (cpu, ctr_idx); + }else { + ret =riscv_pmu_incr_ctr_rv64 (cpu, ctr_idx); + } + +return ret; +} +bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env,uint32_t target_ctr) { -return (target_ctr ==0 ) ? true : false; +RISCVCPU *cpu; +uint32_t event_idx; +uint32_t ctr_idx; + +/* Fixed instret counter */ +if (target_ctr ==2 ) { +return true; + } + + cpu =RISCV_CPU (env_cpu (env)); + event_idx =RISCV_PMU_EVENT_HW_INSTRUCTIONS ; + ctr_idx =GPOINTER_TO_UINT (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx))); +if (!ctr_idx) { +return false; + } + +return target_ctr == ctr_idx ? true : false; }bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr) { -return (target_ctr ==2 ) ? true : false; +RISCVCPU *cpu; +uint32_t event_idx; +uint32_t ctr_idx; + +/* Fixed mcycle counter */ +if (target_ctr ==0 ) { +return true; + } + + cpu =RISCV_CPU (env_cpu (env)); + event_idx =RISCV_PMU_EVENT_HW_CPU_CYCLES ; + ctr_idx =GPOINTER_TO_UINT (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx))); + +/* Counter zero is not used for event_ctr_map */ +if (!ctr_idx) { +return false; + } + +return (target_ctr == ctr_idx) ? true : false; +} + +static gboolean pmu_remove_event_map (gpointer key,gpointer value, +gpointer udata) +{ +return (GPOINTER_TO_UINT (value) ==GPOINTER_TO_UINT (udata)) ? true : false; +} + +static int64_t pmu_icount_ticks_to_ns (int64_t value) +{ +int64_t ret =0 ; + +if (icount_enabled ()) { + ret =icount_to_ns (value); + }else { + ret = (NANOSECONDS_PER_SECOND /RISCV_TIMEBASE_FREQ ) * value; + } + +return ret; +} + +int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx) +{ +uint32_t event_idx; +RISCVCPU *cpu =RISCV_CPU (env_cpu (env)); + +if (!riscv_pmu_counter_valid (cpu, ctr_idx)) { +return -1 ; + } + +/** +* Expected mhpmevent value is zero for reset case. Remove the current +* mapping. +*/ +if (!value) { +g_hash_table_foreach_remove (cpu->pmu_event_ctr_map, + pmu_remove_event_map, +GUINT_TO_POINTER (ctr_idx)); +return 0 ; + } + + event_idx = value &MHPMEVENT_IDX_MASK ; +if (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx))) { +return 0 ; + } + +switch (event_idx) { +case RISCV_PMU_EVENT_HW_CPU_CYCLES : +case RISCV_PMU_EVENT_HW_INSTRUCTIONS : +case RISCV_PMU_EVENT_CACHE_DTLB_READ_MISS : +case RISCV_PMU_EVENT_CACHE_DTLB_WRITE_MISS : +case RISCV_PMU_EVENT_CACHE_ITLB_PREFETCH_MISS : +break ; +default : +/* We don't support any raw events right now */ +return -1 ; + } +g_hash_table_insert (cpu->pmu_event_ctr_map,GUINT_TO_POINTER (event_idx), +GUINT_TO_POINTER (ctr_idx)); + +return 0 ; +} + +static void pmu_timer_trigger_irq (RISCVCPU *cpu, +enum riscv_pmu_event_idx evt_idx) +{ +uint32_t ctr_idx; +CPURISCVState *env = &cpu->env; +PMUCTRState *counter; +target_ulong *mhpmevent_val; +uint64_t of_bit_mask; +int64_t irq_trigger_at; + +if (evt_idx !=RISCV_PMU_EVENT_HW_CPU_CYCLES && + evt_idx !=RISCV_PMU_EVENT_HW_INSTRUCTIONS ) { +return ; + } + + ctr_idx =GPOINTER_TO_UINT (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (evt_idx))); +if (!riscv_pmu_counter_enabled (cpu, ctr_idx)) { +return ; + } + +if (riscv_cpu_mxl (env) ==MXL_RV32 ) { + mhpmevent_val = &env->mhpmeventh_val[ctr_idx]; + of_bit_mask =MHPMEVENTH_BIT_OF ; + }else { + mhpmevent_val = &env->mhpmevent_val[ctr_idx]; + of_bit_mask =MHPMEVENT_BIT_OF ; + } + + counter = &env->pmu_ctrs[ctr_idx]; +if (counter->irq_overflow_left >0 ) { + irq_trigger_at =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + counter->irq_overflow_left; +timer_mod_anticipate_ns (cpu->pmu_timer, irq_trigger_at); + counter->irq_overflow_left =0 ; +return ; + } + +if (cpu->pmu_avail_ctrs &BIT (ctr_idx)) { +/* Generate interrupt only if OF bit is clear */ +if (!(*mhpmevent_val & of_bit_mask)) { + *mhpmevent_val |= of_bit_mask; +riscv_cpu_update_mip (cpu,MIP_LCOFIP ,BOOL_TO_MASK (1 )); + } + } +} + +/* Timer callback for instret and cycle counter overflow */ +void riscv_pmu_timer_cb (void *priv) +{ +RISCVCPU *cpu = priv; + +/* Timer event was triggered only for these events */ +pmu_timer_trigger_irq (cpu,RISCV_PMU_EVENT_HW_CPU_CYCLES ); +pmu_timer_trigger_irq (cpu,RISCV_PMU_EVENT_HW_INSTRUCTIONS ); +} + +int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value,uint32_t ctr_idx) +{ +uint64_t overflow_delta, overflow_at; +int64_t overflow_ns, overflow_left =0 ; +RISCVCPU *cpu =RISCV_CPU (env_cpu (env)); +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + +if (!riscv_pmu_counter_valid (cpu, ctr_idx) || !cpu->cfg.ext_sscof) { +return -1 ; + } + +if (value) { + overflow_delta =UINT64_MAX - value +1 ; + }else { + overflow_delta =UINT64_MAX - value; + } + +/** +* QEMU supports only int64_t timers while RISC-V counters are uint64_t. +* Compute the leftover and save it so that it can be reprogrammed again +* when timer expires. +*/ +if (overflow_delta >INT64_MAX ) { + overflow_left = overflow_delta -INT64_MAX ; + } + +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + overflow_ns =pmu_icount_ticks_to_ns ((int64_t )overflow_delta); + overflow_left =pmu_icount_ticks_to_ns (overflow_left) ; + }else { +return -1 ; + } + overflow_at = (uint64_t )qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + overflow_ns; + +if (overflow_at >INT64_MAX ) { + overflow_left += overflow_at -INT64_MAX ; + counter->irq_overflow_left = overflow_left; + overflow_at =INT64_MAX ; + } +timer_mod_anticipate_ns (cpu->pmu_timer, overflow_at); + +return 0 ; +} + + +int riscv_pmu_init (RISCVCPU *cpu,int num_counters) +{ +if (num_counters > (RV_MAX_MHPMCOUNTERS -3 )) { +return -1 ; + } + + cpu->pmu_event_ctr_map =g_hash_table_new (g_direct_hash, g_direct_equal); +if (!cpu->pmu_event_ctr_map) { +/* PMU support can not be enabled */ +qemu_log_mask (LOG_UNIMP ,"PMU events can't be supported\n" ); + cpu->cfg.pmu_num =0 ; +return -1 ; + } + +/* Create a bitmask of available programmable counters */ + cpu->pmu_avail_ctrs =MAKE_32BIT_MASK (3 , num_counters); + +return 0 ; }target/riscv/pmu.h +8
-1@@ -26,3 +26,11 @@ bool riscv_pmu_ctr_monitor_instructions(CPURISCVState *env, uint32_t target_ctr);bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr); +void riscv_pmu_timer_cb (void *priv); +int riscv_pmu_init (RISCVCPU *cpu,int num_counters); +int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx); +int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx); +target_ulong get_icount_ticks (bool brv32); +int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx); --2.30.2
Re: [PATCH v4 08/11] target/riscv: Add sscofpmf extension support
Quoted 549 lines · Anup Patel
Quoted 547 lines · Atish Patra
The Sscofpmf ('Ss' for Privileged arch and Supervisor-level extensions, and 'cofpmf' for Count OverFlow and Privilege Mode Filtering) extension allows the perf to handle overflow interrupts and filtering support. This patch provides a framework for programmable counters to leverage the extension. As the extension doesn't have any provision for the overflow bit for fixed counters, the fixed events can also be monitoring using programmable counters. The underlying counters for cycle and instruction counters are always running. Thus, a separate timer device is programmed to handle the overflow.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- target/riscv/cpu.c | 12 ++ target/riscv/cpu.h | 25 +++ target/riscv/cpu_bits.h | 55 +++++++ target/riscv/csr.c | 156 ++++++++++++++++-- target/riscv/pmu.c | 346 +++++++++++++++++++++++++++++++++++++++- target/riscv/pmu.h | 8 + 6 files changed, 591 insertions(+), 11 deletions(-)target/riscv/cpu.c +12
-0@@ -22,6 +22,7 @@#include "qemu/ctype.h" #include "qemu/log.h" #include "cpu.h" +#include "pmu.h" #include "internals.h" #include "exec/exec-all.h" #include "qapi/error.h" @@ -569,6 +570,16 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_misa (env, env->misa_mxl, ext); } +if (cpu->cfg.pmu_num) { +if (!riscv_pmu_init (cpu, cpu->cfg.pmu_num) && cpu->cfg.ext_sscof) { + cpu->pmu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + riscv_pmu_timer_cb, cpu); +if (!cpu->pmu_timer) { + cpu->cfg.ext_sscof = false; + } + } + } +riscv_cpu_register_gdb_regs_for_features (cs);qemu_init_vcpu (cs);@@ -628,6 +639,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("u" ,RISCVCPU , cfg.ext_u, true),DEFINE_PROP_BOOL ("v" ,RISCVCPU , cfg.ext_v, false),DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ), +DEFINE_PROP_BOOL ("sscof" ,RISCVCPU , cfg.ext_sscof, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zfh", RISCVCPU, cfg.ext_zfh, false),target/riscv/cpu.h +25
-0@@ -123,6 +123,8 @@ struct PMUCTRState {/* Snapshort value of a counter in RV32 */ target_ulong mhpmcounterh_prev;bool started; +/* Value beyond UINT32_MAX/UINT64_MAX before overflow interrupt trigger */ +target_ulong irq_overflow_left; };struct CPURISCVState {@@ -245,6 +247,9 @@ struct CPURISCVState {/* PMU event selector configured values. First three are unused*/ target_ulong mhpmevent_val[RV_MAX_MHPMEVENTS ]; +/* PMU event selector configured values for RV32*/ +target_ulong mhpmeventh_val[RV_MAX_MHPMEVENTS ]; +target_ulong sscratch;target_ulong mscratch;@@ -339,6 +344,7 @@ struct RISCVCPU {bool ext_icsr;bool ext_zfh;bool ext_zfhmin; +bool ext_sscof;uint8_t pmu_num;char *priv_spec;@@ -352,6 +358,12 @@ struct RISCVCPU {bool epmp;uint64_t resetvec; } cfg; + +QEMUTimer *pmu_timer; +/* A bitmask of Available programmable counters */ +uint32_t pmu_avail_ctrs; +/* Mapping of events to counters */ +GHashTable *pmu_event_ctr_map; };static inline int riscv_has_ext (CPURISCVState *env,target_ulong ext)@@ -526,6 +538,19 @@ enum { CSR_TABLE_SIZE = 0x1000 }; +/** +* The event id are encoded based on the encoding specified in the +* SBI specification v0.3 +*/ + +enum riscv_pmu_event_idx { +RISCV_PMU_EVENT_HW_CPU_CYCLES =0x01 , +RISCV_PMU_EVENT_HW_INSTRUCTIONS =0x02 , +RISCV_PMU_EVENT_CACHE_DTLB_READ_MISS =0x10019 , +RISCV_PMU_EVENT_CACHE_DTLB_WRITE_MISS =0x1001B , +RISCV_PMU_EVENT_CACHE_ITLB_PREFETCH_MISS =0x10021 , +}; +/* CSR function table */ extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE ];target/riscv/cpu_bits.h +55
-0@@ -316,6 +316,37 @@#define CSR_MHPMEVENT29 0x33d#define CSR_MHPMEVENT30 0x33e#define CSR_MHPMEVENT31 0x33f + +#define CSR_MHPMEVENT3H 0x723 +#define CSR_MHPMEVENT4H 0x724 +#define CSR_MHPMEVENT5H 0x725 +#define CSR_MHPMEVENT6H 0x726 +#define CSR_MHPMEVENT7H 0x727 +#define CSR_MHPMEVENT8H 0x728 +#define CSR_MHPMEVENT9H 0x729 +#define CSR_MHPMEVENT10H 0x72a +#define CSR_MHPMEVENT11H 0x72b +#define CSR_MHPMEVENT12H 0x72c +#define CSR_MHPMEVENT13H 0x72d +#define CSR_MHPMEVENT14H 0x72e +#define CSR_MHPMEVENT15H 0x72f +#define CSR_MHPMEVENT16H 0x730 +#define CSR_MHPMEVENT17H 0x731 +#define CSR_MHPMEVENT18H 0x732 +#define CSR_MHPMEVENT19H 0x733 +#define CSR_MHPMEVENT20H 0x734 +#define CSR_MHPMEVENT21H 0x735 +#define CSR_MHPMEVENT22H 0x736 +#define CSR_MHPMEVENT23H 0x737 +#define CSR_MHPMEVENT24H 0x738 +#define CSR_MHPMEVENT25H 0x739 +#define CSR_MHPMEVENT26H 0x73a +#define CSR_MHPMEVENT27H 0x73b +#define CSR_MHPMEVENT28H 0x73c +#define CSR_MHPMEVENT29H 0x73d +#define CSR_MHPMEVENT30H 0x73e +#define CSR_MHPMEVENT31H 0x73f +#define CSR_MHPMCOUNTER3H 0xb83#define CSR_MHPMCOUNTER4H 0xb84#define CSR_MHPMCOUNTER5H 0xb85@@ -377,6 +408,7 @@#define CSR_VSMTE 0x2c0#define CSR_VSPMMASK 0x2c1#define CSR_VSPMBASE 0x2c2 +#define CSR_SCOUNTOVF 0xda0/* mstatus CSR bits */ #define MSTATUS_UIE 0x00000001@@ -538,6 +570,7 @@ typedef enum RISCVException {#define IRQ_S_EXT 9#define IRQ_VS_EXT 10#define IRQ_M_EXT 11 +#define IRQ_PMU_OVF 13/* mip masks */ #define MIP_USIP (1 << IRQ_U_SOFT)@@ -552,11 +585,13 @@ typedef enum RISCVException {#define MIP_SEIP (1 << IRQ_S_EXT)#define MIP_VSEIP (1 << IRQ_VS_EXT)#define MIP_MEIP (1 << IRQ_M_EXT) +#define MIP_LCOFIP (1 << IRQ_PMU_OVF)/* sip masks */ #define SIP_SSIP MIP_SSIP#define SIP_STIP MIP_STIP#define SIP_SEIP MIP_SEIP +#define SIP_LCOFIP MIP_LCOFIP/* MIE masks */ #define MIE_SEIE (1 << IRQ_S_EXT)@@ -629,4 +664,24 @@ typedef enum RISCVException {#define UMTE_U_PM_INSN U_PM_INSN#define UMTE_MASK (UMTE_U_PM_ENABLE | MMTE_U_PM_CURRENT | UMTE_U_PM_INSN) +/* PMU related bits */ +#define MIE_LCOFIE (1 << IRQ_PMU_OVF) + +#define MHPMEVENT_BIT_OF BIT(63) +#define MHPMEVENTH_BIT_OF BIT(31) +#define MHPMEVENT_BIT_MINH BIT(62) +#define MHPMEVENTH_BIT_MINH BIT(30) +#define MHPMEVENT_BIT_SINH BIT(61) +#define MHPMEVENTH_BIT_SINH BIT(29) +#define MHPMEVENT_BIT_UINH BIT(60) +#define MHPMEVENTH_BIT_UINH BIT(28) +#define MHPMEVENT_BIT_VSINH BIT(59) +#define MHPMEVENTH_BIT_VSINH BIT(27) +#define MHPMEVENT_BIT_VUINH BIT(58) +#define MHPMEVENTH_BIT_VUINH BIT(26) + +#define MHPMEVENT_SSCOF_MASK _ULL(0xFFFF000000000000) +#define MHPMEVENT_IDX_MASK 0xFFFFF +#define MHPMEVENT_SSCOF_RESVD 16 +#endif target/riscv/csr.c +147
-9@@ -90,13 +90,26 @@ static RISCVException mctr32(CPURISCVState *env, int csrno)return mctr (env, csrno); } +static RISCVException sscof (CPURISCVState *env,int csrno) +{ +#if !defined(CONFIG_USER_ONLY ) +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_sscof) { +return RISCV_EXCP_ILLEGAL_INST ; + } +#endif +return RISCV_EXCP_NONE ; +} +static RISCVException ctr (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY )CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; -int base_csrno =CSR_HPMCOUNTER3 ; +int base_csrno =CSR_CYCLE ;bool rv32 =riscv_cpu_mxl (env) ==MXL_RV32 ? true : false;if (rv32 && csrno >=CSR_CYCLEH ) {@@ -105,11 +118,18 @@ static RISCVException ctr(CPURISCVState *env, int csrno) } ctr_index = csrno - base_csrno; -if (!cpu->cfg.pmu_num || ctr_index >= (cpu->cfg.pmu_num)) { +if ((csrno >=CSR_CYCLE && csrno <=CSR_INSTRET ) || + (csrno >=CSR_CYCLEH && csrno <=CSR_INSTRETH )) { + goto skip_ext_pmu_check; + } + +if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs &BIT (ctr_index)))) {/* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST ; } +skip_ext_pmu_check: +if (env->priv ==PRV_S ) {switch (csrno) {case CSR_CYCLE :@@ -128,7 +148,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: - ctr_index = csrno -CSR_CYCLE ;if (!get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -152,7 +171,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: - ctr_index = csrno -CSR_CYCLEH ;if (!get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -182,7 +200,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: - ctr_index = csrno -CSR_CYCLE ;if (!get_field (env->hcounteren,1 << ctr_index) &&get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ;@@ -210,7 +227,6 @@ static RISCVException ctr(CPURISCVState *env, int csrno) }break ; case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: - ctr_index = csrno -CSR_CYCLEH ;if (!get_field (env->hcounteren,1 << ctr_index) &&get_field (env->mcounteren,1 << ctr_index)) {return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ;@@ -462,7 +478,7 @@ static int write_vcsr(CPURISCVState *env, int csrno, target_ulong val) }/* User Timers and Counters */ -static target_ulong get_icount_ticks (bool brv32) +target_ulong get_icount_ticks (bool brv32) {int64_t val;target_ulong result;@@ -499,11 +515,36 @@ static int write_mhpmevent(CPURISCVState *env, int csrno, target_ulong val) {int evt_index = csrno -CSR_MCOUNTINHIBIT ; +if (riscv_cpu_mxl (env) !=MXL_RV32 ) { +riscv_pmu_update_event_map (env, val, evt_index); + } env->mhpmevent_val[evt_index] = val;return RISCV_EXCP_NONE ; } +static int read_mhpmeventh (CPURISCVState *env,int csrno,target_ulong *val) +{ +int evt_index = csrno -CSR_MHPMEVENT3H +3 ; + + *val = env->mhpmevent_val[evt_index]; + +return RISCV_EXCP_NONE ; +} + +static int write_mhpmeventh (CPURISCVState *env,int csrno,target_ulong val) +{ +int evt_index = csrno -CSR_MHPMEVENT3H +3 ; +uint64_t mhpmevth_val = val; +uint64_t mhpmevt_val = env->mhpmevent_val[evt_index]; + + mhpmevt_val = mhpmevt_val | (mhpmevth_val <<32 ); +riscv_pmu_update_event_map (env, mhpmevt_val, evt_index); + env->mhpmeventh_val[evt_index] = val; + +return RISCV_EXCP_NONE ; +} +static int write_mhpmcounter (CPURISCVState *env,int csrno,target_ulong val) {int ctr_idx = csrno -CSR_MCYCLE ;@@ -513,6 +554,9 @@ static int write_mhpmcounter(CPURISCVState *env, int csrno, target_ulong val)if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) ||riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { counter->mhpmcounter_prev =get_icount_ticks (false); +if (ctr_idx >2 ) { +riscv_pmu_setup_timer (env, val, ctr_idx); + } }else {/* Other counters can keep incrementing from the given value */ counter->mhpmcounter_prev = val;@@ -525,11 +569,17 @@ static int write_mhpmcounterh(CPURISCVState *env, int csrno, target_ulong val) {int ctr_idx = csrno -CSR_MCYCLEH ;PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; +uint64_t mhpmctr_val = counter->mhpmcounter_val; +uint64_t mhpmctrh_val = val; counter->mhpmcounterh_val = val; + mhpmctr_val = mhpmctr_val | (mhpmctrh_val <<32 );if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) ||riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { counter->mhpmcounterh_prev =get_icount_ticks (false); +if (ctr_idx >2 ) { +riscv_pmu_setup_timer (env, mhpmctr_val, ctr_idx); + } }else { counter->mhpmcounterh_prev = val; }@@ -599,6 +649,32 @@ static int read_hpmcounterh(CPURISCVState *env, int csrno, target_ulong *val)return riscv_pmu_read_ctr (env, val, true, ctr_index); } +static int read_scountovf (CPURISCVState *env,int csrno,target_ulong *val) +{ +int mhpmevt_start =CSR_MHPMEVENT3 -CSR_MCOUNTINHIBIT ; +int i; + *val =0 ; +target_ulong *mhpm_evt_val; +uint64_t of_bit_mask; + +if (riscv_cpu_mxl (env) ==MXL_RV32 ) { + mhpm_evt_val = env->mhpmeventh_val; + of_bit_mask =MHPMEVENTH_BIT_OF ; + }else { + mhpm_evt_val = env->mhpmevent_val; + of_bit_mask =MHPMEVENT_BIT_OF ; + } + +for (i = mhpmevt_start; i <RV_MAX_MHPMEVENTS ; i++) { +if ((get_field (env->mcounteren,BIT (i))) && + (mhpm_evt_val[i] & of_bit_mask)) { + *val |=BIT (i); + } + } + +return RISCV_EXCP_NONE ; +} +#if defined(CONFIG_USER_ONLY )static RISCVException read_time (CPURISCVState *env,int csrno,target_ulong *val)@@ -645,7 +721,7 @@ static RISCVException read_timeh(CPURISCVState *env, int csrno,/* Machine constants */ #define M_MODE_INTERRUPTS (MIP_MSIP | MIP_MTIP | MIP_MEIP) -#define S_MODE_INTERRUPTS (MIP_SSIP | MIP_STIP | MIP_SEIP) +#define S_MODE_INTERRUPTS (MIP_SSIP | MIP_STIP | MIP_SEIP | MIP_LCOFIP)#define VS_MODE_INTERRUPTS (MIP_VSSIP | MIP_VSTIP | MIP_VSEIP) static const target_ulong delegable_ints = S_MODE_INTERRUPTS |@@ -683,7 +759,8 @@ static const target_ulong vs_delegable_excps = DELEGABLE_EXCPS &static const target_ulong sstatus_v1_10_mask =SSTATUS_SIE |SSTATUS_SPIE |SSTATUS_UIE |SSTATUS_UPIE |SSTATUS_SPP |SSTATUS_FS |SSTATUS_XS |SSTATUS_SUM |SSTATUS_MXR |SSTATUS_VS ; -static const target_ulong sip_writable_mask =SIP_SSIP |MIP_USIP |MIP_UEIP ; +static const target_ulong sip_writable_mask =SIP_SSIP |MIP_USIP |MIP_UEIP | +SIP_LCOFIP ;static const target_ulong hip_writable_mask =MIP_VSSIP ;static const target_ulong hvip_writable_mask =MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ;static const target_ulong vsip_writable_mask =MIP_VSSIP ;@@ -2362,6 +2439,65 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_mhpmevent, write_mhpmevent }, + [CSR_MHPMEVENT3H] = { "mhpmevent3h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT4H] = { "mhpmevent4h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT5H] = { "mhpmevent5h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT6H] = { "mhpmevent6h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT7H] = { "mhpmevent7h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT8H] = { "mhpmevent8h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT9H] = { "mhpmevent9h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT10H] = { "mhpmevent10h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT11H] = { "mhpmevent11h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT12H] = { "mhpmevent12h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT13H] = { "mhpmevent13h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT14H] = { "mhpmevent14h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT15H] = { "mhpmevent15h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT16H] = { "mhpmevent16h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT17H] = { "mhpmevent17h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT18H] = { "mhpmevent18h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT19H] = { "mhpmevent19h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT20H] = { "mhpmevent20h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT21H] = { "mhpmevent21h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT22H] = { "mhpmevent22h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT23H] = { "mhpmevent23h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT24H] = { "mhpmevent24h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT25H] = { "mhpmevent25h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT26H] = { "mhpmevent26h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT27H] = { "mhpmevent27h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT28H] = { "mhpmevent28h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT29H] = { "mhpmevent29h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT30H] = { "mhpmevent30h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_MHPMEVENT31H] = { "mhpmevent31h", sscof, read_mhpmeventh, + write_mhpmeventh}, + [CSR_HPMCOUNTER3H] = { "hpmcounter3h", ctr32, read_hpmcounterh }, [CSR_HPMCOUNTER4H] = { "hpmcounter4h", ctr32, read_hpmcounterh }, [CSR_HPMCOUNTER5H] = { "hpmcounter5h", ctr32, read_hpmcounterh },@@ -2450,5 +2586,7 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { write_mhpmcounterh }, [CSR_MHPMCOUNTER31H] = { "mhpmcounter31h", mctr32, read_hpmcounterh, write_mhpmcounterh }, + [CSR_SCOUNTOVF] = { "scountovf", sscof, read_scountovf }, + #endif /* !CONFIG_USER_ONLY */ };target/riscv/pmu.c +35
-0@@ -20,13 +20,355 @@#include "cpu.h" #include "pmu.h" +#define RISCV_TIMEBASE_FREQ 1000000000/* 1Ghz */ +#define MAKE_32BIT_MASK (shift, length) \ + (((uint32_t)(~0UL) >> (32 - (length))) << (shift)) + +static bool riscv_pmu_counter_valid (RISCVCPU *cpu,uint32_t ctr_idx) +{ +if (ctr_idx <3 || ctr_idx >=RV_MAX_MHPMCOUNTERS || + !(cpu->pmu_avail_ctrs &BIT (ctr_idx))) { +return false; + }else { +return true; + } +} + +static bool riscv_pmu_counter_enabled (RISCVCPU *cpu,uint32_t ctr_idx) +{ +CPURISCVState *env = &cpu->env; + +if (!riscv_pmu_counter_valid (cpu, ctr_idx) || + !get_field (env->mcounteren,BIT (ctr_idx))) { +return false; + }else { +return true; + } +} + +static int riscv_pmu_incr_ctr_rv32 (RISCVCPU *cpu,uint32_t ctr_idx) +{ +CPURISCVState *env = &cpu->env; +target_ulong max_val =UINT32_MAX ; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + +/* Privilege mode filtering */ + if ((env->priv == PRV_M && + (env->mhpmeventh_val[ctr_idx] & MHPMEVENTH_BIT_MINH)) ||
Quoted 9 lines
target/riscv/pmu.c line 63
Quoted 6 lines
target/riscv/pmu.c +6
-0+ (env->priv == PRV_S && + (env->mhpmeventh_val[ctr_idx] & MHPMEVENTH_BIT_SINH)) || + (env->priv == PRV_U && + (env->mhpmeventh_val[ctr_idx] & MHPMEVENTH_BIT_UINH))) { +return 0 ; + }This does not consider VS/VU modes.
Yeah. That was on purpose as there is no perf support in KVM.
I was planning to add it along with KVM perf support so that we have a way to test these bits.
Quoted 338 lines
Please update it here and below as well.
Regards,
AnupQuoted 333 lines
target/riscv/pmu.c +303
-2+ +/* Handle the overflow scenario */ +if (counter->mhpmcounter_val == max_val) { +if (counter->mhpmcounterh_val == max_val) { + counter->mhpmcounter_val =0 ; + counter->mhpmcounterh_val =0 ; +/* Generate interrupt only if OF bit is clear */ +if (!(env->mhpmeventh_val[ctr_idx] &MHPMEVENTH_BIT_OF )) { + env->mhpmeventh_val[ctr_idx] |=MHPMEVENTH_BIT_OF ; +riscv_cpu_update_mip (cpu,MIP_LCOFIP ,BOOL_TO_MASK (1 )); + } + }else { + counter->mhpmcounterh_val++; + } + }else { + counter->mhpmcounter_val++; + } + +return 0 ; +} + +static int riscv_pmu_incr_ctr_rv64 (RISCVCPU *cpu,uint32_t ctr_idx) +{ +CPURISCVState *env = &cpu->env; +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; +uint64_t max_val =UINT64_MAX ; + +/* Privilege mode filtering */ +if ((env->priv ==PRV_M && + (env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_MINH )) || + (env->priv ==PRV_S && + (env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_SINH )) || + (env->priv ==PRV_U && + (env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_UINH ))) { +return 0 ; + } + +/* Handle the overflow scenario */ +if (counter->mhpmcounter_val == max_val) { + counter->mhpmcounter_val =0 ; +/* Generate interrupt only if OF bit is clear */ +if (!(env->mhpmevent_val[ctr_idx] &MHPMEVENT_BIT_OF )) { + env->mhpmevent_val[ctr_idx] |=MHPMEVENT_BIT_OF ; +riscv_cpu_update_mip (cpu,MIP_LCOFIP ,BOOL_TO_MASK (1 )); + } + }else { + counter->mhpmcounter_val++; + } +return 0 ; +} + +int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx) +{ +uint32_t ctr_idx; +int ret; +CPURISCVState *env = &cpu->env; +gpointer value; + + value =g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx)); +if (!value) { +return -1 ; + } + + ctr_idx =GPOINTER_TO_UINT (value); +if (!riscv_pmu_counter_enabled (cpu, ctr_idx) || +get_field (env->mcountinhibit,BIT (ctr_idx))) { +return -1 ; + } + +if (riscv_cpu_mxl (env) ==MXL_RV32 ) { + ret =riscv_pmu_incr_ctr_rv32 (cpu, ctr_idx); + }else { + ret =riscv_pmu_incr_ctr_rv64 (cpu, ctr_idx); + } + +return ret; +} +bool riscv_pmu_ctr_monitor_instructions (CPURISCVState *env,uint32_t target_ctr) { -return (target_ctr ==0 ) ? true : false; +RISCVCPU *cpu; +uint32_t event_idx; +uint32_t ctr_idx; + +/* Fixed instret counter */ +if (target_ctr ==2 ) { +return true; + } + + cpu =RISCV_CPU (env_cpu (env)); + event_idx =RISCV_PMU_EVENT_HW_INSTRUCTIONS ; + ctr_idx =GPOINTER_TO_UINT (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx))); +if (!ctr_idx) { +return false; + } + +return target_ctr == ctr_idx ? true : false; }bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr) { -return (target_ctr ==2 ) ? true : false; +RISCVCPU *cpu; +uint32_t event_idx; +uint32_t ctr_idx; + +/* Fixed mcycle counter */ +if (target_ctr ==0 ) { +return true; + } + + cpu =RISCV_CPU (env_cpu (env)); + event_idx =RISCV_PMU_EVENT_HW_CPU_CYCLES ; + ctr_idx =GPOINTER_TO_UINT (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx))); + +/* Counter zero is not used for event_ctr_map */ +if (!ctr_idx) { +return false; + } + +return (target_ctr == ctr_idx) ? true : false; +} + +static gboolean pmu_remove_event_map (gpointer key,gpointer value, +gpointer udata) +{ +return (GPOINTER_TO_UINT (value) ==GPOINTER_TO_UINT (udata)) ? true : false; +} + +static int64_t pmu_icount_ticks_to_ns (int64_t value) +{ +int64_t ret =0 ; + +if (icount_enabled ()) { + ret =icount_to_ns (value); + }else { + ret = (NANOSECONDS_PER_SECOND /RISCV_TIMEBASE_FREQ ) * value; + } + +return ret; +} + +int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx) +{ +uint32_t event_idx; +RISCVCPU *cpu =RISCV_CPU (env_cpu (env)); + +if (!riscv_pmu_counter_valid (cpu, ctr_idx)) { +return -1 ; + } + +/** +* Expected mhpmevent value is zero for reset case. Remove the current +* mapping. +*/ +if (!value) { +g_hash_table_foreach_remove (cpu->pmu_event_ctr_map, + pmu_remove_event_map, +GUINT_TO_POINTER (ctr_idx)); +return 0 ; + } + + event_idx = value &MHPMEVENT_IDX_MASK ; +if (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (event_idx))) { +return 0 ; + } + +switch (event_idx) { +case RISCV_PMU_EVENT_HW_CPU_CYCLES : +case RISCV_PMU_EVENT_HW_INSTRUCTIONS : +case RISCV_PMU_EVENT_CACHE_DTLB_READ_MISS : +case RISCV_PMU_EVENT_CACHE_DTLB_WRITE_MISS : +case RISCV_PMU_EVENT_CACHE_ITLB_PREFETCH_MISS : +break ; +default : +/* We don't support any raw events right now */ +return -1 ; + } +g_hash_table_insert (cpu->pmu_event_ctr_map,GUINT_TO_POINTER (event_idx), +GUINT_TO_POINTER (ctr_idx)); + +return 0 ; +} + +static void pmu_timer_trigger_irq (RISCVCPU *cpu, +enum riscv_pmu_event_idx evt_idx) +{ +uint32_t ctr_idx; +CPURISCVState *env = &cpu->env; +PMUCTRState *counter; +target_ulong *mhpmevent_val; +uint64_t of_bit_mask; +int64_t irq_trigger_at; + +if (evt_idx !=RISCV_PMU_EVENT_HW_CPU_CYCLES && + evt_idx !=RISCV_PMU_EVENT_HW_INSTRUCTIONS ) { +return ; + } + + ctr_idx =GPOINTER_TO_UINT (g_hash_table_lookup (cpu->pmu_event_ctr_map, +GUINT_TO_POINTER (evt_idx))); +if (!riscv_pmu_counter_enabled (cpu, ctr_idx)) { +return ; + } + +if (riscv_cpu_mxl (env) ==MXL_RV32 ) { + mhpmevent_val = &env->mhpmeventh_val[ctr_idx]; + of_bit_mask =MHPMEVENTH_BIT_OF ; + }else { + mhpmevent_val = &env->mhpmevent_val[ctr_idx]; + of_bit_mask =MHPMEVENT_BIT_OF ; + } + + counter = &env->pmu_ctrs[ctr_idx]; +if (counter->irq_overflow_left >0 ) { + irq_trigger_at =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + counter->irq_overflow_left; +timer_mod_anticipate_ns (cpu->pmu_timer, irq_trigger_at); + counter->irq_overflow_left =0 ; +return ; + } + +if (cpu->pmu_avail_ctrs &BIT (ctr_idx)) { +/* Generate interrupt only if OF bit is clear */ +if (!(*mhpmevent_val & of_bit_mask)) { + *mhpmevent_val |= of_bit_mask; +riscv_cpu_update_mip (cpu,MIP_LCOFIP ,BOOL_TO_MASK (1 )); + } + } +} + +/* Timer callback for instret and cycle counter overflow */ +void riscv_pmu_timer_cb (void *priv) +{ +RISCVCPU *cpu = priv; + +/* Timer event was triggered only for these events */ +pmu_timer_trigger_irq (cpu,RISCV_PMU_EVENT_HW_CPU_CYCLES ); +pmu_timer_trigger_irq (cpu,RISCV_PMU_EVENT_HW_INSTRUCTIONS ); +} + +int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value,uint32_t ctr_idx) +{ +uint64_t overflow_delta, overflow_at; +int64_t overflow_ns, overflow_left =0 ; +RISCVCPU *cpu =RISCV_CPU (env_cpu (env)); +PMUCTRState *counter = &env->pmu_ctrs[ctr_idx]; + +if (!riscv_pmu_counter_valid (cpu, ctr_idx) || !cpu->cfg.ext_sscof) { +return -1 ; + } + +if (value) { + overflow_delta =UINT64_MAX - value +1 ; + }else { + overflow_delta =UINT64_MAX - value; + } + +/** +* QEMU supports only int64_t timers while RISC-V counters are uint64_t. +* Compute the leftover and save it so that it can be reprogrammed again +* when timer expires. +*/ +if (overflow_delta >INT64_MAX ) { + overflow_left = overflow_delta -INT64_MAX ; + } + +if (riscv_pmu_ctr_monitor_cycles (env, ctr_idx) || +riscv_pmu_ctr_monitor_instructions (env, ctr_idx)) { + overflow_ns =pmu_icount_ticks_to_ns ((int64_t )overflow_delta); + overflow_left =pmu_icount_ticks_to_ns (overflow_left) ; + }else { +return -1 ; + } + overflow_at = (uint64_t )qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + overflow_ns; + +if (overflow_at >INT64_MAX ) { + overflow_left += overflow_at -INT64_MAX ; + counter->irq_overflow_left = overflow_left; + overflow_at =INT64_MAX ; + } +timer_mod_anticipate_ns (cpu->pmu_timer, overflow_at); + +return 0 ; +} + + +int riscv_pmu_init (RISCVCPU *cpu,int num_counters) +{ +if (num_counters > (RV_MAX_MHPMCOUNTERS -3 )) { +return -1 ; + } + + cpu->pmu_event_ctr_map =g_hash_table_new (g_direct_hash, g_direct_equal); +if (!cpu->pmu_event_ctr_map) { +/* PMU support can not be enabled */ +qemu_log_mask (LOG_UNIMP ,"PMU events can't be supported\n" ); + cpu->cfg.pmu_num =0 ; +return -1 ; + } + +/* Create a bitmask of available programmable counters */ + cpu->pmu_avail_ctrs =MAKE_32BIT_MASK (3 , num_counters); + +return 0 ; }target/riscv/pmu.h +8
-1@@ -26,3 +26,11 @@ bool riscv_pmu_ctr_monitor_instructions(CPURISCVState *env, uint32_t target_ctr);bool riscv_pmu_ctr_monitor_cycles (CPURISCVState *env,uint32_t target_ctr); +void riscv_pmu_timer_cb (void *priv); +int riscv_pmu_init (RISCVCPU *cpu,int num_counters); +int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx); +int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx); +target_ulong get_icount_ticks (bool brv32); +int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value, +uint32_t ctr_idx); --2.30.2
PATCH v4 9/11 target/riscv: Simplify counter predicate function
In reply to Atish PatraAll the hpmcounters and the fixed counters (CY, IR, TM) can be represented as a unified counter. Thus, the predicate function doesn't need handle each case separately.
Simplify the predicate function so that we just handle things differently between RV32/RV64 and S/HS mode.
--- target/riscv/csr.c | 111 ++++----------------------------------------- 1 file changed, 10 insertions(+), 101 deletions(-)
target/riscv/csr.c +10 -101
@@ -109,6 +109,7 @@ static RISCVException ctr(CPURISCVState *env, int csrno)CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; +uint64_t ctr_mask;int base_csrno =CSR_CYCLE ;bool rv32 =riscv_cpu_mxl (env) ==MXL_RV32 ? true : false;
@@ -117,122 +118,30 @@ static RISCVException ctr(CPURISCVState *env, int csrno) base_csrno +=0x80 ; } ctr_index = csrno - base_csrno; + ctr_mask =BIT (ctr_index);if ((csrno >=CSR_CYCLE && csrno <=CSR_INSTRET ) || (csrno >=CSR_CYCLEH && csrno <=CSR_INSTRETH )) { goto skip_ext_pmu_check; } -if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs &BIT (ctr_index)))) { +if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs & ctr_mask))) {/* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST ; } skip_ext_pmu_check: -if (env->priv ==PRV_S ) { -switch (csrno) { -case CSR_CYCLE : -if (!get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_TIME : -if (!get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_INSTRET : -if (!get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - } -if (rv32) { -switch (csrno) { -case CSR_CYCLEH : -if (!get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - } - } +if ((env->priv ==PRV_S ) && (!get_field (env->mcounteren, ctr_mask))) { +return RISCV_EXCP_ILLEGAL_INST ; }if (riscv_cpu_virt_enabled (env)) { -switch (csrno) { -case CSR_CYCLE : -if (!get_field (env->hcounteren,COUNTEREN_CY ) && -get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIME : -if (!get_field (env->hcounteren,COUNTEREN_TM ) && -get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRET : -if (!get_field (env->hcounteren,COUNTEREN_IR ) && -get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->hcounteren,1 << ctr_index) && -get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - } -if (rv32) { -switch (csrno) { -case CSR_CYCLEH : -if (!get_field (env->hcounteren,COUNTEREN_CY ) && -get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->hcounteren,COUNTEREN_TM ) && -get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->hcounteren,COUNTEREN_IR ) && -get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->hcounteren,1 << ctr_index) && -get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - } +if (!get_field (env->mcounteren, ctr_mask)) { +/* The bit must be set in mcountern for HS mode access */ +return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + }else if (!get_field (env->hcounteren, ctr_mask)) { +return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; } }#endif
Signature · 1 line
2.30.2
Re: [PATCH v4 09/11] target/riscv: Simplify counter predicate function
Quoted 18 lines · Atish Patra
All the hpmcounters and the fixed counters (CY, IR, TM) can be represented as a unified counter. Thus, the predicate function doesn't need handle each case separately.
Simplify the predicate function so that we just handle things differently between RV32/RV64 and S/HS mode.
Signed-off-by Atish Patra <[email protected]>--- target/riscv/csr.c | 111 ++++----------------------------------------- 1 file changed, 10 insertions(+), 101 deletions(-)target/riscv/csr.c +0
-0
target/riscv/csr.c static RISCVException ctr(CPURISCVState *env, int csrno) · line 112
Quoted 4 lines
target/riscv/csr.c +1
-0@@ -109,6 +109,7 @@ static RISCVException ctr(CPURISCVState *env, int csrno)CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; +uint64_t ctr_mask;
Use target_ulong should be enough?
Quoted 124 lines
target/riscv/csr.c +4
-98int base_csrno =CSR_CYCLE ;bool rv32 =riscv_cpu_mxl (env) ==MXL_RV32 ? true : false;@@ -117,122 +118,30 @@ static RISCVException ctr(CPURISCVState *env, int csrno) base_csrno +=0x80 ; } ctr_index = csrno - base_csrno; + ctr_mask =BIT (ctr_index);if ((csrno >=CSR_CYCLE && csrno <=CSR_INSTRET ) || (csrno >=CSR_CYCLEH && csrno <=CSR_INSTRETH )) { goto skip_ext_pmu_check; } -if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs &BIT (ctr_index)))) { +if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs & ctr_mask))) {/* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST ; } skip_ext_pmu_check: -if (env->priv ==PRV_S ) { -switch (csrno) { -case CSR_CYCLE : -if (!get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_TIME : -if (!get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_INSTRET : -if (!get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - } -if (rv32) { -switch (csrno) { -case CSR_CYCLEH : -if (!get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - } - } +if ((env->priv ==PRV_S ) && (!get_field (env->mcounteren, ctr_mask))) { +return RISCV_EXCP_ILLEGAL_INST ; }if (riscv_cpu_virt_enabled (env)) { -switch (csrno) { -case CSR_CYCLE : -if (!get_field (env->hcounteren,COUNTEREN_CY ) && -get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIME : -if (!get_field (env->hcounteren,COUNTEREN_TM ) && -get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRET : -if (!get_field (env->hcounteren,COUNTEREN_IR ) && -get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->hcounteren,1 << ctr_index) && -get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - } -if (rv32) { -switch (csrno) { -case CSR_CYCLEH : -if (!get_field (env->hcounteren,COUNTEREN_CY ) && -get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->hcounteren,COUNTEREN_TM ) && -get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->hcounteren,COUNTEREN_IR ) && -get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->hcounteren,1 << ctr_index) && -get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ;
target/riscv/csr.c static RISCVException ctr(CPURISCVState *env, int csrno) · line 146
Quoted 10 lines
target/riscv/csr.c +5
-3- } -break ; - } +if (!get_field (env->mcounteren, ctr_mask)) { +/* The bit must be set in mcountern for HS mode access */ +return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + }else if (!get_field (env->hcounteren, ctr_mask)) { +return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; } }
Re: [PATCH v4 09/11] target/riscv: Simplify counter predicate function
Quoted 15 lines · Bin Meng
Quoted 13 lines · Atish Patra
All the hpmcounters and the fixed counters (CY, IR, TM) can be represented as a unified counter. Thus, the predicate function doesn't need handle each case separately.
Simplify the predicate function so that we just handle things differently between RV32/RV64 and S/HS mode.
Signed-off-by Atish Patra <[email protected]>--- target/riscv/csr.c | 111 ++++----------------------------------------- 1 file changed, 10 insertions(+), 101 deletions(-)
Quoted 12 lines
target/riscv/csr.c static RISCVException ctr(CPURISCVState *env, int csrno) · line 112
Quoted 9 lines
target/riscv/csr.c +1
-0@@ -109,6 +109,7 @@ static RISCVException ctr(CPURISCVState *env, int csrno)CPUState *cs =env_cpu (env);RISCVCPU *cpu =RISCV_CPU (cs);int ctr_index; +uint64_t ctr_mask;Use
target_ulongshould be enough?
Yeah. Will fix it in the next version.
Quoted 136 lines
Quoted 124 lines
target/riscv/csr.c +4
-98int base_csrno =CSR_CYCLE ;bool rv32 =riscv_cpu_mxl (env) ==MXL_RV32 ? true : false;@@ -117,122 +118,30 @@ static RISCVException ctr(CPURISCVState *env, int csrno) base_csrno +=0x80 ; } ctr_index = csrno - base_csrno; + ctr_mask =BIT (ctr_index);if ((csrno >=CSR_CYCLE && csrno <=CSR_INSTRET ) || (csrno >=CSR_CYCLEH && csrno <=CSR_INSTRETH )) { goto skip_ext_pmu_check; } -if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs &BIT (ctr_index)))) { +if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs & ctr_mask))) {/* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST ; } skip_ext_pmu_check: -if (env->priv ==PRV_S ) { -switch (csrno) { -case CSR_CYCLE : -if (!get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_TIME : -if (!get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_INSTRET : -if (!get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - } -if (rv32) { -switch (csrno) { -case CSR_CYCLEH : -if (!get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_ILLEGAL_INST ; - } -break ; - } - } +if ((env->priv ==PRV_S ) && (!get_field (env->mcounteren, ctr_mask))) { +return RISCV_EXCP_ILLEGAL_INST ; }if (riscv_cpu_virt_enabled (env)) { -switch (csrno) { -case CSR_CYCLE : -if (!get_field (env->hcounteren,COUNTEREN_CY ) && -get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIME : -if (!get_field (env->hcounteren,COUNTEREN_TM ) && -get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRET : -if (!get_field (env->hcounteren,COUNTEREN_IR ) && -get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: -if (!get_field (env->hcounteren,1 << ctr_index) && -get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - } -if (rv32) { -switch (csrno) { -case CSR_CYCLEH : -if (!get_field (env->hcounteren,COUNTEREN_CY ) && -get_field (env->mcounteren,COUNTEREN_CY )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->hcounteren,COUNTEREN_TM ) && -get_field (env->mcounteren,COUNTEREN_TM )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->hcounteren,COUNTEREN_IR ) && -get_field (env->mcounteren,COUNTEREN_IR )) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->hcounteren,1 << ctr_index) && -get_field (env->mcounteren,1 << ctr_index)) { -return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ;target/riscv/csr.c static RISCVException ctr(CPURISCVState *env, int csrno) · line 146
Quoted 10 lines
target/riscv/csr.c +5
-3- } -break ; - } +if (!get_field (env->mcounteren, ctr_mask)) { +/* The bit must be set in mcountern for HS mode access */ +return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + }else if (!get_field (env->hcounteren, ctr_mask)) { +return RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; } }Reviewed-by Bin Meng <[email protected]>
PATCH v4 10/11 target/riscv: Add few cache related PMU events
In reply to Atish PatraFrom: Atish Patra <[email protected]>
Qemu can monitor the following cache related PMU events through tlb_fill functions.
1. DTLB load/store miss
3. ITLB prefetch miss
Increment the PMU counter in tlb_fill function.
--- target/riscv/cpu_helper.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
target/riscv/cpu_helper.c +26 -0
@@ -21,10 +21,13 @@#include "qemu/log.h" #include "qemu/main-loop.h" #include "cpu.h" +#include "pmu.h" #include "exec/exec-all.h" #include "tcg/tcg-op.h" #include "trace.h" #include "semihosting/common-semi.h" +#include "cpu.h" +#include "cpu_bits.h" int riscv_cpu_mmu_index (CPURISCVState *env,bool ifetch) {
@@ -846,6 +849,28 @@ void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,riscv_raise_exception (env, cs->exception_index, retaddr); } + +static void pmu_tlb_fill_incr_ctr (RISCVCPU *cpu,MMUAccessType access_type) +{ +enum riscv_pmu_event_idx pmu_event_type; + +switch (access_type) { +case MMU_INST_FETCH : + pmu_event_type =RISCV_PMU_EVENT_CACHE_ITLB_PREFETCH_MISS ; +break ; +case MMU_DATA_LOAD : + pmu_event_type =RISCV_PMU_EVENT_CACHE_DTLB_READ_MISS ; +break ; +case MMU_DATA_STORE : + pmu_event_type =RISCV_PMU_EVENT_CACHE_DTLB_WRITE_MISS ; +break ; +default : +return ; + } + +riscv_pmu_incr_ctr (cpu, pmu_event_type); +} +bool riscv_cpu_tlb_fill (CPUState *cs,vaddr address,int size,MMUAccessType access_type,int mmu_idx,bool probe,uintptr_t retaddr)
@@ -942,6 +967,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, } } }else { +pmu_tlb_fill_incr_ctr (cpu, access_type);/* Single stage lookup */ ret =get_physical_address (env, &pa, &prot, address,NULL , access_type, mmu_idx, true, false, false);
Signature · 1 line
2.30.2
PATCH v4 11/11 hw/riscv: virt: Add PMU DT node to the device tree
In reply to Atish PatraQemu virt machine can support few cache events and cycle/instret counters. It also supports counter overflow for these events.
Add a DT node so that OpenSBI/Linux kernel is aware of the virt machine capabilities. There are some dummy nodes added for testing as well.
--- hw/riscv/virt.c | 38 ++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.h | 1 + 3 files changed, 84 insertions(+)
hw/riscv/virt.c +38 -0
@@ -28,6 +28,7 @@#include "hw/qdev-properties.h" #include "hw/char/serial.h" #include "target/riscv/cpu.h" +#include "target/riscv/pmu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/virt.h" #include "hw/riscv/boot.h"
@@ -406,6 +407,33 @@ static void create_fdt_socket_plic(RISCVVirtState *s,g_free (plic_cells); } +static void create_fdt_socket_pmu (RISCVVirtState *s, +int socket,uint32_t *phandle, +uint32_t *intc_phandles) +{ +int cpu; +char *pmu_name; +uint32_t *pmu_cells; +MachineState *mc =MACHINE (s); +RISCVCPU hart = s->soc[socket].harts[0 ]; + + pmu_cells =g_new0 (uint32_t, s->soc[socket].num_harts *2 ); + +for (cpu =0 ; cpu < s->soc[socket].num_harts; cpu++) { + pmu_cells[cpu *2 +0 ] =cpu_to_be32 (intc_phandles[cpu]); + pmu_cells[cpu *2 +1 ] =cpu_to_be32 (IRQ_PMU_OVF ); + } + + pmu_name =g_strdup_printf ("/soc/pmu" ); +qemu_fdt_add_subnode (mc->fdt, pmu_name); +qemu_fdt_setprop_string (mc->fdt, pmu_name,"compatible" ,"riscv,pmu" ); +riscv_pmu_generate_fdt_node (mc->fdt, hart.cfg.pmu_num, pmu_name); + +g_free (pmu_name); +g_free (pmu_cells); +} + + static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap, bool is_32_bit, uint32_t *phandle, uint32_t *irq_mmio_phandle,
@@ -417,12 +445,20 @@ static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,uint32_t *intc_phandles;MachineState *mc =MACHINE (s);uint32_t xplic_phandles[MAX_NODES ]; +RISCVCPU hart;qemu_fdt_add_subnode (mc->fdt,"/cpus" );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"timebase-frequency" ,RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"#address-cells" ,0x1 ); + +/* Add the node for isa extensions discovery */ +qemu_fdt_add_subnode (mc->fdt,"/cpus/riscv,isa-ext" ); + hart = s->soc[0 ].harts[0 ]; +if (hart.cfg.ext_sscof) { +qemu_fdt_setprop (mc->fdt,"/cpus/riscv,isa-ext" ,"sscofpmf" ,NULL ,0 ); + }qemu_fdt_add_subnode (mc->fdt,"/cpus/cpu-map" );for (socket = (riscv_socket_count (mc) -1 ); socket >=0 ; socket--) {
@@ -445,6 +481,8 @@ static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,create_fdt_socket_plic (s, memmap, socket, phandle, intc_phandles, xplic_phandles); +create_fdt_socket_pmu (s, socket, phandle, intc_phandles); +g_free (intc_phandles);g_free (clust_name); }
target/riscv/pmu.c +45 -0
56 lines not on this page · raw message
target/riscv/pmu.h +1 -0
@@ -31,6 +31,7 @@ int riscv_pmu_init(RISCVCPU *cpu, int num_counters);int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value,uint32_t ctr_idx);int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx); +void riscv_pmu_generate_fdt_node (void *fdt,int num_counters,char *pmu_name);target_ulong get_icount_ticks (bool brv32);int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value,uint32_t ctr_idx);
Signature · 1 line
2.30.2
Re: [PATCH v4 11/11] hw/riscv: virt: Add PMU DT node to the device tree
Quoted 25 lines · Atish Patra
Qemu virt machine can support few cache events and cycle/instret counters. It also supports counter overflow for these events.
Add a DT node so that OpenSBI/Linux kernel is aware of the virt machine capabilities. There are some dummy nodes added for testing as well.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- hw/riscv/virt.c | 38 ++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.h | 1 + 3 files changed, 84 insertions(+)hw/riscv/virt.c +11
-0+static void create_fdt_socket_pmu (RISCVVirtState *s, +int socket,uint32_t *phandle, +uint32_t *intc_phandles) +{ +int cpu; +char *pmu_name; +uint32_t *pmu_cells; +MachineState *mc =MACHINE (s); +RISCVCPU hart = s->soc[socket].harts[0 ]; + + pmu_cells =g_new0 (uint32_t, s->soc[socket].num_harts *2 );
hw/riscv/virt.c static void create_fdt_socket_plic(RISCVVirtState *s, · line 430
Quoted 10 lines
hw/riscv/virt.c +10
-0+ +for (cpu =0 ; cpu < s->soc[socket].num_harts; cpu++) { + pmu_cells[cpu *2 +0 ] =cpu_to_be32 (intc_phandles[cpu]); + pmu_cells[cpu *2 +1 ] =cpu_to_be32 (IRQ_PMU_OVF ); + } + + pmu_name =g_strdup_printf ("/soc/pmu" ); +qemu_fdt_add_subnode (mc->fdt, pmu_name); +qemu_fdt_setprop_string (mc->fdt, pmu_name,"compatible" ,"riscv,pmu" ); +riscv_pmu_generate_fdt_node (mc->fdt, hart.cfg.pmu_num, pmu_name);
pmu_cells[] is not consumed...
Quoted 4 lines
hw/riscv/virt.c +4
-0+ +g_free (pmu_name); +g_free (pmu_cells); +}
Re: [PATCH v4 11/11] hw/riscv: virt: Add PMU DT node to the device tree
Quoted 31 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Atish Patra
Qemu virt machine can support few cache events and cycle/instret counters. It also supports counter overflow for these events.
Add a DT node so that OpenSBI/Linux kernel is aware of the virt machine capabilities. There are some dummy nodes added for testing as well.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- hw/riscv/virt.c | 38 ++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.h | 1 + 3 files changed, 84 insertions(+)hw/riscv/virt.c +15
-0+static void create_fdt_socket_pmu (RISCVVirtState *s, +int socket,uint32_t *phandle, +uint32_t *intc_phandles) +{ +int cpu; +char *pmu_name; +uint32_t *pmu_cells; +MachineState *mc =MACHINE (s); +RISCVCPU hart = s->soc[socket].harts[0 ]; + + pmu_cells =g_new0 (uint32_t, s->soc[socket].num_harts *2 ); + +for (cpu =0 ; cpu < s->soc[socket].num_harts; cpu++) { + pmu_cells[cpu *2 +0 ] =cpu_to_be32 (intc_phandles[cpu]); + pmu_cells[cpu *2 +1 ] =cpu_to_be32 (IRQ_PMU_OVF );
Quoted 9 lines
hw/riscv/virt.c static void create_fdt_socket_plic(RISCVVirtState *s, · line 430
Quoted 6 lines
hw/riscv/virt.c +6
-0+ } + + pmu_name =g_strdup_printf ("/soc/pmu" ); +qemu_fdt_add_subnode (mc->fdt, pmu_name); +qemu_fdt_setprop_string (mc->fdt, pmu_name,"compatible" ,"riscv,pmu" ); +riscv_pmu_generate_fdt_node (mc->fdt, hart.cfg.pmu_num, pmu_name);pmu_cells[] is not consumed...
Oops. I removed the DT requirement in the kernel. Forgot to remove this snippet. Thanks!
I will fix it in the next version.
Quoted 6 lines
Quoted 4 lines
hw/riscv/virt.c +4
-0+ +g_free (pmu_name); +g_free (pmu_cells); +}
Signature · 2 lines
Regards, Atish
Re: [PATCH v4 11/11] hw/riscv: virt: Add PMU DT node to the device tree
In reply to Atish PatraQuoted 65 lines · Atish Patra
Qemu virt machine can support few cache events and cycle/instret counters. It also supports counter overflow for these events.
Add a DT node so that OpenSBI/Linux kernel is aware of the virt machine capabilities. There are some dummy nodes added for testing as well.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- hw/riscv/virt.c | 38 ++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.h | 1 + 3 files changed, 84 insertions(+)hw/riscv/virt.c +28
-0@@ -28,6 +28,7 @@#include "hw/qdev-properties.h" #include "hw/char/serial.h" #include "target/riscv/cpu.h" +#include "target/riscv/pmu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/virt.h" #include "hw/riscv/boot.h" @@ -406,6 +407,33 @@ static void create_fdt_socket_plic(RISCVVirtState *s,g_free (plic_cells); } +static void create_fdt_socket_pmu (RISCVVirtState *s, +int socket,uint32_t *phandle, +uint32_t *intc_phandles) +{ +int cpu; +char *pmu_name; +uint32_t *pmu_cells; +MachineState *mc =MACHINE (s); +RISCVCPU hart = s->soc[socket].harts[0 ]; + + pmu_cells =g_new0 (uint32_t, s->soc[socket].num_harts *2 ); + +for (cpu =0 ; cpu < s->soc[socket].num_harts; cpu++) { + pmu_cells[cpu *2 +0 ] =cpu_to_be32 (intc_phandles[cpu]); + pmu_cells[cpu *2 +1 ] =cpu_to_be32 (IRQ_PMU_OVF ); + } + + pmu_name =g_strdup_printf ("/soc/pmu" ); +qemu_fdt_add_subnode (mc->fdt, pmu_name); +qemu_fdt_setprop_string (mc->fdt, pmu_name,"compatible" ,"riscv,pmu" ); +riscv_pmu_generate_fdt_node (mc->fdt, hart.cfg.pmu_num, pmu_name); + +g_free (pmu_name); +g_free (pmu_cells); +} + + static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap, bool is_32_bit, uint32_t *phandle, uint32_t *irq_mmio_phandle,@@ -417,12 +445,20 @@ static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,uint32_t *intc_phandles;MachineState *mc =MACHINE (s);uint32_t xplic_phandles[MAX_NODES ];
hw/riscv/virt.c static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap, · line 457
Quoted 10 lines
hw/riscv/virt.c +4
-0+RISCVCPU hart;qemu_fdt_add_subnode (mc->fdt,"/cpus" );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"timebase-frequency" ,RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"#address-cells" ,0x1 ); + +/* Add the node for isa extensions discovery */ +qemu_fdt_add_subnode (mc->fdt,"/cpus/riscv,isa-ext" );
Looks like the ongoing discussion does not support this idea
https://lore.kernel.org/linux-riscv/[email protected]/
Quoted 25 lines
hw/riscv/virt.c +6
-0+ hart = s->soc[0 ].harts[0 ]; +if (hart.cfg.ext_sscof) { +qemu_fdt_setprop (mc->fdt,"/cpus/riscv,isa-ext" ,"sscofpmf" ,NULL ,0 ); + }qemu_fdt_add_subnode (mc->fdt,"/cpus/cpu-map" );for (socket = (riscv_socket_count (mc) -1 ); socket >=0 ; socket--) {@@ -445,6 +481,8 @@ static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,create_fdt_socket_plic (s, memmap, socket, phandle, intc_phandles, xplic_phandles); +create_fdt_socket_pmu (s, socket, phandle, intc_phandles); +g_free (intc_phandles);g_free (clust_name); }target/riscv/pmu.c +1
-0@@ -19,11 +19,56 @@#include "qemu/osdep.h" #include "cpu.h" #include "pmu.h" +#include "sysemu/device_tree.h"
target/riscv/pmu.c line 32
Quoted 10 lines
target/riscv/pmu.c +5
-0#define RISCV_TIMEBASE_FREQ 1000000000/* 1Ghz */ #define MAKE_32BIT_MASK (shift, length) \ (((uint32_t)(~0UL) >> (32 - (length))) << (shift)) +/** +* To keep it simple, any event can be mapped to any programmable counters in +* QEMU. The generic cycle & instruction count events can also be monitored +* using programmable counters. In that case, mcycle & minstret must continue +* to provide the correct value as well. Hetergenous PMU per hart is not
typo of Heterogeneous
Quoted 27 lines
target/riscv/pmu.c +27
-0+* supported yet. Thus, number of counters are same across all harts. +*/ +void riscv_pmu_generate_fdt_node (void *fdt,int num_ctrs,char *pmu_name) +{ +uint32_t fdt_event_ctr_map[20 ] = {}; +uint32_t cmask; + +/* All the programmable counters can map to any event */ + cmask =MAKE_32BIT_MASK (3 , num_ctrs); + +/* SBI_PMU_HW_CPU_CYCLES */ + fdt_event_ctr_map[0 ] =cpu_to_be32 (0x00000001 ); + fdt_event_ctr_map[1 ] =cpu_to_be32 (0x00000001 ); + fdt_event_ctr_map[2 ] =cpu_to_be32 (cmask |1 <<0 ); + +/* SBI_PMU_HW_INSTRUCTIONS */ + fdt_event_ctr_map[3 ] =cpu_to_be32 (0x00000002 ); + fdt_event_ctr_map[4 ] =cpu_to_be32 (0x00000002 ); + fdt_event_ctr_map[5 ] =cpu_to_be32 (cmask |1 <<2 ); + +/* SBI_PMU_HW_CACHE_DTLB : READ : MISS */ + fdt_event_ctr_map[6 ] =cpu_to_be32 (0x00010019 ); + fdt_event_ctr_map[7 ] =cpu_to_be32 (0x00010019 ); + fdt_event_ctr_map[8 ] =cpu_to_be32 (cmask); + +/* SBI_PMU_HW_CACHE_DTLB : WRITE : MISS */ + fdt_event_ctr_map[9 ] =cpu_to_be32 (0x0001001B );
target/riscv/pmu.c line 69
Quoted 10 lines
target/riscv/pmu.c +10
-0+ fdt_event_ctr_map[10 ] =cpu_to_be32 (0x0001001B ); + fdt_event_ctr_map[11 ] =cpu_to_be32 (cmask); + +/* SBI_PMU_HW_CACHE_ITLB : READ : MISS */ + fdt_event_ctr_map[12 ] =cpu_to_be32 (0x00010021 ); + fdt_event_ctr_map[13 ] =cpu_to_be32 (0x00010021 ); + fdt_event_ctr_map[14 ] =cpu_to_be32 (cmask); + +qemu_fdt_setprop (fdt, pmu_name,"riscv,event-to-mhpmcounters" , + fdt_event_ctr_map,sizeof (fdt_event_ctr_map));
Where is this documented? I can't find related discussion in the linux-riscv ML.
Please add some comment blocks to explain where these magic numbers (like 0x00010021) come from.
Quoted 10 lines
target/riscv/pmu.c +2
-0+} +static bool riscv_pmu_counter_valid (RISCVCPU *cpu,uint32_t ctr_idx) { if (ctr_idx < 3 || ctr_idx >= RV_MAX_MHPMCOUNTERS ||target/riscv/pmu.h +0
-0
target/riscv/pmu.h int riscv_pmu_init(RISCVCPU *cpu, int num_counters);
Quoted 8 lines
target/riscv/pmu.h +1
-1@@ -31,6 +31,7 @@ int riscv_pmu_init(RISCVCPU *cpu, int num_counters);int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value,uint32_t ctr_idx);int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx); +void riscv_pmu_generate_fdt_node (void *fdt,int num_counters,char *pmu_name);target_ulong get_icount_ticks (bool brv32);int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value,uint32_t ctr_idx); --
Regards,
Bin
Re: [PATCH v4 11/11] hw/riscv: virt: Add PMU DT node to the device tree
Quoted 69 lines · Bin Meng
Quoted 67 lines · Atish Patra
Qemu virt machine can support few cache events and cycle/instret counters. It also supports counter overflow for these events.
Add a DT node so that OpenSBI/Linux kernel is aware of the virt machine capabilities. There are some dummy nodes added for testing as well.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Atish Patra <[email protected]>--- hw/riscv/virt.c | 38 ++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/pmu.h | 1 + 3 files changed, 84 insertions(+)hw/riscv/virt.c +29
-0@@ -28,6 +28,7 @@#include "hw/qdev-properties.h" #include "hw/char/serial.h" #include "target/riscv/cpu.h" +#include "target/riscv/pmu.h" #include "hw/riscv/riscv_hart.h" #include "hw/riscv/virt.h" #include "hw/riscv/boot.h" @@ -406,6 +407,33 @@ static void create_fdt_socket_plic(RISCVVirtState *s,g_free (plic_cells); } +static void create_fdt_socket_pmu (RISCVVirtState *s, +int socket,uint32_t *phandle, +uint32_t *intc_phandles) +{ +int cpu; +char *pmu_name; +uint32_t *pmu_cells; +MachineState *mc =MACHINE (s); +RISCVCPU hart = s->soc[socket].harts[0 ]; + + pmu_cells =g_new0 (uint32_t, s->soc[socket].num_harts *2 ); + +for (cpu =0 ; cpu < s->soc[socket].num_harts; cpu++) { + pmu_cells[cpu *2 +0 ] =cpu_to_be32 (intc_phandles[cpu]); + pmu_cells[cpu *2 +1 ] =cpu_to_be32 (IRQ_PMU_OVF ); + } + + pmu_name =g_strdup_printf ("/soc/pmu" ); +qemu_fdt_add_subnode (mc->fdt, pmu_name); +qemu_fdt_setprop_string (mc->fdt, pmu_name,"compatible" ,"riscv,pmu" ); +riscv_pmu_generate_fdt_node (mc->fdt, hart.cfg.pmu_num, pmu_name); + +g_free (pmu_name); +g_free (pmu_cells); +} + + static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap, bool is_32_bit, uint32_t *phandle, uint32_t *irq_mmio_phandle,@@ -417,12 +445,20 @@ static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,uint32_t *intc_phandles;MachineState *mc =MACHINE (s);uint32_t xplic_phandles[MAX_NODES ]; +RISCVCPU hart;
Quoted 12 lines
hw/riscv/virt.c static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap, · line 457
Quoted 8 lines
hw/riscv/virt.c +3
-0qemu_fdt_add_subnode (mc->fdt,"/cpus" );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"timebase-frequency" ,RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"#size-cells" ,0x0 );qemu_fdt_setprop_cell (mc->fdt,"/cpus" ,"#address-cells" ,0x1 ); + +/* Add the node for isa extensions discovery */ +qemu_fdt_add_subnode (mc->fdt,"/cpus/riscv,isa-ext" );Looks like the ongoing discussion does not support this idea
https://lore.kernel.org/linux-riscv/[email protected]/
Yes. Palmer's comment arrived after I sent out the Qemu series. I will fix that in the next
version once we have string parsing (riscv,isa) ready.
Quoted 69 lines
Quoted 25 lines
hw/riscv/virt.c +6
-0+ hart = s->soc[0 ].harts[0 ]; +if (hart.cfg.ext_sscof) { +qemu_fdt_setprop (mc->fdt,"/cpus/riscv,isa-ext" ,"sscofpmf" ,NULL ,0 ); + }qemu_fdt_add_subnode (mc->fdt,"/cpus/cpu-map" );for (socket = (riscv_socket_count (mc) -1 ); socket >=0 ; socket--) {@@ -445,6 +481,8 @@ static void create_fdt_sockets(RISCVVirtState *s, const MemMapEntry *memmap,create_fdt_socket_plic (s, memmap, socket, phandle, intc_phandles, xplic_phandles); +create_fdt_socket_pmu (s, socket, phandle, intc_phandles); +g_free (intc_phandles);g_free (clust_name); }target/riscv/pmu.c +1
-0@@ -19,11 +19,56 @@#include "qemu/osdep.h" #include "cpu.h" #include "pmu.h" +#include "sysemu/device_tree.h" target/riscv/pmu.c line 32
Quoted 10 lines
target/riscv/pmu.c +5
-0#define RISCV_TIMEBASE_FREQ 1000000000/* 1Ghz */ #define MAKE_32BIT_MASK (shift, length) \ (((uint32_t)(~0UL) >> (32 - (length))) << (shift)) +/** +* To keep it simple, any event can be mapped to any programmable counters in +* QEMU. The generic cycle & instruction count events can also be monitored +* using programmable counters. In that case, mcycle & minstret must continue +* to provide the correct value as well. Hetergenous PMU per hart is not typo of Heterogeneous
Quoted 31 lines
target/riscv/pmu.c +31
-0+* supported yet. Thus, number of counters are same across all harts. +*/ +void riscv_pmu_generate_fdt_node (void *fdt,int num_ctrs,char *pmu_name) +{ +uint32_t fdt_event_ctr_map[20 ] = {}; +uint32_t cmask; + +/* All the programmable counters can map to any event */ + cmask =MAKE_32BIT_MASK (3 , num_ctrs); + +/* SBI_PMU_HW_CPU_CYCLES */ + fdt_event_ctr_map[0 ] =cpu_to_be32 (0x00000001 ); + fdt_event_ctr_map[1 ] =cpu_to_be32 (0x00000001 ); + fdt_event_ctr_map[2 ] =cpu_to_be32 (cmask |1 <<0 ); + +/* SBI_PMU_HW_INSTRUCTIONS */ + fdt_event_ctr_map[3 ] =cpu_to_be32 (0x00000002 ); + fdt_event_ctr_map[4 ] =cpu_to_be32 (0x00000002 ); + fdt_event_ctr_map[5 ] =cpu_to_be32 (cmask |1 <<2 ); + +/* SBI_PMU_HW_CACHE_DTLB : READ : MISS */ + fdt_event_ctr_map[6 ] =cpu_to_be32 (0x00010019 ); + fdt_event_ctr_map[7 ] =cpu_to_be32 (0x00010019 ); + fdt_event_ctr_map[8 ] =cpu_to_be32 (cmask); + +/* SBI_PMU_HW_CACHE_DTLB : WRITE : MISS */ + fdt_event_ctr_map[9 ] =cpu_to_be32 (0x0001001B ); + fdt_event_ctr_map[10 ] =cpu_to_be32 (0x0001001B ); + fdt_event_ctr_map[11 ] =cpu_to_be32 (cmask); + +/* SBI_PMU_HW_CACHE_ITLB : READ : MISS */
Quoted 9 lines
target/riscv/pmu.c line 69
Quoted 6 lines
target/riscv/pmu.c +6
-0+ fdt_event_ctr_map[12 ] =cpu_to_be32 (0x00010021 ); + fdt_event_ctr_map[13 ] =cpu_to_be32 (0x00010021 ); + fdt_event_ctr_map[14 ] =cpu_to_be32 (cmask); + +qemu_fdt_setprop (fdt, pmu_name,"riscv,event-to-mhpmcounters" , + fdt_event_ctr_map,sizeof (fdt_event_ctr_map));Where is this documented? I can't find related discussion in the linux-riscv ML.
These are OpenSBI specific DT bindings. OpenSBI will delete it during the dt fixup.
https://github.com/riscv-software-src/opensbi/blob/master/docs/pmu_support.md
Apologies for this confusion. I should have put a comment about this here.
Quoted 3 lines
Please add some comment blocks to explain where these magic numbers (like
0x00010021) come from.
Sure. I will refer to the event encoding scheme and describe the details.
Quoted 21 lines
Quoted 10 lines
target/riscv/pmu.c +2
-0+} +static bool riscv_pmu_counter_valid (RISCVCPU *cpu,uint32_t ctr_idx) { if (ctr_idx < 3 || ctr_idx >= RV_MAX_MHPMCOUNTERS ||target/riscv/pmu.h +0
-0target/riscv/pmu.h int riscv_pmu_init(RISCVCPU *cpu, int num_counters);
Quoted 8 lines
target/riscv/pmu.h +1
-1@@ -31,6 +31,7 @@ int riscv_pmu_init(RISCVCPU *cpu, int num_counters);int riscv_pmu_update_event_map (CPURISCVState *env,uint64_t value,uint32_t ctr_idx);int riscv_pmu_incr_ctr (RISCVCPU *cpu,enum riscv_pmu_event_idx event_idx); +void riscv_pmu_generate_fdt_node (void *fdt,int num_counters,char *pmu_name);target_ulong get_icount_ticks (bool brv32);int riscv_pmu_setup_timer (CPURISCVState *env,uint64_t value,uint32_t ctr_idx); --Regards,
Bin