Introduce extension implied rules
v2 cover Introduce extension implied rules
From: Frank Chang <[email protected]>
Currently, the implied extensions are enabled and checked in riscv_cpu_validate_set_extensions(). However, the order of enabling the implied extensions must follow a strict sequence, which is error-prone.
This patchset introduce extension implied rule helpers to enable the implied extensions. This also eliminates the old-fashioned ordering requirement. For example, Zvksg implies Zvks, Zvks implies Zvksed, etc., removing the need to check the implied rules of Zvksg before Zvks.
The idea [1] and the implied rules [2] are referenced from LLVM.
[1] https://github.com/llvm/llvm-project/blob/main/llvm/lib/TargetParser/RISCVISAInfo.cpp#L875
[2] https://github.com/llvm/llvm-project/blob/main/llvm/lib/Target/RISCV/RISCVFeatures.td
Changelog:
v2:
- Remove enabled bitmask from user-mode QEMU as there's no good way (e.g. mhartid) to distinguish the SMP cores in user-mode QEMU.
- Use qatomic API to access the enabled bitmask to prevent the potential enabled bit from being cleared by another hart.
Frank Chang (6):
target/riscv: Introduce extension implied rules definition target/riscv: Introduce extension implied rule helpers target/riscv: Add MISA implied rules target/riscv: Add standard extension implied rules target/riscv: Add Zc extension implied rule target/riscv: Remove extension auto-update check statements
target/riscv/cpu.c | 396 +++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 25 +++ target/riscv/tcg/tcg-cpu.c | 244 ++++++++++++----------- 3 files changed, 546 insertions(+), 119 deletions(-)
--
2.43.2
PATCH v2 1/6 target/riscv: Introduce extension implied rules definition
From: Frank Chang <[email protected]>
RISCVCPUImpliedExtsRule is created to store the implied rules. 'is_misa' flag is used to distinguish whether the rule is derived from the MISA or other extensions.
'ext' stores the MISA bit if 'is_misa' is true. Otherwise, it stores the offset of the extension defined in RISCVCPUConfig. 'ext' will also serve as the key of the hash tables to look up the rule in the following commit.
--- target/riscv/cpu.c | 8 ++++++++ target/riscv/cpu.h | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+)
target/riscv/cpu.c +8 -0
@@ -2250,6 +2250,14 @@ RISCVCPUProfile *riscv_profiles[] = { NULL, }; +RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[] = { +NULL +}; + +RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[] = { +NULL +}; +static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("debug" ,RISCVCPU , cfg.debug, true),
target/riscv/cpu.h +25 -0
@@ -124,6 +124,31 @@ typedef enum {EXT_STATUS_DIRTY , } RISCVExtStatus; +typedef struct riscv_cpu_implied_exts_rule RISCVCPUImpliedExtsRule ; + +struct riscv_cpu_implied_exts_rule { +#ifndef CONFIG_USER_ONLY +/* +* Bitmask indicates the rule enabled status for the harts. +* This enhancement is only available in system-mode QEMU, +* as we don't have a good way (e.g. mhartid) to distinguish +* the SMP cores in user-mode QEMU. +*/ +uint64_t enabled; +#endif +/* True if this is a MISA implied rule. */ +bool is_misa; +/* ext is MISA bit if is_misa flag is true, else extension offset. */ +const uint32_t ext; +const uint32_t implied_misas; +const uint32_t implied_exts[]; +}; + +extern RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[]; +extern RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[]; + +#define RISCV_IMPLIED_EXTS_RULE_END -1 +#define MMU_USER_IDX 3#define MAX_RISCV_PMPS (16)
Signature · 1 line
2.43.2
Re: [PATCH v2 1/6] target/riscv: Introduce extension implied rules definition
Quoted 10 lines · On 6/15/24 11:46 PM, [email protected] wrote:
From: Frank Chang <[email protected]>
RISCVCPUImpliedExtsRule is created to store the implied rules. '
is_misa' flag is used to distinguish whether the rule is derived from the MISA or other extensions.
'ext' stores the MISA bit if 'is_misa' is true. Otherwise, it stores the offset of the extension defined in RISCVCPUConfig. 'ext' will also serve as the key of the hash tables to look up the rule in the following commit.
Quoted 4 lines
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>---
Quoted 59 lines
target/riscv/cpu.c | 8 ++++++++ target/riscv/cpu.h | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+)target/riscv/cpu.c +8
-0@@ -2250,6 +2250,14 @@ RISCVCPUProfile *riscv_profiles[] = { NULL, }; +RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[] = { +NULL +}; + +RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[] = { +NULL +}; +static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("debug" ,RISCVCPU , cfg.debug, true),target/riscv/cpu.h +25
-0@@ -124,6 +124,31 @@ typedef enum {EXT_STATUS_DIRTY , } RISCVExtStatus; +typedef struct riscv_cpu_implied_exts_rule RISCVCPUImpliedExtsRule ; + +struct riscv_cpu_implied_exts_rule { +#ifndef CONFIG_USER_ONLY +/* +* Bitmask indicates the rule enabled status for the harts. +* This enhancement is only available in system-mode QEMU, +* as we don't have a good way (e.g. mhartid) to distinguish +* the SMP cores in user-mode QEMU. +*/ +uint64_t enabled; +#endif +/* True if this is a MISA implied rule. */ +bool is_misa; +/* ext is MISA bit if is_misa flag is true, else extension offset. */ +const uint32_t ext; +const uint32_t implied_misas; +const uint32_t implied_exts[]; +}; + +extern RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[]; +extern RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[]; + +#define RISCV_IMPLIED_EXTS_RULE_END -1 +#define MMU_USER_IDX 3#define MAX_RISCV_PMPS (16)
PATCH v2 2/6 target/riscv: Introduce extension implied rule helpers
In reply to [email protected]From: Frank Chang <[email protected]>
Introduce helpers to enable the extensions based on the implied rules. The implied extensions are enabled recursively, so we don't have to expand all of them manually. This also eliminates the old-fashioned ordering requirement. For example, Zvksg implies Zvks, Zvks implies Zvksed, etc., removing the need to check the implied rules of Zvksg before Zvks.
--- target/riscv/tcg/tcg-cpu.c | 91 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)
target/riscv/tcg/tcg-cpu.c +91 -0
@@ -36,6 +36,9 @@static GHashTable *multi_ext_user_opts;static GHashTable *misa_ext_user_opts; +static GHashTable *misa_implied_rules; +static GHashTable *ext_implied_rules; +static bool cpu_cfg_ext_is_user_set (uint32_t ext_offset) { return g_hash_table_contains(multi_ext_user_opts,
@@ -836,11 +839,97 @@ static void riscv_cpu_validate_profiles(RISCVCPU *cpu) } } +static void riscv_cpu_init_implied_exts_rules (void ) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +g_hash_table_insert (misa_implied_rules,GUINT_TO_POINTER (rule->ext), + (gpointer )rule); + } + +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +g_hash_table_insert (ext_implied_rules,GUINT_TO_POINTER (rule->ext), + (gpointer )rule); + } +} + +static void cpu_enable_implied_rule (RISCVCPU *cpu, +RISCVCPUImpliedExtsRule *rule) +{ +CPURISCVState *env = &cpu->env; +RISCVCPUImpliedExtsRule *ir; +bool enabled = false; +int i; + +#ifndef CONFIG_USER_ONLY + enabled =qatomic_read (&rule->enabled) &BIT_ULL (cpu->env.mhartid); +#endif + +if (!enabled) { +/* Enable the implied MISAs. */ +if (rule->implied_misas) { +riscv_cpu_set_misa_ext (env, env->misa_ext | rule->implied_misas); + +for (i =0 ; misa_bits[i] !=0 ; i++) { +if (rule->implied_misas & misa_bits[i]) { + ir =g_hash_table_lookup (misa_implied_rules, +GUINT_TO_POINTER (misa_bits[i])); + +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + } + } + +/* Enable the implied extensions. */ +for (i =0 ; rule->implied_exts[i] !=RISCV_IMPLIED_EXTS_RULE_END ; i++) { +cpu_cfg_ext_auto_update (cpu, rule->implied_exts[i], true); + + ir =g_hash_table_lookup (ext_implied_rules, +GUINT_TO_POINTER (rule->implied_exts[i])); + +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + +#ifndef CONFIG_USER_ONLY +qatomic_or (&rule->enabled,BIT_ULL (cpu->env.mhartid)); +#endif + } +} + +static void riscv_cpu_enable_implied_rules (RISCVCPU *cpu) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +/* Enable the implied MISAs. */ +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +if (riscv_has_ext (&cpu->env, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } + +/* Enable the implied extensions. */ +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +if (isa_ext_is_enabled (cpu, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } +} +void riscv_tcg_cpu_finalize_features (RISCVCPU *cpu,Error **errp) {CPURISCVState *env = &cpu->env;Error *local_err =NULL ; +riscv_cpu_init_implied_exts_rules (); +riscv_cpu_enable_implied_rules (cpu); +riscv_cpu_validate_misa_priv (env, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err);
@@ -1346,6 +1435,8 @@ static void riscv_tcg_cpu_instance_init(CPUState *cs) misa_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); multi_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); + misa_implied_rules =g_hash_table_new (NULL , g_direct_equal); + ext_implied_rules =g_hash_table_new (NULL , g_direct_equal);riscv_cpu_add_user_properties (obj);if (riscv_cpu_has_max_extensions (obj)) {
Signature · 1 line
2.43.2
Re: [PATCH v2 2/6] target/riscv: Introduce extension implied rule helpers
Quoted 9 lines · On 6/15/24 11:46 PM, [email protected] wrote:
From: Frank Chang <[email protected]>
Introduce helpers to enable the extensions based on the implied rules. The implied extensions are enabled recursively, so we don't have to expand all of them manually. This also eliminates the old-fashioned ordering requirement. For example, Zvksg implies Zvks, Zvks implies Zvksed, etc., removing the need to check the implied rules of Zvksg before Zvks.
Quoted 4 lines
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>---
Quoted 124 lines
target/riscv/tcg/tcg-cpu.c | 91 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)target/riscv/tcg/tcg-cpu.c +91
-0@@ -36,6 +36,9 @@static GHashTable *multi_ext_user_opts;static GHashTable *misa_ext_user_opts; +static GHashTable *misa_implied_rules; +static GHashTable *ext_implied_rules; +static bool cpu_cfg_ext_is_user_set (uint32_t ext_offset) { return g_hash_table_contains(multi_ext_user_opts,@@ -836,11 +839,97 @@ static void riscv_cpu_validate_profiles(RISCVCPU *cpu) } } +static void riscv_cpu_init_implied_exts_rules (void ) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +g_hash_table_insert (misa_implied_rules,GUINT_TO_POINTER (rule->ext), + (gpointer )rule); + } + +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +g_hash_table_insert (ext_implied_rules,GUINT_TO_POINTER (rule->ext), + (gpointer )rule); + } +} + +static void cpu_enable_implied_rule (RISCVCPU *cpu, +RISCVCPUImpliedExtsRule *rule) +{ +CPURISCVState *env = &cpu->env; +RISCVCPUImpliedExtsRule *ir; +bool enabled = false; +int i; + +#ifndef CONFIG_USER_ONLY + enabled =qatomic_read (&rule->enabled) &BIT_ULL (cpu->env.mhartid); +#endif + +if (!enabled) { +/* Enable the implied MISAs. */ +if (rule->implied_misas) { +riscv_cpu_set_misa_ext (env, env->misa_ext | rule->implied_misas); + +for (i =0 ; misa_bits[i] !=0 ; i++) { +if (rule->implied_misas & misa_bits[i]) { + ir =g_hash_table_lookup (misa_implied_rules, +GUINT_TO_POINTER (misa_bits[i])); + +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + } + } + +/* Enable the implied extensions. */ +for (i =0 ; rule->implied_exts[i] !=RISCV_IMPLIED_EXTS_RULE_END ; i++) { +cpu_cfg_ext_auto_update (cpu, rule->implied_exts[i], true); + + ir =g_hash_table_lookup (ext_implied_rules, +GUINT_TO_POINTER (rule->implied_exts[i])); + +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + +#ifndef CONFIG_USER_ONLY +qatomic_or (&rule->enabled,BIT_ULL (cpu->env.mhartid)); +#endif + } +} + +static void riscv_cpu_enable_implied_rules (RISCVCPU *cpu) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +/* Enable the implied MISAs. */ +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +if (riscv_has_ext (&cpu->env, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } + +/* Enable the implied extensions. */ +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +if (isa_ext_is_enabled (cpu, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } +} +void riscv_tcg_cpu_finalize_features (RISCVCPU *cpu,Error **errp) {CPURISCVState *env = &cpu->env;Error *local_err =NULL ; +riscv_cpu_init_implied_exts_rules (); +riscv_cpu_enable_implied_rules (cpu); +riscv_cpu_validate_misa_priv (env, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err);@@ -1346,6 +1435,8 @@ static void riscv_tcg_cpu_instance_init(CPUState *cs) misa_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); multi_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); + misa_implied_rules =g_hash_table_new (NULL , g_direct_equal); + ext_implied_rules =g_hash_table_new (NULL , g_direct_equal);riscv_cpu_add_user_properties (obj);if (riscv_cpu_has_max_extensions (obj)) {
Re: [PATCH v2 2/6] target/riscv: Introduce extension implied rule helpers
In reply to [email protected]Quoted 51 lines · On Sun, Jun 16, 2024 at 12:48 PM <[email protected]> wrote:
From: Frank Chang <[email protected]>
Introduce helpers to enable the extensions based on the implied rules. The implied extensions are enabled recursively, so we don't have to expand all of them manually. This also eliminates the old-fashioned ordering requirement. For example, Zvksg implies Zvks, Zvks implies Zvksed, etc., removing the need to check the implied rules of Zvksg before Zvks.
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>--- target/riscv/tcg/tcg-cpu.c | 91 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)target/riscv/tcg/tcg-cpu.c +19
-0@@ -36,6 +36,9 @@static GHashTable *multi_ext_user_opts;static GHashTable *misa_ext_user_opts; +static GHashTable *misa_implied_rules; +static GHashTable *ext_implied_rules; +static bool cpu_cfg_ext_is_user_set (uint32_t ext_offset) { return g_hash_table_contains(multi_ext_user_opts,@@ -836,11 +839,97 @@ static void riscv_cpu_validate_profiles(RISCVCPU *cpu) } } +static void riscv_cpu_init_implied_exts_rules (void ) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +g_hash_table_insert (misa_implied_rules,GUINT_TO_POINTER (rule->ext), + (gpointer )rule); + } + +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +g_hash_table_insert (ext_implied_rules,GUINT_TO_POINTER (rule->ext), + (gpointer )rule); + } +} +
target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu) · line 867
Quoted 10 lines
target/riscv/tcg/tcg-cpu.c +10
-0+static void cpu_enable_implied_rule (RISCVCPU *cpu, +RISCVCPUImpliedExtsRule *rule) +{ +CPURISCVState *env = &cpu->env; +RISCVCPUImpliedExtsRule *ir; +bool enabled = false; +int i; + +#ifndef CONFIG_USER_ONLY + enabled =qatomic_read (&rule->enabled) &BIT_ULL (cpu->env.mhartid);
enabled is a uint64_t, so this limits us to 64 harts right?
The virt machine currently has a limit of 512, so this won't work right?
Alistair
Quoted 81 lines
target/riscv/tcg/tcg-cpu.c +62
-1+#endif + +if (!enabled) { +/* Enable the implied MISAs. */ +if (rule->implied_misas) { +riscv_cpu_set_misa_ext (env, env->misa_ext | rule->implied_misas); + +for (i =0 ; misa_bits[i] !=0 ; i++) { +if (rule->implied_misas & misa_bits[i]) { + ir =g_hash_table_lookup (misa_implied_rules, +GUINT_TO_POINTER (misa_bits[i])); + +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + } + } + +/* Enable the implied extensions. */ +for (i =0 ; rule->implied_exts[i] !=RISCV_IMPLIED_EXTS_RULE_END ; i++) { +cpu_cfg_ext_auto_update (cpu, rule->implied_exts[i], true); + + ir =g_hash_table_lookup (ext_implied_rules, +GUINT_TO_POINTER (rule->implied_exts[i])); + +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + +#ifndef CONFIG_USER_ONLY +qatomic_or (&rule->enabled,BIT_ULL (cpu->env.mhartid)); +#endif + } +} + +static void riscv_cpu_enable_implied_rules (RISCVCPU *cpu) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +/* Enable the implied MISAs. */ +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +if (riscv_has_ext (&cpu->env, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } + +/* Enable the implied extensions. */ +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +if (isa_ext_is_enabled (cpu, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } +} +void riscv_tcg_cpu_finalize_features (RISCVCPU *cpu,Error **errp) {CPURISCVState *env = &cpu->env;Error *local_err =NULL ; +riscv_cpu_init_implied_exts_rules (); +riscv_cpu_enable_implied_rules (cpu); +riscv_cpu_validate_misa_priv (env, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err);@@ -1346,6 +1435,8 @@ static void riscv_tcg_cpu_instance_init(CPUState *cs) misa_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); multi_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); + misa_implied_rules =g_hash_table_new (NULL , g_direct_equal); + ext_implied_rules =g_hash_table_new (NULL , g_direct_equal);riscv_cpu_add_user_properties (obj);if (riscv_cpu_has_max_extensions (obj)) { --2.43.2
Re: [PATCH v2 2/6] target/riscv: Introduce extension implied rule helpers
Quoted 68 lines · Alistair Francis
target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU
Quoted 32 lines · On Sun, Jun 16, 2024 at 12:48 PM <[email protected]> wrote:
From: Frank Chang <[email protected]>
Introduce helpers to enable the extensions based on the implied rules. The implied extensions are enabled recursively, so we don't have to expand all of them manually. This also eliminates the old-fashioned ordering requirement. For example, Zvksg implies Zvks, Zvks implies Zvksed, etc., removing the need to check the implied rules of Zvksg before Zvks.
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>--- target/riscv/tcg/tcg-cpu.c | 91 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+)target/riscv/tcg/tcg-cpu.c +3
-0@@ -36,6 +36,9 @@static GHashTable *multi_ext_user_opts;static GHashTable *misa_ext_user_opts; +static GHashTable *misa_implied_rules; +static GHashTable *ext_implied_rules; +static bool cpu_cfg_ext_is_user_set (uint32_t ext_offset) { return g_hash_table_contains(multi_ext_user_opts,@@ -836,11 +839,97 @@ static void riscv_cpu_validate_profiles(RISCVCPU*cpu)
target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu)
Quoted 10 lines
target/riscv/tcg/tcg-cpu.c +7
-0} } +static void riscv_cpu_init_implied_exts_rules (void ) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { + g_hash_table_insert(misa_implied_rules,
GUINT_TO_POINTER(rule->ext),target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu)
Quoted 5 lines
target/riscv/tcg/tcg-cpu.c +5
-0+ (gpointer)rule); + } + +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { + g_hash_table_insert(ext_implied_rules,
GUINT_TO_POINTER(rule->ext),Quoted 4 lines
target/riscv/tcg/tcg-cpu.c +4
-0+ (gpointer)rule); + } +} +target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu) · line 867
Quoted 10 lines
target/riscv/tcg/tcg-cpu.c +10
-0+static void cpu_enable_implied_rule (RISCVCPU *cpu, +RISCVCPUImpliedExtsRule *rule) +{ +CPURISCVState *env = &cpu->env; +RISCVCPUImpliedExtsRule *ir; +bool enabled = false; +int i; + +#ifndef CONFIG_USER_ONLY + enabled =qatomic_read (&rule->enabled) &BIT_ULL (cpu->env.mhartid);enabled is a
uint64_t, so this limits us to 64 harts right?
Quoted 4 lines
The virt machine currently has a limit of 512, so this won't work right?
Alistair
Yes, that's true.
Though it wouldn't impact the result as this is just the optimization of not iterating the rules that have been applied already.
Maybe I can replace it with the dynamic hart bitmask.
Regards,
Frank Chang
Quoted 88 lines
target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu)
Quoted 7 lines
target/riscv/tcg/tcg-cpu.c +6
-0+#endif + +if (!enabled) { +/* Enable the implied MISAs. */ +if (rule->implied_misas) { + riscv_cpu_set_misa_ext(env, env->misa_ext |
rule->implied_misas);target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu) · line 879
Quoted 5 lines
target/riscv/tcg/tcg-cpu.c +5
-0+ +for (i =0 ; misa_bits[i] !=0 ; i++) { +if (rule->implied_misas & misa_bits[i]) { + ir = g_hash_table_lookup(misa_implied_rules, +
GUINT_TO_POINTER(misa_bits[i]));target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu)
Quoted 10 lines
target/riscv/tcg/tcg-cpu.c +10
-0+ +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + } + } + +/* Enable the implied extensions. */ + for (i = 0; rule->implied_exts[i] !=
RISCV_IMPLIED_EXTS_RULE_END; i++) {target/riscv/tcg/tcg-cpu.c static void riscv_cpu_validate_profiles(RISCVCPU *cpu) · line 893
Quoted 4 lines
target/riscv/tcg/tcg-cpu.c +4
-0+cpu_cfg_ext_auto_update (cpu, rule->implied_exts[i], true); + + ir = g_hash_table_lookup(ext_implied_rules, +
GUINT_TO_POINTER(rule->implied_exts[i]));target/riscv/tcg/tcg-cpu.c static void riscv_tcg_cpu_instance_init(CPUState
Quoted 44 lines
target/riscv/tcg/tcg-cpu.c +35
-0+ +if (ir) { +cpu_enable_implied_rule (cpu, ir); + } + } + +#ifndef CONFIG_USER_ONLY +qatomic_or (&rule->enabled,BIT_ULL (cpu->env.mhartid)); +#endif + } +} + +static void riscv_cpu_enable_implied_rules (RISCVCPU *cpu) +{ +RISCVCPUImpliedExtsRule *rule; +int i; + +/* Enable the implied MISAs. */ +for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) { +if (riscv_has_ext (&cpu->env, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } + +/* Enable the implied extensions. */ +for (i =0 ; (rule = riscv_ext_implied_rules[i]); i++) { +if (isa_ext_is_enabled (cpu, rule->ext)) { +cpu_enable_implied_rule (cpu, rule); + } + } +} +void riscv_tcg_cpu_finalize_features (RISCVCPU *cpu,Error **errp) {CPURISCVState *env = &cpu->env;Error *local_err =NULL ; +riscv_cpu_init_implied_exts_rules (); +riscv_cpu_enable_implied_rules (cpu); +riscv_cpu_validate_misa_priv (env, &local_err);if (local_err !=NULL ) {error_propagate (errp, local_err);@@ -1346,6 +1435,8 @@ static void riscv_tcg_cpu_instance_init(CPUState*cs)
Quoted 12 lines
target/riscv/tcg/tcg-cpu.c +2
-1misa_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); multi_ext_user_opts =g_hash_table_new (NULL , g_direct_equal); + misa_implied_rules =g_hash_table_new (NULL , g_direct_equal); + ext_implied_rules =g_hash_table_new (NULL , g_direct_equal);riscv_cpu_add_user_properties (obj);if (riscv_cpu_has_max_extensions (obj)) { --2.43.2
PATCH v2 3/6 target/riscv: Add MISA implied rules
In reply to [email protected]From: Frank Chang <[email protected]>
Add MISA extension implied rules to enable the implied extensions of MISA recursively.
--- target/riscv/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)
target/riscv/cpu.c +49 -1
@@ -2250,8 +2250,56 @@ RISCVCPUProfile *riscv_profiles[] = { NULL, }; +static RISCVCPUImpliedExtsRule RVA_IMPLIED = { + .is_misa = true, + .ext =RVA , + .implied_exts = { +CPU_CFG_OFFSET (ext_zalrsc),CPU_CFG_OFFSET (ext_zaamo), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule RVD_IMPLIED = { + .is_misa = true, + .ext =RVD , + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule RVF_IMPLIED = { + .is_misa = true, + .ext =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule RVM_IMPLIED = { + .is_misa = true, + .ext =RVM , + .implied_exts = { +CPU_CFG_OFFSET (ext_zmmul), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule RVV_IMPLIED = { + .is_misa = true, + .ext =RVV , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve64d), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; +RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[] = { -NULL + &RVA_IMPLIED , &RVD_IMPLIED , &RVF_IMPLIED , + &RVM_IMPLIED , &RVV_IMPLIED ,NULL };RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[] = {
Signature · 1 line
2.43.2
Re: [PATCH v2 3/6] target/riscv: Add MISA implied rules
Quoted 10 lines · On 6/15/24 11:46 PM, [email protected] wrote:
From: Frank Chang <[email protected]>
Add MISA extension implied rules to enable the implied extensions of MISA recursively.
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>Reviewed-by Alistair Francis <[email protected]>---
Quoted 65 lines
target/riscv/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)target/riscv/cpu.c +49
-1@@ -2250,8 +2250,56 @@ RISCVCPUProfile *riscv_profiles[] = { NULL, }; +static RISCVCPUImpliedExtsRule RVA_IMPLIED = { + .is_misa = true, + .ext =RVA , + .implied_exts = { +CPU_CFG_OFFSET (ext_zalrsc),CPU_CFG_OFFSET (ext_zaamo), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule RVD_IMPLIED = { + .is_misa = true, + .ext =RVD , + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule RVF_IMPLIED = { + .is_misa = true, + .ext =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule RVM_IMPLIED = { + .is_misa = true, + .ext =RVM , + .implied_exts = { +CPU_CFG_OFFSET (ext_zmmul), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule RVV_IMPLIED = { + .is_misa = true, + .ext =RVV , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve64d), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; +RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[] = { -NULL + &RVA_IMPLIED , &RVD_IMPLIED , &RVF_IMPLIED , + &RVM_IMPLIED , &RVV_IMPLIED ,NULL };RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[] = {
PATCH v2 4/6 target/riscv: Add standard extension implied rules
In reply to [email protected]From: Frank Chang <[email protected]>
Add standard extension implied rules to enable the implied extensions of the standard extension recursively.
--- target/riscv/cpu.c | 340 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 340 insertions(+)
target/riscv/cpu.c +340 -0
@@ -2297,12 +2297,352 @@ static RISCVCPUImpliedExtsRule RVV_IMPLIED = { }, }; +static RISCVCPUImpliedExtsRule ZCB_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcb), + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCD_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcd), + .implied_misas =RVD , + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCE_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zce), + .implied_exts = { +CPU_CFG_OFFSET (ext_zcb),CPU_CFG_OFFSET (ext_zcmp), +CPU_CFG_OFFSET (ext_zcmt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCF_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcf), + .implied_misas =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCMP_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcmp), + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCMT_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcmt), + .implied_exts = { +CPU_CFG_OFFSET (ext_zca),CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZDINX_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zdinx), + .implied_exts = { +CPU_CFG_OFFSET (ext_zfinx), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZFA_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfa), + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule ZFBFMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfbfmin), + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule ZFH_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfh), + .implied_exts = { +CPU_CFG_OFFSET (ext_zfhmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZFHMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfhmin), + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule ZFINX_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfinx), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZHINX_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zhinx), + .implied_exts = { +CPU_CFG_OFFSET (ext_zhinxmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZHINXMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zhinxmin), + .implied_exts = { +CPU_CFG_OFFSET (ext_zfinx), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZICNTR_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zicntr), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZIHPM_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zihpm), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZK_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zk), + .implied_exts = { +CPU_CFG_OFFSET (ext_zkn),CPU_CFG_OFFSET (ext_zkr), +CPU_CFG_OFFSET (ext_zkt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZKN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zkn), + .implied_exts = { +CPU_CFG_OFFSET (ext_zbkb),CPU_CFG_OFFSET (ext_zbkc), +CPU_CFG_OFFSET (ext_zbkx),CPU_CFG_OFFSET (ext_zkne), +CPU_CFG_OFFSET (ext_zknd),CPU_CFG_OFFSET (ext_zknh), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZKS_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zks), + .implied_exts = { +CPU_CFG_OFFSET (ext_zbkb),CPU_CFG_OFFSET (ext_zbkc), +CPU_CFG_OFFSET (ext_zbkx),CPU_CFG_OFFSET (ext_zksed), +CPU_CFG_OFFSET (ext_zksh), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVBB_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvbb), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkb), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE32F_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve32f), + .implied_misas =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE32X_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve32x), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE64D_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve64d), + .implied_misas =RVD , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve64f), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE64F_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve64f), + .implied_misas =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32f),CPU_CFG_OFFSET (ext_zve64x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE64X_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve64x), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFBFMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfbfmin), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32f), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFBFWMA_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfbfwma), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvfbfmin),CPU_CFG_OFFSET (ext_zfbfmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFH_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfh), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvfhmin),CPU_CFG_OFFSET (ext_zfhmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFHMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfhmin), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32f), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvkn), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkned),CPU_CFG_OFFSET (ext_zvknhb), +CPU_CFG_OFFSET (ext_zvkb),CPU_CFG_OFFSET (ext_zvkt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKNC_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvknc), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkn),CPU_CFG_OFFSET (ext_zvbc), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKNG_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvkng), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkn),CPU_CFG_OFFSET (ext_zvkg), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKNHB_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvknhb), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve64x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKS_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvks), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvksed),CPU_CFG_OFFSET (ext_zvksh), +CPU_CFG_OFFSET (ext_zvkb),CPU_CFG_OFFSET (ext_zvkt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKSC_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvksc), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvks),CPU_CFG_OFFSET (ext_zvbc), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKSG_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvksg), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvks),CPU_CFG_OFFSET (ext_zvkg), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; +RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[] = { &RVA_IMPLIED , &RVD_IMPLIED , &RVF_IMPLIED , &RVM_IMPLIED , &RVV_IMPLIED ,NULL };RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[] = { + &ZCB_IMPLIED , &ZCD_IMPLIED , &ZCE_IMPLIED , + &ZCF_IMPLIED , &ZCMP_IMPLIED , &ZCMT_IMPLIED , + &ZDINX_IMPLIED , &ZFA_IMPLIED , &ZFBFMIN_IMPLIED , + &ZFH_IMPLIED , &ZFHMIN_IMPLIED , &ZFINX_IMPLIED , + &ZHINX_IMPLIED , &ZHINXMIN_IMPLIED , &ZICNTR_IMPLIED , + &ZIHPM_IMPLIED , &ZK_IMPLIED , &ZKN_IMPLIED , + &ZKS_IMPLIED , &ZVBB_IMPLIED , &ZVE32F_IMPLIED , + &ZVE32X_IMPLIED , &ZVE64D_IMPLIED , &ZVE64F_IMPLIED , + &ZVE64X_IMPLIED , &ZVFBFMIN_IMPLIED , &ZVFBFWMA_IMPLIED , + &ZVFH_IMPLIED , &ZVFHMIN_IMPLIED , &ZVKN_IMPLIED , + &ZVKNC_IMPLIED , &ZVKNG_IMPLIED , &ZVKNHB_IMPLIED , + &ZVKS_IMPLIED , &ZVKSC_IMPLIED , &ZVKSG_IMPLIED ,NULL };
Signature · 1 line
2.43.2
Re: [PATCH v2 4/6] target/riscv: Add standard extension implied rules
Quoted 10 lines · On 6/15/24 11:46 PM, [email protected] wrote:
From: Frank Chang <[email protected]>
Add standard extension implied rules to enable the implied extensions of the standard extension recursively.
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>Acked-by Alistair Francis <[email protected]>---
Quoted 360 lines
target/riscv/cpu.c | 340 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 340 insertions(+)target/riscv/cpu.c +340
-0@@ -2297,12 +2297,352 @@ static RISCVCPUImpliedExtsRule RVV_IMPLIED = { }, }; +static RISCVCPUImpliedExtsRule ZCB_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcb), + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCD_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcd), + .implied_misas =RVD , + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCE_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zce), + .implied_exts = { +CPU_CFG_OFFSET (ext_zcb),CPU_CFG_OFFSET (ext_zcmp), +CPU_CFG_OFFSET (ext_zcmt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCF_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcf), + .implied_misas =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCMP_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcmp), + .implied_exts = { +CPU_CFG_OFFSET (ext_zca), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZCMT_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zcmt), + .implied_exts = { +CPU_CFG_OFFSET (ext_zca),CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZDINX_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zdinx), + .implied_exts = { +CPU_CFG_OFFSET (ext_zfinx), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZFA_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfa), + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule ZFBFMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfbfmin), + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule ZFH_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfh), + .implied_exts = { +CPU_CFG_OFFSET (ext_zfhmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZFHMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfhmin), + .implied_misas =RVF , + .implied_exts = {RISCV_IMPLIED_EXTS_RULE_END }, +}; + +static RISCVCPUImpliedExtsRule ZFINX_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zfinx), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZHINX_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zhinx), + .implied_exts = { +CPU_CFG_OFFSET (ext_zhinxmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZHINXMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zhinxmin), + .implied_exts = { +CPU_CFG_OFFSET (ext_zfinx), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZICNTR_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zicntr), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZIHPM_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zihpm), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZK_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zk), + .implied_exts = { +CPU_CFG_OFFSET (ext_zkn),CPU_CFG_OFFSET (ext_zkr), +CPU_CFG_OFFSET (ext_zkt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZKN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zkn), + .implied_exts = { +CPU_CFG_OFFSET (ext_zbkb),CPU_CFG_OFFSET (ext_zbkc), +CPU_CFG_OFFSET (ext_zbkx),CPU_CFG_OFFSET (ext_zkne), +CPU_CFG_OFFSET (ext_zknd),CPU_CFG_OFFSET (ext_zknh), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZKS_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zks), + .implied_exts = { +CPU_CFG_OFFSET (ext_zbkb),CPU_CFG_OFFSET (ext_zbkc), +CPU_CFG_OFFSET (ext_zbkx),CPU_CFG_OFFSET (ext_zksed), +CPU_CFG_OFFSET (ext_zksh), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVBB_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvbb), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkb), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE32F_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve32f), + .implied_misas =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE32X_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve32x), + .implied_exts = { +CPU_CFG_OFFSET (ext_zicsr), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE64D_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve64d), + .implied_misas =RVD , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve64f), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE64F_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve64f), + .implied_misas =RVF , + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32f),CPU_CFG_OFFSET (ext_zve64x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVE64X_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zve64x), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFBFMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfbfmin), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32f), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFBFWMA_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfbfwma), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvfbfmin),CPU_CFG_OFFSET (ext_zfbfmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFH_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfh), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvfhmin),CPU_CFG_OFFSET (ext_zfhmin), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVFHMIN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvfhmin), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve32f), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKN_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvkn), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkned),CPU_CFG_OFFSET (ext_zvknhb), +CPU_CFG_OFFSET (ext_zvkb),CPU_CFG_OFFSET (ext_zvkt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKNC_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvknc), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkn),CPU_CFG_OFFSET (ext_zvbc), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKNG_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvkng), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvkn),CPU_CFG_OFFSET (ext_zvkg), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKNHB_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvknhb), + .implied_exts = { +CPU_CFG_OFFSET (ext_zve64x), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKS_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvks), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvksed),CPU_CFG_OFFSET (ext_zvksh), +CPU_CFG_OFFSET (ext_zvkb),CPU_CFG_OFFSET (ext_zvkt), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKSC_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvksc), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvks),CPU_CFG_OFFSET (ext_zvbc), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; + +static RISCVCPUImpliedExtsRule ZVKSG_IMPLIED = { + .ext =CPU_CFG_OFFSET (ext_zvksg), + .implied_exts = { +CPU_CFG_OFFSET (ext_zvks),CPU_CFG_OFFSET (ext_zvkg), + +RISCV_IMPLIED_EXTS_RULE_END + }, +}; +RISCVCPUImpliedExtsRule *riscv_misa_implied_rules[] = { &RVA_IMPLIED , &RVD_IMPLIED , &RVF_IMPLIED , &RVM_IMPLIED , &RVV_IMPLIED ,NULL };RISCVCPUImpliedExtsRule *riscv_ext_implied_rules[] = { + &ZCB_IMPLIED , &ZCD_IMPLIED , &ZCE_IMPLIED , + &ZCF_IMPLIED , &ZCMP_IMPLIED , &ZCMT_IMPLIED , + &ZDINX_IMPLIED , &ZFA_IMPLIED , &ZFBFMIN_IMPLIED , + &ZFH_IMPLIED , &ZFHMIN_IMPLIED , &ZFINX_IMPLIED , + &ZHINX_IMPLIED , &ZHINXMIN_IMPLIED , &ZICNTR_IMPLIED , + &ZIHPM_IMPLIED , &ZK_IMPLIED , &ZKN_IMPLIED , + &ZKS_IMPLIED , &ZVBB_IMPLIED , &ZVE32F_IMPLIED , + &ZVE32X_IMPLIED , &ZVE64D_IMPLIED , &ZVE64F_IMPLIED , + &ZVE64X_IMPLIED , &ZVFBFMIN_IMPLIED , &ZVFBFWMA_IMPLIED , + &ZVFH_IMPLIED , &ZVFHMIN_IMPLIED , &ZVKN_IMPLIED , + &ZVKNC_IMPLIED , &ZVKNG_IMPLIED , &ZVKNHB_IMPLIED , + &ZVKS_IMPLIED , &ZVKSC_IMPLIED , &ZVKSG_IMPLIED ,NULL };
PATCH v2 5/6 target/riscv: Add Zc extension implied rule
In reply to [email protected]From: Frank Chang <[email protected]>
Zc extension has special implied rules that need to be handled separately.
--- target/riscv/tcg/tcg-cpu.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
target/riscv/tcg/tcg-cpu.c +34 -0
@@ -902,11 +902,45 @@ static void cpu_enable_implied_rule(RISCVCPU *cpu, } } +/* Zc extension has special implied rules that need to be handled separately. */ +static void cpu_enable_zc_implied_rules (RISCVCPU *cpu) +{ +RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (cpu); +CPURISCVState *env = &cpu->env; + +if (cpu->cfg.ext_zce) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcb), true); +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmp), true); +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmt), true); + +if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); + } + } + +/* Zca, Zcd and Zcf has a PRIV 1.12.0 restriction */ +if (riscv_has_ext (env,RVC ) && env->priv_ver >=PRIV_VERSION_1_12_0 ) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); + +if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); + } + +if (riscv_has_ext (env,RVD )) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcd), true); + } + } +} +static void riscv_cpu_enable_implied_rules (RISCVCPU *cpu) {RISCVCPUImpliedExtsRule *rule;int i; +/* Enable the implied extensions for Zc. */ +cpu_enable_zc_implied_rules (cpu); +/* Enable the implied MISAs. */ for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) {if (riscv_has_ext (&cpu->env, rule->ext)) {
Signature · 1 line
2.43.2
Re: [PATCH v2 5/6] target/riscv: Add Zc extension implied rule
Quoted 8 lines · On 6/15/24 11:46 PM, [email protected] wrote:
From: Frank Chang <[email protected]>
Zc extension has special implied rules that need to be handled separately.
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>---
Quoted 53 lines
target/riscv/tcg/tcg-cpu.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)target/riscv/tcg/tcg-cpu.c +34
-0@@ -902,11 +902,45 @@ static void cpu_enable_implied_rule(RISCVCPU *cpu, } } +/* Zc extension has special implied rules that need to be handled separately. */ +static void cpu_enable_zc_implied_rules (RISCVCPU *cpu) +{ +RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (cpu); +CPURISCVState *env = &cpu->env; + +if (cpu->cfg.ext_zce) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcb), true); +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmp), true); +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmt), true); + +if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); + } + } + +/* Zca, Zcd and Zcf has a PRIV 1.12.0 restriction */ +if (riscv_has_ext (env,RVC ) && env->priv_ver >=PRIV_VERSION_1_12_0 ) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); + +if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); + } + +if (riscv_has_ext (env,RVD )) { +cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcd), true); + } + } +} +static void riscv_cpu_enable_implied_rules (RISCVCPU *cpu) {RISCVCPUImpliedExtsRule *rule;int i; +/* Enable the implied extensions for Zc. */ +cpu_enable_zc_implied_rules (cpu); +/* Enable the implied MISAs. */ for (i =0 ; (rule = riscv_misa_implied_rules[i]); i++) {if (riscv_has_ext (&cpu->env, rule->ext)) {
PATCH v2 6/6 target/riscv: Remove extension auto-update check statements
In reply to [email protected]From: Frank Chang <[email protected]>
Remove the old-fashioned extension auto-update check statements as they are replaced by the extension implied rules.
--- target/riscv/tcg/tcg-cpu.c | 119 ------------------------------------- 1 file changed, 119 deletions(-)
target/riscv/tcg/tcg-cpu.c +0 -119
@@ -468,10 +468,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_zfh) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zfhmin), true); - } -if (cpu->cfg.ext_zfhmin && !riscv_has_ext (env,RVF )) {error_setg (errp,"Zfh/Zfhmin extensions require F extension" );return ;
@@ -493,9 +489,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_propagate (errp, local_err);return ; } - -/* The V vector extension depends on the Zve64d extension */ -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve64d), true); }/* The Zve64d extension depends on the Zve64f extension */
@@ -504,18 +497,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_setg (errp,"Zve64d/V extensions require D extension" );return ; } -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve64f), true); - } - -/* The Zve64f extension depends on the Zve64x and Zve32f extensions */ -if (cpu->cfg.ext_zve64f) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve64x), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve32f), true); - } - -/* The Zve64x extension depends on the Zve32x extension */ -if (cpu->cfg.ext_zve64x) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve32x), true); }/* The Zve32f extension depends on the Zve32x extension */
@@ -524,11 +505,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_setg (errp,"Zve32f/Zve64f extensions require F extension" );return ; } -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve32x), true); - } - -if (cpu->cfg.ext_zvfh) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvfhmin), true); }if (cpu->cfg.ext_zvfhmin && !cpu->cfg.ext_zve32f) {
@@ -551,11 +527,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -/* Set the ISA extensions, checks should have happened above */ -if (cpu->cfg.ext_zhinx) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); - } -if ((cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinxmin) && !cpu->cfg.ext_zfinx) {error_setg (errp,"Zdinx/Zhinx/Zhinxmin extensions require Zfinx" );return ;
@@ -573,27 +544,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) } } -if (cpu->cfg.ext_zce) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmp), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmt), true); -if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); - } - } - -/* zca, zcd and zcf has a PRIV 1.12.0 restriction */ -if (riscv_has_ext (env,RVC ) && env->priv_ver >=PRIV_VERSION_1_12_0 ) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); -if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); - } -if (riscv_has_ext (env,RVD )) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcd), true); - } - } -if (mcc->misa_mxl_max !=MXL_RV32 && cpu->cfg.ext_zcf) {error_setg (errp,"Zcf extension is only relevant to RV32" );return ;
@@ -627,52 +577,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -/* -* Shorthand vector crypto extensions -*/ -if (cpu->cfg.ext_zvknc) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkn), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbc), true); - } - -if (cpu->cfg.ext_zvkng) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkn), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkg), true); - } - -if (cpu->cfg.ext_zvkn) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkned), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvknhb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkt), true); - } - -if (cpu->cfg.ext_zvksc) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvks), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbc), true); - } - -if (cpu->cfg.ext_zvksg) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvks), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkg), true); - } - -if (cpu->cfg.ext_zvks) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvksed), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvksh), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkt), true); - } - -if (cpu->cfg.ext_zvkt) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbc), true); - } - -if (cpu->cfg.ext_zvbb) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkb), true); - } -if ((cpu->cfg.ext_zvbb || cpu->cfg.ext_zvkb || cpu->cfg.ext_zvkg || cpu->cfg.ext_zvkned || cpu->cfg.ext_zvknha || cpu->cfg.ext_zvksed || cpu->cfg.ext_zvksh) && !cpu->cfg.ext_zve32x) {
@@ -688,29 +592,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_zk) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkn), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkr), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkt), true); - } - -if (cpu->cfg.ext_zkn) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkc), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkx), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkne), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zknd), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zknh), true); - } - -if (cpu->cfg.ext_zks) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkc), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkx), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zksed), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zksh), true); - } -if (cpu->cfg.ext_zicntr && !cpu->cfg.ext_zicsr) {if (cpu_cfg_ext_is_user_set (CPU_CFG_OFFSET (ext_zicntr))) {error_setg (errp,"zicntr requires zicsr" );
Signature · 1 line
2.43.2
Re: [PATCH v2 6/6] target/riscv: Remove extension auto-update check statements
Quoted 9 lines · On 6/15/24 11:46 PM, [email protected] wrote:
From: Frank Chang <[email protected]>
Remove the old-fashioned extension auto-update check statements as they are replaced by the extension implied rules.
Signed-off-by Frank Chang <[email protected]>Reviewed-by Jerry Zhang Jian <[email protected]>Tested-by Max Chou <[email protected]>---
Quoted 182 lines
target/riscv/tcg/tcg-cpu.c | 119 ------------------------------------- 1 file changed, 119 deletions(-)target/riscv/tcg/tcg-cpu.c +0
-119@@ -468,10 +468,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_zfh) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zfhmin), true); - } -if (cpu->cfg.ext_zfhmin && !riscv_has_ext (env,RVF )) {error_setg (errp,"Zfh/Zfhmin extensions require F extension" );return ;@@ -493,9 +489,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_propagate (errp, local_err);return ; } - -/* The V vector extension depends on the Zve64d extension */ -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve64d), true); }/* The Zve64d extension depends on the Zve64f extension */ @@ -504,18 +497,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_setg (errp,"Zve64d/V extensions require D extension" );return ; } -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve64f), true); - } - -/* The Zve64f extension depends on the Zve64x and Zve32f extensions */ -if (cpu->cfg.ext_zve64f) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve64x), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve32f), true); - } - -/* The Zve64x extension depends on the Zve32x extension */ -if (cpu->cfg.ext_zve64x) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve32x), true); }/* The Zve32f extension depends on the Zve32x extension */ @@ -524,11 +505,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)error_setg (errp,"Zve32f/Zve64f extensions require F extension" );return ; } -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zve32x), true); - } - -if (cpu->cfg.ext_zvfh) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvfhmin), true); }if (cpu->cfg.ext_zvfhmin && !cpu->cfg.ext_zve32f) {@@ -551,11 +527,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -/* Set the ISA extensions, checks should have happened above */ -if (cpu->cfg.ext_zhinx) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); - } -if ((cpu->cfg.ext_zdinx || cpu->cfg.ext_zhinxmin) && !cpu->cfg.ext_zfinx) {error_setg (errp,"Zdinx/Zhinx/Zhinxmin extensions require Zfinx" );return ;@@ -573,27 +544,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) } } -if (cpu->cfg.ext_zce) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmp), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcmt), true); -if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); - } - } - -/* zca, zcd and zcf has a PRIV 1.12.0 restriction */ -if (riscv_has_ext (env,RVC ) && env->priv_ver >=PRIV_VERSION_1_12_0 ) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zca), true); -if (riscv_has_ext (env,RVF ) && mcc->misa_mxl_max ==MXL_RV32 ) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcf), true); - } -if (riscv_has_ext (env,RVD )) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zcd), true); - } - } -if (mcc->misa_mxl_max !=MXL_RV32 && cpu->cfg.ext_zcf) {error_setg (errp,"Zcf extension is only relevant to RV32" );return ;@@ -627,52 +577,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -/* -* Shorthand vector crypto extensions -*/ -if (cpu->cfg.ext_zvknc) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkn), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbc), true); - } - -if (cpu->cfg.ext_zvkng) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkn), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkg), true); - } - -if (cpu->cfg.ext_zvkn) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkned), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvknhb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkt), true); - } - -if (cpu->cfg.ext_zvksc) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvks), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbc), true); - } - -if (cpu->cfg.ext_zvksg) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvks), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkg), true); - } - -if (cpu->cfg.ext_zvks) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvksed), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvksh), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkt), true); - } - -if (cpu->cfg.ext_zvkt) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvbc), true); - } - -if (cpu->cfg.ext_zvbb) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zvkb), true); - } -if ((cpu->cfg.ext_zvbb || cpu->cfg.ext_zvkb || cpu->cfg.ext_zvkg || cpu->cfg.ext_zvkned || cpu->cfg.ext_zvknha || cpu->cfg.ext_zvksed || cpu->cfg.ext_zvksh) && !cpu->cfg.ext_zve32x) {@@ -688,29 +592,6 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)return ; } -if (cpu->cfg.ext_zk) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkn), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkr), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkt), true); - } - -if (cpu->cfg.ext_zkn) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkc), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkx), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zkne), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zknd), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zknh), true); - } - -if (cpu->cfg.ext_zks) { -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkb), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkc), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zbkx), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zksed), true); -cpu_cfg_ext_auto_update (cpu,CPU_CFG_OFFSET (ext_zksh), true); - } -if (cpu->cfg.ext_zicntr && !cpu->cfg.ext_zicsr) {if (cpu_cfg_ext_is_user_set (CPU_CFG_OFFSET (ext_zicntr))) {error_setg (errp,"zicntr requires zicsr" );