From patchwork Tue Jan 12 09:38:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 12013065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C04BBC433E0 for ; Tue, 12 Jan 2021 10:06:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C6F122B30 for ; Tue, 12 Jan 2021 10:06:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C6F122B30 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzGZk-000568-96 for qemu-devel@archiver.kernel.org; Tue, 12 Jan 2021 05:06:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzGAp-0003gn-6I for qemu-devel@nongnu.org; Tue, 12 Jan 2021 04:41:11 -0500 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:33256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzGAn-0007RV-0V for qemu-devel@nongnu.org; Tue, 12 Jan 2021 04:41:10 -0500 Received: by mail-pf1-x436.google.com with SMTP id h186so1081066pfe.0 for ; Tue, 12 Jan 2021 01:41:08 -0800 (PST) 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=mkSgJj+AdtN+uPMUSm+PksB4+E8StQF6TXa/U+VZxYE=; b=AoTRIu7XbNG35qogik87/vcbB4rTyT9+oXAWWsubJvx/oTSrm4rZ7Eik9jVGXCArXR gqd0w7mHZlqBaUxL24dk6wpIKWU1xhIWrqCE9Ob9tPiYyOCjX2xXuJrcJ3PBK4dn8cJv FqnlSkkcmIO7m5AE+xQn0maNuwA/5VbPF3q113drZuXIC37Z33xQjCO4vCqHI3nvZGwn 0fNx8yyL8nJeuf9ROeju92ldPx7iBOvrsxTOTlPGxSsxHvPjTLDbfmoPBi5qTouTJDJZ 6AYhVF5f19gj3QyYJQhNT4QIul+oob+vqOnUpACAnfOyoaz7KmkTmX7BviQq3PN1HSi8 PhNg== 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=mkSgJj+AdtN+uPMUSm+PksB4+E8StQF6TXa/U+VZxYE=; b=MpNB0Q3cUv3JAee6Cigy5MB2UygyTP20Uqba4JSEVn74IG0sq6mIUnUgC1BSmTmJ3s ztomDwghx52QZx7m5s6AaSIMuDINOJpH00ibIdMPDWpoL3RGuG6lKEgb5SdDbooNzKKg +dM5ECVCcuLMd/wg6sgftkV5+r2zMyFu1AhCj5GI38EOVBp2t8cMb/vlnTpl+mJHd3ax tL2NEte9T4RAtNtp7tHgzqgqWAcMHQkzp09o7Y74v7ZIz6mnivJZkQqCNDZGYyGxHYG8 4LCMG/UjCvwXslV2Tg8QpwiZ/shcRPch5BO+J7NHxcwuUWGgH1mC51A2PUuA5Ql71Vxo HTWQ== X-Gm-Message-State: AOAM530AgVOdttQyj5685y5If2MiHei4gb5sPXgiAcKlUYAwlmUvwbn6 i73m6zys9c7ib6ZIZeSh7Lpw/GzINbC4K4JU X-Google-Smtp-Source: ABdhPJx2PXKffxCQuMghCQrpSfW0azsmyYrKNBE0SX27cES1F2KENMgsek7d/AVZxx7X0i0h6kgX3g== X-Received: by 2002:a63:574c:: with SMTP id h12mr3909671pgm.79.1610444467053; Tue, 12 Jan 2021 01:41:07 -0800 (PST) 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 h16sm2865664pgd.62.2021.01.12.01.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 01:41:06 -0800 (PST) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v6 17/72] target/riscv: rvv-1.0: configure instructions Date: Tue, 12 Jan 2021 17:38:51 +0800 Message-Id: <20210112093950.17530-18-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210112093950.17530-1-frank.chang@sifive.com> References: <20210112093950.17530-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=frank.chang@sifive.com; helo=mail-pf1-x436.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagar Karandikar , Frank Chang , Bastian Koppelmann , Richard Henderson , Alistair Francis , Palmer Dabbelt , LIU Zhiwei Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Frank Chang Signed-off-by: Frank Chang Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/insn_trans/trans_rvv.c.inc | 53 +++++++++---------------- target/riscv/vector_helper.c | 14 ++++++- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc index ccfa93cf2f8..a3732e76e09 100644 --- a/target/riscv/insn_trans/trans_rvv.c.inc +++ b/target/riscv/insn_trans/trans_rvv.c.inc @@ -132,28 +132,29 @@ static bool require_noover_seg(const int8_t dst, const int8_t nf, return !is_overlapped(dst, nf, src, 1); } -static bool trans_vsetvl(DisasContext *ctx, arg_vsetvl *a) +static bool do_vsetvl(DisasContext *ctx, int rd, int rs1, TCGv s2) { - TCGv s1, s2, dst; + TCGv s1, dst; if (!require_rvv(ctx) || !has_ext(ctx, RVV)) { return false; } - s2 = tcg_temp_new(); dst = tcg_temp_new(); - /* 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_const_tl(RV_VLEN_MAX); } else { s1 = tcg_temp_new(); - gen_get_gpr(s1, a->rs1); + gen_get_gpr(s1, rs1); } - gen_get_gpr(s2, a->rs2); + gen_helper_vsetvl(dst, cpu_env, s1, s2); - gen_set_gpr(a->rd, dst); + gen_set_gpr(rd, dst); mark_vs_dirty(ctx); tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn); lookup_and_goto_ptr(ctx); @@ -165,35 +166,17 @@ static bool trans_vsetvl(DisasContext *ctx, arg_vsetvl *a) return true; } -static bool trans_vsetvli(DisasContext *ctx, arg_vsetvli *a) +static bool trans_vsetvl(DisasContext *ctx, arg_vsetvl *a) { - TCGv s1, s2, dst; - - if (!require_rvv(ctx) || !has_ext(ctx, RVV)) { - return false; - } - - s2 = tcg_const_tl(a->zimm); - dst = tcg_temp_new(); - - /* 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_const_tl(RV_VLEN_MAX); - } else { - s1 = tcg_temp_new(); - gen_get_gpr(s1, a->rs1); - } - gen_helper_vsetvl(dst, cpu_env, s1, s2); - gen_set_gpr(a->rd, dst); - mark_vs_dirty(ctx); - gen_goto_tb(ctx, 0, ctx->pc_succ_insn); - ctx->base.is_jmp = DISAS_NORETURN; + TCGv s2 = tcg_temp_new(); + gen_get_gpr(s2, a->rs2); + return do_vsetvl(ctx, a->rd, a->rs1, s2); +} - tcg_temp_free(s1); - tcg_temp_free(s2); - tcg_temp_free(dst); - return true; +static bool trans_vsetvli(DisasContext *ctx, arg_vsetvli *a) +{ + TCGv s2 = tcg_const_tl(a->zimm); + return do_vsetvl(ctx, 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 89aa7cbf73f..61917d34ffe 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;