From nobody Fri May  9 15:40:37 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	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;
	dmarc=pass(p=none dis=none)  header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1591376336; cv=none;
	d=zohomail.com; s=zohoarc;
	b=CTbH7GXGdq1wClAwH9Y2cfv5FJI9+yFO+dFLW04POvyfkIDfh2o/ynbuxz0MfS6PTEWhS1j7yLsvwVaEKodUtItZ5Jn5Kdy4Uji7GGDjgNcciSVP+mQ4k6PwKKXIVqGiRXiD0y3+w/OX0IZOiJVBicb2cR6eoWfPcJXMUABhqY0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1591376336;
 h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=zJYNISEOsg8ccU7UHuK/z2j9Xqafzuocjd3EYSZ8uNY=;
	b=THc7xh2L4U1bw/rfhVw1B8hKVRUH+W8u4VVEfSeYdwtSRspzJYgSeeczwXtb601gJGJ2pkU+VG28v1XVEGhgb09mTAgjsTpHKN6guzEBtXZK+e0fuYdT/ZYSphYKQJn2YmHtEG/qhO1OYGgknlys2uwa0/SaIAv9mCb/PuYJNqg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	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;
	dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
 header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1591376336132694.8771929045996;
 Fri, 5 Jun 2020 09:58:56 -0700 (PDT)
Received: from localhost ([::1]:34152 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1jhFgD-0002xR-RP
	for importer@patchew.org; Fri, 05 Jun 2020 12:58:53 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:40604)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
 id 1jhFYC-0001y3-OI
 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 12:50:36 -0400
Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:44079)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
 id 1jhFYA-0001hX-L2
 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 12:50:36 -0400
Received: by mail-wr1-x434.google.com with SMTP id y17so10421985wrn.11
 for <qemu-devel@nongnu.org>; Fri, 05 Jun 2020 09:50:34 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
 by smtp.gmail.com with ESMTPSA id c140sm12272724wmd.18.2020.06.05.09.50.32
 for <qemu-devel@nongnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 05 Jun 2020 09:50:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
 h=from:to:subject:date:message-id:in-reply-to:references:mime-version
 :content-transfer-encoding;
 bh=zJYNISEOsg8ccU7UHuK/z2j9Xqafzuocjd3EYSZ8uNY=;
 b=JUvW+4tvfSllrBuXaJWxemmJiulrYZRNADY/bDSNtze6iGodmWdT1/9oNYlJEz+XuL
 IEjyt6n98EB+Pp76ypPutBNkGnKBsnzSDYmH9CrQlepp+BI/Hqgr8sGgrRASsZpi4gwT
 LnH/SBaDSjJYMddpEWxiTQcZaZWYP7y1wlVhZtcE1Tys8iyFYe6fuGUy5hnPnDQyRyaZ
 vF9bOf5U9oiRTIBCjfvnxHALULrT7JxXVZib+SL2Hj0CVvYfvBhHkFwX9wvnQI4wCg4l
 hRhqaQYrBudejf9GjGlShuaMYzttdtqpnFPCX4oYOc5eQ0ZEMIhMIp2o/nkRqaStMHRZ
 Wv3w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=zJYNISEOsg8ccU7UHuK/z2j9Xqafzuocjd3EYSZ8uNY=;
 b=fdkTIRfAbN4/MYC5lAvVfDYmTC2IqnnaLOlIc0ALOWFhNUnvRZwajVLqv00mpyxjDx
 q29y8PT8yThDrENmL8HuuhnRw6g+EWfCvBfE/us6VDVDm2nb/0wKv6r3PhxmDvN26VbZ
 DMeprYU21rYup6mz+YGPjqwu0PQGlie0SYTzPGp17tnX1mHhVqEoJ4mxp7jYvUr37wQP
 dWC1AiZ6W9LRMmvgv3RMzcdUm4vcKU3Dgyk8veJyXbBIr9tU195uf2Z8ICXTS4JRl8pI
 omPBUt0ZVp1cNy32+sZmO7a+And1/6/XJrqAKU1PtgTAxkmLt9L28W5I5KONqwtbfw2p
 UtMw==
