From patchwork Thu Aug 6 10:46:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Chang X-Patchwork-Id: 11702949 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3BD7A722 for ; Thu, 6 Aug 2020 11:54:44 +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 0BD8522CF7 for ; Thu, 6 Aug 2020 11:54:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="gusz5RGt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BD8522CF7 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:36402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3drA-0001BC-4C for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Aug 2020 07:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3dSL-0003HB-2B for qemu-devel@nongnu.org; Thu, 06 Aug 2020 06:49:06 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:34407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3dSB-0007vr-HC for qemu-devel@nongnu.org; Thu, 06 Aug 2020 06:49:03 -0400 Received: by mail-pl1-x630.google.com with SMTP id o1so27327252plk.1 for ; Thu, 06 Aug 2020 03:48:54 -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=f3euh/ct8dEIWpjZBGRdkEY9SdcS0vgVdpZNMlYCEsE=; b=gusz5RGtzM80ABHUkqX5kaX0efSKVBFMAa2V81V+qKNTgh3pHrIWcVEerXm24BLt5L wpb1hf/L5uG12VExr1ytlkWQmxBC19/1SwmKpm6AtJWM9rQ1/AdZwbpOS4h4YVo3/mU6 bqJYrbORg+zshGhpyzFLjBby44ZqyK4wd35K1DNu0eZFeV17OIaHN3gQX67LtRKU6YSx SHipPuR2lyK3FUzUjTaB6a0oU42HFzj8bB1V1QhSPT554kQbAxV0G31SOAqHDnOQE0BM bVXiIJ/jKXIY9O/oAkiIgz3/9jF5GzXfuKr+nVc6HG40CXv2rHqkcJyW6+9crkEGwoha I6YQ== 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=f3euh/ct8dEIWpjZBGRdkEY9SdcS0vgVdpZNMlYCEsE=; b=Qo+C4djiutyYJcYrVf0Bx4YkHKU2cSnBrJ6lTKSt0kzVv0XrwavA5sJgxprR6gcvAm YICWRJ1FivKwB/ufhaeeSto4d19IH4YyFrlAltseu7jL4YtzVJHyhPc+NnW4gTZAwo9U 9dQu3OJWTXim9O3YLu4ebAAilnMid+MahvZ3kX94GcQoLEuo7HjAMh52qVQ/Du/SZbiL nfepSrxHRIJ3l9Fy7WIia1+PaTiXbdGERcf5W5mb1k/xWflkP8EoXqQ6vnc2DJ0ttFwY 6AEqYbT1WXHNNK9LHTK7xESn5YZ9FHo+1TBQCYST6nJ8S39fSvG88GlMS5ea2X80hKRn XgXQ== X-Gm-Message-State: AOAM533wz9BOXeisxqXUCR5ZlhWrBUZuwzhmnQEZelQm7un5jok5p3HK 57isN0kIXMVKm4d+dIfVF20NNeV0ago= X-Google-Smtp-Source: ABdhPJxnJuWAFjf2ONic/6bYycxppE1lzdwmT1tB3mrfHjND6ZcZwmLV0SrHX6rhDh8TMHnt4F2ivw== X-Received: by 2002:a17:90b:c98:: with SMTP id o24mr7888482pjz.31.1596710932533; Thu, 06 Aug 2020 03:48:52 -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 f18sm6567309pgv.84.2020.08.06.03.48.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 03:48:52 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v3 37/71] target/riscv: rvv-1.0: integer scalar move instructions Date: Thu, 6 Aug 2020 18:46:34 +0800 Message-Id: <20200806104709.13235-38-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806104709.13235-1-frank.chang@sifive.com> References: <20200806104709.13235-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=frank.chang@sifive.com; helo=mail-pl1-x630.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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Frank Chang * Remove "vmv.s.x: dothing if rs1 == 0" constraint. * Add vmv.x.s instruction. Signed-off-by: Frank Chang Reviewed-by: Richard Henderson --- target/riscv/insn32.decode | 3 +- target/riscv/insn_trans/trans_rvv.inc.c | 45 ++++++++++++++++++++----- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 67306ac7161..6b90b67c7cc 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -598,8 +598,9 @@ vmsif_m 010100 . ..... 00011 010 ..... 1010111 @r2_vm vmsof_m 010100 . ..... 00010 010 ..... 1010111 @r2_vm viota_m 010100 . ..... 10000 010 ..... 1010111 @r2_vm vid_v 010100 . 00000 10001 010 ..... 1010111 @r1_vm +vmv_x_s 010000 1 ..... 00000 010 ..... 1010111 @r2rd +vmv_s_x 010000 1 00000 ..... 110 ..... 1010111 @r2 vext_x_v 001100 1 ..... ..... 010 ..... 1010111 @r -vmv_s_x 001101 1 00000 ..... 110 ..... 1010111 @r2 vfmv_f_s 001100 1 ..... 00000 001 ..... 1010111 @r2rd vfmv_s_f 001101 1 00000 ..... 101 ..... 1010111 @r2 vslideup_vx 001110 . ..... ..... 100 ..... 1010111 @r_vm diff --git a/target/riscv/insn_trans/trans_rvv.inc.c b/target/riscv/insn_trans/trans_rvv.inc.c index 6698e1e860b..61d913fb4d9 100644 --- a/target/riscv/insn_trans/trans_rvv.inc.c +++ b/target/riscv/insn_trans/trans_rvv.inc.c @@ -3196,27 +3196,56 @@ static void vec_element_storei(DisasContext *s, int vreg, store_element(val, cpu_env, endian_ofs(s, vreg, idx), s->sew); } +/* vmv.x.s rd, vs2 # x[rd] = vs2[0] */ +static bool trans_vmv_x_s(DisasContext *s, arg_vmv_x_s *a) +{ + if (require_rvv(s) && + vext_check_isa_ill(s)) { + TCGv_i64 t1; + TCGv dest; + + t1 = tcg_temp_new_i64(); + dest = tcg_temp_new(); + /* + * load vreg and sign-extend to 64 bits, + * then truncate to XLEN bits before storing to gpr. + */ + vec_element_loadi(s, t1, a->rs2, 0, true); + tcg_gen_trunc_i64_tl(dest, t1); + gen_set_gpr(a->rd, dest); + tcg_temp_free_i64(t1); + tcg_temp_free(dest); + + return true; + } + return false; +} + /* vmv.s.x vd, rs1 # vd[0] = rs1 */ static bool trans_vmv_s_x(DisasContext *s, arg_vmv_s_x *a) { - if (vext_check_isa_ill(s)) { + if (require_rvv(s) && + vext_check_isa_ill(s)) { /* This instruction ignores LMUL and vector register groups */ - int maxsz = s->vlen >> 3; TCGv_i64 t1; + TCGv s1; TCGLabel *over = gen_new_label(); tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_vl, 0, over); - tcg_gen_gvec_dup_imm(SEW64, vreg_ofs(s, a->rd), maxsz, maxsz, 0); - if (a->rs1 == 0) { - goto done; - } t1 = tcg_temp_new_i64(); - tcg_gen_extu_tl_i64(t1, cpu_gpr[a->rs1]); + s1 = tcg_temp_new(); + + /* + * load gpr and sign-extend to 64 bits, + * then truncate to SEW bits when storing to vreg. + */ + gen_get_gpr(s1, a->rs1); + tcg_gen_ext_tl_i64(t1, s1); vec_element_storei(s, a->rd, 0, t1); tcg_temp_free_i64(t1); + tcg_temp_free(s1); mark_vs_dirty(s); - done: gen_set_label(over); return true; }