From nobody Mon Feb 9 20:46:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597655494; cv=none; d=zohomail.com; s=zohoarc; b=Rz3JRb0274Vsz6gVJh+nm+LSWqq5z71Esn0Bko8W/q6nfAoJhBzvIxgSrsyFpY5QeqVKHXSoWebOkMu6O8yaIDMyX5815NBmulp0GB1ZigsUidq5PMDzZ6l/plBJQwPZfzwRaWpXaqw2zSdmw44jLFwllBJYWQQqXrZR1ljJcDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597655494; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=kdV/DLbRkszWL23vC+x1qFeulOdV1WYvVXiJb/rz5to=; b=EjvbA96gNagEj55Uxmj5ECQPDy2djhyKcCeQK4NwYyeG3jAGnhZZjxpyQ4HVf+Z4vQ/nB0wKgWiWMpH5r6tPkhosPVRz37LwbKAlgsAfAsuidF8QKRM4jM41lQ7Dvi17TqOHyBeVIW5GoDAq8jxFcJPEzNIxxvKckkIONaRDM1c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597655494763977.1884720815896; Mon, 17 Aug 2020 02:11:34 -0700 (PDT) Received: from localhost ([::1]:57726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7bAz-0005l2-If for importer@patchew.org; Mon, 17 Aug 2020 05:11:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7arp-0000pT-B9 for qemu-devel@nongnu.org; Mon, 17 Aug 2020 04:51:45 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:46725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7arn-000577-Da for qemu-devel@nongnu.org; Mon, 17 Aug 2020 04:51:44 -0400 Received: by mail-pf1-x433.google.com with SMTP id 74so7877941pfx.13 for ; Mon, 17 Aug 2020 01:51:42 -0700 (PDT) Received: from frankchang-ThinkPad-T490.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id d9sm16478588pgv.45.2020.08.17.01.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kdV/DLbRkszWL23vC+x1qFeulOdV1WYvVXiJb/rz5to=; b=TE7Tz8FNnNY3OXcmLFEWe8zFE15lYCTOH1xyWeuMLITp2NJSKAr7BMGNlmb3JLdYM6 +auJMiPcnQRifJE2M53CjVIvhPsPz6Fc8eIORkJYAHaSd3nM1LejcGtGR5WZrvmro6FC JI+Pw1/n9QwfywKyE8uUAxU/i0sNwCWYPls8opOXP/VB+9JwfOhIbbYa1Nr0NrezC02p qSG6Rv1r06pzKktsBx7FzHfFsk/Wb8AKidFawHIGtnBaoLONP65GJNE3l8e+g88iNgvn eZ53eJJLX7e0/BS3HKezeGdqtuKP+73NJAfHJ5he8ORg/NW0VkgitnjJ5lLxf9SPStm3 6lgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kdV/DLbRkszWL23vC+x1qFeulOdV1WYvVXiJb/rz5to=; b=Lz9daYxg6gccfHeCbns3sEHYSR/3brfdlxrjMGoz9BDSRIZ3snceww8Rf+MZnpDKlI YqBm7+XXOadFHpGKqtZmJU/rbODDEzxYjm3PgWCokMk/BZ5MQAaenwLd1+LXRlsqxAS4 XGZcLkqzxUkhjnWXICCzg35MrDyH0OUaIwfH/DbFF9JC7EXURgQ1TuAgeEc5RRStIZUp VIA/kKYHTuTZ4I82ZXz7hrcvE1L92yXVhkN6E14vWMA9Uuck3QYAff+NPQgMnt4EvOKK JBaVOkD068kMsGcvuZbsnNPr4jmpNFVvP8ben9RIGGj8N7bvOyWy7X1qI4tMetcuWDiy 9Xww== X-Gm-Message-State: AOAM532ONxQMa0cCoeTQMLgV1WkslIePk5/8jtVMTwKv0aNbCO2uq9RH q6Ti0YQgh09yenVVR4x7BZNGn0pgNgfIsQ== X-Google-Smtp-Source: ABdhPJyVzxVzc2wTZphIp3ig0hx+Ipi7ogjdE9a/4Ps5M8G95hMwjDeyvALEc2lKPnPlrMJcEYj0Iw== X-Received: by 2002:a63:5b55:: with SMTP id l21mr9561288pgm.348.1597654301793; Mon, 17 Aug 2020 01:51:41 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v4 34/70] target/riscv: rvv-1.0: register gather instructions Date: Mon, 17 Aug 2020 16:49:19 +0800 Message-Id: <20200817084955.28793-35-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817084955.28793-1-frank.chang@sifive.com> References: <20200817084955.28793-1-frank.chang@sifive.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::433; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Frank Chang , Alistair Francis , Palmer Dabbelt , Sagar Karandikar , Bastian Koppelmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Frank Chang * Add vrgatherei16.vv instruction. Signed-off-by: Frank Chang --- target/riscv/helper.h | 4 ++++ target/riscv/insn32.decode | 1 + target/riscv/insn_trans/trans_rvv.inc.c | 21 +++++++++++++++++++-- target/riscv/vector_helper.c | 23 ++++++++++++++--------- 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/target/riscv/helper.h b/target/riscv/helper.h index a5d58010134..35fb09d2892 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -1105,6 +1105,10 @@ DEF_HELPER_6(vrgather_vv_b, void, ptr, ptr, ptr, ptr= , env, i32) DEF_HELPER_6(vrgather_vv_h, void, ptr, ptr, ptr, ptr, env, i32) DEF_HELPER_6(vrgather_vv_w, void, ptr, ptr, ptr, ptr, env, i32) DEF_HELPER_6(vrgather_vv_d, void, ptr, ptr, ptr, ptr, env, i32) +DEF_HELPER_6(vrgatherei16_vv_b, void, ptr, ptr, ptr, ptr, env, i32) +DEF_HELPER_6(vrgatherei16_vv_h, void, ptr, ptr, ptr, ptr, env, i32) +DEF_HELPER_6(vrgatherei16_vv_w, void, ptr, ptr, ptr, ptr, env, i32) +DEF_HELPER_6(vrgatherei16_vv_d, void, ptr, ptr, ptr, ptr, env, i32) DEF_HELPER_6(vrgather_vx_b, void, ptr, ptr, tl, ptr, env, i32) DEF_HELPER_6(vrgather_vx_h, void, ptr, ptr, tl, ptr, env, i32) DEF_HELPER_6(vrgather_vx_w, void, ptr, ptr, tl, ptr, env, i32) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 15afc469cb0..67306ac7161 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -609,6 +609,7 @@ vslidedown_vx 001111 . ..... ..... 100 ..... 1010111 = @r_vm vslidedown_vi 001111 . ..... ..... 011 ..... 1010111 @r_vm vslide1down_vx 001111 . ..... ..... 110 ..... 1010111 @r_vm vrgather_vv 001100 . ..... ..... 000 ..... 1010111 @r_vm +vrgatherei16_vv 001110 . ..... ..... 000 ..... 1010111 @r_vm vrgather_vx 001100 . ..... ..... 100 ..... 1010111 @r_vm vrgather_vi 001100 . ..... ..... 011 ..... 1010111 @r_vm vcompress_vm 010111 - ..... ..... 010 ..... 1010111 @r diff --git a/target/riscv/insn_trans/trans_rvv.inc.c b/target/riscv/insn_tr= ans/trans_rvv.inc.c index be5149fa762..392a1eba6b9 100644 --- a/target/riscv/insn_trans/trans_rvv.inc.c +++ b/target/riscv/insn_trans/trans_rvv.inc.c @@ -3319,7 +3319,21 @@ static bool vrgather_vv_check(DisasContext *s, arg_r= mrr *a) require_vm(a->vm, a->rd); } =20 +static bool vrgatherei16_vv_check(DisasContext *s, arg_rmrr *a) +{ + int8_t emul =3D 4 - (s->sew + 3) + s->lmul; + return require_rvv(s) && + vext_check_isa_ill(s) && + (emul >=3D -3 && emul <=3D 3) && + require_align(a->rd, 1 << s->lmul) && + require_align(a->rs1, 1 << emul) && + require_align(a->rs2, 1 << s->lmul) && + (a->rd !=3D a->rs2 && a->rd !=3D a->rs1) && + require_vm(a->vm, a->rd); +} + GEN_OPIVV_TRANS(vrgather_vv, vrgather_vv_check) +GEN_OPIVV_TRANS(vrgatherei16_vv, vrgatherei16_vv_check) =20 static bool vrgather_vx_check(DisasContext *s, arg_rmrr *a) { @@ -3339,7 +3353,8 @@ static bool trans_vrgather_vx(DisasContext *s, arg_rm= rr *a) } =20 if (a->vm && s->vl_eq_vlmax) { - int vlmax =3D s->vlen; + int scale =3D s->lmul - (s->sew + 3); + int vlmax =3D scale < 0 ? s->vlen >> -scale : s->vlen << scale; TCGv_i64 dest =3D tcg_temp_new_i64(); =20 if (a->rs1 =3D=3D 0) { @@ -3370,7 +3385,9 @@ static bool trans_vrgather_vi(DisasContext *s, arg_rm= rr *a) } =20 if (a->vm && s->vl_eq_vlmax) { - if (a->rs1 >=3D s->vlen) { + int scale =3D s->lmul - (s->sew + 3); + int vlmax =3D scale < 0 ? s->vlen >> -scale : s->vlen << scale; + if (a->rs1 >=3D vlmax) { tcg_gen_gvec_dup_imm(SEW64, vreg_ofs(s, a->rd), MAXSZ(s), MAXSZ(s), 0); } else { diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 716e1926ee2..26a8ac6fe25 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -4693,11 +4693,11 @@ GEN_VEXT_VSLIDE1DOWN_VX(vslide1down_vx_w, uint32_t,= H4) GEN_VEXT_VSLIDE1DOWN_VX(vslide1down_vx_d, uint64_t, H8) =20 /* Vector Register Gather Instruction */ -#define GEN_VEXT_VRGATHER_VV(NAME, ETYPE, H) \ +#define GEN_VEXT_VRGATHER_VV(NAME, TS1, TS2, HS1, HS2) \ void HELPER(NAME)(void *vd, void *v0, void *vs1, void *vs2, \ CPURISCVState *env, uint32_t desc) \ { \ - uint32_t vlmax =3D vext_max_elems(desc, ctzl(sizeof(ETYPE))); = \ + uint32_t vlmax =3D vext_max_elems(desc, ctzl(sizeof(TS1))); = \ uint32_t vm =3D vext_vm(desc); = \ uint32_t vl =3D env->vl; = \ uint32_t index, i; \ @@ -4706,20 +4706,25 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, vo= id *vs2, \ if (!vm && !vext_elem_mask(v0, i)) { \ continue; \ } \ - index =3D *((ETYPE *)vs1 + H(i)); = \ + index =3D *((TS1 *)vs1 + HS1(i)); = \ if (index >=3D vlmax) { = \ - *((ETYPE *)vd + H(i)) =3D 0; = \ + *((TS2 *)vd + HS2(i)) =3D 0; = \ } else { \ - *((ETYPE *)vd + H(i)) =3D *((ETYPE *)vs2 + H(index)); = \ + *((TS2 *)vd + HS2(i)) =3D *((TS2 *)vs2 + HS2(index)); = \ } \ } \ } =20 /* vd[i] =3D (vs1[i] >=3D VLMAX) ? 0 : vs2[vs1[i]]; */ -GEN_VEXT_VRGATHER_VV(vrgather_vv_b, uint8_t, H1) -GEN_VEXT_VRGATHER_VV(vrgather_vv_h, uint16_t, H2) -GEN_VEXT_VRGATHER_VV(vrgather_vv_w, uint32_t, H4) -GEN_VEXT_VRGATHER_VV(vrgather_vv_d, uint64_t, H8) +GEN_VEXT_VRGATHER_VV(vrgather_vv_b, uint8_t, uint8_t, H1, H1) +GEN_VEXT_VRGATHER_VV(vrgather_vv_h, uint16_t, uint16_t, H2, H2) +GEN_VEXT_VRGATHER_VV(vrgather_vv_w, uint32_t, uint32_t, H4, H4) +GEN_VEXT_VRGATHER_VV(vrgather_vv_d, uint64_t, uint64_t, H8, H8) + +GEN_VEXT_VRGATHER_VV(vrgatherei16_vv_b, uint16_t, uint8_t, H2, H1) +GEN_VEXT_VRGATHER_VV(vrgatherei16_vv_h, uint16_t, uint16_t, H2, H2) +GEN_VEXT_VRGATHER_VV(vrgatherei16_vv_w, uint16_t, uint32_t, H2, H4) +GEN_VEXT_VRGATHER_VV(vrgatherei16_vv_d, uint16_t, uint64_t, H2, H8) =20 #define GEN_VEXT_VRGATHER_VX(NAME, ETYPE, H) \ void HELPER(NAME)(void *vd, void *v0, target_ulong s1, void *vs2, \ --=20 2.17.1