From patchwork Tue Feb 11 16:25:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 864106 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1289:b0:385:e875:8a9e with SMTP id f9csp327497wrx; Tue, 11 Feb 2025 08:34:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUFHf5FPjpmZRhThZy2MogM9px4mxJi7F2HmqLX2h38sk+EHzPkmEkHzUtxU9JQHd0BhjaEew==@linaro.org X-Google-Smtp-Source: AGHT+IEvLSkNnm82ZUWTDd2b6zhQ1aPqDyF5LieyFAuVi5wa/Y0UGfhRHG0jUoPA5lEz9iK3T74R X-Received: by 2002:a05:620a:25c6:b0:7be:82e5:5681 with SMTP id af79cd13be357-7c047c74d31mr2625414985a.43.1739291684610; Tue, 11 Feb 2025 08:34:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739291684; cv=none; d=google.com; s=arc-20240605; b=Yifb7ua8DJBUiLPtDg5VHGPx3EuF+YzI3ynuUMRpsdto2GjSPzrF+crBb0yBJhKeR0 VGFZ6rpoXoMLbThiEyNELKTDnUAxGWD8fxvGCbtUK7t6zldHQgUM1JADI7JfTkPI4+4D Ca7ofDIx+I+nO9QPsllN4cmf4tRL1XzkUFyLe8rj43GeYaxU8Xi9dGmMn+mrwWkN2XKp 9FuXGvmqGDLvng5HCFmv772Bxh6sEA2AekX7GuATbhJfU6OJkvfd7474JNQcW8yPK/To MpA33GSdzUSlgaA+O7ufVvS0Zi2Sumfnur79TW3T0W7frv1YJ5iV9ikgE9biermiHYXw rk7g== 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=htYhz0lU1fSw0+mws+bcJcnJI70g4/8lJiqmKbiAD3w=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=PoVwlKksnr9rJQPY8yE1UEwc8E9fNNXMGy/t0OshGnMZPd971dxhzOToERtbeJkqjK DnDa3xUMBjsQYeLGbX9NC7Bq+N4wAwCy9n64Ge8106Ht5sVIgw4eBI2PDqPlSc16hLNO zWLWODka2fPKTeZ02UBm0SUzVl2ucnerzP/QmsI5DgYqix3kWiEdiF7AxTuyjeOd8A7C tXxRoec6kxjcZOHAvRcp2qFbuiph7AmZ55REHUnba+D5j3nW/BFuGk/bDfwRC0Jm8Cw9 Tt/m3XlBFBZIIK5/ooH1hGvEAENDX1e6plXjwpCbuXdfuImSyW79Ap6svtpVzUi7RcZp qjtw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cpEXFVBq; 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 af79cd13be357-7c0644b5faesi295362885a.428.2025.02.11.08.34.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Feb 2025 08:34:44 -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=cpEXFVBq; 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 1tht7Y-0002pL-Er; Tue, 11 Feb 2025 11:28:25 -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 1tht5x-0006kq-Lx for qemu-devel@nongnu.org; Tue, 11 Feb 2025 11:26:47 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tht5u-0003N5-Fk for qemu-devel@nongnu.org; Tue, 11 Feb 2025 11:26:45 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43957634473so1665325e9.0 for ; Tue, 11 Feb 2025 08:26:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739291201; x=1739896001; 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=htYhz0lU1fSw0+mws+bcJcnJI70g4/8lJiqmKbiAD3w=; b=cpEXFVBqM5gZ7TW8HZvOmHz6rZtaVyRZlqhoVmFeiRlTQDXCgZsIq0FqpoVRKv0rPO T0CYNof2GeEDVyRUtd0P1+/uVDFYYlkrrM3Wcoeb1k1KNW8fSYjINBjEsOZ/+efYxnNE VIimmV58SA7aYvxcTqvhsx+2ewdFYIaUate39i/1M8Ytj58835HzbpUkCY5FzjjjMcQR X7mCp3Z6GBbQEQ8fazHXZDXbbJUFsouOVDf8+kpfdaWcVpU/Fh9dtchcGAlynFYIoGrB AEFTw5I6sJGxTfdhtRG2cuY+306t2tWJ123c2+qEEquBfGM3cvDDHUn93rIXwZ823rpl NMRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739291201; x=1739896001; 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=htYhz0lU1fSw0+mws+bcJcnJI70g4/8lJiqmKbiAD3w=; b=L5Smt1ITeEpaVm9fxZ8ZIOLI5qO4700tPICS6aoBzrq64+sxX9tyZwZ8ZuIO+StBsO mx9ySknxQ4k1CbFNpe6bLt2+1LdtOIEYnIRJ5iwQHi5sklQbpSX+JuyQCdl5y2o88jCI daPyrRFUnxqfhMuZ1BH2MGL120hPE1uSLQWbs6YxNLsh7oTHbGbPuyqK+z+F9oPoSmgR PNJdIZZE68T+SR/mNFpcZDnNBM1IJyAGAOrSjhyB1G3Rtd5+fmRFs5TE2kmS1FPhdpEY +qo7DM4IcltgABmUFcP398RcJPfAy7ldE0uYjJX/khdIFvoNgmyL4lYmq9UwdQNMJ1ct iDfg== X-Gm-Message-State: AOJu0Yzfi5VbkZ44kAmP4GR9yO4TtMh81VajiOsxTWE5bz95Iw9nMkL2 gquJ+EPnnUDinsdFIkSyInG9f6YWFoEOOeYc3XPi+j0CGzUHIe9RYK60YRnIFY3svs63sFS5+pz w X-Gm-Gg: ASbGncsNEjbceFVvucpzofDoP3W/cBH2dUJwaWHQIQt7ZTY5IIy4iskoOd3NqKmO+Dy Ai/hG1HVLCkkSYlpb3ql3xWqXKOj4B+1vQGj7h80RRqfzb+O4Sm8tEyrrJzKrgjHGMvXVl7Vr0l rJrfugHb1Bk63O4wy9bFvaFeGTEwLWPaEqKdf37Gsw4Ab5tDCNhxsEK3eCpln1BKbSSGWRK9f8d eszuPWdO/AVNGQWbLQ+LGl4GOWrU15+3RYM6RtfAayQ75UihvVwu/bT5P+bpZOxHQdK/gmCnqUX z29WhMc0KqX8qS9b2kuu X-Received: by 2002:a5d:4d42:0:b0:38d:bd82:2f9 with SMTP id ffacd0b85a97d-38dc935122cmr12803757f8f.43.1739291200775; Tue, 11 Feb 2025 08:26:40 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4393f202721sm82660455e9.21.2025.02.11.08.26.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 08:26:40 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 43/68] target/arm: Handle FPCR.AH in SVE FTSSEL Date: Tue, 11 Feb 2025 16:25:29 +0000 Message-Id: <20250211162554.4135349-44-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211162554.4135349-1-peter.maydell@linaro.org> References: <20250211162554.4135349-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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 --- 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