target/riscv: RVA23 profile support
v2 cover target/riscv: RVA23 profile support
Hi,
This version implements changes based on Drew's feedback from v1.
Most notable change is the addition of zifencei in RVA23S64 that I somehow missed in v1.
Patches based on alistair/riscv-to-apply.next.
Changes from v1:
- patch 2:
- do not remove zba/zbb/zbs from the extension list
- patch 3:
- fixed commit msg
- treat supm as an extension rather than a named feature
- patch 4:
- add zifencei
- treat ssnpm as a extension rather than a named feature
v1 link: https://lore.kernel.org/qemu-riscv/[email protected]/
Daniel Henrique Barboza (4):
target/riscv: add ssu64xl
target/riscv: use RVB in RVA22U64
target/riscv: add RVA23U64 profile
target/riscv: add RVA23S64 profile
target/riscv/cpu-qom.h | 2 + target/riscv/cpu.c | 77 +++++++++++++++++++++++++++++- tests/data/acpi/riscv64/virt/RHCT | Bin 390 -> 400 bytes 3 files changed, 78 insertions(+), 1 deletion(-)
Signature · 1 line
2.47.1
PATCH v2 1/4 target/riscv: add ssu64xl
ssu64xl is defined in RVA22 as:
"sstatus.UXL must be capable of holding the value 2 (i.e., UXLEN=64 must be supported)."
This is always true in TCG and it's mandatory for RVA23, so claim support for it.
--- target/riscv/cpu.c | 1 + tests/data/acpi/riscv64/virt/RHCT | Bin 390 -> 398 bytes 2 files changed, 1 insertion(+)
target/riscv/cpu.c +1 -0
@@ -213,6 +213,7 @@ const RISCVIsaExtData isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc),ISA_EXT_DATA_ENTRY (sstvala,PRIV_VERSION_1_12_0 , has_priv_1_12),ISA_EXT_DATA_ENTRY (sstvecd,PRIV_VERSION_1_12_0 , has_priv_1_12), +ISA_EXT_DATA_ENTRY (ssu64xl,PRIV_VERSION_1_12_0 , has_priv_1_12),ISA_EXT_DATA_ENTRY (supm,PRIV_VERSION_1_13_0 , ext_supm),ISA_EXT_DATA_ENTRY (svade,PRIV_VERSION_1_11_0 , ext_svade), ISA_EXT_DATA_ENTRY(svadu, PRIV_VERSION_1_12_0, ext_svadu),
tests/data/acpi/riscv64/virt/RHCT binary +0 -0
Signature · 1 line
2.47.1
Re: [PATCH v2 1/4] target/riscv: add ssu64xl
Quoted 39 lines · Daniel Henrique Barboza
ssu64xl is defined in RVA22 as:
"sstatus.UXL must be capable of holding the value 2 (i.e., UXLEN=64 must be supported)."
This is always true in TCG and it's mandatory for RVA23, so claim support for it.
Signed-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/cpu.c | 1 + tests/data/acpi/riscv64/virt/RHCT | Bin 390 -> 398 bytes 2 files changed, 1 insertion(+)target/riscv/cpu.c +1
-0@@ -213,6 +213,7 @@ const RISCVIsaExtData isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc),ISA_EXT_DATA_ENTRY (sstvala,PRIV_VERSION_1_12_0 , has_priv_1_12),ISA_EXT_DATA_ENTRY (sstvecd,PRIV_VERSION_1_12_0 , has_priv_1_12), +ISA_EXT_DATA_ENTRY (ssu64xl,PRIV_VERSION_1_12_0 , has_priv_1_12),ISA_EXT_DATA_ENTRY (supm,PRIV_VERSION_1_13_0 , ext_supm),ISA_EXT_DATA_ENTRY (svade,PRIV_VERSION_1_11_0 , ext_svade), ISA_EXT_DATA_ENTRY(svadu, PRIV_VERSION_1_12_0, ext_svadu),tests/data/acpi/riscv64/virt/RHCT binary +0
-0Signature · 2 lines
-- 2.47.1
Re: [PATCH v2 1/4] target/riscv: add ssu64xl
In reply to Daniel Henrique BarbozaQuoted 10 lines · Daniel Henrique Barboza
ssu64xl is defined in RVA22 as:
"sstatus.UXL must be capable of holding the value 2 (i.e., UXLEN=64 must be supported)."
This is always true in TCG and it's mandatory for RVA23, so claim support for it.
Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 31 lines
--- target/riscv/cpu.c | 1 + tests/data/acpi/riscv64/virt/RHCT | Bin 390 -> 398 bytes 2 files changed, 1 insertion(+)target/riscv/cpu.c +1
-0@@ -213,6 +213,7 @@ const RISCVIsaExtData isa_edata_arr[] = {ISA_EXT_DATA_ENTRY (sstc,PRIV_VERSION_1_12_0 , ext_sstc),ISA_EXT_DATA_ENTRY (sstvala,PRIV_VERSION_1_12_0 , has_priv_1_12),ISA_EXT_DATA_ENTRY (sstvecd,PRIV_VERSION_1_12_0 , has_priv_1_12), +ISA_EXT_DATA_ENTRY (ssu64xl,PRIV_VERSION_1_12_0 , has_priv_1_12),ISA_EXT_DATA_ENTRY (supm,PRIV_VERSION_1_13_0 , ext_supm),ISA_EXT_DATA_ENTRY (svade,PRIV_VERSION_1_11_0 , ext_svade), ISA_EXT_DATA_ENTRY(svadu, PRIV_VERSION_1_12_0, ext_svadu),tests/data/acpi/riscv64/virt/RHCT binary +0
-1--2.47.1
PATCH v2 2/4 target/riscv: use RVB in RVA22U64
In reply to Daniel Henrique BarbozaFrom the time we added RVA22U64 until now the spec didn't declare 'RVB' as a dependency, using zba/zbb/zbs instead. Since then the RVA22 spec
[1] added the following in the 'RVA22U64 Mandatory Extensions' section:
"B Bit-manipulation instructions
Note: The B extension comprises the Zba, Zbb, and Zbs extensions. At the time of RVA22U64's ratification, the B extension had not yet been defined, and so RVA22U64 explicitly mandated Zba, Zbb, and Zbs instead. Mandating B is equivalent."
It is also equivalent to QEMU (see riscv_cpu_validate_b() in target/riscv/tcg/tcg-cpu.c).
Finally, RVA23U64 [2] directly mentions RVB as a mandatory extension, not citing zba/zbb/zbs.
To make it clear that RVA23U64 will extend RVA22U64 (i.e. RVA22 is a parent of RVA23), use RVB in RVA22U64 as well.
(bios-tables-test change: RVB added to riscv,isa)
[1] https://github.com/riscv/riscv-profiles/blob/main/src/profiles.adoc#61-rva22u64-profile
[2] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc#rva23u64-profile
--- target/riscv/cpu.c | 2 +- tests/data/acpi/riscv64/virt/RHCT | Bin 398 -> 400 bytes 2 files changed, 1 insertion(+), 1 deletion(-)
target/riscv/cpu.c +1 -1
@@ -2351,7 +2351,7 @@ static const PropertyInfo prop_marchid = {static RISCVCPUProfile RVA22U64 = { .parent =NULL , .name ="rva22u64" , - .misa_ext =RVI |RVM |RVA |RVF |RVD |RVC |RVU , + .misa_ext =RVI |RVM |RVA |RVF |RVD |RVC |RVB |RVU , .priv_spec =RISCV_PROFILE_ATTR_UNUSED , .satp_mode =RISCV_PROFILE_ATTR_UNUSED , .ext_offsets = {
tests/data/acpi/riscv64/virt/RHCT binary +0 -0
Signature · 1 line
2.47.1
Re: [PATCH v2 2/4] target/riscv: use RVB in RVA22U64
Quoted 58 lines · Daniel Henrique Barboza
From the time we added RVA22U64 until now the spec didn't declare 'RVB' as a dependency, using zba/zbb/zbs instead. Since then the RVA22 spec
[1] added the following in the 'RVA22U64 Mandatory Extensions' section:"B Bit-manipulation instructions
Note: The B extension comprises the Zba, Zbb, and Zbs extensions. At the time of RVA22U64's ratification, the B extension had not yet been defined, and so RVA22U64 explicitly mandated Zba, Zbb, and Zbs instead. Mandating B is equivalent."
It is also equivalent to QEMU (see
riscv_cpu_validate_b()intarget/riscv/tcg/tcg-cpu.c).Finally, RVA23U64 [2] directly mentions RVB as a mandatory extension, not citing zba/zbb/zbs.
To make it clear that RVA23U64 will extend RVA22U64 (i.e. RVA22 is a parent of RVA23), use RVB in RVA22U64 as well.
(bios-tables-test change: RVB added to riscv,isa)
[1] https://github.com/riscv/riscv-profiles/blob/main/src/profiles.adoc#61-rva22u64-profile
[2] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc#rva23u64-profileSigned-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/cpu.c | 2 +- tests/data/acpi/riscv64/virt/RHCT | Bin 398 -> 400 bytes 2 files changed, 1 insertion(+), 1 deletion(-)target/riscv/cpu.c +1
-1@@ -2351,7 +2351,7 @@ static const PropertyInfo prop_marchid = {static RISCVCPUProfile RVA22U64 = { .parent =NULL , .name ="rva22u64" , - .misa_ext =RVI |RVM |RVA |RVF |RVD |RVC |RVU , + .misa_ext =RVI |RVM |RVA |RVF |RVD |RVC |RVB |RVU , .priv_spec =RISCV_PROFILE_ATTR_UNUSED , .satp_mode =RISCV_PROFILE_ATTR_UNUSED , .ext_offsets = {tests/data/acpi/riscv64/virt/RHCT binary +0
-0Signature · 2 lines
-- 2.47.1
Re: [PATCH v2 2/4] target/riscv: use RVB in RVA22U64
In reply to Daniel Henrique BarbozaQuoted 21 lines · Daniel Henrique Barboza
From the time we added RVA22U64 until now the spec didn't declare 'RVB' as a dependency, using zba/zbb/zbs instead. Since then the RVA22 spec
[1] added the following in the 'RVA22U64 Mandatory Extensions' section:"B Bit-manipulation instructions
Note: The B extension comprises the Zba, Zbb, and Zbs extensions. At the time of RVA22U64's ratification, the B extension had not yet been defined, and so RVA22U64 explicitly mandated Zba, Zbb, and Zbs instead. Mandating B is equivalent."
It is also equivalent to QEMU (see
riscv_cpu_validate_b()intarget/riscv/tcg/tcg-cpu.c).Finally, RVA23U64 [2] directly mentions RVB as a mandatory extension, not citing zba/zbb/zbs.
To make it clear that RVA23U64 will extend RVA22U64 (i.e. RVA22 is a parent of RVA23), use RVB in RVA22U64 as well.
Quoted 6 lines
(bios-tables-test change: RVB added to riscv,isa)
[1] https://github.com/riscv/riscv-profiles/blob/main/src/profiles.adoc#61-rva22u64-profile
[2] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc#rva23u64-profileSigned-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 33 lines
--- target/riscv/cpu.c | 2 +- tests/data/acpi/riscv64/virt/RHCT | Bin 398 -> 400 bytes 2 files changed, 1 insertion(+), 1 deletion(-)target/riscv/cpu.c +1
-1@@ -2351,7 +2351,7 @@ static const PropertyInfo prop_marchid = {static RISCVCPUProfile RVA22U64 = { .parent =NULL , .name ="rva22u64" , - .misa_ext =RVI |RVM |RVA |RVF |RVD |RVC |RVU , + .misa_ext =RVI |RVM |RVA |RVF |RVD |RVC |RVB |RVU , .priv_spec =RISCV_PROFILE_ATTR_UNUSED , .satp_mode =RISCV_PROFILE_ATTR_UNUSED , .ext_offsets = {tests/data/acpi/riscv64/virt/RHCT binary +0
-1--2.47.1
PATCH v2 3/4 target/riscv: add RVA23U64 profile
In reply to Daniel Henrique BarbozaAdd RVA23U64 as described in [1]. Add it as a child of RVA22U64 since all RVA22U64 mandatory extensions are also present in RVA23U64. What's left then is to list the mandatory extensions that are RVA23 only.
A new "rva23u64" CPU is also added.
[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)
target/riscv/cpu-qom.h +1 -0
@@ -40,6 +40,7 @@#define TYPE_RISCV_CPU_RV64E RISCV_CPU_TYPE_NAME("rv64e")#define TYPE_RISCV_CPU_RVA22U64 RISCV_CPU_TYPE_NAME("rva22u64")#define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64") +#define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64")#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")
target/riscv/cpu.c +32 -0
@@ -2395,9 +2395,33 @@ static RISCVCPUProfile RVA22S64 = { } }; +/* +* All mandatory extensions from RVA22U64 are present +* in RVA23U64 so set RVA22 as a parent. We need to +* declare just the newly added mandatory extensions. +*/ +static RISCVCPUProfile RVA23U64 = { + .parent = &RVA22U64 , + .name ="rva23u64" , + .misa_ext =RVV , + .priv_spec =RISCV_PROFILE_ATTR_UNUSED , + .satp_mode =RISCV_PROFILE_ATTR_UNUSED , + .ext_offsets = { +CPU_CFG_OFFSET (ext_zvfhmin),CPU_CFG_OFFSET (ext_zvbb), +CPU_CFG_OFFSET (ext_zvkt),CPU_CFG_OFFSET (ext_zihintntl), +CPU_CFG_OFFSET (ext_zicond),CPU_CFG_OFFSET (ext_zimop), +CPU_CFG_OFFSET (ext_zcmop),CPU_CFG_OFFSET (ext_zcb), +CPU_CFG_OFFSET (ext_zfa),CPU_CFG_OFFSET (ext_zawrs), +CPU_CFG_OFFSET (ext_supm), + +RISCV_PROFILE_EXT_LIST_END + } +}; +RISCVCPUProfile *riscv_profiles[] = { &RVA22U64 , &RVA22S64 , + &RVA23U64 ,NULL , };
@@ -2884,6 +2908,13 @@ static void rva22s64_profile_cpu_init(Object *obj) RVA22S64.enabled = true; } + +static void rva23u64_profile_cpu_init (Object *obj) +{ +rv64i_bare_cpu_init (obj); + +RVA23U64 .enabled = true; +}#endif static const gchar *riscv_gdb_arch_name (CPUState *cs)
@@ -3163,6 +3194,7 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_BARE_CPU (TYPE_RISCV_CPU_RV64E ,MXL_RV64 , rv64e_bare_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22U64 ,MXL_RV64 , rva22u64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22S64 ,MXL_RV64 , rva22s64_profile_cpu_init), + DEFINE_PROFILE_CPU(TYPE_RISCV_CPU_RVA23U64, MXL_RV64, rva23u64_profile_cpu_init), #endif /* TARGET_RISCV64 */ };
Signature · 1 line
2.47.1
Re: [PATCH v2 3/4] target/riscv: add RVA23U64 profile
Quoted 6 lines · Daniel Henrique Barboza
Add RVA23U64 as described in [1]. Add it as a child of RVA22U64 since all RVA22U64 mandatory extensions are also present in RVA23U64. What's left then is to list the mandatory extensions that are RVA23 only.
A new "rva23u64" CPU is also added.
Quoted 8 lines
[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
Signed-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)
Re: [PATCH v2 3/4] target/riscv: add RVA23U64 profile
In reply to Daniel Henrique BarbozaQuoted 10 lines · Daniel Henrique Barboza
Add RVA23U64 as described in [1]. Add it as a child of RVA22U64 since all RVA22U64 mandatory extensions are also present in RVA23U64. What's left then is to list the mandatory extensions that are RVA23 only.
A new "rva23u64" CPU is also added.
[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 81 lines
--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -40,6 +40,7 @@#define TYPE_RISCV_CPU_RV64E RISCV_CPU_TYPE_NAME("rv64e")#define TYPE_RISCV_CPU_RVA22U64 RISCV_CPU_TYPE_NAME("rva22u64")#define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64") +#define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64")#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")target/riscv/cpu.c +32
-1@@ -2395,9 +2395,33 @@ static RISCVCPUProfile RVA22S64 = { } }; +/* +* All mandatory extensions from RVA22U64 are present +* in RVA23U64 so set RVA22 as a parent. We need to +* declare just the newly added mandatory extensions. +*/ +static RISCVCPUProfile RVA23U64 = { + .parent = &RVA22U64 , + .name ="rva23u64" , + .misa_ext =RVV , + .priv_spec =RISCV_PROFILE_ATTR_UNUSED , + .satp_mode =RISCV_PROFILE_ATTR_UNUSED , + .ext_offsets = { +CPU_CFG_OFFSET (ext_zvfhmin),CPU_CFG_OFFSET (ext_zvbb), +CPU_CFG_OFFSET (ext_zvkt),CPU_CFG_OFFSET (ext_zihintntl), +CPU_CFG_OFFSET (ext_zicond),CPU_CFG_OFFSET (ext_zimop), +CPU_CFG_OFFSET (ext_zcmop),CPU_CFG_OFFSET (ext_zcb), +CPU_CFG_OFFSET (ext_zfa),CPU_CFG_OFFSET (ext_zawrs), +CPU_CFG_OFFSET (ext_supm), + +RISCV_PROFILE_EXT_LIST_END + } +}; +RISCVCPUProfile *riscv_profiles[] = { &RVA22U64 , &RVA22S64 , + &RVA23U64 ,NULL , };@@ -2884,6 +2908,13 @@ static void rva22s64_profile_cpu_init(Object *obj) RVA22S64.enabled = true; } + +static void rva23u64_profile_cpu_init (Object *obj) +{ +rv64i_bare_cpu_init (obj); + +RVA23U64 .enabled = true; +}#endif static const gchar *riscv_gdb_arch_name (CPUState *cs)@@ -3163,6 +3194,7 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_BARE_CPU (TYPE_RISCV_CPU_RV64E ,MXL_RV64 , rv64e_bare_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22U64 ,MXL_RV64 , rva22u64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22S64 ,MXL_RV64 , rva22s64_profile_cpu_init), + DEFINE_PROFILE_CPU(TYPE_RISCV_CPU_RVA23U64, MXL_RV64, rva23u64_profile_cpu_init), #endif /* TARGET_RISCV64 */ }; --2.47.1
Re: [PATCH v2 3/4] target/riscv: add RVA23U64 profile
Quoted 7 lines · Alistair Francis
Quoted 5 lines · Daniel Henrique Barboza
Add RVA23U64 as described in [1]. Add it as a child of RVA22U64 since all RVA22U64 mandatory extensions are also present in RVA23U64. What's left then is to list the mandatory extensions that are RVA23 only.
Quoted 7 lines
Quoted 5 lines
A new "rva23u64" CPU is also added.
[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
Signed-off-by Daniel Henrique Barboza <[email protected]>Reviewed-by Alistair Francis <[email protected]>
Thanks for the review! If you could take a look at the latest version of this work that would be great too:
[PATCH v4 0/6] target/riscv: RVA23 profile support
All patches are acked. Drew's points that were raised in this version (and v3) were addressed.
Thanks,
Daniel
Quoted 84 lines
Alistair
Quoted 81 lines
--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -40,6 +40,7 @@#define TYPE_RISCV_CPU_RV64E RISCV_CPU_TYPE_NAME("rv64e")#define TYPE_RISCV_CPU_RVA22U64 RISCV_CPU_TYPE_NAME("rva22u64")#define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64") +#define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64")#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")target/riscv/cpu.c +32
-1@@ -2395,9 +2395,33 @@ static RISCVCPUProfile RVA22S64 = { } }; +/* +* All mandatory extensions from RVA22U64 are present +* in RVA23U64 so set RVA22 as a parent. We need to +* declare just the newly added mandatory extensions. +*/ +static RISCVCPUProfile RVA23U64 = { + .parent = &RVA22U64 , + .name ="rva23u64" , + .misa_ext =RVV , + .priv_spec =RISCV_PROFILE_ATTR_UNUSED , + .satp_mode =RISCV_PROFILE_ATTR_UNUSED , + .ext_offsets = { +CPU_CFG_OFFSET (ext_zvfhmin),CPU_CFG_OFFSET (ext_zvbb), +CPU_CFG_OFFSET (ext_zvkt),CPU_CFG_OFFSET (ext_zihintntl), +CPU_CFG_OFFSET (ext_zicond),CPU_CFG_OFFSET (ext_zimop), +CPU_CFG_OFFSET (ext_zcmop),CPU_CFG_OFFSET (ext_zcb), +CPU_CFG_OFFSET (ext_zfa),CPU_CFG_OFFSET (ext_zawrs), +CPU_CFG_OFFSET (ext_supm), + +RISCV_PROFILE_EXT_LIST_END + } +}; +RISCVCPUProfile *riscv_profiles[] = { &RVA22U64 , &RVA22S64 , + &RVA23U64 ,NULL , };@@ -2884,6 +2908,13 @@ static void rva22s64_profile_cpu_init(Object *obj) RVA22S64.enabled = true; } + +static void rva23u64_profile_cpu_init (Object *obj) +{ +rv64i_bare_cpu_init (obj); + +RVA23U64 .enabled = true; +}#endif static const gchar *riscv_gdb_arch_name (CPUState *cs)@@ -3163,6 +3194,7 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_BARE_CPU (TYPE_RISCV_CPU_RV64E ,MXL_RV64 , rv64e_bare_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22U64 ,MXL_RV64 , rva22u64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22S64 ,MXL_RV64 , rva22s64_profile_cpu_init), + DEFINE_PROFILE_CPU(TYPE_RISCV_CPU_RVA23U64, MXL_RV64, rva23u64_profile_cpu_init), #endif /* TARGET_RISCV64 */ }; --2.47.1
PATCH v2 4/4 target/riscv: add RVA23S64 profile
In reply to Daniel Henrique BarbozaAdd RVA23S64 as described in [1]. This profile inherits all mandatory extensions of RVA23U64, making it a child of the U64 profile.
A new "rva23s64" profile CPU is also added. This is the generated riscv,isa for it (taken via -M dumpdtb):
rv64imafdcbvh_zic64b_zicbom_zicbop_zicboz_ziccamoa_ziccif_zicclsm_ ziccrse_zicond_zicntr_zicsr_zifencei_zihintntl_zihintpause_zihpm_zimop_ zmmul_za64rs_zaamo_zalrsc_zawrs_zfa_zfhmin_zca_zcb_zcd_zcmop_zba_zbb_zbs_ zkt_zvbb_zve32f_zve32x_zve64f_zve64d_zve64x_zvfhmin_zvkb_zvkt_shcounterenw_ sha_shgatpa_shtvala_shvsatpa_shvstvala_shvstvecd_smnpm_smstateen_ssccptr_ sscofpmf_sscounterenw_ssnpm_ssstateen_sstc_sstvala_sstvecd_ssu64xl_ supm_svade_svinval_svnapot_svpbmt
[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
target/riscv/cpu-qom.h +1 -0
@@ -41,6 +41,7 @@#define TYPE_RISCV_CPU_RVA22U64 RISCV_CPU_TYPE_NAME("rva22u64")#define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64")#define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64") +#define TYPE_RISCV_CPU_RVA23S64 RISCV_CPU_TYPE_NAME("rva23s64")#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")
target/riscv/cpu.c +42 -0
64 lines not on this page · raw message
Signature · 1 line
2.47.1
Re: [PATCH v2 4/4] target/riscv: add RVA23S64 profile
Quoted 51 lines · Daniel Henrique Barboza
Add RVA23S64 as described in [1]. This profile inherits all mandatory extensions of RVA23U64, making it a child of the U64 profile.
A new "rva23s64" profile CPU is also added. This is the generated riscv,isa for it (taken via -M dumpdtb):
rv64imafdcbvh_zic64b_zicbom_zicbop_zicboz_ziccamoa_ziccif_zicclsm_ziccrse_zicond_zicntr_zicsr_zifencei_zihintntl_zihintpause_zihpm_zimop_zmmul_za64rs_zaamo_zalrsc_zawrs_zfa_zfhmin_zca_zcb_zcd_zcmop_zba_zbb_zbs_zkt_zvbb_zve32f_zve32x_zve64f_zve64d_zve64x_zvfhmin_zvkb_zvkt_shcounterenw_sha_shgatpa_shtvala_shvsatpa_shvstvala_shvstvecd_smnpm_smstateen_ssccptr_sscofpmf_sscounterenw_ssnpm_ssstateen_sstc_sstvala_sstvecd_ssu64xl_supm_svade_svinval_svnapot_svpbmt[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
Signed-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -41,6 +41,7 @@#define TYPE_RISCV_CPU_RVA22U64 RISCV_CPU_TYPE_NAME("rva22u64")#define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64")#define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64") +#define TYPE_RISCV_CPU_RVA23S64 RISCV_CPU_TYPE_NAME("rva23s64")#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")target/riscv/cpu.c +9
-0@@ -2418,10 +2418,44 @@ static RISCVCPUProfile RVA23U64 = { } }; +/* +* As with RVA23U64, RVA23S64 also defines 'named features'. +* +* Cache related features that we consider enabled since we don't +* implement cache: Ssccptr +* +* Other named features that we already implement: Sstvecd, Sstvala, +* Sscounterenw, Ssu64xl +*
target/riscv/cpu.c static RISCVCPUProfile RVA23U64 = { · line 2439
Quoted 10 lines
target/riscv/cpu.c +10
-0+* The remaining features/extensions comes from RVA23U64. +*/ +static RISCVCPUProfile RVA23S64 = { + .parent = &RVA23U64 , + .name ="rva23s64" , + .misa_ext =RVS , + .priv_spec =PRIV_VERSION_1_13_0 , + .satp_mode =VM_1_10_SV39 , + .ext_offsets = { +/* These were present in RVA22S64 */
I'd prefer we come up with a way to inherit rva22s64, as it'll make the fact that later profiles should expand earlier profiles more clear and also avoid issues like missing zifencei. I guess it should be as easy as renaming parent to uparent and adding an sparent, right?
Thanks,
drew
Quoted 47 lines
target/riscv/cpu.c +23
-0+CPU_CFG_OFFSET (ext_zifencei),CPU_CFG_OFFSET (ext_svade ), +CPU_CFG_OFFSET (ext_svpbmt ),CPU_CFG_OFFSET (ext_svinval ), + +/* New in RVA23S64 */ +CPU_CFG_OFFSET (ext_svnapot ),CPU_CFG_OFFSET (ext_sstc ), +CPU_CFG_OFFSET (ext_sscofpmf ),CPU_CFG_OFFSET (ext_ssnpm ), + +/* Named features: Sha */ +CPU_CFG_OFFSET (ext_sha ), + +RISCV_PROFILE_EXT_LIST_END + } +}; +RISCVCPUProfile *riscv_profiles[] = { &RVA22U64 , &RVA22S64 , &RVA23U64 , + &RVA23S64 ,NULL , };@@ -2915,6 +2949,13 @@ static void rva23u64_profile_cpu_init(Object *obj) RVA23U64.enabled = true; } + +static void rva23s64_profile_cpu_init (Object *obj) +{ +rv64i_bare_cpu_init (obj); + +RVA23S64 .enabled = true; +}#endif static const gchar *riscv_gdb_arch_name (CPUState *cs)@@ -3195,6 +3236,7 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22U64 ,MXL_RV64 , rva22u64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22S64 ,MXL_RV64 , rva22s64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA23U64 ,MXL_RV64 , rva23u64_profile_cpu_init), + DEFINE_PROFILE_CPU(TYPE_RISCV_CPU_RVA23S64, MXL_RV64, rva23s64_profile_cpu_init), #endif /* TARGET_RISCV64 */ };Signature · 1 line
2.47.1
Re: [PATCH v2 4/4] target/riscv: add RVA23S64 profile
Quoted 60 lines · Andrew Jones
Quoted 59 lines · Daniel Henrique Barboza
Add RVA23S64 as described in [1]. This profile inherits all mandatory extensions of RVA23U64, making it a child of the U64 profile.
A new "rva23s64" profile CPU is also added. This is the generated riscv,isa for it (taken via -M dumpdtb):
rv64imafdcbvh_zic64b_zicbom_zicbop_zicboz_ziccamoa_ziccif_zicclsm_ziccrse_zicond_zicntr_zicsr_zifencei_zihintntl_zihintpause_zihpm_zimop_zmmul_za64rs_zaamo_zalrsc_zawrs_zfa_zfhmin_zca_zcb_zcd_zcmop_zba_zbb_zbs_zkt_zvbb_zve32f_zve32x_zve64f_zve64d_zve64x_zvfhmin_zvkb_zvkt_shcounterenw_sha_shgatpa_shtvala_shvsatpa_shvstvala_shvstvecd_smnpm_smstateen_ssccptr_sscofpmf_sscounterenw_ssnpm_ssstateen_sstc_sstvala_sstvecd_ssu64xl_supm_svade_svinval_svnapot_svpbmt[1] https://github.com/riscv/riscv-profiles/blob/main/src/rva23-profile.adoc
Signed-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/cpu-qom.h | 1 + target/riscv/cpu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)target/riscv/cpu-qom.h +1
-0@@ -41,6 +41,7 @@#define TYPE_RISCV_CPU_RVA22U64 RISCV_CPU_TYPE_NAME("rva22u64")#define TYPE_RISCV_CPU_RVA22S64 RISCV_CPU_TYPE_NAME("rva22s64")#define TYPE_RISCV_CPU_RVA23U64 RISCV_CPU_TYPE_NAME("rva23u64") +#define TYPE_RISCV_CPU_RVA23S64 RISCV_CPU_TYPE_NAME("rva23s64")#define TYPE_RISCV_CPU_IBEX RISCV_CPU_TYPE_NAME("lowrisc-ibex")#define TYPE_RISCV_CPU_SHAKTI_C RISCV_CPU_TYPE_NAME("shakti-c")#define TYPE_RISCV_CPU_SIFIVE_E31 RISCV_CPU_TYPE_NAME("sifive-e31")target/riscv/cpu.c +17
-0@@ -2418,10 +2418,44 @@ static RISCVCPUProfile RVA23U64 = { } }; +/* +* As with RVA23U64, RVA23S64 also defines 'named features'. +* +* Cache related features that we consider enabled since we don't +* implement cache: Ssccptr +* +* Other named features that we already implement: Sstvecd, Sstvala, +* Sscounterenw, Ssu64xl +* +* The remaining features/extensions comes from RVA23U64. +*/ +static RISCVCPUProfile RVA23S64 = { + .parent = &RVA23U64 , + .name ="rva23s64" , + .misa_ext =RVS , + .priv_spec =PRIV_VERSION_1_13_0 , + .satp_mode =VM_1_10_SV39 ,
Quoted 8 lines
target/riscv/cpu.c static RISCVCPUProfile RVA23U64 = { · line 2439
Quoted 2 lines
target/riscv/cpu.c +2
-0+ .ext_offsets = { +/* These were present in RVA22S64 */ I'd prefer we come up with a way to inherit rva22s64, as it'll make the fact that later profiles should expand earlier profiles more clear and also avoid issues like missing zifencei. I guess it should be as easy as renaming parent to uparent and adding an sparent, right?
I think it's worth a shot. I'll see what I can do in v3. Thanks,
Daniel
Quoted 51 lines
Thanks,
drewQuoted 47 lines
target/riscv/cpu.c +23
-0+CPU_CFG_OFFSET (ext_zifencei),CPU_CFG_OFFSET (ext_svade ), +CPU_CFG_OFFSET (ext_svpbmt ),CPU_CFG_OFFSET (ext_svinval ), + +/* New in RVA23S64 */ +CPU_CFG_OFFSET (ext_svnapot ),CPU_CFG_OFFSET (ext_sstc ), +CPU_CFG_OFFSET (ext_sscofpmf ),CPU_CFG_OFFSET (ext_ssnpm ), + +/* Named features: Sha */ +CPU_CFG_OFFSET (ext_sha ), + +RISCV_PROFILE_EXT_LIST_END + } +}; +RISCVCPUProfile *riscv_profiles[] = { &RVA22U64 , &RVA22S64 , &RVA23U64 , + &RVA23S64 ,NULL , };@@ -2915,6 +2949,13 @@ static void rva23u64_profile_cpu_init(Object *obj) RVA23U64.enabled = true; } + +static void rva23s64_profile_cpu_init (Object *obj) +{ +rv64i_bare_cpu_init (obj); + +RVA23S64 .enabled = true; +}#endif static const gchar *riscv_gdb_arch_name (CPUState *cs)@@ -3195,6 +3236,7 @@ static const TypeInfo riscv_cpu_type_infos[] = {DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22U64 ,MXL_RV64 , rva22u64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA22S64 ,MXL_RV64 , rva22s64_profile_cpu_init),DEFINE_PROFILE_CPU (TYPE_RISCV_CPU_RVA23U64 ,MXL_RV64 , rva23u64_profile_cpu_init), + DEFINE_PROFILE_CPU(TYPE_RISCV_CPU_RVA23S64, MXL_RV64, rva23s64_profile_cpu_init), #endif /* TARGET_RISCV64 */ };Signature · 1 line
2.47.1