* [PATCH v3 1/3] target/loongarch: Add cpu model 'max'
2023-10-20 8:49 [PATCH v3 0/3] Allow user enable/disable LSX/LASX Song Gao
@ 2023-10-20 8:49 ` Song Gao
2023-10-20 8:49 ` [PATCH v3 2/3] target/loongarch: Allow user enable/disable LSX/LASX features Song Gao
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Song Gao @ 2023-10-20 8:49 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, philmd, peter.maydell, eblake, armbru, maobibo
We use cpu la464 for the 'max' cpu.
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
target/loongarch/cpu.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index ef1bf89dac..ef6922e812 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -474,6 +474,12 @@ static void loongarch_la132_initfn(Object *obj)
env->cpucfg[1] = data;
}
+static void loongarch_max_initfn(Object *obj)
+{
+ /* '-cpu max' for TCG: we use cpu la464. */
+ loongarch_la464_initfn(obj);
+}
+
static void loongarch_cpu_list_entry(gpointer data, gpointer user_data)
{
const char *typename = object_class_get_name(OBJECT_CLASS(data));
@@ -829,6 +835,7 @@ static const TypeInfo loongarch_cpu_type_infos[] = {
},
DEFINE_LOONGARCH_CPU_TYPE(64, "la464", loongarch_la464_initfn),
DEFINE_LOONGARCH_CPU_TYPE(32, "la132", loongarch_la132_initfn),
+ DEFINE_LOONGARCH_CPU_TYPE(64, "max", loongarch_max_initfn),
};
DEFINE_TYPES(loongarch_cpu_type_infos)
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 2/3] target/loongarch: Allow user enable/disable LSX/LASX features
2023-10-20 8:49 [PATCH v3 0/3] Allow user enable/disable LSX/LASX Song Gao
2023-10-20 8:49 ` [PATCH v3 1/3] target/loongarch: Add cpu model 'max' Song Gao
@ 2023-10-20 8:49 ` Song Gao
2023-10-20 8:49 ` [PATCH v3 3/3] target/loongarch: Implement query-cpu-model-expansion Song Gao
2023-10-20 19:06 ` [PATCH v3 0/3] Allow user enable/disable LSX/LASX Richard Henderson
3 siblings, 0 replies; 5+ messages in thread
From: Song Gao @ 2023-10-20 8:49 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, philmd, peter.maydell, eblake, armbru, maobibo
Some users may not need LSX/LASX, this patch allows the user
enable/disable LSX/LASX features.
e.g
'-cpu max,lsx=on,lasx=on' (default);
'-cpu max,lsx=on,lasx=off' (enabled LSX);
'-cpu max,lsx=off,lasx=on' (enabled LASX, LSX);
'-cpu max,lsx=off' (disable LSX and LASX).
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
target/loongarch/cpu.c | 67 ++++++++++++++++++++++++++++++++++++++++++
target/loongarch/cpu.h | 2 ++
2 files changed, 69 insertions(+)
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index ef6922e812..a60d07acd5 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -443,6 +443,7 @@ static void loongarch_la464_initfn(Object *obj)
env->cpucfg[20] = data;
env->CSR_ASID = FIELD_DP64(0, CSR_ASID, ASIDBITS, 0xa);
+ loongarch_cpu_post_init(obj);
}
static void loongarch_la132_initfn(Object *obj)
@@ -622,6 +623,72 @@ static const MemoryRegionOps loongarch_qemu_ops = {
};
#endif
+static bool loongarch_get_lsx(Object *obj, Error **errp)
+{
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+ bool ret;
+
+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
+ ret = true;
+ } else {
+ ret = false;
+ }
+ return ret;
+}
+
+static void loongarch_set_lsx(Object *obj, bool value, Error **errp)
+{
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+
+ if (value) {
+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);
+ } else {
+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 0);
+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);
+ }
+}
+
+static bool loongarch_get_lasx(Object *obj, Error **errp)
+{
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+ bool ret;
+
+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) {
+ ret = true;
+ } else {
+ ret = false;
+ }
+ return ret;
+}
+
+static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
+{
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+
+ if (value) {
+ if (!FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LSX, 1);
+ }
+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 1);
+ } else {
+ cpu->env.cpucfg[2] = FIELD_DP32(cpu->env.cpucfg[2], CPUCFG2, LASX, 0);
+ }
+}
+
+void loongarch_cpu_post_init(Object *obj)
+{
+ LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+
+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LSX)) {
+ object_property_add_bool(obj, "lsx", loongarch_get_lsx,
+ loongarch_set_lsx);
+ }
+ if (FIELD_EX32(cpu->env.cpucfg[2], CPUCFG2, LASX)) {
+ object_property_add_bool(obj, "lasx", loongarch_get_lasx,
+ loongarch_set_lasx);
+ }
+}
+
static void loongarch_cpu_init(Object *obj)
{
#ifndef CONFIG_USER_ONLY
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index 8b54cf109c..9d0f79f814 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -486,4 +486,6 @@ void loongarch_cpu_list(void);
#define LOONGARCH_CPU_TYPE_NAME(model) model LOONGARCH_CPU_TYPE_SUFFIX
#define CPU_RESOLVING_TYPE TYPE_LOONGARCH_CPU
+void loongarch_cpu_post_init(Object *obj);
+
#endif /* LOONGARCH_CPU_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v3 3/3] target/loongarch: Implement query-cpu-model-expansion
2023-10-20 8:49 [PATCH v3 0/3] Allow user enable/disable LSX/LASX Song Gao
2023-10-20 8:49 ` [PATCH v3 1/3] target/loongarch: Add cpu model 'max' Song Gao
2023-10-20 8:49 ` [PATCH v3 2/3] target/loongarch: Allow user enable/disable LSX/LASX features Song Gao
@ 2023-10-20 8:49 ` Song Gao
2023-10-20 19:06 ` [PATCH v3 0/3] Allow user enable/disable LSX/LASX Richard Henderson
3 siblings, 0 replies; 5+ messages in thread
From: Song Gao @ 2023-10-20 8:49 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, philmd, peter.maydell, eblake, armbru, maobibo
Add support for the query-cpu-model-expansion QMP command to LoongArch.
We support query the cpu features.
e.g
la464 and max cpu support LSX/LASX, default enable,
la132 not support LSX/LASX.
1. start with '-cpu max,lasx=off'
(QEMU) query-cpu-model-expansion type=static model={"name":"max"}
{"return": {"model": {"name": "max", "props": {"lasx": false, "lsx": true}}}}
2. start with '-cpu la464,lasx=off'
(QEMU) query-cpu-model-expansion type=static model={"name":"la464"}
{"return": {"model": {"name": "max", "props": {"lasx": false, "lsx": true}}}
3. start with '-cpu la132,lasx=off'
qemu-system-loongarch64: can't apply global la132-loongarch-cpu.lasx=off: Property 'la132-loongarch-cpu.lasx' not found
4. start with '-cpu max,lasx=off' or start with '-cpu la464,lasx=off' query cpu model la132
(QEMU) query-cpu-model-expansion type=static model={"name":"la132"}
{"return": {"model": {"name": "la132"}}}
Acked-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Song Gao <gaosong@loongson.cn>
---
qapi/machine-target.json | 6 ++-
target/loongarch/loongarch-qmp-cmds.c | 64 +++++++++++++++++++++++++++
2 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/qapi/machine-target.json b/qapi/machine-target.json
index f0a6b72414..752b18cced 100644
--- a/qapi/machine-target.json
+++ b/qapi/machine-target.json
@@ -228,7 +228,8 @@
'data': { 'model': 'CpuModelInfo' },
'if': { 'any': [ 'TARGET_S390X',
'TARGET_I386',
- 'TARGET_ARM' ] } }
+ 'TARGET_ARM',
+ 'TARGET_LOONGARCH64' ] } }
##
# @query-cpu-model-expansion:
@@ -273,7 +274,8 @@
'returns': 'CpuModelExpansionInfo',
'if': { 'any': [ 'TARGET_S390X',
'TARGET_I386',
- 'TARGET_ARM' ] } }
+ 'TARGET_ARM',
+ 'TARGET_LOONGARCH64' ] } }
##
# @CpuDefinitionInfo:
diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c
index 6c25957881..645672ff59 100644
--- a/target/loongarch/loongarch-qmp-cmds.c
+++ b/target/loongarch/loongarch-qmp-cmds.c
@@ -7,8 +7,13 @@
*/
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "qapi/qapi-commands-machine-target.h"
#include "cpu.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qobject-input-visitor.h"
+#include "qom/qom-qobject.h"
static void loongarch_cpu_add_definition(gpointer data, gpointer user_data)
{
@@ -35,3 +40,62 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
return cpu_list;
}
+
+static const char *cpu_model_advertised_features[] = {
+ "lsx", "lasx", NULL
+};
+
+CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+ CpuModelInfo *model,
+ Error **errp)
+{
+ CpuModelExpansionInfo *expansion_info;
+ QDict *qdict_out;
+ ObjectClass *oc;
+ Object *obj;
+ const char *name;
+ int i;
+
+ if (type != CPU_MODEL_EXPANSION_TYPE_STATIC) {
+ error_setg(errp, "The requested expansion type is not supported");
+ return NULL;
+ }
+
+ oc = cpu_class_by_name(TYPE_LOONGARCH_CPU, model->name);
+ if (!oc) {
+ error_setg(errp, "The CPU type '%s' is not a recognized LoongArch CPU type",
+ model->name);
+ return NULL;
+ }
+
+ obj = object_new(object_class_get_name(oc));
+
+ expansion_info = g_new0(CpuModelExpansionInfo, 1);
+ expansion_info->model = g_malloc0(sizeof(*expansion_info->model));
+ expansion_info->model->name = g_strdup(model->name);
+
+ qdict_out = qdict_new();
+
+ i = 0;
+ while ((name = cpu_model_advertised_features[i++]) != NULL) {
+ ObjectProperty *prop = object_property_find(obj, name);
+ if (prop) {
+ QObject *value;
+
+ assert(prop->get);
+ value = object_property_get_qobject(obj, name, &error_abort);
+
+ qdict_put_obj(qdict_out, name, value);
+ }
+ }
+
+ if (!qdict_size(qdict_out)) {
+ qobject_unref(qdict_out);
+ } else {
+ expansion_info->model->props = QOBJECT(qdict_out);
+ }
+
+ object_unref(obj);
+
+ return expansion_info;
+}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3 0/3] Allow user enable/disable LSX/LASX
2023-10-20 8:49 [PATCH v3 0/3] Allow user enable/disable LSX/LASX Song Gao
` (2 preceding siblings ...)
2023-10-20 8:49 ` [PATCH v3 3/3] target/loongarch: Implement query-cpu-model-expansion Song Gao
@ 2023-10-20 19:06 ` Richard Henderson
3 siblings, 0 replies; 5+ messages in thread
From: Richard Henderson @ 2023-10-20 19:06 UTC (permalink / raw)
To: Song Gao, qemu-devel; +Cc: philmd, peter.maydell, eblake, armbru, maobibo
On 10/20/23 01:49, Song Gao wrote:
> Hi,
>
> This series adds the cpu model 'max' support. and allow users
> enable/disable LSX/LASX features.
>
> V3:
> - Remove patch 2, add cpu feature flags;
> - Remove unused code has_lsx, has_lasx.
>
> V2:
> - Use qapi type OnOffAuto;
> - Add patch2, add cpu feature flags;
> - patch4: show more query results.
>
>
> Song Gao (3):
> target/loongarch: Add cpu model 'max'
> target/loongarch: Allow user enable/disable LSX/LASX features
> target/loongarch: Implement query-cpu-model-expansion
>
> qapi/machine-target.json | 6 ++-
> target/loongarch/cpu.c | 74 +++++++++++++++++++++++++++
> target/loongarch/cpu.h | 2 +
> target/loongarch/loongarch-qmp-cmds.c | 64 +++++++++++++++++++++++
> 4 files changed, 144 insertions(+), 2 deletions(-)
>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 5+ messages in thread