From patchwork Sat Feb 1 16:39:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 861248 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1263508wrr; Sat, 1 Feb 2025 08:45:13 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVyEnEOHLHtzZKxBHTMdW8RvP+51lsVhL2LAl1uiHChj7L992lAAfnbDvZtDfB6yWQmp0bVpA==@linaro.org X-Google-Smtp-Source: AGHT+IHZQIbdg2p9NWSbrLq0cTrviDVBJnwOUQIyLIFJVYOOa4opjKfFdwLVC/rd61cGLEcvRP+1 X-Received: by 2002:a05:6214:1c0b:b0:6d9:2e46:dc35 with SMTP id 6a1803df08f44-6e243bf84c3mr268380686d6.25.1738428313183; Sat, 01 Feb 2025 08:45:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738428313; cv=none; d=google.com; s=arc-20240605; b=clr+vd37eN206tvXeuPPuXWmpIPjYeaBAgXgJ9zcZ7WpTp72Sm+WgUoqgQmXSrvDrj oOB6Pea67/YmQNqdb4G0wrizHKPl8b1slIr3TREuUCoXS8PzjYwtbtxUqQI9l2EMawgK byabsvDeGNVG/GZGazy1LW/dhkU/9eMvTyUa6gp5+ly1A/ciXtlwfmxwt/cyWdjlFaZf vz4ZC1AhQUQokfRVPNsbRugAEYBRb1aQ/VurIzrNW0WGWa/BfmXWpkTtZu04/jGwBzUo q5AOIW2FYp01N8an98hNE0MgeKNM77PuUz9E+LezOkPU5wso0eAx/6Qgvj6dSGE3co7y Lxpw== 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=SCTbhiF3A7AJCYL2Q+XbQocI6/g0fpw4SDujjhwaC4A=; fh=GpuGpEixDL1NarYOsVeZqDlB1wH5X8qxF6GvjKAXw+Y=; b=a1XH5JfCkEKaNGmsxpsOQXcmIwr8peI1cA5nepMMSwic9T8KXDjkY5qX0rYuDsxsTY VF23BLSKsVRBCr5+FjFGKRjjHRMy9r4swZpmGoeXto9SqNjKZ5jBwFhbmRgGl2F7rWjG nsxlGtcVnGD9vzhcigFL/XCqu2rBd56dCZC6HVtYP8GWO++qINlTuoO+AbpwOHTv6uN2 RBOpx8Zfh+5A3Xe2dVISMJ6K64NN1xNwz5JVIyfsYdCD9C4D8XzCrLDy3gGwZ0y69WUs C7t4UA3hDKPnCAAivXf3dgQ0cIY2jAScXIt3zxJZHSQs+qovUMZwpGv1abDbU2ATi7sY vJ3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eXflEHYj; 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 6a1803df08f44-6e254838e20si58756716d6.151.2025.02.01.08.45.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Feb 2025 08:45:13 -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=eXflEHYj; 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 1teGYZ-00074j-2f; Sat, 01 Feb 2025 11:41:19 -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 1teGYV-0006v9-NP for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:15 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1teGYT-0001HP-Oz for qemu-devel@nongnu.org; Sat, 01 Feb 2025 11:41:15 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3862b40a6e0so1894840f8f.0 for ; Sat, 01 Feb 2025 08:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738428072; x=1739032872; 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=SCTbhiF3A7AJCYL2Q+XbQocI6/g0fpw4SDujjhwaC4A=; b=eXflEHYjr2pz07NrWAP06b7PEc4h/MJ04DVBrcqKWKOmcBzmDa4hPIn/MDoVTofB+M xnpRPqA2Tl5YUVzXpzqCnc3xH6DNsqFidYd8xBA96NneHj+wrezA1YpRpzav+5vzOtLG byMp8K/zGXoFtLN0Bi3Vw/Ser1wdv7NUfUQte6e+QHUOJA5HmEO/7TLh/Uel1KZkWkj9 lwVqEOQlw/4Pm3rPqCHwEWAZE2HB4NvDST5TuaAVISNZx7RnBX2pT1h/7fTcrzXsX1qc tQ8GKU9LF+befBxxgzAIEexMpuLv46vTUZREeGG9SmAieiXgJKhK+5TDKdvgcwpgNqNK c6oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738428072; x=1739032872; 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=SCTbhiF3A7AJCYL2Q+XbQocI6/g0fpw4SDujjhwaC4A=; b=XGAQGbHUnQ6Gu80wVA93xZzzVAwRbqCp0IZezbEnQ+ZLfXevgfbQ1ihdxJxeljOtDW K/sf/XxAMqdfSrf/46raxy9HNczGSH4GC7CbCtGMu2iJxlS9NUszBhqipKYlxnaHEx28 py4tR6k3kcmU1D9KCTGeDPGrpXRQoAj+pjjj2tRSJ1M/YwOZj07Z2AqA/Z/fbo1IIPdo KyhWfJgRRCRgtDhsg07oMsdoSCe68wnrj46C8o5kIQOs/Wiy1deXJtRoxwz17zuFNTqN p42OnweosS4vUtrR4yHnnVt0cjov4bSp9bICQJ+f7SyESF/XvzYKIOUafqnjiMe8JPC5 wXAg== X-Forwarded-Encrypted: i=1; AJvYcCXhvDFRmxmmLo77i41bFmeXUxcW37LMsMq9WNAFINiDiD/RIBBgsrWf7ZmZIj/3ZJrZz/TYsGyfFVqs@nongnu.org X-Gm-Message-State: AOJu0Yz59EKf5Bdaw/XlLDxLj6LzVeIqoa9ZzW+0EtYrXDqewNjVMj8d LmbrBS4DF8k5QccZAKGSEdK3k0VCcWPlQRUbTQPPI0tcXE6XgXFml+ZNaxwgxqnTZVhrCBEpRil M X-Gm-Gg: ASbGncvjw3gdo2YIoQscu+RPJ0dVYRHKQzBiB0mn7W982k9OJl7jY29GVF2wgwQcyBz sSIVELFD2fvU5pGypzGYUHxirZxyNB0hYGu07maVFwHMP0gMBsj1/ytU/H28QAM6EguALoAzNlp avKEqB2zvipLMBtdM8IAEe3YJUF+EiUpt63mFfNdDkyksGY05DyTzsm/N0pYZePNgMIVrKOq9vG oNDlMc16xzzjD69/EDYDK3Ee0wRTh4L429yY16eSS7/SE5AX0fDUxUdTG+vgS016SWjSDnR5qSd cYGhnJEhPCME3sSEkt+Y X-Received: by 2002:a05:6000:1849:b0:385:dea3:6059 with SMTP id ffacd0b85a97d-38c52097553mr13333620f8f.49.1738428072304; Sat, 01 Feb 2025 08:41:12 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 08:41:11 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 44/69] target/arm: Handle FPCR.AH in SVE FTSSEL Date: Sat, 1 Feb 2025 16:39:47 +0000 Message-Id: <20250201164012.1660228-45-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::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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: 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 The negation step in the SVE FTSSEL insn mustn't negate a NaN when FPCR.AH is set. Pass FPCR.AH to the helper via the SIMD data field and use that to determine whether to do the negation. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- v2: squashed in RTH's fix to use float*_maybe_ah_chs() --- target/arm/tcg/sve_helper.c | 18 +++++++++++++++--- target/arm/tcg/translate-sve.c | 4 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index 90d4defc0d5..bf88bde8a31 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -2555,6 +2555,7 @@ void HELPER(sve_fexpa_d)(void *vd, void *vn, uint32_t desc) void HELPER(sve_ftssel_h)(void *vd, void *vn, void *vm, uint32_t desc) { intptr_t i, opr_sz = simd_oprsz(desc) / 2; + bool fpcr_ah = extract32(desc, SIMD_DATA_SHIFT, 1); uint16_t *d = vd, *n = vn, *m = vm; for (i = 0; i < opr_sz; i += 1) { uint16_t nn = n[i]; @@ -2562,13 +2563,17 @@ void HELPER(sve_ftssel_h)(void *vd, void *vn, void *vm, uint32_t desc) if (mm & 1) { nn = float16_one; } - d[i] = nn ^ (mm & 2) << 14; + if (mm & 2) { + nn = float16_maybe_ah_chs(nn, fpcr_ah); + } + d[i] = nn; } } void HELPER(sve_ftssel_s)(void *vd, void *vn, void *vm, uint32_t desc) { intptr_t i, opr_sz = simd_oprsz(desc) / 4; + bool fpcr_ah = extract32(desc, SIMD_DATA_SHIFT, 1); uint32_t *d = vd, *n = vn, *m = vm; for (i = 0; i < opr_sz; i += 1) { uint32_t nn = n[i]; @@ -2576,13 +2581,17 @@ void HELPER(sve_ftssel_s)(void *vd, void *vn, void *vm, uint32_t desc) if (mm & 1) { nn = float32_one; } - d[i] = nn ^ (mm & 2) << 30; + if (mm & 2) { + nn = float32_maybe_ah_chs(nn, fpcr_ah); + } + d[i] = nn; } } void HELPER(sve_ftssel_d)(void *vd, void *vn, void *vm, uint32_t desc) { intptr_t i, opr_sz = simd_oprsz(desc) / 8; + bool fpcr_ah = extract32(desc, SIMD_DATA_SHIFT, 1); uint64_t *d = vd, *n = vn, *m = vm; for (i = 0; i < opr_sz; i += 1) { uint64_t nn = n[i]; @@ -2590,7 +2599,10 @@ void HELPER(sve_ftssel_d)(void *vd, void *vn, void *vm, uint32_t desc) if (mm & 1) { nn = float64_one; } - d[i] = nn ^ (mm & 2) << 62; + if (mm & 2) { + nn = float64_maybe_ah_chs(nn, fpcr_ah); + } + d[i] = nn; } } diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c index 17016854d87..2dd4605bb2f 100644 --- a/target/arm/tcg/translate-sve.c +++ b/target/arm/tcg/translate-sve.c @@ -1238,14 +1238,14 @@ static gen_helper_gvec_2 * const fexpa_fns[4] = { gen_helper_sve_fexpa_s, gen_helper_sve_fexpa_d, }; TRANS_FEAT_NONSTREAMING(FEXPA, aa64_sve, gen_gvec_ool_zz, - fexpa_fns[a->esz], a->rd, a->rn, 0) + fexpa_fns[a->esz], a->rd, a->rn, s->fpcr_ah) static gen_helper_gvec_3 * const ftssel_fns[4] = { NULL, gen_helper_sve_ftssel_h, gen_helper_sve_ftssel_s, gen_helper_sve_ftssel_d, }; TRANS_FEAT_NONSTREAMING(FTSSEL, aa64_sve, gen_gvec_ool_arg_zzz, - ftssel_fns[a->esz], a, 0) + ftssel_fns[a->esz], a, s->fpcr_ah) /* *** SVE Predicate Logical Operations Group