Message ID | 20230825130853.511782-16-dbarboza@ventanamicro.com |
---|---|
State | New |
Headers | show |
Series | riscv: split TCG/KVM accelerators from cpu.c | expand |
On Fri, Aug 25, 2023 at 10:08:48AM -0300, Daniel Henrique Barboza wrote: > tcg_cpu_instance_init() will be the 'cpu_instance_init' impl for the TCG > accelerator. It'll be called from within riscv_cpu_post_init(), via > accel_cpu_instance_init(), similar to what happens with KVM. In fact, to > preserve behavior, the implementation will be similar to what > riscv_cpu_post_init() already does. > > In this patch we'll move riscv_cpu_add_user_properties() and > riscv_init_max_cpu_extensions() and all their dependencies to tcg-cpu.c. > All multi-extension properties code was moved. The 'multi_ext_user_opts' > hash table was also moved to tcg-cpu.c since it's a TCG only structure, > meaning that we won't have to worry about initializing a TCG hash table > when running a KVM CPU anymore. > > riscv_cpu_add_user_properties() will remain in cpu.c for now due to how > much code it requires to be moved at the same time. We'll do that in the > next patch. > > Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > --- > target/riscv/cpu.c | 141 +------------------------------------ > target/riscv/cpu.h | 2 +- > target/riscv/tcg/tcg-cpu.c | 138 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 140 insertions(+), 141 deletions(-) > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index f9aea6a80a..89b09a7e89 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -162,9 +162,6 @@ static const struct isa_ext_data isa_edata_arr[] = { > ISA_EXT_DATA_ENTRY(xventanacondops, PRIV_VERSION_1_12_0, ext_XVentanaCondOps), > }; > > -/* Hash that stores user set extensions */ > -static GHashTable *multi_ext_user_opts; > - > bool isa_ext_is_enabled(RISCVCPU *cpu, uint32_t ext_offset) > { > bool *ext_enabled = (void *)&cpu->cfg + ext_offset; > @@ -195,12 +192,6 @@ int cpu_cfg_ext_get_min_version(uint32_t ext_offset) > return PRIV_VERSION_1_10_0; > } > > -bool cpu_cfg_ext_is_user_set(uint32_t ext_offset) > -{ > - return g_hash_table_contains(multi_ext_user_opts, > - GUINT_TO_POINTER(ext_offset)); > -} > - > const char * const riscv_int_regnames[] = { > "x0/zero", "x1/ra", "x2/sp", "x3/gp", "x4/tp", "x5/t0", "x6/t1", > "x7/t2", "x8/s0", "x9/s1", "x10/a0", "x11/a1", "x12/a2", "x13/a3", > @@ -281,9 +272,6 @@ static const char * const riscv_intr_names[] = { > "reserved" > }; > > -static void riscv_cpu_add_user_properties(Object *obj); > -static void riscv_init_max_cpu_extensions(Object *obj); > - > const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) > { > if (async) { > @@ -295,7 +283,7 @@ const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) > } > } > > -static void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext) > +void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext) > { > env->misa_mxl_max = env->misa_mxl = mxl; > env->misa_ext_mask = env->misa_ext = ext; > @@ -1198,18 +1186,7 @@ static void riscv_cpu_set_irq(void *opaque, int irq, int level) > > static void riscv_cpu_post_init(Object *obj) > { > - RISCVCPU *cpu = RISCV_CPU(obj); > - RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(cpu); > - > accel_cpu_instance_init(CPU(obj)); > - > - if (rcc->user_extension_properties) { > - riscv_cpu_add_user_properties(obj); > - } > - > - if (cpu->cfg.max_features) { > - riscv_init_max_cpu_extensions(obj); > - } > } > > static void riscv_cpu_init(Object *obj) > @@ -1222,8 +1199,6 @@ static void riscv_cpu_init(Object *obj) > qdev_init_gpio_in(DEVICE(cpu), riscv_cpu_set_irq, > IRQ_LOCAL_MAX + IRQ_LOCAL_GUEST_MAX); > #endif /* CONFIG_USER_ONLY */ > - > - multi_ext_user_opts = g_hash_table_new(NULL, g_direct_equal); > } > > typedef struct RISCVCPUMisaExtConfig { > @@ -1503,120 +1478,6 @@ Property riscv_cpu_options[] = { > DEFINE_PROP_END_OF_LIST(), > }; > > -static void cpu_set_multi_ext_cfg(Object *obj, Visitor *v, const char *name, > - void *opaque, Error **errp) > -{ > - const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; > - bool value; > - > - if (!visit_type_bool(v, name, &value, errp)) { > - return; > - } > - > - isa_ext_update_enabled(RISCV_CPU(obj), multi_ext_cfg->offset, value); > - > - g_hash_table_insert(multi_ext_user_opts, > - GUINT_TO_POINTER(multi_ext_cfg->offset), > - (gpointer)value); > -} > - > -static void cpu_get_multi_ext_cfg(Object *obj, Visitor *v, const char *name, > - void *opaque, Error **errp) > -{ > - const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; > - bool value = isa_ext_is_enabled(RISCV_CPU(obj), multi_ext_cfg->offset); > - > - visit_type_bool(v, name, &value, errp); > -} > - > -static void cpu_add_multi_ext_prop(Object *cpu_obj, > - const RISCVCPUMultiExtConfig *multi_cfg) > -{ > - object_property_add(cpu_obj, multi_cfg->name, "bool", > - cpu_get_multi_ext_cfg, > - cpu_set_multi_ext_cfg, > - NULL, (void *)multi_cfg); > - > - /* > - * Set def val directly instead of using > - * object_property_set_bool() to save the set() > - * callback hash for user inputs. > - */ > - isa_ext_update_enabled(RISCV_CPU(cpu_obj), multi_cfg->offset, > - multi_cfg->enabled); > -} > - > -static void riscv_cpu_add_multiext_prop_array(Object *obj, > - const RISCVCPUMultiExtConfig *array) > -{ > - const RISCVCPUMultiExtConfig *prop; > - > - for (prop = array; prop && prop->name; prop++) { > - cpu_add_multi_ext_prop(obj, prop); > - } > -} > - > -/* > - * Add CPU properties with user-facing flags. > - * > - * This will overwrite existing env->misa_ext values with the > - * defaults set via riscv_cpu_add_misa_properties(). > - */ > -static void riscv_cpu_add_user_properties(Object *obj) > -{ > -#ifndef CONFIG_USER_ONLY > - if (kvm_enabled()) { > - return; > - } > - riscv_add_satp_mode_properties(obj); > -#endif > - > - riscv_cpu_add_misa_properties(obj); > - > - riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_extensions); > - riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_vendor_exts); > - riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_experimental_exts); > - > - for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { > - qdev_property_add_static(DEVICE(obj), prop); > - } > -} > - > -/* > - * The 'max' type CPU will have all possible ratified > - * non-vendor extensions enabled. > - */ > -static void riscv_init_max_cpu_extensions(Object *obj) > -{ > - RISCVCPU *cpu = RISCV_CPU(obj); > - CPURISCVState *env = &cpu->env; > - const RISCVCPUMultiExtConfig *prop; > - > - /* Enable RVG, RVJ and RVV that are disabled by default */ > - set_misa(env, env->misa_mxl, env->misa_ext | RVG | RVJ | RVV); > - > - for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { > - isa_ext_update_enabled(cpu, prop->offset, true); > - } > - > - /* set vector version */ > - env->vext_ver = VEXT_VERSION_1_00_0; > - > - /* Zfinx is not compatible with F. Disable it */ > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zfinx), false); > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zdinx), false); > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinx), false); > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinxmin), false); > - > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zce), false); > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmp), false); > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmt), false); > - > - if (env->misa_mxl != MXL_RV32) { > - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcf), false); > - } > -} > - > static Property riscv_cpu_properties[] = { > DEFINE_PROP_BOOL("debug", RISCVCPU, cfg.debug, true), > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 9ec3b98bd2..74fbb33e09 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -710,9 +710,9 @@ enum riscv_pmu_event_idx { > > /* used by tcg/tcg-cpu.c*/ > void isa_ext_update_enabled(RISCVCPU *cpu, uint32_t ext_offset, bool en); > -bool cpu_cfg_ext_is_user_set(uint32_t ext_offset); > bool isa_ext_is_enabled(RISCVCPU *cpu, uint32_t ext_offset); > int cpu_cfg_ext_get_min_version(uint32_t ext_offset); > +void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext); riscv_cpu_set_misa() ? > void riscv_cpu_disable_priv_spec_isa_exts(RISCVCPU *cpu); > > typedef struct RISCVCPUMultiExtConfig { > diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c > index 2024c98793..68ce3cbcb9 100644 > --- a/target/riscv/tcg/tcg-cpu.c > +++ b/target/riscv/tcg/tcg-cpu.c > @@ -23,12 +23,22 @@ > #include "pmu.h" > #include "time_helper.h" > #include "qapi/error.h" > +#include "qapi/visitor.h" > #include "qemu/accel.h" > #include "qemu/error-report.h" > #include "hw/core/accel-cpu.h" > #include "hw/core/tcg-cpu-ops.h" > #include "tcg/tcg.h" > > +/* Hash that stores user set extensions */ > +static GHashTable *multi_ext_user_opts; > + > +static bool cpu_cfg_ext_is_user_set(uint32_t ext_offset) > +{ > + return g_hash_table_contains(multi_ext_user_opts, > + GUINT_TO_POINTER(ext_offset)); > +} > + > static void riscv_cpu_synchronize_from_tb(CPUState *cs, > const TranslationBlock *tb) > { > @@ -564,6 +574,133 @@ static bool tcg_cpu_realizefn(CPUState *cs, Error **errp) > return true; > } > > +static void cpu_set_multi_ext_cfg(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; > + bool value; > + > + if (!visit_type_bool(v, name, &value, errp)) { > + return; > + } > + > + isa_ext_update_enabled(RISCV_CPU(obj), multi_ext_cfg->offset, value); > + > + g_hash_table_insert(multi_ext_user_opts, > + GUINT_TO_POINTER(multi_ext_cfg->offset), > + (gpointer)value); > +} > + > +static void cpu_get_multi_ext_cfg(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; > + bool value = isa_ext_is_enabled(RISCV_CPU(obj), multi_ext_cfg->offset); > + > + visit_type_bool(v, name, &value, errp); > +} > + > +static void cpu_add_multi_ext_prop(Object *cpu_obj, > + const RISCVCPUMultiExtConfig *multi_cfg) > +{ > + object_property_add(cpu_obj, multi_cfg->name, "bool", > + cpu_get_multi_ext_cfg, > + cpu_set_multi_ext_cfg, > + NULL, (void *)multi_cfg); > + > + /* > + * Set def val directly instead of using > + * object_property_set_bool() to save the set() > + * callback hash for user inputs. > + */ > + isa_ext_update_enabled(RISCV_CPU(cpu_obj), multi_cfg->offset, > + multi_cfg->enabled); > +} > + > +static void riscv_cpu_add_multiext_prop_array(Object *obj, > + const RISCVCPUMultiExtConfig *array) > +{ > + const RISCVCPUMultiExtConfig *prop; > + > + for (prop = array; prop && prop->name; prop++) { > + cpu_add_multi_ext_prop(obj, prop); > + } > +} > + > +/* > + * Add CPU properties with user-facing flags. > + * > + * This will overwrite existing env->misa_ext values with the > + * defaults set via riscv_cpu_add_misa_properties(). > + */ > +static void riscv_cpu_add_user_properties(Object *obj) > +{ > +#ifndef CONFIG_USER_ONLY > + riscv_add_satp_mode_properties(obj); > +#endif > + > + riscv_cpu_add_misa_properties(obj); > + > + riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_extensions); > + riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_vendor_exts); > + riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_experimental_exts); > + > + for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { > + qdev_property_add_static(DEVICE(obj), prop); > + } > +} > + > +/* > + * The 'max' type CPU will have all possible ratified > + * non-vendor extensions enabled. > + */ > +static void riscv_init_max_cpu_extensions(Object *obj) > +{ > + RISCVCPU *cpu = RISCV_CPU(obj); > + CPURISCVState *env = &cpu->env; > + const RISCVCPUMultiExtConfig *prop; > + > + /* Enable RVG, RVJ and RVV that are disabled by default */ > + set_misa(env, env->misa_mxl, env->misa_ext | RVG | RVJ | RVV); > + > + for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { > + isa_ext_update_enabled(cpu, prop->offset, true); > + } > + > + /* set vector version */ > + env->vext_ver = VEXT_VERSION_1_00_0; > + > + /* Zfinx is not compatible with F. Disable it */ > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zfinx), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zdinx), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinx), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinxmin), false); > + > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zce), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmp), false); > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmt), false); > + > + if (env->misa_mxl != MXL_RV32) { > + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcf), false); > + } > +} > + > +static void tcg_cpu_instance_init(CPUState *cs) > +{ > + RISCVCPU *cpu = RISCV_CPU(cs); > + Object *obj = OBJECT(cpu); > + RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(obj); > + > + if (rcc->user_extension_properties) { > + multi_ext_user_opts = g_hash_table_new(NULL, g_direct_equal); > + riscv_cpu_add_user_properties(obj); > + } > + > + if (cpu->cfg.max_features) { > + riscv_init_max_cpu_extensions(obj); > + } > +} > + > static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) > { > /* > @@ -583,6 +720,7 @@ static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data) > AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); > > acc->cpu_class_init = tcg_cpu_class_init; > + acc->cpu_instance_init = tcg_cpu_instance_init; > acc->cpu_realizefn = tcg_cpu_realizefn; > } > > -- > 2.41.0 > > Otherwise, Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index f9aea6a80a..89b09a7e89 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -162,9 +162,6 @@ static const struct isa_ext_data isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(xventanacondops, PRIV_VERSION_1_12_0, ext_XVentanaCondOps), }; -/* Hash that stores user set extensions */ -static GHashTable *multi_ext_user_opts; - bool isa_ext_is_enabled(RISCVCPU *cpu, uint32_t ext_offset) { bool *ext_enabled = (void *)&cpu->cfg + ext_offset; @@ -195,12 +192,6 @@ int cpu_cfg_ext_get_min_version(uint32_t ext_offset) return PRIV_VERSION_1_10_0; } -bool cpu_cfg_ext_is_user_set(uint32_t ext_offset) -{ - return g_hash_table_contains(multi_ext_user_opts, - GUINT_TO_POINTER(ext_offset)); -} - const char * const riscv_int_regnames[] = { "x0/zero", "x1/ra", "x2/sp", "x3/gp", "x4/tp", "x5/t0", "x6/t1", "x7/t2", "x8/s0", "x9/s1", "x10/a0", "x11/a1", "x12/a2", "x13/a3", @@ -281,9 +272,6 @@ static const char * const riscv_intr_names[] = { "reserved" }; -static void riscv_cpu_add_user_properties(Object *obj); -static void riscv_init_max_cpu_extensions(Object *obj); - const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) { if (async) { @@ -295,7 +283,7 @@ const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) } } -static void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext) +void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext) { env->misa_mxl_max = env->misa_mxl = mxl; env->misa_ext_mask = env->misa_ext = ext; @@ -1198,18 +1186,7 @@ static void riscv_cpu_set_irq(void *opaque, int irq, int level) static void riscv_cpu_post_init(Object *obj) { - RISCVCPU *cpu = RISCV_CPU(obj); - RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(cpu); - accel_cpu_instance_init(CPU(obj)); - - if (rcc->user_extension_properties) { - riscv_cpu_add_user_properties(obj); - } - - if (cpu->cfg.max_features) { - riscv_init_max_cpu_extensions(obj); - } } static void riscv_cpu_init(Object *obj) @@ -1222,8 +1199,6 @@ static void riscv_cpu_init(Object *obj) qdev_init_gpio_in(DEVICE(cpu), riscv_cpu_set_irq, IRQ_LOCAL_MAX + IRQ_LOCAL_GUEST_MAX); #endif /* CONFIG_USER_ONLY */ - - multi_ext_user_opts = g_hash_table_new(NULL, g_direct_equal); } typedef struct RISCVCPUMisaExtConfig { @@ -1503,120 +1478,6 @@ Property riscv_cpu_options[] = { DEFINE_PROP_END_OF_LIST(), }; -static void cpu_set_multi_ext_cfg(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; - bool value; - - if (!visit_type_bool(v, name, &value, errp)) { - return; - } - - isa_ext_update_enabled(RISCV_CPU(obj), multi_ext_cfg->offset, value); - - g_hash_table_insert(multi_ext_user_opts, - GUINT_TO_POINTER(multi_ext_cfg->offset), - (gpointer)value); -} - -static void cpu_get_multi_ext_cfg(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) -{ - const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; - bool value = isa_ext_is_enabled(RISCV_CPU(obj), multi_ext_cfg->offset); - - visit_type_bool(v, name, &value, errp); -} - -static void cpu_add_multi_ext_prop(Object *cpu_obj, - const RISCVCPUMultiExtConfig *multi_cfg) -{ - object_property_add(cpu_obj, multi_cfg->name, "bool", - cpu_get_multi_ext_cfg, - cpu_set_multi_ext_cfg, - NULL, (void *)multi_cfg); - - /* - * Set def val directly instead of using - * object_property_set_bool() to save the set() - * callback hash for user inputs. - */ - isa_ext_update_enabled(RISCV_CPU(cpu_obj), multi_cfg->offset, - multi_cfg->enabled); -} - -static void riscv_cpu_add_multiext_prop_array(Object *obj, - const RISCVCPUMultiExtConfig *array) -{ - const RISCVCPUMultiExtConfig *prop; - - for (prop = array; prop && prop->name; prop++) { - cpu_add_multi_ext_prop(obj, prop); - } -} - -/* - * Add CPU properties with user-facing flags. - * - * This will overwrite existing env->misa_ext values with the - * defaults set via riscv_cpu_add_misa_properties(). - */ -static void riscv_cpu_add_user_properties(Object *obj) -{ -#ifndef CONFIG_USER_ONLY - if (kvm_enabled()) { - return; - } - riscv_add_satp_mode_properties(obj); -#endif - - riscv_cpu_add_misa_properties(obj); - - riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_extensions); - riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_vendor_exts); - riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_experimental_exts); - - for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { - qdev_property_add_static(DEVICE(obj), prop); - } -} - -/* - * The 'max' type CPU will have all possible ratified - * non-vendor extensions enabled. - */ -static void riscv_init_max_cpu_extensions(Object *obj) -{ - RISCVCPU *cpu = RISCV_CPU(obj); - CPURISCVState *env = &cpu->env; - const RISCVCPUMultiExtConfig *prop; - - /* Enable RVG, RVJ and RVV that are disabled by default */ - set_misa(env, env->misa_mxl, env->misa_ext | RVG | RVJ | RVV); - - for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { - isa_ext_update_enabled(cpu, prop->offset, true); - } - - /* set vector version */ - env->vext_ver = VEXT_VERSION_1_00_0; - - /* Zfinx is not compatible with F. Disable it */ - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zfinx), false); - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zdinx), false); - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinx), false); - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinxmin), false); - - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zce), false); - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmp), false); - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmt), false); - - if (env->misa_mxl != MXL_RV32) { - isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcf), false); - } -} - static Property riscv_cpu_properties[] = { DEFINE_PROP_BOOL("debug", RISCVCPU, cfg.debug, true), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 9ec3b98bd2..74fbb33e09 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -710,9 +710,9 @@ enum riscv_pmu_event_idx { /* used by tcg/tcg-cpu.c*/ void isa_ext_update_enabled(RISCVCPU *cpu, uint32_t ext_offset, bool en); -bool cpu_cfg_ext_is_user_set(uint32_t ext_offset); bool isa_ext_is_enabled(RISCVCPU *cpu, uint32_t ext_offset); int cpu_cfg_ext_get_min_version(uint32_t ext_offset); +void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext); void riscv_cpu_disable_priv_spec_isa_exts(RISCVCPU *cpu); typedef struct RISCVCPUMultiExtConfig { diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 2024c98793..68ce3cbcb9 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -23,12 +23,22 @@ #include "pmu.h" #include "time_helper.h" #include "qapi/error.h" +#include "qapi/visitor.h" #include "qemu/accel.h" #include "qemu/error-report.h" #include "hw/core/accel-cpu.h" #include "hw/core/tcg-cpu-ops.h" #include "tcg/tcg.h" +/* Hash that stores user set extensions */ +static GHashTable *multi_ext_user_opts; + +static bool cpu_cfg_ext_is_user_set(uint32_t ext_offset) +{ + return g_hash_table_contains(multi_ext_user_opts, + GUINT_TO_POINTER(ext_offset)); +} + static void riscv_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb) { @@ -564,6 +574,133 @@ static bool tcg_cpu_realizefn(CPUState *cs, Error **errp) return true; } +static void cpu_set_multi_ext_cfg(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; + bool value; + + if (!visit_type_bool(v, name, &value, errp)) { + return; + } + + isa_ext_update_enabled(RISCV_CPU(obj), multi_ext_cfg->offset, value); + + g_hash_table_insert(multi_ext_user_opts, + GUINT_TO_POINTER(multi_ext_cfg->offset), + (gpointer)value); +} + +static void cpu_get_multi_ext_cfg(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + const RISCVCPUMultiExtConfig *multi_ext_cfg = opaque; + bool value = isa_ext_is_enabled(RISCV_CPU(obj), multi_ext_cfg->offset); + + visit_type_bool(v, name, &value, errp); +} + +static void cpu_add_multi_ext_prop(Object *cpu_obj, + const RISCVCPUMultiExtConfig *multi_cfg) +{ + object_property_add(cpu_obj, multi_cfg->name, "bool", + cpu_get_multi_ext_cfg, + cpu_set_multi_ext_cfg, + NULL, (void *)multi_cfg); + + /* + * Set def val directly instead of using + * object_property_set_bool() to save the set() + * callback hash for user inputs. + */ + isa_ext_update_enabled(RISCV_CPU(cpu_obj), multi_cfg->offset, + multi_cfg->enabled); +} + +static void riscv_cpu_add_multiext_prop_array(Object *obj, + const RISCVCPUMultiExtConfig *array) +{ + const RISCVCPUMultiExtConfig *prop; + + for (prop = array; prop && prop->name; prop++) { + cpu_add_multi_ext_prop(obj, prop); + } +} + +/* + * Add CPU properties with user-facing flags. + * + * This will overwrite existing env->misa_ext values with the + * defaults set via riscv_cpu_add_misa_properties(). + */ +static void riscv_cpu_add_user_properties(Object *obj) +{ +#ifndef CONFIG_USER_ONLY + riscv_add_satp_mode_properties(obj); +#endif + + riscv_cpu_add_misa_properties(obj); + + riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_extensions); + riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_vendor_exts); + riscv_cpu_add_multiext_prop_array(obj, riscv_cpu_experimental_exts); + + for (Property *prop = riscv_cpu_options; prop && prop->name; prop++) { + qdev_property_add_static(DEVICE(obj), prop); + } +} + +/* + * The 'max' type CPU will have all possible ratified + * non-vendor extensions enabled. + */ +static void riscv_init_max_cpu_extensions(Object *obj) +{ + RISCVCPU *cpu = RISCV_CPU(obj); + CPURISCVState *env = &cpu->env; + const RISCVCPUMultiExtConfig *prop; + + /* Enable RVG, RVJ and RVV that are disabled by default */ + set_misa(env, env->misa_mxl, env->misa_ext | RVG | RVJ | RVV); + + for (prop = riscv_cpu_extensions; prop && prop->name; prop++) { + isa_ext_update_enabled(cpu, prop->offset, true); + } + + /* set vector version */ + env->vext_ver = VEXT_VERSION_1_00_0; + + /* Zfinx is not compatible with F. Disable it */ + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zfinx), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zdinx), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinx), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zhinxmin), false); + + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zce), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmp), false); + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcmt), false); + + if (env->misa_mxl != MXL_RV32) { + isa_ext_update_enabled(cpu, CPU_CFG_OFFSET(ext_zcf), false); + } +} + +static void tcg_cpu_instance_init(CPUState *cs) +{ + RISCVCPU *cpu = RISCV_CPU(cs); + Object *obj = OBJECT(cpu); + RISCVCPUClass *rcc = RISCV_CPU_GET_CLASS(obj); + + if (rcc->user_extension_properties) { + multi_ext_user_opts = g_hash_table_new(NULL, g_direct_equal); + riscv_cpu_add_user_properties(obj); + } + + if (cpu->cfg.max_features) { + riscv_init_max_cpu_extensions(obj); + } +} + static void tcg_cpu_init_ops(AccelCPUClass *accel_cpu, CPUClass *cc) { /* @@ -583,6 +720,7 @@ static void tcg_cpu_accel_class_init(ObjectClass *oc, void *data) AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); acc->cpu_class_init = tcg_cpu_class_init; + acc->cpu_instance_init = tcg_cpu_instance_init; acc->cpu_realizefn = tcg_cpu_realizefn; }
tcg_cpu_instance_init() will be the 'cpu_instance_init' impl for the TCG accelerator. It'll be called from within riscv_cpu_post_init(), via accel_cpu_instance_init(), similar to what happens with KVM. In fact, to preserve behavior, the implementation will be similar to what riscv_cpu_post_init() already does. In this patch we'll move riscv_cpu_add_user_properties() and riscv_init_max_cpu_extensions() and all their dependencies to tcg-cpu.c. All multi-extension properties code was moved. The 'multi_ext_user_opts' hash table was also moved to tcg-cpu.c since it's a TCG only structure, meaning that we won't have to worry about initializing a TCG hash table when running a KVM CPU anymore. riscv_cpu_add_user_properties() will remain in cpu.c for now due to how much code it requires to be moved at the same time. We'll do that in the next patch. Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> --- target/riscv/cpu.c | 141 +------------------------------------ target/riscv/cpu.h | 2 +- target/riscv/tcg/tcg-cpu.c | 138 ++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+), 141 deletions(-)