[PATCH v2 0/4] Allow user enable/disable LSX/LASX

[PATCH v2 0/4] Allow user enable/disable LSX/LASX

[Song Gao]

Hi,

This series adds the cpu model 'max' support. and allow users
enable/disable LSX/LASX features.

V2:
- Use qapi type OnOffAuto;
- Add patch2, add cpu feature flags;
- patch4: show more query results.

Song Gao (4):
  target/loongarch: Add cpu model 'max'
  target/loongarch: Add cpu feature flags
  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                | 89 +++++++++++++++++++++++++++
 target/loongarch/cpu.h                | 40 ++++++++++++
 target/loongarch/loongarch-qmp-cmds.c | 64 +++++++++++++++++++
 4 files changed, 197 insertions(+), 2 deletions(-)

-- 
2.25.1

[PATCH v2 1/4] target/loongarch: Add cpu model 'max'

[Song Gao]

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

[PATCH v2 2/4] target/loongarch: Add cpu feature flags

[Song Gao]

CPULoongArchState adds cpu feature flags features.
Intrduce loongarch_feature() to check feature and
set_feature() to set feature.

Signed-off-by: Song Gao <gaosong@loongson.cn>
---
 target/loongarch/cpu.c |  4 ++++
 target/loongarch/cpu.h | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index ef6922e812..87fcd08110 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -366,6 +366,10 @@ static void loongarch_la464_initfn(Object *obj)
     CPULoongArchState *env = &cpu->env;
     int i;
 
+    env->features = 0;
+    set_feature(env, CPU_FEATURE_LSX);
+    set_feature(env, CPU_FEATURE_LASX);
+
     for (i = 0; i < 21; i++) {
         env->cpucfg[i] = 0x0;
     }
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index 8b54cf109c..b98064945a 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -295,6 +295,8 @@ typedef struct CPUArchState {
     uint64_t lladdr; /* LL virtual address compared against SC */
     uint64_t llval;
 
+    uint64_t features;
+
     /* LoongArch CSRs */
     uint64_t CSR_CRMD;
     uint64_t CSR_PRMD;
@@ -364,6 +366,36 @@ typedef struct CPUArchState {
 #endif
 } CPULoongArchState;
 
+/*
+ * See arch/loongarch/include/asm/cpu.h
+ * and arch/loongarch/include/uapi/asm/hwcap.h
+ */
+enum loongarch_features {
+    CPU_FEATURE_CPUCFG,
+    CPU_FEATURE_LAM,
+    CPU_FEATURE_UAL,
+    CPU_FEATURE_FPU,
+    CPU_FEATURE_LSX,
+    CPU_FEATURE_LASX,
+    CPU_FEATURE_CRC32,
+    CPU_FEATURE_COMPLEX,
+    CPU_FEATURE_CRYPTO,
+    CPU_FEATURE_LVZ,
+    CPU_FEATURE_LBT_X86,
+    CPU_FEATURE_LBT_ARM,
+    CPU_FEATURE_LBT_MIPS,
+};
+
+static inline int loongarch_feature(CPULoongArchState *env, int feature)
+{
+    return (env->features & (1ULL << feature)) != 0;
+}
+
+static inline void set_feature(CPULoongArchState *env, int feature)
+{
+    env->features |= 1ULL << feature;
+}
+
 /**
  * LoongArchCPU:
  * @env: #CPULoongArchState
-- 
2.25.1

[PATCH v2 3/4] target/loongarch: Allow user enable/disable LSX/LASX features

[Song Gao]

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 | 78 ++++++++++++++++++++++++++++++++++++++++++
 target/loongarch/cpu.h |  8 +++++
 2 files changed, 86 insertions(+)

diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index 87fcd08110..48ad4f9d8b 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -447,6 +447,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)
@@ -626,6 +627,83 @@ 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;
+        cpu->has_lsx = ON_OFF_AUTO_AUTO;
+    } else {
+        ret = false;
+        cpu->has_lsx = ON_OFF_AUTO_OFF;
+    }
+    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);
+    }
+
+    cpu->has_lsx = value ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF;
+}
+
+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;
+        cpu->has_lasx = true;
+    } else {
+        ret = false;
+        cpu->has_lasx = false;
+    }
+    return ret;
+}
+
+static void loongarch_set_lasx(Object *obj, bool value, Error **errp)
+{
+    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+
+    if (value) {
+        if (cpu->has_lsx == ON_OFF_AUTO_AUTO || cpu->has_lsx == ON_OFF_AUTO_OFF) {
+            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);
+    }
+
+    cpu->has_lasx = value;
+}
+
+void loongarch_cpu_post_init(Object *obj)
+{
+    LoongArchCPU *cpu = LOONGARCH_CPU(obj);
+    CPULoongArchState *env = &cpu->env;
+
+    if (loongarch_feature(env, CPU_FEATURE_LSX)) {
+        cpu->has_lsx = ON_OFF_AUTO_AUTO;
+        object_property_add_bool(obj, "lsx", loongarch_get_lsx,
+                                 loongarch_set_lsx);
+    }
+    if (loongarch_feature(env, CPU_FEATURE_LASX)) {
+        cpu->has_lasx = ON_OFF_AUTO_AUTO;
+        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 b98064945a..b63ebe16ac 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -13,6 +13,7 @@
 #include "fpu/softfloat-types.h"
 #include "hw/registerfields.h"
 #include "qemu/timer.h"
+#include "qapi/qapi-types-common.h"
 #ifndef CONFIG_USER_ONLY
 #include "exec/memory.h"
 #endif
@@ -413,6 +414,11 @@ struct ArchCPU {
 
     /* 'compatible' string for this CPU for Linux device trees */
     const char *dtb_compatible;
+
+    /* CPU has LSX */
+    OnOffAuto has_lsx;
+    /* CPU has  LASX */
+    OnOffAuto has_lasx;
 };
 
 #define TYPE_LOONGARCH_CPU "loongarch-cpu"
