From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 055B5C4727C for ; Tue, 29 Sep 2020 19:41:43 +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 62A2B20774 for ; Tue, 29 Sep 2020 19:41:42 +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="LY3c0Lpo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 62A2B20774 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]:45108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNLVN-0002KL-Bn for qemu-devel@archiver.kernel.org; Tue, 29 Sep 2020 15:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNKyC-0005tG-Oj for qemu-devel@nongnu.org; Tue, 29 Sep 2020 15:07:24 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:53341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNKyA-0002Ek-PS for qemu-devel@nongnu.org; Tue, 29 Sep 2020 15:07:24 -0400 Received: by mail-pj1-x102c.google.com with SMTP id t7so3185385pjd.3 for ; Tue, 29 Sep 2020 12:07:22 -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=VRIOxzmNwDOciq5eMw0dA0/ZCfiTPWfUuRt4ezZioCk=; b=LY3c0LpoBf/RYtWdIDBOCJRdvUm55mPiir4vJzfN6KsCwNUlvFld6fDQk13V7cxEPm dTOHP5qtuGFqWkHr2pYfKi1NK/XDh0vVHjKHPHX5lf2UOuO/ySSLM5qQeLGEtAVmEpOu /d1Qj+IyqM3GpqulNuDaZKdT7nUzQdy12MwydMQH8Um5sObpwmonvCFXETcZnghe9P0W 8NAhxXvxaxs7mQsWMwULQjpndSRD8u7iePlto5VJKihJ/jMz+IdEMiA5wMdJzKbm/r3w heRyPisaeBNx3II13ElF75f1/3JV5oOH+7L98rGDEN2Tt5gVleomLKiSl8G2B5VBIT1+ XeUQ== 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=VRIOxzmNwDOciq5eMw0dA0/ZCfiTPWfUuRt4ezZioCk=; b=Mc8w6xImlE4E6hH47pr/rP5JcBheMKzUyQbeUhNP9/OzA2kyfacAPh1y1DyNy5mlvr q4ZhGL0ebJt87sadxyZZV7a+/5WwX2VLLPfeC8GlA1RWnUteQCoGfHqm9M4I51GqePZh 28am+8ozu4rLb1NCx+0om4BYwp8LZp834zBEOD0/1DuyUOjw+ucUmq/kEs9G2Nakavac MW+9l8kMTi/VDS1SO0NYt3qNc0WWiutPf1/87YIwEj8+5BArBaw1Hj0hsncf1jGIHFdw dlAtzRLTLlsYJuidSufuDH0x+/Y7dANDEtvj8EUoH34XzCmnVdXd18CXSOHkJYVAUGO9 u1pQ== X-Gm-Message-State: AOAM533fADLvfONaqM9MSDgWqprB2F/nTQhLs3T1Vxw9C7KhDhJOntlh E38sSeeU+etubQ0+ts21ZvhoKRoFEhDtpQ== X-Google-Smtp-Source: ABdhPJy8+1bDeu0DZsyrdnUV6nA3feWKZL44kXVgatRFbMGw1uhpQ0ahlVvzkGYr2/60JoI2hHZHlg== X-Received: by 2002:a17:90a:9f09:: with SMTP id n9mr5141787pjp.88.1601406441294; Tue, 29 Sep 2020 12:07:21 -0700 (PDT) Received: from localhost.localdomain (122-116-72-36.HINET-IP.hinet.net. [122.116.72.36]) by smtp.gmail.com with ESMTPSA id v8sm6003950pgg.58.2020.09.29.12.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 12:07:20 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [RFC v5 35/68] target/riscv: rvv-1.0: integer scalar move instructions Date: Wed, 30 Sep 2020 03:04:10 +0800 Message-Id: <20200929190448.31116-36-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929190448.31116-1-frank.chang@sifive.com> References: <20200929190448.31116-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=frank.chang@sifive.com; helo=mail-pj1-x102c.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 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: 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 * 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.c.inc | 45 ++++++++++++++++++++----- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 5555fa2906..ad7d47748b 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -609,8 +609,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.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc index 97a7ff0251..46317ae490 100644 --- a/target/riscv/insn_trans/trans_rvv.c.inc +++ b/target/riscv/insn_trans/trans_rvv.c.inc @@ -3223,27 +3223,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; } -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1kNKyE-0005wp-CK for mharc-qemu-riscv@gnu.org; Tue, 29 Sep 2020 15:07:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNKyC-0005sO-Cg for qemu-riscv@nongnu.org; Tue, 29 Sep 2020 15:07:24 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:52455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNKyA-0002Eh-FP for qemu-riscv@nongnu.org; Tue, 29 Sep 2020 15:07:24 -0400 Received: by mail-pj1-x1035.google.com with SMTP id ml18so350163pjb.2 for ; Tue, 29 Sep 2020 12:07:22 -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=VRIOxzmNwDOciq5eMw0dA0/ZCfiTPWfUuRt4ezZioCk=; b=LY3c0LpoBf/RYtWdIDBOCJRdvUm55mPiir4vJzfN6KsCwNUlvFld6fDQk13V7cxEPm dTOHP5qtuGFqWkHr2pYfKi1NK/XDh0vVHjKHPHX5lf2UOuO/ySSLM5qQeLGEtAVmEpOu /d1Qj+IyqM3GpqulNuDaZKdT7nUzQdy12MwydMQH8Um5sObpwmonvCFXETcZnghe9P0W 8NAhxXvxaxs7mQsWMwULQjpndSRD8u7iePlto5VJKihJ/jMz+IdEMiA5wMdJzKbm/r3w heRyPisaeBNx3II13ElF75f1/3JV5oOH+7L98rGDEN2Tt5gVleomLKiSl8G2B5VBIT1+ XeUQ== 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=VRIOxzmNwDOciq5eMw0dA0/ZCfiTPWfUuRt4ezZioCk=; b=m2x0wjR35UjWMAskQpULUZPQBWPFM5dE9Cf2R2PECofYLQCpG4fb5s6r6yJLZKEuEn Fd/fYczpgaafBglONiRAQkrHo/8qMoF9ilhhdFhUI07enCBwse8TGi6SxvyASkWRr7yo eAdhK0nfqsdgbHDulgzt/mqyHR4QRKaamBD4SQYmnmdmhvoAUeW0u82IYtVbADuQ0y9S nvjOKsZRtF1ubPAa4jiWRBvPewnMLxAsgml03VY9NiOlKVxXQajp3NGAWBh+FZCTDT9u iHLT0ty+FWYJIgl4g94MW5qlRBa7q7AnnYofWe1lh50ZKNzAieXy1keUj3QQI6gNV68Y QrXg== X-Gm-Message-State: AOAM532JVlMjVzhn8q9OOBBRow1rDLzF3rww+gwrVLQlMOprxr8xvO1D JwdE2QJI4ncv7x28mgztOu33Ow== X-Google-Smtp-Source: ABdhPJy8+1bDeu0DZsyrdnUV6nA3feWKZL44kXVgatRFbMGw1uhpQ0ahlVvzkGYr2/60JoI2hHZHlg== X-Received: by 2002:a17:90a:9f09:: with SMTP id n9mr5141787pjp.88.1601406441294; Tue, 29 Sep 2020 12:07:21 -0700 (PDT) Received: from localhost.localdomain (122-116-72-36.HINET-IP.hinet.net. [122.116.72.36]) by smtp.gmail.com with ESMTPSA id v8sm6003950pgg.58.2020.09.29.12.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 12:07:20 -0700 (PDT) From: frank.chang@sifive.com To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Frank Chang , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , Bastian Koppelmann , Richard Henderson , LIU Zhiwei Subject: [RFC v5 35/68] target/riscv: rvv-1.0: integer scalar move instructions Date: Wed, 30 Sep 2020 03:04:10 +0800 Message-Id: <20200929190448.31116-36-frank.chang@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929190448.31116-1-frank.chang@sifive.com> References: <20200929190448.31116-1-frank.chang@sifive.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=frank.chang@sifive.com; helo=mail-pj1-x1035.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2020 19:07:24 -0000 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.c.inc | 45 ++++++++++++++++++++----- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 5555fa2906..ad7d47748b 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -609,8 +609,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.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc index 97a7ff0251..46317ae490 100644 --- a/target/riscv/insn_trans/trans_rvv.c.inc +++ b/target/riscv/insn_trans/trans_rvv.c.inc @@ -3223,27 +3223,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; } -- 2.17.1