From nobody Wed Apr 16 19:17:07 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=1630492916; cv=none;
d=zohomail.com; s=zohoarc;
b=LQ+h6uoba88axxY/c8A0B4U+HqWOGqCI4Wbg1ThqHMW81bvAsIMMEROiwpK5gaaXioEz2+IgRXDdxPZ7AauTNp8HsXqwFr3Kmmj6r1Ff6W9eFnD6GO4qpaibQk2gIRhv7yN8Xr7Om84zsYSvzRBX2dNmGNiDD2gkCI3R8m7QNWk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1630492916;
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=mWFsqLJx/ZREG9fsj3Ycq1zQrSJgiL5MT7G2IKi2KCc=;
b=IzbEnIIDTEjxFSOQtySFq9IrySMqQqrtds8qsRQL1b5mF0kgA8Gn3an8Ov+pJgjQzL+S3kvijSqStN4w+mH80ESCTSChFGAiRTEphuasrNb5W0jsJn1CPVfis74MZTWhUQ+DAb1c3S/XnDrp7N+1WkeMY9NaF0RENPEGnRK9Z/0=
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)
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 1630492916713884.7548997406906;
Wed, 1 Sep 2021 03:41:56 -0700 (PDT)
Received: from localhost ([::1]:56554 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 1mLNgp-0006z1-Fn
for importer@patchew.org; Wed, 01 Sep 2021 06:41:55 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:43228)
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 1mLNcA-0006qI-VQ
for qemu-devel@nongnu.org; Wed, 01 Sep 2021 06:37:07 -0400
Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:51929)
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 1mLNc5-0005e5-MZ
for qemu-devel@nongnu.org; Wed, 01 Sep 2021 06:37:06 -0400
Received: by mail-wm1-x335.google.com with SMTP id u15so1523683wmj.1
for <qemu-devel@nongnu.org>; Wed, 01 Sep 2021 03:37:01 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id j207sm5494771wmj.40.2021.09.01.03.36.59
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 01 Sep 2021 03:37:00 -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=mWFsqLJx/ZREG9fsj3Ycq1zQrSJgiL5MT7G2IKi2KCc=;
b=vR5OJvH84Lqs2vbAIWyVvUS9iyluzShJ4f5LlEO/tYqL0yRkJh8UJfVOkgEMoWOGz9
LVW3G8T5ypkgg9XTz7CAKHcH1HLQ2o1JVTzNxSYqCoN0YQL2Df+Ka5SH8+dm6CmWBDSR
nrYKmHok/RX3RCNdPrXxlX9lj+scnHyF1+Uz3lLpOGeOn3QP5xgiDle2o18jpUF08Njo
7Z5htVGiFOy2hEkgBdNgmVbIsY/sTNYiggh4nfzBJon25+LNyVCBuoFjQulrKqX8ukYp
rxR037A/QcDbZikLXRpUV1Nha0u6oBwuSQkyiCBsx4ap/LJ2Z4+EJLwwv8sLf5sbhqT+
fz3A==
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=mWFsqLJx/ZREG9fsj3Ycq1zQrSJgiL5MT7G2IKi2KCc=;
b=IITbr10oDXajxK4aFfFQcMj/D+zMFtzmpk2ApZyGUMcaN5V1QNvfUmkZo9PKqjnJIg
KSRdVB7U9EK+vDt94iAOBJuKB5U2clK/yUWiZS4iya/VmcrNDRNxFLfz0Gc520TW6Qwb
zTiiDSg45OosYasQ9SmsRDVfeLeGHwtxny6BfeCty/nPXq6yQb7Xd/dWgk3qePyVaLS9
QAK3nZj36U5FpGcEVZ1JGJ/RbuplSAw7453JPOx/LVnxwILV0CfDcM9i3R9Lt/VmF7Df
zvKcZRbEELJxh5vJpe80RrNlHVpAGcYP+urN+oaJ4GvP8npxcmKqKBcct2T5fG9XLCY7
kqhQ==
X-Gm-Message-State: AOAM530Fk2FtgDgk4ZKQyb549UJTjWBXyXoFEhCjeuM/KqwJx6ReXHWX
buhXJkbyz8HS1EgfEGSo2A0Z0f2nV8ONyg==
X-Google-Smtp-Source:
ABdhPJzOlJ4foWY/6uOA3gNFGDhysGI5YIa+rVxTKp+1FgnFqNDwNbM7XRbuyEqIp/LHYdh8CeCo5A==
X-Received: by 2002:a1c:20d7:: with SMTP id
g206mr9229605wmg.153.1630492620383;
Wed, 01 Sep 2021 03:37:00 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 06/51] target/arm: Implement MVE VADD (floating-point)
Date: Wed, 1 Sep 2021 11:36:08 +0100
Message-Id: <20210901103653.13435-7-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210901103653.13435-1-peter.maydell@linaro.org>
References: <20210901103653.13435-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::335;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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: <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)
X-ZM-MESSAGEID: 1630492918521100001
Content-Type: text/plain; charset="utf-8"
Implement the MVE VADD (floating-point) insn. Handling of this is
similar to the 2-operand integer insns, except that we must take care
to only update the floating point exception status if the least
significant bit of the predicate mask for each element is active.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/helper-mve.h | 3 +++
target/arm/translate.h | 6 ++++++
target/arm/mve.decode | 10 ++++++++++
target/arm/mve_helper.c | 40 +++++++++++++++++++++++++++++++++++++
target/arm/translate-mve.c | 17 ++++++++++++++++
target/arm/translate-neon.c | 6 ------
6 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/target/arm/helper-mve.h b/target/arm/helper-mve.h
index 3db9b15f121..32fd2e1f9be 100644
--- a/target/arm/helper-mve.h
+++ b/target/arm/helper-mve.h
@@ -410,6 +410,9 @@ DEF_HELPER_FLAGS_4(mve_vhcadd270b, TCG_CALL_NO_WG, void=
, env, ptr, ptr, ptr)
DEF_HELPER_FLAGS_4(mve_vhcadd270h, TCG_CALL_NO_WG, void, env, ptr, ptr, pt=
r)
DEF_HELPER_FLAGS_4(mve_vhcadd270w, TCG_CALL_NO_WG, void, env, ptr, ptr, pt=
r)
=20
+DEF_HELPER_FLAGS_4(mve_vfaddh, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr)
+DEF_HELPER_FLAGS_4(mve_vfadds, TCG_CALL_NO_WG, void, env, ptr, ptr, ptr)
+
DEF_HELPER_FLAGS_4(mve_vadd_scalarb, TCG_CALL_NO_WG, void, env, ptr, ptr, =
i32)
DEF_HELPER_FLAGS_4(mve_vadd_scalarh, TCG_CALL_NO_WG, void, env, ptr, ptr, =
i32)
DEF_HELPER_FLAGS_4(mve_vadd_scalarw, TCG_CALL_NO_WG, void, env, ptr, ptr, =
i32)
diff --git a/target/arm/translate.h b/target/arm/translate.h
index 241596c5bda..8636c20c3b4 100644
--- a/target/arm/translate.h
+++ b/target/arm/translate.h
@@ -181,6 +181,12 @@ static inline int rsub_8(DisasContext *s, int x)
return 8 - x;
}
=20
+static inline int neon_3same_fp_size(DisasContext *s, int x)
+{
+ /* Convert 0=3D=3Dfp32, 1=3D=3Dfp16 into a MO_* value */
+ return MO_32 - x;
+}
+
static inline int arm_dc_feature(DisasContext *dc, int feature)
{
return (dc->features & (1ULL << feature)) !=3D 0;
diff --git a/target/arm/mve.decode b/target/arm/mve.decode
index 87446816293..e211cb016c6 100644
--- a/target/arm/mve.decode
+++ b/target/arm/mve.decode
@@ -26,6 +26,10 @@
# VQDMULL has size in bit 28: 0 for 16 bit, 1 for 32 bit
%size_28 28:1 !function=3Dplus_1
=20
+# 2 operand fp insns have size in bit 20: 1 for 16 bit, 0 for 32 bit,
+# like Neon FP insns.
+%2op_fp_size 20:1 !function=3Dneon_3same_fp_size
+
# 1imm format immediate
%imm_28_16_0 28:1 16:3 0:4
=20
@@ -118,6 +122,9 @@
=20
@vmaxv .... .... .... size:2 .. rda:4 .... .... .... &vmaxv qm=3D%qm
=20
+@2op_fp .... .... .... .... .... .... .... .... &2op \
+ qd=3D%qd qn=3D%qn qm=3D%qm size=3D%2op_fp_size
+
# Vector loads and stores
=20
# Widening loads and narrowing stores:
@@ -615,3 +622,6 @@ VCMPGE_scalar 1111 1110 0 . .. ... 1 ... 1 1111 0 1=
0 0 .... @vcmp_scalar
VCMPLT_scalar 1111 1110 0 . .. ... 1 ... 1 1111 1 1 0 0 .... @vcmp_sca=
lar
VCMPGT_scalar 1111 1110 0 . .. ... 1 ... 1 1111 0 1 1 0 .... @vcmp_sca=
lar
VCMPLE_scalar 1111 1110 0 . .. ... 1 ... 1 1111 1 1 1 0 .... @vcmp_sca=
lar
+
+# 2-operand FP
+VADD_fp 1110 1111 0 . 0 . ... 0 ... 0 1101 . 1 . 0 ... 0 @2op_fp
diff --git a/target/arm/mve_helper.c b/target/arm/mve_helper.c
index c2826eb5f9f..abca7c0b2ab 100644
--- a/target/arm/mve_helper.c
+++ b/target/arm/mve_helper.c
@@ -25,6 +25,7 @@
#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
#include "tcg/tcg.h"
+#include "fpu/softfloat.h"
=20
static uint16_t mve_eci_mask(CPUARMState *env)
{
@@ -2798,3 +2799,42 @@ DO_VMAXMINA(vmaxaw, 4, int32_t, uint32_t, DO_MAX)
DO_VMAXMINA(vminab, 1, int8_t, uint8_t, DO_MIN)
DO_VMAXMINA(vminah, 2, int16_t, uint16_t, DO_MIN)
DO_VMAXMINA(vminaw, 4, int32_t, uint32_t, DO_MIN)
+
+/*
+ * 2-operand floating point. Note that if an element is partially
+ * predicated we must do the FP operation to update the non-predicated
+ * bytes, but we must be careful to avoid updating the FP exception
+ * state unless byte 0 of the element was unpredicated.
+ */
+#define DO_2OP_FP(OP, ESIZE, TYPE, FN) \
+ void HELPER(glue(mve_, OP))(CPUARMState *env, \
+ void *vd, void *vn, void *vm) \
+ { \
+ TYPE *d =3D vd, *n =3D vn, *m =3D vm; =
\
+ TYPE r; \
+ uint16_t mask =3D mve_element_mask(env); \
+ unsigned e; \
+ float_status *fpst; \
+ float_status scratch_fpst; \
+ for (e =3D 0; e < 16 / ESIZE; e++, mask >>=3D ESIZE) { =
\
+ if ((mask & MAKE_64BIT_MASK(0, ESIZE)) =3D=3D 0) { =
\
+ continue; \
+ } \
+ fpst =3D (ESIZE =3D=3D 2) ? &env->vfp.standard_fp_status_f16 :=
\
+ &env->vfp.standard_fp_status; \
+ if (!(mask & 1)) { \
+ /* We need the result but without updating flags */ \
+ scratch_fpst =3D *fpst; \
+ fpst =3D &scratch_fpst; \
+ } \
+ r =3D FN(n[H##ESIZE(e)], m[H##ESIZE(e)], fpst); \
+ mergemask(&d[H##ESIZE(e)], r, mask); \
+ } \
+ mve_advance_vpt(env); \
+ }
+
+#define DO_2OP_FP_ALL(OP, FN) \
+ DO_2OP_FP(OP##h, 2, float16, float16_##FN) \
+ DO_2OP_FP(OP##s, 4, float32, float32_##FN)
+
+DO_2OP_FP_ALL(vfadd, add)
diff --git a/target/arm/translate-mve.c b/target/arm/translate-mve.c
index 78229c44c68..d2c40ede564 100644
--- a/target/arm/translate-mve.c
+++ b/target/arm/translate-mve.c
@@ -831,6 +831,23 @@ static bool trans_VSBCI(DisasContext *s, arg_2op *a)
return do_2op(s, a, gen_helper_mve_vsbci);
}
=20
+#define DO_2OP_FP(INSN, FN) \
+ static bool trans_##INSN(DisasContext *s, arg_2op *a) \
+ { \
+ static MVEGenTwoOpFn * const fns[] =3D { \
+ NULL, \
+ gen_helper_mve_##FN##h, \
+ gen_helper_mve_##FN##s, \
+ NULL, \
+ }; \
+ if (!dc_isar_feature(aa32_mve_fp, s)) { \
+ return false; \
+ } \
+ return do_2op(s, a, fns[a->size]); \
+ }
+
+DO_2OP_FP(VADD_fp, vfadd)
+
static bool do_2op_scalar(DisasContext *s, arg_2scalar *a,
MVEGenTwoOpScalarFn fn)
{
diff --git a/target/arm/translate-neon.c b/target/arm/translate-neon.c
index c53ab20fa48..dd43de558e4 100644
--- a/target/arm/translate-neon.c
+++ b/target/arm/translate-neon.c
@@ -28,12 +28,6 @@
#include "translate.h"
#include "translate-a32.h"
=20
-static inline int neon_3same_fp_size(DisasContext *s, int x)
-{
- /* Convert 0=3D=3Dfp32, 1=3D=3Dfp16 into a MO_* value */
- return MO_32 - x;
-}
-
/* Include the generated Neon decoder */
#include "decode-neon-dp.c.inc"
#include "decode-neon-ls.c.inc"
--=20
2.20.1