qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Weiwei Li <liweiwei@iscas.ac.cn>
To: richard.henderson@linaro.org, palmer@dabbelt.com,
	alistair.francis@wdc.com, bin.meng@windriver.com,
	qemu-riscv@nongnu.org, qemu-devel@nongnu.org
Cc: wangjunqiang@iscas.ac.cn, lazyparser@gmail.com,
	Weiwei Li <liweiwei@iscas.ac.cn>
Subject: [PATCH v12 10/10] target/riscv: Add support for Zce
Date: Tue,  7 Mar 2023 16:14:03 +0800	[thread overview]
Message-ID: <20230307081403.61950-11-liweiwei@iscas.ac.cn> (raw)
In-Reply-To: <20230307081403.61950-1-liweiwei@iscas.ac.cn>

Add and expose property for Zce:
* Specifying Zce without F includes Zca, Zcb, Zcmp, Zcmt.
* Specifying Zce with F includes Zca, Zcb, Zcmp, Zcmt and Zcf.

Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
---
 target/riscv/cpu.c | 12 ++++++++++++
 target/riscv/cpu.h |  1 +
 2 files changed, 13 insertions(+)

diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index d17ae942bd..3502d1e749 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -91,6 +91,7 @@ static const struct isa_ext_data isa_edata_arr[] = {
     ISA_EXT_DATA_ENTRY(zcb, true, PRIV_VERSION_1_12_0, ext_zcb),
     ISA_EXT_DATA_ENTRY(zcf, true, PRIV_VERSION_1_12_0, ext_zcf),
     ISA_EXT_DATA_ENTRY(zcd, true, PRIV_VERSION_1_12_0, ext_zcd),
+    ISA_EXT_DATA_ENTRY(zce, true, PRIV_VERSION_1_12_0, ext_zce),
     ISA_EXT_DATA_ENTRY(zcmp, true, PRIV_VERSION_1_12_0, ext_zcmp),
     ISA_EXT_DATA_ENTRY(zcmt, true, PRIV_VERSION_1_12_0, ext_zcmt),
     ISA_EXT_DATA_ENTRY(zba, true, PRIV_VERSION_1_12_0, ext_zba),
@@ -945,6 +946,16 @@ static void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp)
         }
     }
 
+    if (cpu->cfg.ext_zce) {
+        cpu->cfg.ext_zca = true;
+        cpu->cfg.ext_zcb = true;
+        cpu->cfg.ext_zcmp = true;
+        cpu->cfg.ext_zcmt = true;
+        if (cpu->cfg.ext_f && env->misa_mxl_max == MXL_RV32) {
+            cpu->cfg.ext_zcf = true;
+        }
+    }
+
     if (cpu->cfg.ext_c) {
         cpu->cfg.ext_zca = true;
         if (cpu->cfg.ext_f && env->misa_mxl_max == MXL_RV32) {
@@ -1501,6 +1512,7 @@ static Property riscv_cpu_extensions[] = {
     DEFINE_PROP_BOOL("x-zca", RISCVCPU, cfg.ext_zca, false),
     DEFINE_PROP_BOOL("x-zcb", RISCVCPU, cfg.ext_zcb, false),
     DEFINE_PROP_BOOL("x-zcd", RISCVCPU, cfg.ext_zcd, false),
+    DEFINE_PROP_BOOL("x-zce", RISCVCPU, cfg.ext_zce, false),
     DEFINE_PROP_BOOL("x-zcf", RISCVCPU, cfg.ext_zcf, false),
     DEFINE_PROP_BOOL("x-zcmp", RISCVCPU, cfg.ext_zcmp, false),
     DEFINE_PROP_BOOL("x-zcmt", RISCVCPU, cfg.ext_zcmt, false),
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 351d5e3e79..9b76885166 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -443,6 +443,7 @@ struct RISCVCPUConfig {
     bool ext_zca;
     bool ext_zcb;
     bool ext_zcd;
+    bool ext_zce;
     bool ext_zcf;
     bool ext_zcmp;
     bool ext_zcmt;
-- 
2.25.1



  parent reply	other threads:[~2023-03-07  8:16 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07  8:13 [PATCH v12 00/10] support subsets of code size reduction extension Weiwei Li
2023-03-07  8:13 ` [PATCH v12 01/10] target/riscv: add cfg properties for Zc* extension Weiwei Li
2023-03-07  8:13 ` [PATCH v12 02/10] target/riscv: add support for Zca extension Weiwei Li
2023-04-06 20:22   ` Daniel Henrique Barboza
2023-04-07  1:14     ` liweiwei
2023-04-07  3:34       ` liweiwei
2023-04-07 19:25         ` Daniel Henrique Barboza
2023-04-08  1:09           ` liweiwei
2023-04-07 10:28       ` Daniel Henrique Barboza
2023-04-07 10:48         ` liweiwei
2023-04-12  2:12     ` Alistair Francis
2023-04-12  2:55       ` Weiwei Li
2023-04-12 10:55         ` Alistair Francis
2023-04-12 11:35           ` Weiwei Li
2023-04-12 17:24             ` Daniel Henrique Barboza
2023-04-17  2:35               ` Alistair Francis
2023-04-17 11:00                 ` Daniel Henrique Barboza
2023-03-07  8:13 ` [PATCH v12 03/10] target/riscv: add support for Zcf extension Weiwei Li
2023-03-07  8:13 ` [PATCH v12 04/10] target/riscv: add support for Zcd extension Weiwei Li
2023-03-07  8:13 ` [PATCH v12 05/10] target/riscv: add support for Zcb extension Weiwei Li
2023-03-07  8:13 ` [PATCH v12 06/10] target/riscv: add support for Zcmp extension Weiwei Li
2023-03-07  8:14 ` [PATCH v12 07/10] target/riscv: add support for Zcmt extension Weiwei Li
2023-03-07  8:14 ` [PATCH v12 08/10] target/riscv: expose properties for Zc* extension Weiwei Li
2023-03-07  8:14 ` [PATCH v12 09/10] disas/riscv.c: add disasm support for Zc* Weiwei Li
2023-03-07  8:14 ` Weiwei Li [this message]
2023-04-05  4:15   ` [PATCH v12 10/10] target/riscv: Add support for Zce Alistair Francis
2023-03-24 13:23 ` [PATCH v12 00/10] support subsets of code size reduction extension liweiwei
2023-04-05  4:17 ` Alistair Francis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230307081403.61950-11-liweiwei@iscas.ac.cn \
    --to=liweiwei@iscas.ac.cn \
    --cc=alistair.francis@wdc.com \
    --cc=bin.meng@windriver.com \
    --cc=lazyparser@gmail.com \
    --cc=palmer@dabbelt.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=wangjunqiang@iscas.ac.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).