@@ -518,4 +524,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

[PATCH v2 4/4] target/loongarch: Implement query-cpu-model-expansion

[Song Gao]

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

Re: [PATCH v2 2/4] target/loongarch: Add cpu feature flags

[maobibo]

在 2023/10/19 下午8:58, Song Gao 写道:
> CPULoongArchState adds cpu feature flags features.
> Intrduce loongarch_feature() to check feature and
> set_feature() to set feature.
> 
> Signed-off-by: Song Gao <gaosong@loongson.cn>
> ---
>   target/loongarch/cpu.c |  4 ++++
>   target/loongarch/cpu.h | 32 ++++++++++++++++++++++++++++++++
>   2 files changed, 36 insertions(+)
> 
> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
> index ef6922e812..87fcd08110 100644
> --- a/target/loongarch/cpu.c
> +++ b/target/loongarch/cpu.c
> @@ -366,6 +366,10 @@ static void loongarch_la464_initfn(Object *obj)
>       CPULoongArchState *env = &cpu->env;
>       int i;
>   
> +    env->features = 0;
> +    set_feature(env, CPU_FEATURE_LSX);
> +    set_feature(env, CPU_FEATURE_LASX);
> +
>       for (i = 0; i < 21; i++) {
>           env->cpucfg[i] = 0x0;
>       }
> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
> index 8b54cf109c..b98064945a 100644
> --- a/target/loongarch/cpu.h
> +++ b/target/loongarch/cpu.h
> @@ -295,6 +295,8 @@ typedef struct CPUArchState {
>       uint64_t lladdr; /* LL virtual address compared against SC */
>       uint64_t llval;
>   
> +    uint64_t features;
Like what Richard says, it is not necessary to use features here,
cpucfg2 can be used directly.

> +
>       /* LoongArch CSRs */
>       uint64_t CSR_CRMD;
>       uint64_t CSR_PRMD;
> @@ -364,6 +366,36 @@ typedef struct CPUArchState {
>   #endif
>   } CPULoongArchState;
>   
> +/*
> + * See arch/loongarch/include/asm/cpu.h
> + * and arch/loongarch/include/uapi/asm/hwcap.h
> + */
> +enum loongarch_features {
> +    CPU_FEATURE_CPUCFG,
> +    CPU_FEATURE_LAM,
> +    CPU_FEATURE_UAL,
> +    CPU_FEATURE_FPU,
> +    CPU_FEATURE_LSX,
> +    CPU_FEATURE_LASX,
> +    CPU_FEATURE_CRC32,
> +    CPU_FEATURE_COMPLEX,
> +    CPU_FEATURE_CRYPTO,
> +    CPU_FEATURE_LVZ,
> +    CPU_FEATURE_LBT_X86,
> +    CPU_FEATURE_LBT_ARM,
> +    CPU_FEATURE_LBT_MIPS,
> +};
Suggest to only list features which can be set on/off from QEMU command 
line.

Regards
Bibo, Mao
> +
> +static inline int loongarch_feature(CPULoongArchState *env, int feature)
> +{
> +    return (env->features & (1ULL << feature)) != 0;
> +}
> +
> +static inline void set_feature(CPULoongArchState *env, int feature)
> +{
> +    env->features |= 1ULL << feature;
> +}
> +
>   /**
>    * LoongArchCPU:
>    * @env: #CPULoongArchState
> 

Re: [PATCH v2 2/4] target/loongarch: Add cpu feature flags

[gaosong]

在 2023/10/20 下午4:05, maobibo 写道:
>
>
> 在 2023/10/19 下午8:58, Song Gao 写道:
>> CPULoongArchState adds cpu feature flags features.
>> Intrduce loongarch_feature() to check feature and
>> set_feature() to set feature.
>>
>> Signed-off-by: Song Gao <gaosong@loongson.cn>
>> ---
>>   target/loongarch/cpu.c |  4 ++++
>>   target/loongarch/cpu.h | 32 ++++++++++++++++++++++++++++++++
>>   2 files changed, 36 insertions(+)
>>
>> diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
>> index ef6922e812..87fcd08110 100644
>> --- a/target/loongarch/cpu.c
>> +++ b/target/loongarch/cpu.c
>> @@ -366,6 +366,10 @@ static void loongarch_la464_initfn(Object *obj)
>>       CPULoongArchState *env = &cpu->env;
>>       int i;
>>   +    env->features = 0;
>> +    set_feature(env, CPU_FEATURE_LSX);
>> +    set_feature(env, CPU_FEATURE_LASX);
>> +
>>       for (i = 0; i < 21; i++) {
>>           env->cpucfg[i] = 0x0;
>>       }
>> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
>> index 8b54cf109c..b98064945a 100644
>> --- a/target/loongarch/cpu.h
>> +++ b/target/loongarch/cpu.h
>> @@ -295,6 +295,8 @@ typedef struct CPUArchState {
>>       uint64_t lladdr; /* LL virtual address compared against SC */
>>       uint64_t llval;
>>   +    uint64_t features;
> Like what Richard says, it is not necessary to use features here,
> cpucfg2 can be used directly.
>
Agreed,  I dropped this patch on v3.

Thanks.
Song Gao