On Wed, Jul 3, 2024 at 1:29 PM ~liuxu <li...@git.sr.ht> wrote:
>
> From: lxx <1733205...@qq.com>
>
> This patch adds support for the Zilsd and Zcmlsd extension,
> which is documented at
> https://github.com/riscv/riscv-zilsd/releases/tag/v0.9.0
>
> Co-developed-by: SUN Dongya <sundon...@nucleisys.com>
> Co-developed-by: LIU Xu <li...@nucleisys.com>
> Co-developed-by: ZHAO Fujin <zhaofu...@nucleisys.com>
> ---
> target/riscv/cpu.c | 4 +
> target/riscv/cpu_cfg.h | 2 +
> target/riscv/insn16.decode | 8 ++
> target/riscv/insn32.decode | 12 ++-
> target/riscv/insn_trans/trans_zcmlsd.c.inc | 98 ++++++++++++++++++++++
> target/riscv/insn_trans/trans_zilsd.c.inc | 97 +++++++++++++++++++++
> target/riscv/tcg/tcg-cpu.c | 13 +++
> target/riscv/translate.c | 2 +
> 8 files changed, 234 insertions(+), 2 deletions(-)
> create mode 100644 target/riscv/insn_trans/trans_zcmlsd.c.inc
> create mode 100644 target/riscv/insn_trans/trans_zilsd.c.inc
>
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 36e3e5fdaf..71274e36f8 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -113,6 +113,7 @@ const RISCVIsaExtData isa_edata_arr[] = {
> ISA_EXT_DATA_ENTRY(zihintntl, PRIV_VERSION_1_10_0, ext_zihintntl),
> ISA_EXT_DATA_ENTRY(zihintpause, PRIV_VERSION_1_10_0, ext_zihintpause),
> ISA_EXT_DATA_ENTRY(zihpm, PRIV_VERSION_1_12_0, ext_zihpm),
> + ISA_EXT_DATA_ENTRY(zilsd, PRIV_VERSION_1_12_0, ext_zilsd),
> ISA_EXT_DATA_ENTRY(zmmul, PRIV_VERSION_1_12_0, ext_zmmul),
> ISA_EXT_DATA_ENTRY(za64rs, PRIV_VERSION_1_12_0, has_priv_1_11),
> ISA_EXT_DATA_ENTRY(zaamo, PRIV_VERSION_1_12_0, ext_zaamo),
> @@ -132,6 +133,7 @@ const RISCVIsaExtData isa_edata_arr[] = {
> ISA_EXT_DATA_ENTRY(zce, PRIV_VERSION_1_12_0, ext_zce),
> ISA_EXT_DATA_ENTRY(zcmp, PRIV_VERSION_1_12_0, ext_zcmp),
> ISA_EXT_DATA_ENTRY(zcmt, PRIV_VERSION_1_12_0, ext_zcmt),
> + ISA_EXT_DATA_ENTRY(zcmlsd, PRIV_VERSION_1_12_0, ext_zcmlsd),
> ISA_EXT_DATA_ENTRY(zba, PRIV_VERSION_1_12_0, ext_zba),
> ISA_EXT_DATA_ENTRY(zbb, PRIV_VERSION_1_12_0, ext_zbb),
> ISA_EXT_DATA_ENTRY(zbc, PRIV_VERSION_1_12_0, ext_zbc),
> @@ -1492,6 +1494,7 @@ const RISCVCPUMultiExtConfig riscv_cpu_extensions[] = {
>
> MULTI_EXT_CFG_BOOL("zicntr", ext_zicntr, true),
> MULTI_EXT_CFG_BOOL("zihpm", ext_zihpm, true),
> + MULTI_EXT_CFG_BOOL("zilsd", ext_zilsd, false),
>
> MULTI_EXT_CFG_BOOL("zba", ext_zba, true),
> MULTI_EXT_CFG_BOOL("zbb", ext_zbb, true),
> @@ -1531,6 +1534,7 @@ const RISCVCPUMultiExtConfig riscv_cpu_extensions[] = {
> MULTI_EXT_CFG_BOOL("zcmp", ext_zcmp, false),
> MULTI_EXT_CFG_BOOL("zcmt", ext_zcmt, false),
> MULTI_EXT_CFG_BOOL("zicond", ext_zicond, false),
> + MULTI_EXT_CFG_BOOL("zcmlsd", ext_zcmlsd, false),
>
> /* Vector cryptography extensions */
> MULTI_EXT_CFG_BOOL("zvbb", ext_zvbb, false),
> diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h
> index cb750154bd..54e93897ee 100644
> --- a/target/riscv/cpu_cfg.h
> +++ b/target/riscv/cpu_cfg.h
> @@ -51,6 +51,7 @@ struct RISCVCPUConfig {
> bool ext_zcf;
> bool ext_zcmp;
> bool ext_zcmt;
> + bool ext_zcmlsd;
> bool ext_zk;
> bool ext_zkn;
> bool ext_zknd;
> @@ -71,6 +72,7 @@ struct RISCVCPUConfig {
> bool ext_zihintntl;
> bool ext_zihintpause;
> bool ext_zihpm;
> + bool ext_zilsd;
> bool ext_ztso;
> bool ext_smstateen;
> bool ext_sstc;
> diff --git a/target/riscv/insn16.decode b/target/riscv/insn16.decode
> index b96c534e73..5014caa128 100644
> --- a/target/riscv/insn16.decode
> +++ b/target/riscv/insn16.decode
> @@ -130,10 +130,14 @@ sw 110 ... ... .. ... 00 @cs_w
> {
> ld 011 ... ... .. ... 00 @cl_d
> c_flw 011 ... ... .. ... 00 @cl_w
> + # *** Zcmlsd Extension ***
> + zcmlsd_ld 011 ... ... .. ... 00 @cl_d
> }
> {
> sd 111 ... ... .. ... 00 @cs_d
> c_fsw 111 ... ... .. ... 00 @cs_w
> + # *** Zcmlsd Extension ***
> + zcmlsd_sd 111 ... ... .. ... 00 @cs_d
> }
>
> # *** RV32/64C Standard Extension (Quadrant 1) ***
> @@ -207,10 +211,14 @@ sw 110 . ..... ..... 10 @c_swsp
> c64_illegal 011 - 00000 ----- 10 # c.ldsp, RES rd=0
> ld 011 . ..... ..... 10 @c_ldsp
> c_flw 011 . ..... ..... 10 @c_lwsp
> + # *** Zcmlsd Extension ***
> + zcmlsd_ldsp 011 . ..... ..... 10 @c_ldsp
> }
> {
> sd 111 . ..... ..... 10 @c_sdsp
> c_fsw 111 . ..... ..... 10 @c_swsp
> + # *** Zcmlsd Extension ***
> + zcmlsd_sdsp 111 . ..... ..... 10 @c_sdsp
> }
>
> # *** RV64 and RV32 Zcb Extension ***
> diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode
> index f22df04cfd..f6f4b7950b 100644
> --- a/target/riscv/insn32.decode
> +++ b/target/riscv/insn32.decode
> @@ -169,8 +169,16 @@ csrrci ............ ..... 111 ..... 1110011 @csr
>
> # *** RV64I Base Instruction Set (in addition to RV32I) ***
> lwu ............ ..... 110 ..... 0000011 @i
> -ld ............ ..... 011 ..... 0000011 @i
> -sd ....... ..... ..... 011 ..... 0100011 @s
> +{
> + ld ............ ..... 011 ..... 0000011 @i
> + # *** Zilsd instructions ***
> + zilsd_ld ............ ..... 011 ..... 0000011 @i
> +}
> +{
> + sd ....... ..... ..... 011 ..... 0100011 @s
> + # *** Zilsd instructions ***
> + zilsd_sd ....... ..... ..... 011 ..... 0100011 @s
> +}
> addiw ............ ..... 000 ..... 0011011 @i
> slliw 0000000 ..... ..... 001 ..... 0011011 @sh5
> srliw 0000000 ..... ..... 101 ..... 0011011 @sh5
> diff --git a/target/riscv/insn_trans/trans_zcmlsd.c.inc
> b/target/riscv/insn_trans/trans_zcmlsd.c.inc
> new file mode 100644
> index 0000000000..b3587d8a7c
> --- /dev/null
> +++ b/target/riscv/insn_trans/trans_zcmlsd.c.inc
> @@ -0,0 +1,98 @@
> +/*
> + * RISC-V translation routines for the Zcmlsd Extension.
> + *
> + * Copyright (c) 2024 Nucleisys, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> with
> + * this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#define REQUIRE_ZCMLSD(ctx) do { \
> + if (!ctx->cfg_ptr->ext_zcmlsd) \
> + return false; \
> +} while (0)
> +
> +
> +static bool gen_load_ld(DisasContext *ctx, arg_lb *a, MemOp memop, int flag)
> +{
> + REQUIRE_ZCMLSD(ctx);
> + REQUIRE_32BIT(ctx);
> +
> + if (flag&&a->rd==0){
This is missing spaces, make sure you run checkpatch before sending
> + return false;
> + }
> +
> + TCGv dest_low= dest_gpr(ctx, a->rd);
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_ld_tl(dest_low, addr, ctx->mem_idx, memop);
> +
> + TCGv dest_high= dest_gpr(ctx, a->rd+1);
> + tcg_gen_addi_tl(addr, addr, 32);
Doesn't this take bytes as an argument? Shouldn't this be 4 instead of 32?
Alistair
> + tcg_gen_qemu_ld_tl(dest_high, addr, ctx->mem_idx, memop);
> +
> + gen_set_gpr(ctx, a->rd, dest_low);
> + gen_set_gpr(ctx, a->rd+1, dest_high);
> +
> + return true;
> +}
> +
> +// zcmlsd c.ldsp
> +static bool trans_zcmlsd_ldsp(DisasContext *ctx, arg_zcmlsd_ldsp *a)
> +{
> + return gen_load_ld(ctx, a, MO_TESL, 1);
> +}
> +
> +//zcmlsd c.ld
> +static bool trans_zcmlsd_ld(DisasContext *ctx, arg_zcmlsd_ld *a)
> +{
> + return gen_load_ld(ctx, a, MO_TESL, 0);
> +}
> +
> +static bool gen_store_sd(DisasContext *ctx, arg_sb *a, MemOp memop, int flag)
> +{
> + REQUIRE_ZCMLSD(ctx);
> + REQUIRE_32BIT(ctx);
> +
> + if(flag&&a->rs2==0){
> + TCGv data = get_gpr(ctx, a->rs2, EXT_NONE);
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, memop);
> +
> + tcg_gen_addi_tl(addr, addr, 32);
> + tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, memop);
> +
> + return true;
> + }
> +
> + TCGv data_low = get_gpr(ctx, a->rs2, EXT_NONE);
> + TCGv data_high = get_gpr(ctx, a->rs2+1, EXT_NONE);
> +
> +
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_st_tl(data_low, addr, ctx->mem_idx, memop);
> +
> + tcg_gen_addi_tl(addr, addr, 32);
> + tcg_gen_qemu_st_tl(data_high, addr, ctx->mem_idx, memop);
> + return true;
> +}
> +
> +//zcmlsd c.sdsp
> +static bool trans_zcmlsd_sdsp(DisasContext *ctx, arg_zcmlsd_sdsp *a)
> +{
> + return gen_store_sd(ctx, a, MO_TESL, 1);
> +}
> +
> +//zcmlsd c.sd
> +static bool trans_zcmlsd_sd(DisasContext *ctx, arg_zcmlsd_sd *a)
> +{
> + return gen_store_sd(ctx, a, MO_TESL, 0);
> +}
> diff --git a/target/riscv/insn_trans/trans_zilsd.c.inc
> b/target/riscv/insn_trans/trans_zilsd.c.inc
> new file mode 100644
> index 0000000000..25d93d3f50
> --- /dev/null
> +++ b/target/riscv/insn_trans/trans_zilsd.c.inc
> @@ -0,0 +1,97 @@
> +/*
> + * RISC-V translation routines for the Zilsd Extension.
> + *
> + * Copyright (c) 2024 Nucleisys, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2 or later, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> with
> + * this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#define REQUIRE_ZILSD(ctx) do { \
> + if (!ctx->cfg_ptr->ext_zilsd) \
> + return false; \
> +} while (0)
> +
> +static bool gen_load_i32(DisasContext *ctx, arg_ld *a, MemOp memop)
> +{
> + REQUIRE_ZILSD(ctx);
> + REQUIRE_32BIT(ctx);
> +
> + if((a->rd) %2){
> + return false;
> + }
> + if(a->rd==0){
> + TCGv dest = dest_gpr(ctx, a->rd);
> +
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_ld_tl(dest, addr, ctx->mem_idx, memop);
> +
> + gen_set_gpr(ctx, a->rd, dest);
> + return true;
> + }
> +
> + TCGv dest_low = dest_gpr(ctx, a->rd);
> + TCGv dest_high = dest_gpr(ctx, a->rd+1);
> +
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_ld_tl(dest_low, addr, ctx->mem_idx, memop);
> +
> + tcg_gen_addi_tl(addr, addr, 32);
> + tcg_gen_qemu_ld_tl(dest_high, addr, ctx->mem_idx, memop);
> +
> + gen_set_gpr(ctx, a->rd, dest_low);
> + gen_set_gpr(ctx, a->rd+1, dest_high);
> +
> + return true;
> +}
> +
> +static bool trans_zilsd_ld(DisasContext *ctx, arg_zilsd_ld *a)
> +{
> + return gen_load_i32(ctx, a, MO_TESL);
> +}
> +
> +static bool gen_store_i32(DisasContext *ctx, arg_sd *a, MemOp memop)
> +{
> + REQUIRE_ZILSD(ctx);
> + REQUIRE_32BIT(ctx);
> +
> + if((a->rs2) %2){
> + return false;
> + }
> + if(a->rs2==0){
> + TCGv data = get_gpr(ctx, a->rs2, EXT_NONE);
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, memop);
> +
> + tcg_gen_addi_tl(addr, addr, 32);
> + tcg_gen_qemu_st_tl(data, addr, ctx->mem_idx, memop);
> +
> + return true;
> + }
> +
> + TCGv data_low = get_gpr(ctx, a->rs2, EXT_NONE);
> + TCGv data_high = get_gpr(ctx, a->rs2+1, EXT_NONE);
> +
> + TCGv addr = get_address(ctx, a->rs1, a->imm);
> + tcg_gen_qemu_st_tl(data_low, addr, ctx->mem_idx, memop);
> +
> + tcg_gen_addi_tl(addr, addr, 32);
> + tcg_gen_qemu_st_tl(data_high, addr, ctx->mem_idx, memop);
> +
> + return true;
> +}
> +
> +static bool trans_zilsd_sd(DisasContext *ctx, arg_zilsd_sd *a)
> +{
> + return gen_store_i32(ctx, a, MO_TESL);
> +}
> +
> diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c
> index b5b95e052d..8321586513 100644
> --- a/target/riscv/tcg/tcg-cpu.c
> +++ b/target/riscv/tcg/tcg-cpu.c
> @@ -721,6 +721,19 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu,
> Error **errp)
> cpu->pmu_avail_ctrs = 0;
> }
>
> + if (cpu->cfg.ext_zcmlsd) {
> + if (riscv_has_ext(env, RVC) && riscv_has_ext(env, RVF)) {
> + error_setg(errp,
> + "Zcmlsd cannot be supported together with C and F
> extension");
> + return;
> + }
> + if (cpu->cfg.ext_zcf) {
> + error_setg(errp,
> + "Zcmlsd cannot be supported together with Zcf
> extension");
> + return;
> + }
> + }
> +
> /*
> * Disable isa extensions based on priv spec after we
> * validated and set everything we need.
> diff --git a/target/riscv/translate.c b/target/riscv/translate.c
> index 9ff09ebdb6..ec39897ef6 100644
> --- a/target/riscv/translate.c
> +++ b/target/riscv/translate.c
> @@ -1109,10 +1109,12 @@ static uint32_t opcode_at(DisasContextBase *dcbase,
> target_ulong pc)
> #include "decode-xthead.c.inc"
> #include "insn_trans/trans_xthead.c.inc"
> #include "insn_trans/trans_xventanacondops.c.inc"
> +#include "insn_trans/trans_zilsd.c.inc"
>
> /* Include the auto-generated decoder for 16 bit insn */
> #include "decode-insn16.c.inc"
> #include "insn_trans/trans_rvzce.c.inc"
> +#include "insn_trans/trans_zcmlsd.c.inc"
>
> /* Include decoders for factored-out extensions */
> #include "decode-XVentanaCondOps.c.inc"
> --
> 2.43.4
>