X-Gm-Message-State: AOAM5330UiIbWuHcdpFH50d74+AaJRCUIatU3h9MzjQznovH/WewEswA
 5Mf5CG3H1EDsx6u8vhbLOj2sOS7L0wRVYg==
X-Google-Smtp-Source: 
 ABdhPJwMPjmC/3S7fWt8Skpu/QewnKt+QFoXCDO/+KzHcPvyWQfm9wZuQ+mlUzjSFoloH1FhAbDPoQ==
X-Received: by 2002:adf:fb92:: with SMTP id
 a18mr10732048wrr.263.1591375832925;
 Fri, 05 Jun 2020 09:50:32 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 21/29] target/arm: Convert Neon VSHL and VSLI 2-reg-shift insn
 to decodetree
Date: Fri,  5 Jun 2020 17:49:59 +0100
Message-Id: <20200605165007.12095-22-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200605165007.12095-1-peter.maydell@linaro.org>
References: <20200605165007.12095-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
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=2a00:1450:4864:20::434;
 envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.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_PASS=-0.001,
 URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN
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>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
Content-Type: text/plain; charset="utf-8"

Convert the VSHL and VSLI insns from the Neon 2-registers-and-a-shift
group to decodetree.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200522145520.6778-2-peter.maydell@linaro.org
---
 target/arm/neon-dp.decode       | 25 ++++++++++++++++++++++
 target/arm/translate-neon.inc.c | 38 +++++++++++++++++++++++++++++++++
 target/arm/translate.c          | 18 +++++++---------
 3 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/target/arm/neon-dp.decode b/target/arm/neon-dp.decode
index 8af7c53d8b9..fcce2edacd4 100644
--- a/target/arm/neon-dp.decode
+++ b/target/arm/neon-dp.decode
@@ -201,3 +201,28 @@ VRECPS_fp_3s     1111 001 0 0 . 0 . .... .... 1111 ...=
 1 .... @3same_fp
 VRSQRTS_fp_3s    1111 001 0 0 . 1 . .... .... 1111 ... 1 .... @3same_fp
 VMAXNM_fp_3s     1111 001 1 0 . 0 . .... .... 1111 ... 1 .... @3same_fp
 VMINNM_fp_3s     1111 001 1 0 . 1 . .... .... 1111 ... 1 .... @3same_fp
+
+######################################################################
+# 2-reg-and-shift grouping:
+# 1111 001 U 1 D immH:3 immL:3 Vd:4 opc:4 L Q M 1 Vm:4
+######################################################################
+&2reg_shift vm vd q shift size
+
+@2reg_shl_d      .... ... . . . shift:6      .... .... 1 q:1 . . .... \
+                 &2reg_shift vm=3D%vm_dp vd=3D%vd_dp size=3D3
+@2reg_shl_s      .... ... . . . 1 shift:5    .... .... 0 q:1 . . .... \
+                 &2reg_shift vm=3D%vm_dp vd=3D%vd_dp size=3D2
+@2reg_shl_h      .... ... . . . 01 shift:4   .... .... 0 q:1 . . .... \
+                 &2reg_shift vm=3D%vm_dp vd=3D%vd_dp size=3D1
+@2reg_shl_b      .... ... . . . 001 shift:3  .... .... 0 q:1 . . .... \
+                 &2reg_shift vm=3D%vm_dp vd=3D%vd_dp size=3D0
+
+VSHL_2sh         1111 001 0 1 . ...... .... 0101 . . . 1 .... @2reg_shl_d
+VSHL_2sh         1111 001 0 1 . ...... .... 0101 . . . 1 .... @2reg_shl_s
+VSHL_2sh         1111 001 0 1 . ...... .... 0101 . . . 1 .... @2reg_shl_h
+VSHL_2sh         1111 001 0 1 . ...... .... 0101 . . . 1 .... @2reg_shl_b
+
+VSLI_2sh         1111 001 1 1 . ...... .... 0101 . . . 1 .... @2reg_shl_d
+VSLI_2sh         1111 001 1 1 . ...... .... 0101 . . . 1 .... @2reg_shl_s
+VSLI_2sh         1111 001 1 1 . ...... .... 0101 . . . 1 .... @2reg_shl_h
+VSLI_2sh         1111 001 1 1 . ...... .... 0101 . . . 1 .... @2reg_shl_b
diff --git a/target/arm/translate-neon.inc.c b/target/arm/translate-neon.in=
c.c
index 7b19753c8ca..7f05323fdff 100644
--- a/target/arm/translate-neon.inc.c
+++ b/target/arm/translate-neon.inc.c
@@ -1202,3 +1202,41 @@ static bool do_3same_fp_pair(DisasContext *s, arg_3s=
ame *a, VFPGen3OpSPFn *fn)
 DO_3S_FP_PAIR(VPADD, gen_helper_vfp_adds)
 DO_3S_FP_PAIR(VPMAX, gen_helper_vfp_maxs)
 DO_3S_FP_PAIR(VPMIN, gen_helper_vfp_mins)
