From nobody Thu May 8 18:40:43 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=1738428398; cv=none;
d=zohomail.com; s=zohoarc;
b=Naj/dQIzKNEahaKJBNxiaS7a0M42N8rJBn/QDfJe2HjsdOx06pN3tnHigpL7GF4S2YaGuphHd1dLKqntOYElOek5f+1Fh7kDrQ7U4uQM2rocrktRoNcQzFwiDsUarTnjW1OY/1q4EUbJ7b8KIHezErTDmNkEGMxoJfsfyPEvZw0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1738428398;
h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc;
bh=0fctEsT+vD+ZzpjBa9cl09j7OER8dNmtu6EgkXkTcP0=;
b=ji16EuVOaYMy+xQjy0t0D/fDBIVXTHixDqhqDqdbvatGAryz0gjWsdLn/DGu+/hrUpGzNvslOyPGOlMc+rq3ncLp/YWyHrCfBFkMXwDB3XZnwvQcckyu/5zt91+jtt8QWLgwxUDI7x1lPZ298LD1KnPKDd0s0UDyCOO0cYXmBG4=
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 1738428398850255.96194472602565;
Sat, 1 Feb 2025 08:46:38 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1teGYc-0007DZ-77; Sat, 01 Feb 2025 11:41:22 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
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 1teGYY-00074i-R0
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:18 -0500
Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f])
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 1teGYW-0001I8-Vk
for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:18 -0500
Received: by mail-wm1-x32f.google.com with SMTP id
5b1f17b1804b1-4364a37a1d7so29983605e9.3
for <qemu-devel@nongnu.org>; Sat, 01 Feb 2025 08:41:16 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438dcc81d74sm127401525e9.37.2025.02.01.08.41.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 01 Feb 2025 08:41:14 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1738428075; x=1739032875; darn=nongnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=0fctEsT+vD+ZzpjBa9cl09j7OER8dNmtu6EgkXkTcP0=;
b=sllqfa7gJMTXak/gocAKxae4e3/+KmIFCuDhUA+cfxShNOej0fCl9sItT8F091tpZm
kxsgDkQPVkg2xxSubhOdKku8fhk7163eIFuW9XlCBxif3ecXzYYOUNTYbLFAse37K8kR
rJxOXD8XuRpA8umXPTEes+jh6FxMpTiJJQRqGXouP2VBGFb//7TFSbBjTRB2yFpssk3X
cvSIXFHtaHQHkl+GKxesmYJTDMiYFE3nFyL8e2EbL4skD1bJ9+iAxFM5jkDoH+0JIm9b
Z03HptwbWHcBp8pnyuJZlDLAu5LiSg4WLg7XELFda0P7ksHBJJwuNhR033j6T2mIbLoh
TrTQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738428075; x=1739032875;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=0fctEsT+vD+ZzpjBa9cl09j7OER8dNmtu6EgkXkTcP0=;
b=M1SbFAo+7g+hm+P7WE2HtUmrRng7h9cXbbbx7srGjftfWVS2JtIKmudmgeDS7UQ0Wh
fKPVOjK4udfXAMDKlOmWH89ayQuCeGZbn3LGnUKiYnwsL/KnCAjNSOPqiVjeSFvLhBt4
irASUeUAScNcuFeTSG5DfWAWT7E++0k4685W8/W1wK+NTPI3p3+wyEJmLfHog8ROWyZI
xPw2Bu7A/1sCzHZfSz/eBn+pm9py0yiFOqo14eH3oKdqHAbXyBz5roHogPk0fq5y/rS5
QXKq+TVIENpeLiC36PHQ3Ggnkf54KZ0gi7R3ThV4mHFHYOVynz07kn4HxcOFqIugyw9o
Zaeg==
X-Forwarded-Encrypted: i=1;
AJvYcCX+/8UTPQqxDoTeuJ3XigfX0fsNRVlCW3cufY2JhLY8CoiOHAV9Oi04zoDJ2naFPfu0hv2PV2ezv5RS@nongnu.org
X-Gm-Message-State: AOJu0YwP3uWYyTm3PelYg1q74aukoxdw3SjYa0SAzpqhFYYc80xBKeSB
LurY6Mxa6SMODpASWm0KcDHJZRyIUUz8EFSzvJpcJNUVYc/irGjY4Oc5rqr07PY=
X-Gm-Gg: ASbGncs/oHOR4qIMN1ImNE7la9AXFJA4aS3HOTRYDp/xgh9LlUtHa5ALejCN47Jf9q+
32tR5cZtaVPoK8+tx2HeNg9FIsvwlhqbOuCrGeegnhWsU8mFRaf7M+oGwQ/OoP12eBiceiNsRPB
TSJ1W2byRRhMMLsUDK+R2r4ApYdlcky+IiItMcLuwlOAB6hbJxYN0Sv6B3JjZMZj9kTA5dksVkv
ACxJRfKQjAuZdWaGfb0dyabXWxbGJfsdLrGuVK38ex+HdMqonatN+GfJnrbuOh1d6bI/SEhq/lt
8BYYFXYbAj9lqLvYOKZn
X-Google-Smtp-Source:
AGHT+IGm8vZfrhs+Gwe4XLvL2lONTcSzhC6qrytGQVeVfS5jStsj3b0hlPuI2Pg1hSAWQOgo3luUlA==
X-Received: by 2002:a5d:6c65:0:b0:38a:4b8a:e477 with SMTP id
ffacd0b85a97d-38c51969b28mr11948655f8f.22.1738428075553;
Sat, 01 Feb 2025 08:41:15 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
qemu-devel@nongnu.org
Subject: [PATCH v2 46/69] target/arm: Handle FPCR.AH in vector FCMLA
Date: Sat, 1 Feb 2025 16:39:49 +0000
Message-Id: <20250201164012.1660228-47-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20250201164012.1660228-1-peter.maydell@linaro.org>
References: <20250201164012.1660228-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::32f;
envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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.29
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-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1738428399062019000
Content-Type: text/plain; charset="utf-8"
From: Richard Henderson <richard.henderson@linaro.org>
The negation step in FCMLA mustn't negate a NaN when FPCR.AH
is set. Handle this by passing FPCR.AH to the helper via the
SIMD data field, and use this to select whether to do the
negation via XOR or via the muladd negate_product flag.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20250129013857.135256-26-richard.henderson@linaro.org
[PMM: Expanded commit message]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/tcg/translate-a64.c | 2 +-
target/arm/tcg/vec_helper.c | 66 ++++++++++++++++++++--------------
2 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c
index c209ac84228..c45a9822281 100644
--- a/target/arm/tcg/translate-a64.c
+++ b/target/arm/tcg/translate-a64.c
@@ -6175,7 +6175,7 @@ static bool trans_FCMLA_v(DisasContext *s, arg_FCMLA_=
v *a)
=20
gen_gvec_op4_fpst(s, a->q, a->rd, a->rn, a->rm, a->rd,
a->esz =3D=3D MO_16 ? FPST_A64_F16 : FPST_A64,
- a->rot, fn[a->esz]);
+ a->rot | (s->fpcr_ah << 2), fn[a->esz]);
return true;
}
=20
diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c
index fc3e6587b81..630513f00b2 100644
--- a/target/arm/tcg/vec_helper.c
+++ b/target/arm/tcg/vec_helper.c
@@ -965,22 +965,26 @@ void HELPER(gvec_fcmlah)(void *vd, void *vn, void *vm=
, void *va,
uintptr_t opr_sz =3D simd_oprsz(desc);
float16 *d =3D vd, *n =3D vn, *m =3D vm, *a =3D va;
intptr_t flip =3D extract32(desc, SIMD_DATA_SHIFT, 1);
- uint32_t neg_imag =3D extract32(desc, SIMD_DATA_SHIFT + 1, 1);
- uint32_t neg_real =3D flip ^ neg_imag;
+ uint32_t fpcr_ah =3D extract32(desc, SIMD_DATA_SHIFT + 2, 1);
+ uint32_t negf_imag =3D extract32(desc, SIMD_DATA_SHIFT + 1, 1);
+ uint32_t negf_real =3D flip ^ negf_imag;
+ float16 negx_imag, negx_real;
uintptr_t i;
=20
- /* Shift boolean to the sign bit so we can xor to negate. */
- neg_real <<=3D 15;
- neg_imag <<=3D 15;
+ /* With AH=3D0, use negx; with AH=3D1 use negf. */
+ negx_real =3D (negf_real & ~fpcr_ah) << 15;
+ negx_imag =3D (negf_imag & ~fpcr_ah) << 15;
+ negf_real =3D (negf_real & fpcr_ah ? float_muladd_negate_product : 0);
+ negf_imag =3D (negf_imag & fpcr_ah ? float_muladd_negate_product : 0);
=20
for (i =3D 0; i < opr_sz / 2; i +=3D 2) {
float16 e2 =3D n[H2(i + flip)];
- float16 e1 =3D m[H2(i + flip)] ^ neg_real;
+ float16 e1 =3D m[H2(i + flip)] ^ negx_real;
float16 e4 =3D e2;
- float16 e3 =3D m[H2(i + 1 - flip)] ^ neg_imag;
+ float16 e3 =3D m[H2(i + 1 - flip)] ^ negx_imag;
=20
- d[H2(i)] =3D float16_muladd(e2, e1, a[H2(i)], 0, fpst);
- d[H2(i + 1)] =3D float16_muladd(e4, e3, a[H2(i + 1)], 0, fpst);
+ d[H2(i)] =3D float16_muladd(e2, e1, a[H2(i)], negf_real, fpst);
+ d[H2(i + 1)] =3D float16_muladd(e4, e3, a[H2(i + 1)], negf_imag, f=
pst);
}
clear_tail(d, opr_sz, simd_maxsz(desc));
}
@@ -1025,22 +1029,26 @@ void HELPER(gvec_fcmlas)(void *vd, void *vn, void *=
vm, void *va,
uintptr_t opr_sz =3D simd_oprsz(desc);
float32 *d =3D vd, *n =3D vn, *m =3D vm, *a =3D va;
intptr_t flip =3D extract32(desc, SIMD_DATA_SHIFT, 1);
- uint32_t neg_imag =3D extract32(desc, SIMD_DATA_SHIFT + 1, 1);
- uint32_t neg_real =3D flip ^ neg_imag;
+ uint32_t fpcr_ah =3D extract32(desc, SIMD_DATA_SHIFT + 2, 1);
+ uint32_t negf_imag =3D extract32(desc, SIMD_DATA_SHIFT + 1, 1);
+ uint32_t negf_real =3D flip ^ negf_imag;
+ float32 negx_imag, negx_real;
uintptr_t i;
=20
- /* Shift boolean to the sign bit so we can xor to negate. */
- neg_real <<=3D 31;
- neg_imag <<=3D 31;
+ /* With AH=3D0, use negx; with AH=3D1 use negf. */
+ negx_real =3D (negf_real & ~fpcr_ah) << 31;
+ negx_imag =3D (negf_imag & ~fpcr_ah) << 31;
+ negf_real =3D (negf_real & fpcr_ah ? float_muladd_negate_product : 0);
+ negf_imag =3D (negf_imag & fpcr_ah ? float_muladd_negate_product : 0);
=20
for (i =3D 0; i < opr_sz / 4; i +=3D 2) {
float32 e2 =3D n[H4(i + flip)];
- float32 e1 =3D m[H4(i + flip)] ^ neg_real;
+ float32 e1 =3D m[H4(i + flip)] ^ negx_real;
float32 e4 =3D e2;
- float32 e3 =3D m[H4(i + 1 - flip)] ^ neg_imag;
+ float32 e3 =3D m[H4(i + 1 - flip)] ^ negx_imag;
=20
- d[H4(i)] =3D float32_muladd(e2, e1, a[H4(i)], 0, fpst);
- d[H4(i + 1)] =3D float32_muladd(e4, e3, a[H4(i + 1)], 0, fpst);
+ d[H4(i)] =3D float32_muladd(e2, e1, a[H4(i)], negf_real, fpst);
+ d[H4(i + 1)] =3D float32_muladd(e4, e3, a[H4(i + 1)], negf_imag, f=
pst);
}
clear_tail(d, opr_sz, simd_maxsz(desc));
}
@@ -1085,22 +1093,26 @@ void HELPER(gvec_fcmlad)(void *vd, void *vn, void *=
vm, void *va,
uintptr_t opr_sz =3D simd_oprsz(desc);
float64 *d =3D vd, *n =3D vn, *m =3D vm, *a =3D va;
intptr_t flip =3D extract32(desc, SIMD_DATA_SHIFT, 1);
- uint64_t neg_imag =3D extract32(desc, SIMD_DATA_SHIFT + 1, 1);
- uint64_t neg_real =3D flip ^ neg_imag;
+ uint32_t fpcr_ah =3D extract32(desc, SIMD_DATA_SHIFT + 2, 1);
+ uint32_t negf_imag =3D extract32(desc, SIMD_DATA_SHIFT + 1, 1);
+ uint32_t negf_real =3D flip ^ negf_imag;
+ float64 negx_real, negx_imag;
uintptr_t i;
=20
- /* Shift boolean to the sign bit so we can xor to negate. */
- neg_real <<=3D 63;
- neg_imag <<=3D 63;
+ /* With AH=3D0, use negx; with AH=3D1 use negf. */
+ negx_real =3D (uint64_t)(negf_real & ~fpcr_ah) << 63;
+ negx_imag =3D (uint64_t)(negf_imag & ~fpcr_ah) << 63;
+ negf_real =3D (negf_real & fpcr_ah ? float_muladd_negate_product : 0);
+ negf_imag =3D (negf_imag & fpcr_ah ? float_muladd_negate_product : 0);
=20
for (i =3D 0; i < opr_sz / 8; i +=3D 2) {
float64 e2 =3D n[i + flip];
- float64 e1 =3D m[i + flip] ^ neg_real;
+ float64 e1 =3D m[i + flip] ^ negx_real;
float64 e4 =3D e2;
- float64 e3 =3D m[i + 1 - flip] ^ neg_imag;
+ float64 e3 =3D m[i + 1 - flip] ^ negx_imag;
=20
- d[i] =3D float64_muladd(e2, e1, a[i], 0, fpst);
- d[i + 1] =3D float64_muladd(e4, e3, a[i + 1], 0, fpst);
+ d[i] =3D float64_muladd(e2, e1, a[i], negf_real, fpst);
+ d[i + 1] =3D float64_muladd(e4, e3, a[i + 1], negf_imag, fpst);
}
clear_tail(d, opr_sz, simd_maxsz(desc));
}
--=20
2.34.1