Add CPU configuration property of Zvfqwbdota8f extension which depends on the Zve32f extension per the specification.
Signed-off-by: Max Chou <[email protected]> --- target/riscv/cpu.c | 2 ++ target/riscv/cpu_cfg_fields.h.inc | 1 + target/riscv/tcg/tcg-cpu.c | 5 +++++ target/riscv/tcg/vector_helper.c | 2 ++ 4 files changed, 10 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 566e2e835ae..b4a9f2c3e30 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -236,6 +236,8 @@ const RISCVIsaExtData isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(zvfbfwma, PRIV_VERSION_1_12_0, ext_zvfbfwma), ISA_EXT_DATA_ENTRY(zvfh, PRIV_VERSION_1_12_0, ext_zvfh), ISA_EXT_DATA_ENTRY(zvfhmin, PRIV_VERSION_1_12_0, ext_zvfhmin), + ISA_EXPERIMENTAL_EXT_DATA_ENTRY(zvfqwbdota8f, PRIV_VERSION_1_13_0, + ext_zvfqwbdota8f), ISA_EXPERIMENTAL_EXT_DATA_ENTRY(zvfqwdota8f, PRIV_VERSION_1_13_0, ext_zvfqwdota8f), ISA_EXPERIMENTAL_EXT_DATA_ENTRY(zvfwbdota16bf, PRIV_VERSION_1_13_0, diff --git a/target/riscv/cpu_cfg_fields.h.inc b/target/riscv/cpu_cfg_fields.h.inc index 80750db1ccd..0385b58de0a 100644 --- a/target/riscv/cpu_cfg_fields.h.inc +++ b/target/riscv/cpu_cfg_fields.h.inc @@ -106,6 +106,7 @@ BOOL_FIELD(ext_zvfbfmin) BOOL_FIELD(ext_zvfbfwma) BOOL_FIELD(ext_zvfh) BOOL_FIELD(ext_zvfhmin) +BOOL_FIELD(ext_zvfqwbdota8f) BOOL_FIELD(ext_zvfqwdota8f) BOOL_FIELD(ext_zvfwbdota16bf) BOOL_FIELD(ext_zvfwdota16bf) diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 8684e4c709c..a52637f5ca9 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -726,6 +726,11 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) return; } + if (cpu->cfg.ext_zvfqwbdota8f && !cpu->cfg.ext_zve32f) { + error_setg(errp, "Zvfqwbdota8f extension depends on Zve32f extension"); + return; + } + if ((cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinxmin) && !cpu->cfg.ext_zfinx) { error_setg(errp, "Zdinx/Zhinx/Zhinxmin extensions require Zfinx"); return; diff --git a/target/riscv/tcg/vector_helper.c b/target/riscv/tcg/vector_helper.c index 51170625aad..6f3b666784e 100644 --- a/target/riscv/tcg/vector_helper.c +++ b/target/riscv/tcg/vector_helper.c @@ -40,6 +40,7 @@ static target_ulong vtype_reserved(CPURISCVState *env, target_ulong vtype) target_ulong reserved = 0; if (riscv_cpu_cfg(env)->ext_zvfbfa || + riscv_cpu_cfg(env)->ext_zvfqwbdota8f || riscv_cpu_cfg(env)->ext_zvfqwdota8f || riscv_cpu_cfg(env)->ext_zvfwbdota16bf || riscv_cpu_cfg(env)->ext_zvfwdota16bf || @@ -96,6 +97,7 @@ target_ulong HELPER(vsetvl)(CPURISCVState *env, target_ulong s1, switch (vsew) { case MO_8: ill_altfmt &= !(cpu->cfg.ext_zvfbfa || + cpu->cfg.ext_zvfqwbdota8f || cpu->cfg.ext_zvfqwdota8f || cpu->cfg.ext_zvqwbdota8i || cpu->cfg.ext_zvqwdota8i); -- 2.56.0