+
+static bool do_vector_2sh(DisasContext *s, arg_2reg_shift *a, GVecGen2iFn =
*fn)
+{
+    /* Handle a 2-reg-shift insn which can be vectorized. */
+    int vec_size =3D a->q ? 16 : 8;
+    int rd_ofs =3D neon_reg_offset(a->vd, 0);
+    int rm_ofs =3D neon_reg_offset(a->vm, 0);
+
+    if (!arm_dc_feature(s, ARM_FEATURE_NEON)) {
+        return false;
+    }
+
+    /* UNDEF accesses to D16-D31 if they don't exist. */
+    if (!dc_isar_feature(aa32_simd_r32, s) &&
+        ((a->vd | a->vm) & 0x10)) {
+        return false;
+    }
+
+    if ((a->vm | a->vd) & a->q) {
+        return false;
+    }
+
+    if (!vfp_access_check(s)) {
+        return true;
+    }
+
+    fn(a->size, rd_ofs, rm_ofs, a->shift, vec_size, vec_size);
+    return true;
+}
+
+#define DO_2SH(INSN, FUNC)                                              \
+    static bool trans_##INSN##_2sh(DisasContext *s, arg_2reg_shift *a)  \
+    {                                                                   \
+        return do_vector_2sh(s, a, FUNC);                               \
+    }                                                                   \
+
+DO_2SH(VSHL, tcg_gen_gvec_shli)
+DO_2SH(VSLI, gen_gvec_sli)
diff --git a/target/arm/translate.c b/target/arm/translate.c
index c61180ea618..41fef49dbe7 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -5294,6 +5294,14 @@ static int disas_neon_data_insn(DisasContext *s, uin=
t32_t insn)
         if ((insn & 0x00380080) !=3D 0) {
             /* Two registers and shift.  */
             op =3D (insn >> 8) & 0xf;
+
+            switch (op) {
+            case 5: /* VSHL, VSLI */
+                return 1; /* handled by decodetree */
+            default:
+                break;
+            }
+
             if (insn & (1 << 7)) {
                 /* 64-bit shift. */
                 if (op > 7) {
@@ -5387,16 +5395,6 @@ static int disas_neon_data_insn(DisasContext *s, uin=
t32_t insn)
                     gen_gvec_sri(size, rd_ofs, rm_ofs, shift,
                                  vec_size, vec_size);
                     return 0;
-
-                case 5: /* VSHL, VSLI */
-                    if (u) { /* VSLI */
-                        gen_gvec_sli(size, rd_ofs, rm_ofs, shift,
-                                     vec_size, vec_size);
-                    } else { /* VSHL */
-                        tcg_gen_gvec_shli(size, rd_ofs, rm_ofs, shift,
-                                          vec_size, vec_size);
-                    }
-                    return 0;
                 }
=20
                 if (size =3D=3D 3) {
--=20
2.20.1