risc-v: Add ISA extension smcntrpmf support
cover risc-v: Add ISA extension smcntrpmf support
This patch series adds the support for RISC-V ISA extension smcntrpmf (cycle and privilege mode filtering) [1]. QEMU only calculates dummy cycles and instructions, so there is no actual means to stop the icount in QEMU. Therefore, this series only add the read/write behavior of the relevant CSRs such that the implemented firmware support [2] can work without causing unnecessary illegal instruction exceptions.
[1] https://github.com/riscv/riscv-smcntrpmf
[2] https://github.com/rivosinc/opensbi/tree/dev/kaiwenx/smcntrpmf_upstream
Kaiwen Xue (3):
target/riscv: Add cycle & instret privilege mode filtering properties target/riscv: Add cycle & instret privilege mode filtering definitions target/riscv: Add cycle & instret privilege mode filtering support
target/riscv/cpu.c | 2 ++ target/riscv/cpu.h | 6 ++++ target/riscv/cpu_bits.h | 29 ++++++++++++++++ target/riscv/cpu_cfg.h | 1 + target/riscv/csr.c | 73 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+)
Signature · 1 line
2.34.1
PATCH 3/3 target/riscv: Add cycle & instret privilege mode filtering support
QEMU only calculates dummy cycles and instructions, so there is no actual means to stop the icount in QEMU. Hence this patch merely adds the functionality of accessing the cfg registers, and cause no actual effects on the counting of cycle and instret counters.
--- target/riscv/csr.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
target/riscv/csr.c +73 -0
@@ -218,6 +218,17 @@ static RISCVException sscofpmf(CPURISCVState *env, int csrno)return RISCV_EXCP_NONE ; } +static RISCVException smcntrpmf (CPURISCVState *env,int csrno) +{ +RISCVCPU *cpu =env_archcpu (env); + +if (!cpu->cfg.ext_smcntrpmf) { +return RISCV_EXCP_ILLEGAL_INST ; + } + +return RISCV_EXCP_NONE ; +} +static RISCVException any (CPURISCVState *env,int csrno) {return RISCV_EXCP_NONE ;
@@ -800,6 +811,54 @@ static int read_hpmcounterh(CPURISCVState *env, int csrno, target_ulong *val)#else /* CONFIG_USER_ONLY */ +static int read_mcyclecfg (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->mcyclecfg; +return RISCV_EXCP_NONE ; +} + +static int write_mcyclecfg (CPURISCVState *env,int csrno,target_ulong val) +{ + env->mcyclecfg = val; +return RISCV_EXCP_NONE ; +} + +static int read_mcyclecfgh (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->mcyclecfgh; +return RISCV_EXCP_NONE ; +} + +static int write_mcyclecfgh (CPURISCVState *env,int csrno,target_ulong val) +{ + env->mcyclecfgh = val; +return RISCV_EXCP_NONE ; +} + +static int read_minstretcfg (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->minstretcfg; +return RISCV_EXCP_NONE ; +} + +static int write_minstretcfg (CPURISCVState *env,int csrno,target_ulong val) +{ + env->minstretcfg = val; +return RISCV_EXCP_NONE ; +} + +static int read_minstretcfgh (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->minstretcfgh; +return RISCV_EXCP_NONE ; +} + +static int write_minstretcfgh (CPURISCVState *env,int csrno,target_ulong val) +{ + env->minstretcfgh = val; +return RISCV_EXCP_NONE ; +} +static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) {int evt_index = csrno -CSR_MCOUNTINHIBIT ;
@@ -4506,6 +4565,13 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { write_mcountinhibit, .min_priv_ver = PRIV_VERSION_1_11_0 }, + [CSR_MCYCLECFG] = { "mcyclecfg", smcntrpmf, read_mcyclecfg, + write_mcyclecfg, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MINSTRETCFG] = { "minstretcfg", smcntrpmf, read_minstretcfg, + write_minstretcfg, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_mhpmevent, write_mhpmevent }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_mhpmevent,
@@ -4565,6 +4631,13 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_mhpmevent, write_mhpmevent }, + [CSR_MCYCLECFGH] = { "mcyclecfgh", smcntrpmf, read_mcyclecfgh, + write_mcyclecfgh, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MINSTRETCFGH] = { "minstretcfgh", smcntrpmf, read_minstretcfgh, + write_minstretcfgh, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MHPMEVENT3H] = { "mhpmevent3h", sscofpmf, read_mhpmeventh, write_mhpmeventh, .min_priv_ver = PRIV_VERSION_1_12_0 },
Signature · 1 line
2.34.1
PATCH 2/3 target/riscv: Add cycle & instret privilege mode filtering definitions
In reply to Kaiwen XueThis adds the definitions for ISA extension smcntrpmf.
--- target/riscv/cpu.h | 6 ++++++ target/riscv/cpu_bits.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+)
target/riscv/cpu.h +6 -0
@@ -283,6 +283,12 @@ struct CPUArchState {target_ulong mcountinhibit; +/* PMU cycle & instret privilege mode filtering */ +target_ulong mcyclecfg; +target_ulong mcyclecfgh; +target_ulong minstretcfg; +target_ulong minstretcfgh; +/* PMU counter state */ PMUCTRState pmu_ctrs[RV_MAX_MHPMCOUNTERS ];
target/riscv/cpu_bits.h +29 -0
@@ -401,6 +401,10 @@/* Machine counter-inhibit register */ #define CSR_MCOUNTINHIBIT 0x320 +/* Machine counter configuration registers */ +#define CSR_MCYCLECFG 0x321 +#define CSR_MINSTRETCFG 0x322 +#define CSR_MHPMEVENT3 0x323#define CSR_MHPMEVENT4 0x324#define CSR_MHPMEVENT5 0x325
@@ -431,6 +435,9 @@#define CSR_MHPMEVENT30 0x33e#define CSR_MHPMEVENT31 0x33f +#define CSR_MCYCLECFGH 0x721 +#define CSR_MINSTRETCFGH 0x722 +#define CSR_MHPMEVENT3H 0x723#define CSR_MHPMEVENT4H 0x724#define CSR_MHPMEVENT5H 0x725
@@ -879,6 +886,28 @@ typedef enum RISCVException {/* PMU related bits */ #define MIE_LCOFIE (1 << IRQ_PMU_OVF) +#define MCYCLECFG_BIT_MINH BIT_ULL(62) +#define MCYCLECFGH_BIT_MINH BIT(30) +#define MCYCLECFG_BIT_SINH BIT_ULL(61) +#define MCYCLECFGH_BIT_SINH BIT(29) +#define MCYCLECFG_BIT_UINH BIT_ULL(60) +#define MCYCLECFGH_BIT_UINH BIT(28) +#define MCYCLECFG_BIT_VSINH BIT_ULL(59) +#define MCYCLECFGH_BIT_VSINH BIT(27) +#define MCYCLECFG_BIT_VUINH BIT_ULL(58) +#define MCYCLECFGH_BIT_VUINH BIT(26) + +#define MINSTRETCFG_BIT_MINH BIT_ULL(62) +#define MINSTRETCFGH_BIT_MINH BIT(30) +#define MINSTRETCFG_BIT_SINH BIT_ULL(61) +#define MINSTRETCFGH_BIT_SINH BIT(29) +#define MINSTRETCFG_BIT_UINH BIT_ULL(60) +#define MINSTRETCFGH_BIT_UINH BIT(28) +#define MINSTRETCFG_BIT_VSINH BIT_ULL(59) +#define MINSTRETCFGH_BIT_VSINH BIT(27) +#define MINSTRETCFG_BIT_VUINH BIT_ULL(58) +#define MINSTRETCFGH_BIT_VUINH BIT(26) +#define MHPMEVENT_BIT_OF BIT_ULL(63)#define MHPMEVENTH_BIT_OF BIT(31)#define MHPMEVENT_BIT_MINH BIT_ULL(62)
Signature · 1 line
2.34.1
PATCH 1/3 target/riscv: Add cycle & instret privilege mode filtering properties
In reply to Kaiwen XueThis adds the properties for ISA extension smcntrpmf. Patches implementing it will follow.
--- target/riscv/cpu.c | 2 ++ target/riscv/cpu_cfg.h | 1 + 2 files changed, 3 insertions(+)
target/riscv/cpu.c +2 -0
@@ -132,6 +132,7 @@ static const struct isa_ext_data isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (smstateen,PRIV_VERSION_1_12_0 , ext_smstateen),ISA_EXT_DATA_ENTRY (ssaia,PRIV_VERSION_1_12_0 , ext_ssaia),ISA_EXT_DATA_ENTRY (sscofpmf,PRIV_VERSION_1_12_0 , ext_sscofpmf), +ISA_EXT_DATA_ENTRY (smcntrpmf,PRIV_VERSION_1_12_0 , ext_smcntrpmf),ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc),ISA_EXT_DATA_ENTRY (svadu,PRIV_VERSION_1_12_0 , ext_svadu), ISA_EXT_DATA_ENTRY(svinval, PRIV_VERSION_1_12_0, ext_svinval),
@@ -1753,6 +1754,7 @@ static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false), +DEFINE_PROP_BOOL ("smcntrpmf" ,RISCVCPU , cfg.ext_smcntrpmf, false),DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zihintpause", RISCVCPU, cfg.ext_zihintpause, true),
target/riscv/cpu_cfg.h +1 -0
@@ -69,6 +69,7 @@ struct RISCVCPUConfig {bool ext_zihintpause;bool ext_smstateen;bool ext_sstc; +bool ext_smcntrpmf;bool ext_svadu;bool ext_svinval;bool ext_svnapot;
Signature · 1 line
2.34.1
Re: [PATCH 1/3] target/riscv: Add cycle & instret privilege mode filtering properties
Quoted 23 lines · Kaiwen Xue
This adds the properties for ISA extension smcntrpmf. Patches implementing it will follow.
Signed-off-by Kaiwen Xue <[email protected]>Signed-off-by Kaiwen Xue <[email protected]>--- target/riscv/cpu.c | 2 ++ target/riscv/cpu_cfg.h | 1 + 2 files changed, 3 insertions(+)target/riscv/cpu.c +1
-0@@ -132,6 +132,7 @@ static const struct isa_ext_data isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (smstateen,PRIV_VERSION_1_12_0 , ext_smstateen),ISA_EXT_DATA_ENTRY (ssaia,PRIV_VERSION_1_12_0 , ext_ssaia),ISA_EXT_DATA_ENTRY (sscofpmf,PRIV_VERSION_1_12_0 , ext_sscofpmf), +ISA_EXT_DATA_ENTRY (smcntrpmf,PRIV_VERSION_1_12_0 , ext_smcntrpmf),ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc),ISA_EXT_DATA_ENTRY (svadu,PRIV_VERSION_1_12_0 , ext_svadu), ISA_EXT_DATA_ENTRY(svinval, PRIV_VERSION_1_12_0, ext_svinval),
target/riscv/cpu.c static Property riscv_cpu_extensions[] = { · line 1757
Quoted 4 lines
target/riscv/cpu.c +1
-0@@ -1753,6 +1754,7 @@ static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false), + DEFINE_PROP_BOOL("smcntrpmf", RISCVCPU, cfg.ext_smcntrpmf, false),
Normally, property should be exposed to user at last after the function is implemented.
Regards,
Weiwei Li
Quoted 15 lines
target/riscv/cpu.c +0
-0DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zihintpause", RISCVCPU, cfg.ext_zihintpause, true),target/riscv/cpu_cfg.h +1
-0@@ -69,6 +69,7 @@ struct RISCVCPUConfig {bool ext_zihintpause;bool ext_smstateen;bool ext_sstc; +bool ext_smcntrpmf;bool ext_svadu;bool ext_svinval;bool ext_svnapot;
Re: [PATCH 3/3] target/riscv: Add cycle & instret privilege mode filtering support
In reply to Kaiwen XueQuoted 4 lines · Kaiwen Xue
QEMU only calculates dummy cycles and instructions, so there is no actual means to stop the icount in QEMU. Hence this patch merely adds the functionality of accessing the cfg registers, and cause no actual effects on the counting of cycle and instret counters.
Maybe you can record/accumulate them when privilege mode changes/switchs.
Quoted 99 lines
Signed-off-by Kaiwen Xue <[email protected]>Signed-off-by Kaiwen Xue <[email protected]>--- target/riscv/csr.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)target/riscv/csr.c +66
-0@@ -218,6 +218,17 @@ static RISCVException sscofpmf(CPURISCVState *env, int csrno)return RISCV_EXCP_NONE ; } +static RISCVException smcntrpmf (CPURISCVState *env,int csrno) +{ +RISCVCPU *cpu =env_archcpu (env); + +if (!cpu->cfg.ext_smcntrpmf) { +return RISCV_EXCP_ILLEGAL_INST ; + } + +return RISCV_EXCP_NONE ; +} +static RISCVException any (CPURISCVState *env,int csrno) {return RISCV_EXCP_NONE ;@@ -800,6 +811,54 @@ static int read_hpmcounterh(CPURISCVState *env, int csrno, target_ulong *val)#else /* CONFIG_USER_ONLY */ +static int read_mcyclecfg (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->mcyclecfg; +return RISCV_EXCP_NONE ; +} + +static int write_mcyclecfg (CPURISCVState *env,int csrno,target_ulong val) +{ + env->mcyclecfg = val; +return RISCV_EXCP_NONE ; +} + +static int read_mcyclecfgh (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->mcyclecfgh; +return RISCV_EXCP_NONE ; +} + +static int write_mcyclecfgh (CPURISCVState *env,int csrno,target_ulong val) +{ + env->mcyclecfgh = val; +return RISCV_EXCP_NONE ; +} + +static int read_minstretcfg (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->minstretcfg; +return RISCV_EXCP_NONE ; +} + +static int write_minstretcfg (CPURISCVState *env,int csrno,target_ulong val) +{ + env->minstretcfg = val; +return RISCV_EXCP_NONE ; +} + +static int read_minstretcfgh (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->minstretcfgh; +return RISCV_EXCP_NONE ; +} + +static int write_minstretcfgh (CPURISCVState *env,int csrno,target_ulong val) +{ + env->minstretcfgh = val; +return RISCV_EXCP_NONE ; +} +static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) {int evt_index = csrno -CSR_MCOUNTINHIBIT ;@@ -4506,6 +4565,13 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { write_mcountinhibit, .min_priv_ver = PRIV_VERSION_1_11_0 }, + [CSR_MCYCLECFG] = { "mcyclecfg", smcntrpmf, read_mcyclecfg, + write_mcyclecfg, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MINSTRETCFG] = { "minstretcfg", smcntrpmf, read_minstretcfg, + write_minstretcfg, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_mhpmevent, write_mhpmevent }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_mhpmevent,
target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4639
Quoted 9 lines
target/riscv/csr.c +6
-0@@ -4565,6 +4631,13 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_mhpmevent, write_mhpmevent }, + [CSR_MCYCLECFGH] = { "mcyclecfgh", smcntrpmf, read_mcyclecfgh, + write_mcyclecfgh, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MINSTRETCFGH] = { "minstretcfgh", smcntrpmf, read_minstretcfgh, + write_minstretcfgh, + .min_priv_ver = PRIV_VERSION_1_12_0 },
This two CSRs are RV32-only, they cannot directly share the same predicate as MCYCLECFG/MINSTRETCFG.
Regards,
Weiwei Li
Quoted 4 lines
target/riscv/csr.c +1
-0+ [CSR_MHPMEVENT3H] = { "mhpmevent3h", sscofpmf, read_mhpmeventh, write_mhpmeventh, .min_priv_ver = PRIV_VERSION_1_12_0 },
Re: [PATCH 1/3] target/riscv: Add cycle & instret privilege mode filtering properties
In reply to Weiwei LiQuoted 34 lines · Weiwei Li
Quoted 23 lines · Kaiwen Xue
This adds the properties for ISA extension smcntrpmf. Patches implementing it will follow.
Signed-off-by Kaiwen Xue <[email protected]>Signed-off-by Kaiwen Xue <[email protected]>--- target/riscv/cpu.c | 2 ++ target/riscv/cpu_cfg.h | 1 + 2 files changed, 3 insertions(+)target/riscv/cpu.c +1
-0@@ -132,6 +132,7 @@ static const struct isa_ext_data isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (smstateen,PRIV_VERSION_1_12_0 , ext_smstateen),ISA_EXT_DATA_ENTRY (ssaia,PRIV_VERSION_1_12_0 , ext_ssaia),ISA_EXT_DATA_ENTRY (sscofpmf,PRIV_VERSION_1_12_0 , ext_sscofpmf), +ISA_EXT_DATA_ENTRY (smcntrpmf,PRIV_VERSION_1_12_0 , ext_smcntrpmf),ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc),ISA_EXT_DATA_ENTRY (svadu,PRIV_VERSION_1_12_0 , ext_svadu), ISA_EXT_DATA_ENTRY(svinval, PRIV_VERSION_1_12_0, ext_svinval),target/riscv/cpu.c static Property riscv_cpu_extensions[] = { · line 1757
Quoted 4 lines
target/riscv/cpu.c +1
-0@@ -1753,6 +1754,7 @@ static Property riscv_cpu_extensions[] = {/* Defaults for standard extensions */ DEFINE_PROP_UINT8 ("pmu-num" ,RISCVCPU , cfg.pmu_num,16 ),DEFINE_PROP_BOOL ("sscofpmf" ,RISCVCPU , cfg.ext_sscofpmf, false), + DEFINE_PROP_BOOL("smcntrpmf", RISCVCPU, cfg.ext_smcntrpmf, false),Normally, property should be exposed to user at last after the function is implemented.
Quoted 3 lines
Regards,
Weiwei Li
Will do in the next version.
Thanks,
Kevin
Quoted 18 lines
Quoted 16 lines
target/riscv/cpu.c +0
-0DEFINE_PROP_BOOL ("Zifencei" ,RISCVCPU , cfg.ext_ifencei, true),DEFINE_PROP_BOOL ("Zicsr" ,RISCVCPU , cfg.ext_icsr, true), DEFINE_PROP_BOOL("Zihintpause", RISCVCPU, cfg.ext_zihintpause, true),target/riscv/cpu_cfg.h +1
-0@@ -69,6 +69,7 @@ struct RISCVCPUConfig {bool ext_zihintpause;bool ext_smstateen;bool ext_sstc; +bool ext_smcntrpmf;bool ext_svadu;bool ext_svinval;bool ext_svnapot;
Re: [PATCH 3/3] target/riscv: Add cycle & instret privilege mode filtering support
In reply to Weiwei LiQuoted 8 lines · Weiwei Li
Quoted 4 lines · Kaiwen Xue
QEMU only calculates dummy cycles and instructions, so there is no actual means to stop the icount in QEMU. Hence this patch merely adds the functionality of accessing the cfg registers, and cause no actual effects on the counting of cycle and instret counters.
Maybe you can record/accumulate them when privilege mode changes/switchs.
Good idea. Will do in the next version as well.
- Kevin
Quoted 112 lines
Quoted 99 lines
Signed-off-by Kaiwen Xue <[email protected]>Signed-off-by Kaiwen Xue <[email protected]>--- target/riscv/csr.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)target/riscv/csr.c +66
-0@@ -218,6 +218,17 @@ static RISCVException sscofpmf(CPURISCVState *env, int csrno)return RISCV_EXCP_NONE ; } +static RISCVException smcntrpmf (CPURISCVState *env,int csrno) +{ +RISCVCPU *cpu =env_archcpu (env); + +if (!cpu->cfg.ext_smcntrpmf) { +return RISCV_EXCP_ILLEGAL_INST ; + } + +return RISCV_EXCP_NONE ; +} +static RISCVException any (CPURISCVState *env,int csrno) {return RISCV_EXCP_NONE ;@@ -800,6 +811,54 @@ static int read_hpmcounterh(CPURISCVState *env, int csrno, target_ulong *val)#else /* CONFIG_USER_ONLY */ +static int read_mcyclecfg (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->mcyclecfg; +return RISCV_EXCP_NONE ; +} + +static int write_mcyclecfg (CPURISCVState *env,int csrno,target_ulong val) +{ + env->mcyclecfg = val; +return RISCV_EXCP_NONE ; +} + +static int read_mcyclecfgh (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->mcyclecfgh; +return RISCV_EXCP_NONE ; +} + +static int write_mcyclecfgh (CPURISCVState *env,int csrno,target_ulong val) +{ + env->mcyclecfgh = val; +return RISCV_EXCP_NONE ; +} + +static int read_minstretcfg (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->minstretcfg; +return RISCV_EXCP_NONE ; +} + +static int write_minstretcfg (CPURISCVState *env,int csrno,target_ulong val) +{ + env->minstretcfg = val; +return RISCV_EXCP_NONE ; +} + +static int read_minstretcfgh (CPURISCVState *env,int csrno,target_ulong *val) +{ + *val = env->minstretcfgh; +return RISCV_EXCP_NONE ; +} + +static int write_minstretcfgh (CPURISCVState *env,int csrno,target_ulong val) +{ + env->minstretcfgh = val; +return RISCV_EXCP_NONE ; +} +static int read_mhpmevent (CPURISCVState *env,int csrno,target_ulong *val) {int evt_index = csrno -CSR_MCOUNTINHIBIT ;@@ -4506,6 +4565,13 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { write_mcountinhibit, .min_priv_ver = PRIV_VERSION_1_11_0 }, + [CSR_MCYCLECFG] = { "mcyclecfg", smcntrpmf, read_mcyclecfg, + write_mcyclecfg, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MINSTRETCFG] = { "minstretcfg", smcntrpmf, read_minstretcfg, + write_minstretcfg, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MHPMEVENT3] = { "mhpmevent3", any, read_mhpmevent, write_mhpmevent }, [CSR_MHPMEVENT4] = { "mhpmevent4", any, read_mhpmevent,target/riscv/csr.c riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 4639
Quoted 9 lines
target/riscv/csr.c +6
-0@@ -4565,6 +4631,13 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MHPMEVENT31] = { "mhpmevent31", any, read_mhpmevent, write_mhpmevent }, + [CSR_MCYCLECFGH] = { "mcyclecfgh", smcntrpmf, read_mcyclecfgh, + write_mcyclecfgh, + .min_priv_ver = PRIV_VERSION_1_12_0 }, + [CSR_MINSTRETCFGH] = { "minstretcfgh", smcntrpmf, read_minstretcfgh, + write_minstretcfgh, + .min_priv_ver = PRIV_VERSION_1_12_0 },This two CSRs are RV32-only, they cannot directly share the same predicate as MCYCLECFG/MINSTRETCFG.
Quoted 3 lines
Regards,
Weiwei Li
Thanks for catching this! Seems sscofpmf also reused the sscofpmf() predicate for scountovf
and mhpmeventXh. I'll probably turn in another patch for that later on.
- Kevin
Quoted 6 lines
Quoted 5 lines
target/riscv/csr.c +1
-0+ [CSR_MHPMEVENT3H] = { "mhpmevent3h", sscofpmf, read_mhpmeventh, write_mhpmeventh, .min_priv_ver = PRIV_VERSION_1_12_0 },