[18/76] target/riscv: rvv-1.0: configure instructions

Message ID	20211015074627.3957162-19-frank.chang@sifive.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=d4Ft=PD=nongnu.org=qemu-devel-bounces+qemu-devel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5AEEA61037 From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH 18/76] target/riscv: rvv-1.0: configure instructions Date: Fri, 15 Oct 2021 15:45:19 +0800 Message-Id: <20211015074627.3957162-19-frank.chang@sifive.com> In-Reply-To: <20211015074627.3957162-1-frank.chang@sifive.com> References: <20211015074627.3957162-1-frank.chang@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Cc: Frank Chang <frank.chang@sifive.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Richard Henderson <richard.henderson@linaro.org>, Palmer Dabbelt <palmer@dabbelt.com> Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>
Series	support vector extension v1.0 \| expand [v8,00/78] support vector extension v1.0 [v8,01/78] target/riscv: fix TB_FLAGS bits overlapping bug for rvv/rvh [v8,02/78] target/riscv: drop vector 0.7.1 and add 1.0 support [v8,03/78] target/riscv: Use FIELD_EX32() to extract wd field [v8,04/78] target/riscv: rvv-1.0: add mstatus VS field [v8,05/78] target/riscv: rvv-1.0: add sstatus VS field [v8,06/78] target/riscv: rvv-1.0: introduce writable misa.v field [v8,07/78] target/riscv: rvv-1.0: add translation-time vector context status [v8,08/78] target/riscv: rvv-1.0: remove rvv related codes from fcsr registers [v8,09/78] target/riscv: rvv-1.0: add vcsr register [v8,10/78] target/riscv: rvv-1.0: add vlenb register [v8,11/78] target/riscv: rvv-1.0: check MSTATUS_VS when accessing vector csr registers [v8,12/78] target/riscv: rvv-1.0: remove MLEN calculations [v8,13/78] target/riscv: rvv-1.0: add fractional LMUL [v8,14/78] target/riscv: rvv-1.0: add VMA and VTA [v8,15/78] target/riscv: rvv-1.0: update check functions [v8,16/78] target/riscv: introduce more imm value modes in translator functions [v8,17/78] target/riscv: rvv:1.0: add translation-time nan-box helper function [18/76] target/riscv: rvv-1.0: configure instructions [19/76] target/riscv: rvv-1.0: stride load and store instructions [v8,20/78] target/riscv: rvv-1.0: stride load and store instructions [21/76] target/riscv: rvv-1.0: fix address index overflow bug of indexed load/store insns [v8,22/78] target/riscv: rvv-1.0: fix address index overflow bug of indexed load/store insns [23/76] target/riscv: rvv-1.0: amo operations [v8,24/78] target/riscv: rvv-1.0: load/store whole register instructions [v8,25/78] target/riscv: rvv-1.0: update vext_max_elems() for load/store insns [v8,26/78] target/riscv: rvv-1.0: take fractional LMUL into vector max elements calculation [v8,27/78] target/riscv: rvv-1.0: floating-point square-root instruction [v8,28/78] target/riscv: rvv-1.0: floating-point classify instructions [29/76] target/riscv: rvv-1.0: mask population count instruction [v8,30/78] target/riscv: rvv-1.0: find-first-set mask bit instruction [v8,31/78] target/riscv: rvv-1.0: set-X-first mask bit instructions [v8,32/78] target/riscv: rvv-1.0: iota instruction [v8,33/78] target/riscv: rvv-1.0: element index instruction [v8,34/78] target/riscv: rvv-1.0: allow load element with sign-extended [v8,35/78] target/riscv: rvv-1.0: register gather instructions [v8,36/78] target/riscv: rvv-1.0: integer scalar move instructions [v8,37/78] target/riscv: rvv-1.0: floating-point move instruction [v8,38/78] target/riscv: rvv-1.0: floating-point scalar move instructions [v8,39/78] target/riscv: rvv-1.0: whole register move instructions [v8,40/78] target/riscv: rvv-1.0: integer extension instructions [v8,41/78] target/riscv: rvv-1.0: single-width averaging add and subtract instructions [v8,42/78] target/riscv: rvv-1.0: single-width bit shift instructions [v8,43/78] target/riscv: rvv-1.0: integer add-with-carry/subtract-with-borrow [v8,44/78] target/riscv: rvv-1.0: narrowing integer right shift instructions [v8,45/78] target/riscv: rvv-1.0: widening integer multiply-add instructions [v8,46/78] target/riscv: rvv-1.0: single-width saturating add and subtract instructions [v8,47/78] target/riscv: rvv-1.0: integer comparison instructions [v8,48/78] target/riscv: rvv-1.0: floating-point compare instructions [v8,49/78] target/riscv: rvv-1.0: mask-register logical instructions [v8,50/78] target/riscv: rvv-1.0: slide instructions [v8,51/78] target/riscv: rvv-1.0: floating-point slide instructions [v8,52/78] target/riscv: rvv-1.0: narrowing fixed-point clip instructions [v8,53/78] target/riscv: rvv-1.0: single-width floating-point reduction [v8,54/78] target/riscv: rvv-1.0: widening floating-point reduction instructions [v8,55/78] target/riscv: rvv-1.0: single-width scaling shift instructions [v8,56/78] target/riscv: rvv-1.0: remove widening saturating scaled multiply-add [v8,57/78] target/riscv: rvv-1.0: remove vmford.vv and vmford.vf [v8,58/78] target/riscv: rvv-1.0: remove integer extract instruction [v8,59/78] target/riscv: rvv-1.0: floating-point min/max instructions [v8,60/78] target/riscv: introduce floating-point rounding mode enum [v8,61/78] target/riscv: rvv-1.0: floating-point/integer type-convert instructions [v8,62/78] target/riscv: rvv-1.0: widening floating-point/integer type-convert [v8,63/78] target/riscv: add "set round to odd" rounding mode helper function [v8,64/78] target/riscv: rvv-1.0: narrowing floating-point/integer type-convert [v8,65/78] target/riscv: rvv-1.0: relax RV_VLEN_MAX to 1024-bits [v8,66/78] target/riscv: rvv-1.0: implement vstart CSR [v8,67/78] target/riscv: rvv-1.0: trigger illegal instruction exception if frm is not valid [v8,68/78] target/riscv: rvv-1.0: set mstatus.SD bit when writing vector CSRs [v8,69/78] target/riscv: gdb: support vector registers for rv64 & rv32 [v8,70/78] target/riscv: rvv-1.0: floating-point reciprocal square-root estimate instruction [v8,71/78] target/riscv: rvv-1.0: floating-point reciprocal estimate instruction [v8,72/78] target/riscv: set mstatus.SD bit when writing fp CSRs [v8,73/78] target/riscv: rvv-1.0: rename r2_zimm to r2_zimm11 [v8,74/78] target/riscv: rvv-1.0: add vsetivli instruction [v8,75/78] target/riscv: rvv-1.0: add evl parameter to vext_ldst_us() [v8,76/78] target/riscv: rvv-1.0: add vector unit-stride mask load/store insns [v8,77/78] target/riscv: rvv-1.0: rename vmandnot.mm and vmornot.mm to vmandn.mm and vmorn.mm [v8,78/78] target/riscv: rvv-1.0: update opivv_vadc_check() comment

