From patchwork Sat Feb 1 16:39:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 861293 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1265404wrr; Sat, 1 Feb 2025 08:50:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWoLmj59YcpBxg1k469eauvW1OB5QWH4izKLUpeapGTnqZcagqUgJr+E/+DlG7Nxb6I2gVQ5A==@linaro.org X-Google-Smtp-Source: AGHT+IG20E1RF85h+HB/a5yBJcf+nlxLYqBlBXYMzKU2YT3SNuiJbxS2jAZKIkkBO4tqdIGg1kmu X-Received: by 2002:ac8:5a54:0:b0:467:6742:5633 with SMTP id d75a77b69052e-46fd0accdd1mr248775891cf.23.1738428651221; Sat, 01 Feb 2025 08:50:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738428651; cv=none; d=google.com; s=arc-20240605; b=EL5qTHXjxj59yseKNqr0+0gE4VxYe5ukh+Ns1RrXI8XSocJgJ0tlTCMS5V3U4692Im w/1kvs/Rf0wU5aAo6kexRZi4PNr4f8m7AvLfujhfRJ5H/FpceQSKXb/Vg88CW2QLy6R5 lf2JaSOqVjzuGBoUBJkAjeyKaowj2ZeiT5VD28rt+7VhK7Set9WPcJ+jWjZNdBJLPUyR qzCotlzRzktD+nWn5PDk8tSAUQjbJjbYRKzGHs8UMRdkphjDoaXnby4NRjMYEGiwCRDP q5iYElY0TJs6QWB6W2rT0SYAya2I4SXaewQ4cJqhJd5I1c+nANl9G29KrTwuHyZuDovL OtIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ryV1Ue0br35R/rD6LQ3aXcrygp6/qiCCF2NgOcEO2tA=; fh=E1S4Hs1XAPN9VX/Ey879R+rGpixZOupeo6h3ZpRi0tU=; b=L+/ZrFBZOnyOFkE0J1GpQu6gTMn24SfDqY1NUql/8oQ20HKcnRtSgg5loBnFULrvC0 aWipDkME8Clx072p/ZxvkFF9z75qqxIJwnKTvnsLcANXn9Qy9drN4cbRPvheS/eXT54z 0RtrV6h3Csd7tKt1fPPsjUWYAsQby/ZBfEn20s37yr9qLgNQgBFdqtS/huMciCTBpzvL hu+u7rfCXhid71W9FdUIArchm4PQqPWMM38kevATU729DMKmjkj2DCPJ1K3BzgqkBpsm swsAz7p1GJyM8Fkdv8KI4rFWF0m3t0co8FR7+pjsNo88TFgTC7Vq1S2ZxC77OaiaNjue f0Uw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uLfaD99u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-46fdf1d14ccsi59967041cf.343.2025.02.01.08.50.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 08:50:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uLfaD99u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teGYO-0006dj-BX; Sat, 01 Feb 2025 11:41:08 -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 ) id 1teGYN-0006cK-2t for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:07 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1teGYL-0001Dw-6l for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:06 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43625c4a50dso20905795e9.0 for ; Sat, 01 Feb 2025 08:41:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738428063; x=1739032863; 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=ryV1Ue0br35R/rD6LQ3aXcrygp6/qiCCF2NgOcEO2tA=; b=uLfaD99ua/2557VvSRd5fgJIk2jlwzVbHh+Y4qWVlibBrkrERPMKbbCmUf2L/kgRu9 7srY7Ags5pX2weP3EtQQoWrJ4uM5MZy3fWxOfadzPphpWBY2fu0nY3Sn+xCSjizF+OKl HcPFwx5b9AS4qbu1cKnpJCL9fpm+g/TfmJ+uG+YWVcyOVRvPq5b/rodmKnrofPsXEw4A sUiOh9o3dxoc7Nm60pH6ZTmLkoUTECa6RhgY+7ReHMFHZ40fTQjiSaxx93v/qQYwO3bs ABCL3RZ7OghXCauwzM2OQmrC8xsgXUTF3eJogCbY2ZGhN15YlEIcYni2ieaRWDA52+vs bzqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738428063; x=1739032863; 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=ryV1Ue0br35R/rD6LQ3aXcrygp6/qiCCF2NgOcEO2tA=; b=RlMpc+GkN7yy8psr8od1TVke/xua+DyJ90TXxx+1cIEw4hmOGDbx48Zx/yo0k41eBE qpq0616rMhMnvHvTQJpuO2w8j8YOd7TSjgTTMCH8i21Sa6MnZQHuzdgaaLy0rCcgFY+H haJQycvWLs73GvlQFcI49y7EXc3VhT6lBGZylG27L+8lAHF2wBnWbk8dlh0pms9Ron+H 8bcKiklbjStE61nGYAVxIqY3hg/t1PYKE86vCOLLsDEvVborx8aF8m3PwXeDka0dSK5u yUg9wr+ARQjqlukjCNEzYTMRS0s++QhwKc6ewStHXse2ll+rk9RqYtOtlQiUMcFs4Y0t KzOg== X-Forwarded-Encrypted: i=1; AJvYcCWTuYjkp4SRO70kru4/Nb8x8ga/O0Dq5W/DazGO0j5TvI/Yfa0Kn/ZjVaDB4SZCe33grEM9CmejeAK/@nongnu.org X-Gm-Message-State: AOJu0Yx6wOdjHxZxiYZeB2qxNURqEIZSLxBeeJbANvKDRS6d7fXga5W9 7TlK7ffwinwySGEZ0BEIQpcTwrJwCAFv94uw3CVeuHgMgWNLC4GJOpT7ToehDehZhtmtBuPPOQE B X-Gm-Gg: ASbGnculFVRC0YY/L9+2Kfxw37NkD4/fOZmp8vADF165yF+HfAUCBMUgmmcP1mUVuIy /uqcK8DIQ322hgTg2jtIuoTYBi5P4baM0frldiPmQ6h+Ek3rTBUQX5dk8+H4EKnbA+6OD9zB6ww 0O9gDO+/AalAHpVNRt7OiM2nohREvztu4RjLhhrP53YD7fAf5Cm/FS4ZO0dppNMtYIVWt7KpHMc hbjP0l8YTWlp18+IokJHT0FKetLnlVWoohShRXHMMvet2lEZ0Iwe3lSzVBbRzonEPP//3RXV+PG L8YrbjYOMjU+0xExMTBr X-Received: by 2002:a05:600c:4fc1:b0:434:9d62:aa23 with SMTP id 5b1f17b1804b1-438dc40d296mr121435295e9.20.1738428063285; Sat, 01 Feb 2025 08:41:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:41:02 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 36/69] target/arm: Handle FPCR.AH in SVE FABD Date: Sat, 1 Feb 2025 16:39:39 +0000 Message-Id: <20250201164012.1660228-37-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Make the SVE FABD insn honour the FPCR.AH "don't negate the sign of a NaN" semantics. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/tcg/helper-sve.h | 7 +++++++ target/arm/tcg/sve_helper.c | 22 ++++++++++++++++++++++ target/arm/tcg/translate-sve.c | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/target/arm/tcg/helper-sve.h b/target/arm/tcg/helper-sve.h index ff12f650c87..29c70f054af 100644 --- a/target/arm/tcg/helper-sve.h +++ b/target/arm/tcg/helper-sve.h @@ -1183,6 +1183,13 @@ DEF_HELPER_FLAGS_6(sve_fabd_s, TCG_CALL_NO_RWG, DEF_HELPER_FLAGS_6(sve_fabd_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve_ah_fabd_h, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve_ah_fabd_s, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) +DEF_HELPER_FLAGS_6(sve_ah_fabd_d, TCG_CALL_NO_RWG, + void, ptr, ptr, ptr, ptr, fpst, i32) + DEF_HELPER_FLAGS_6(sve_fscalbn_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, fpst, i32) DEF_HELPER_FLAGS_6(sve_fscalbn_s, TCG_CALL_NO_RWG, diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 5ce7d736475..8527a7495a6 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -4394,9 +4394,31 @@ static inline float64 abd_d(float64 a, float64 b, float_status *s) return float64_abs(float64_sub(a, b, s)); } +/* ABD when FPCR.AH = 1: avoid flipping sign bit of a NaN result */ +static float16 ah_abd_h(float16 op1, float16 op2, float_status *stat) +{ + float16 r = float16_sub(op1, op2, stat); + return float16_is_any_nan(r) ? r : float16_abs(r); +} + +static float32 ah_abd_s(float32 op1, float32 op2, float_status *stat) +{ + float32 r = float32_sub(op1, op2, stat); + return float32_is_any_nan(r) ? r : float32_abs(r); +} + +static float64 ah_abd_d(float64 op1, float64 op2, float_status *stat) +{ + float64 r = float64_sub(op1, op2, stat); + return float64_is_any_nan(r) ? r : float64_abs(r); +} + DO_ZPZZ_FP(sve_fabd_h, uint16_t, H1_2, abd_h) DO_ZPZZ_FP(sve_fabd_s, uint32_t, H1_4, abd_s) DO_ZPZZ_FP(sve_fabd_d, uint64_t, H1_8, abd_d) +DO_ZPZZ_FP(sve_ah_fabd_h, uint16_t, H1_2, ah_abd_h) +DO_ZPZZ_FP(sve_ah_fabd_s, uint32_t, H1_4, ah_abd_s) +DO_ZPZZ_FP(sve_ah_fabd_d, uint64_t, H1_8, ah_abd_d) static inline float64 scalbn_d(float64 a, int64_t b, float_status *s) { diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 646d0171d99..0d8bd1a49c4 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -3789,7 +3789,7 @@ DO_ZPZZ_AH_FP(FMIN_zpzz, aa64_sve, sve_fmin, sve_ah_fmin) DO_ZPZZ_AH_FP(FMAX_zpzz, aa64_sve, sve_fmax, sve_ah_fmax) DO_ZPZZ_FP(FMINNM_zpzz, aa64_sve, sve_fminnum) DO_ZPZZ_FP(FMAXNM_zpzz, aa64_sve, sve_fmaxnum) -DO_ZPZZ_FP(FABD, aa64_sve, sve_fabd) +DO_ZPZZ_AH_FP(FABD, aa64_sve, sve_fabd, sve_ah_fabd) DO_ZPZZ_FP(FSCALE, aa64_sve, sve_fscalbn) DO_ZPZZ_FP(FDIV, aa64_sve, sve_fdiv) DO_ZPZZ_FP(FMULX, aa64_sve, sve_fmulx)