Message ID

20211015074627.3957162-19-frank.chang@sifive.com (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5AEEA61037
From: frank.chang@sifive.com
To: qemu-devel@nongnu.org,
	qemu-riscv@nongnu.org
Subject: [PATCH 18/76] target/riscv: rvv-1.0: configure instructions
Date: Fri, 15 Oct 2021 15:45:19 +0800
Message-Id: <20211015074627.3957162-19-frank.chang@sifive.com>
In-Reply-To: <20211015074627.3957162-1-frank.chang@sifive.com>
References: <20211015074627.3957162-1-frank.chang@sifive.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::435;
 envelope-from=frank.chang@sifive.com; helo=mail-pf1-x435.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Frank Chang <frank.chang@sifive.com>,
 Alistair Francis <alistair.francis@wdc.com>,
 Bin Meng <bin.meng@windriver.com>,
 Richard Henderson <richard.henderson@linaro.org>,
 Palmer Dabbelt <palmer@dabbelt.com>
Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org
Sender: "Qemu-devel"
 <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>

Series

support vector extension v1.0 | expand

Commit Message

Frank Chang Oct. 15, 2021, 7:45 a.m. UTC

From: Frank Chang <frank.chang@sifive.com>

Signed-off-by: Frank Chang <frank.chang@sifive.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 target/riscv/insn_trans/trans_rvv.c.inc | 64 +++++++++++--------------
 target/riscv/vector_helper.c            | 14 +++++-
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc
index 69caa5a036b..7d247656e51 100644
--- a/target/riscv/insn_trans/trans_rvv.c.inc
+++ b/target/riscv/insn_trans/trans_rvv.c.inc
@@ -126,59 +126,51 @@  static bool require_noover(const int8_t dst, const int8_t dst_lmul,
     return !is_overlapped(dst, dst_size, src, src_size);
 }
 
-static bool trans_vsetvl(DisasContext *ctx, arg_vsetvl *a)
+static bool do_vsetvl(DisasContext *s, int rd, int rs1, TCGv s2)
 {
-    TCGv s1, s2, dst;
+    TCGv s1, dst;
 
-    if (!require_rvv(ctx) || !has_ext(ctx, RVV)) {
+    if (!require_rvv(s) || !has_ext(s, RVV)) {
         return false;
     }
 
-    s2 = get_gpr(ctx, a->rs2, EXT_ZERO);
-    dst = dest_gpr(ctx, a->rd);
+    dst = dest_gpr(s, rd);
 
-    /* Using x0 as the rs1 register specifier, encodes an infinite AVL */
-    if (a->rs1 == 0) {
+    if (rd == 0 && rs1 == 0) {
+        s1 = tcg_temp_new();
+        tcg_gen_mov_tl(s1, cpu_vl);
+    } else if (rs1 == 0) {
         /* As the mask is at least one bit, RV_VLEN_MAX is >= VLMAX */
         s1 = tcg_constant_tl(RV_VLEN_MAX);
     } else {
-        s1 = get_gpr(ctx, a->rs1, EXT_ZERO);
+        s1 = get_gpr(s, rs1, EXT_ZERO);
     }
-    gen_helper_vsetvl(dst, cpu_env, s1, s2);
-    gen_set_gpr(ctx, a->rd, dst);
-    mark_vs_dirty(ctx);
 
-    tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn);
-    lookup_and_goto_ptr(ctx);
-    ctx->base.is_jmp = DISAS_NORETURN;
-    return true;
-}
+    gen_helper_vsetvl(dst, cpu_env, s1, s2);
+    gen_set_gpr(s, rd, dst);
+    mark_vs_dirty(s);
 
-static bool trans_vsetvli(DisasContext *ctx, arg_vsetvli *a)
-{
-    TCGv s1, s2, dst;
+    tcg_gen_movi_tl(cpu_pc, s->pc_succ_insn);
+    lookup_and_goto_ptr(s);
+    s->base.is_jmp = DISAS_NORETURN;
 
-    if (!require_rvv(ctx) || !has_ext(ctx, RVV)) {
-        return false;
+    if (rd == 0 && rs1 == 0) {
+        tcg_temp_free(s1);
     }
 
-    s2 = tcg_constant_tl(a->zimm);
-    dst = dest_gpr(ctx, a->rd);
+    return true;
+}
 
-    /* Using x0 as the rs1 register specifier, encodes an infinite AVL */
-    if (a->rs1 == 0) {
-        /* As the mask is at least one bit, RV_VLEN_MAX is >= VLMAX */
-        s1 = tcg_constant_tl(RV_VLEN_MAX);
-    } else {
-        s1 = get_gpr(ctx, a->rs1, EXT_ZERO);
-    }
-    gen_helper_vsetvl(dst, cpu_env, s1, s2);
-    gen_set_gpr(ctx, a->rd, dst);
-    mark_vs_dirty(ctx);
+static bool trans_vsetvl(DisasContext *s, arg_vsetvl *a)
+{
+    TCGv s2 = get_gpr(s, a->rs2, EXT_ZERO);
+    return do_vsetvl(s, a->rd, a->rs1, s2);
+}
 
-    gen_goto_tb(ctx, 0, ctx->pc_succ_insn);
-    ctx->base.is_jmp = DISAS_NORETURN;
-    return true;
+static bool trans_vsetvli(DisasContext *s, arg_vsetvli *a)
+{
+    TCGv s2 = tcg_constant_tl(a->zimm);
+    return do_vsetvl(s, a->rd, a->rs1, s2);
 }
 
 /* vector register offset from env */
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index d0a10a926f4..f6ece48e250 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -31,12 +31,24 @@  target_ulong HELPER(vsetvl)(CPURISCVState *env, target_ulong s1,
 {
     int vlmax, vl;
     RISCVCPU *cpu = env_archcpu(env);
+    uint64_t lmul = FIELD_EX64(s2, VTYPE, VLMUL);
     uint16_t sew = 8 << FIELD_EX64(s2, VTYPE, VSEW);
     uint8_t ediv = FIELD_EX64(s2, VTYPE, VEDIV);
     bool vill = FIELD_EX64(s2, VTYPE, VILL);
     target_ulong reserved = FIELD_EX64(s2, VTYPE, RESERVED);
 
-    if ((sew > cpu->cfg.elen) || vill || (ediv != 0) || (reserved != 0)) {
+    if (lmul & 4) {
+        /* Fractional LMUL. */
+        if (lmul == 4 ||
+            cpu->cfg.elen >> (8 - lmul) < sew) {
+            vill = true;
+        }
+    }
+
+    if ((sew > cpu->cfg.elen)
+        || vill
+        || (ediv != 0)
+        || (reserved != 0)) {
         /* only set vill bit. */
         env->vtype = FIELD_DP64(0, VTYPE, VILL, 1);
         env->vl = 0;

[18/76] target/riscv: rvv-1.0: configure instructions

Commit Message

Patch