From patchwork Mon Dec 2 13:13:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 846616 Delivered-To: patch@linaro.org Received: by 2002:a5d:4cd0:0:b0:385:e875:8a9e with SMTP id c16csp1205765wrt; Mon, 2 Dec 2024 05:29:32 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXN+kjtH3iND3Dhd/J+97BNgmug+wUzezGTH7g/8O6gqzJGU/p+Ureyb8odYde+WHDC4p/ZCQ==@linaro.org X-Google-Smtp-Source: AGHT+IGNjJiffk9J2HhogybnkNsEDoZ0mUrhSJZ5/+JxQSlIcNi+xCt7zw6XxPWFzh1ylclvVg2R X-Received: by 2002:a05:6102:38d1:b0:4ad:b85c:e6c with SMTP id ada2fe7eead31-4af446f8fa5mr29360226137.0.1733146172105; Mon, 02 Dec 2024 05:29:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733146172; cv=none; d=google.com; s=arc-20240605; b=RSF00UcOrlyZHEkBHwCeNazahhCESICVnS85RZ1hvthJCh3Fj1qVy0coVCWcs8ht9w DYfuB2j+32LZdGWMQayzjZdJQrS6456/5ANqyiDjKVIcDFeq1GtUPOnLgVbYFNjltxYx s3geRmwWIKuvREz8NedLJ9ogwsyrKGdv3Fjjub0DOnT+q0n9sQhQu5b7xAcCXr+QStHC yVLn56ByEmdFGPpRpc55dZrNcUfLZXapOi9/LkDm6JY9Xx7sTvukoJYRjGNy1swFmYmZ ZeojLewjUHFoTs3Pq9wP8x8+jXqEANrTExHcyrAwO34th9GiFMctnMJRhlkUes3eVzGK Vk2A== 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:cc:to :from:dkim-signature; bh=74ZFmjtVXHtNex2HC0gYU65u2vZGTycqwogjuvw6ju4=; fh=QgE9QYJDVj//6C0QJWGeEM+qaFVaxwMel1ZWqkEy6K0=; b=EaCtU5sYSutPK1Gnt5pPeZcddMFmIPruEQ+cVvN8jr6daT+OsX5bp8djXZ+avYCv0Y rEF5v8J08X2S4DeSkbm3q1EZOIfuZXtkooMF2C6CnCIlbYhZBQvI1NS8oCep7dwvLKhu 0TknZATrkfDEUzTc94UasGgE8pOwpbyhDrcPTvyYMHUSxgcqlau2qI7CPptzVK375BEK gCxP2Jt2RvBamkr9J8mFcrgBvzughaU85wrZxMlwgEC2cYC4OYAn4OSD+839KcdR37HU AWfoSqRLmp7b5xFE1kRytwosPQu7xwlGqZFDsXwH22FU31bqcYXIWCaSO7tjhQpQfPKe 64yQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Gc9PmP/Y"; 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 ada2fe7eead31-4af590d39d8si3760821137.5.2024.12.02.05.29.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Dec 2024 05:29:32 -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="Gc9PmP/Y"; 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 1tI6Tz-0007qb-IQ; Mon, 02 Dec 2024 08:28:59 -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 1tI6Go-0002gV-Dj for qemu-devel@nongnu.org; Mon, 02 Dec 2024 08:15:27 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI6GX-0003IZ-4q for qemu-devel@nongnu.org; Mon, 02 Dec 2024 08:15:19 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-385deda28b3so1803652f8f.0 for ; Mon, 02 Dec 2024 05:14:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733145270; x=1733750070; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=74ZFmjtVXHtNex2HC0gYU65u2vZGTycqwogjuvw6ju4=; b=Gc9PmP/YovdJH4HWXy/98SFsqTHUDTsErfG9ScmxULAZ6FzByalju071nyMMiJ9JvE vGT8VpF08IPCsCUeIv2djbsHk/tUicPCkE/g6jy7zVUIktUKVO9n8ASRSgdHuFMDBTo3 VHeBIyETCwGLT5Ys4fhMkFsea6XVYr1HdopibKNOIRy8/wSVByfcbZpxCvUADui+n3+R SWH5VOrvtU90ZDxr8GcTKc6l1u6gjDqh+5vai6NWYs7lco6/97wc6ChaMPVHI45C3sex 8I3IWL3s198P7WUHT4yuRafGxhU22FC7MKHjZznkwZ4rvCWLIlncrNtQxOWIhKgJAoGk lj1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733145270; x=1733750070; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=74ZFmjtVXHtNex2HC0gYU65u2vZGTycqwogjuvw6ju4=; b=FAzkU/a+IMuXSId2TjC5CspfTYyeRgU3Cw7zg0fqSRASJuGR/MbB6rN8xnnse5D4qk 9EdAiWfYshDhEF1gsQjEzVkn/Q2dv4mNNSBKVqhI0GXdVOz3Ij3xMkPVYWIvzul7oiiO 7Hodg09DNKqHR0xbHWSOmt14d79C8a8raFTlsCRhKm3gA3iQmrKXo2r2gLxV7tpJPF44 k9mrpfujGorEvVzadwDtPl0znxP+GpnwGnl6hsaAOtTDVoannBpNs3eJqhVgKuN2DcRU YR3irgqaZmIHzuKvOP0+FmAUqlYO6b5VdjXAEywroKPhPW8dOpLUnh5Qt3t9XLIjJsW2 NM/Q== X-Gm-Message-State: AOJu0YzCzQk7Dh1bBu4RRikulN/ZMu4gpbeFrZmWpdjt3bhvq2DXtENE X3hZxju2Gm/gEI07uHFFshbsMH42GY6YShqbGQwFYfcri8CuYMBrOAW9xFjIYfIkLvImypAkcAz v X-Gm-Gg: ASbGnct7FC1Ph4tJ81tlz9IHZn5PA0JbEfd0GZ7jx0eV02cukirWuzhO7eJnt0j15nE dYRGXSZdUhiDRFQd4bfNx/HCLpMQvkQ1tLnPfbHx9IHwDT+gsBKX9bsR+gR9KBuiHkjE8KQQa+L X/ov6+I31AefFcjfmA95klgwH6/lEYb8T3VjQndQwOf4P+cvorZCSflY4nGe6wnSoLHH+BY0N3d KxoBYCUjPEV4XQJ2ZzPoO2zMe301LQ0qxAbCEwo4cRmBZ+KcZLnbwE= X-Received: by 2002:a05:6000:156f:b0:385:f0c9:4b66 with SMTP id ffacd0b85a97d-385f0c94ea6mr4495634f8f.33.1733145267678; Mon, 02 Dec 2024 05:14:27 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-385dea1e4ebsm10160157f8f.1.2024.12.02.05.14.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 05:14:27 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Eduardo Habkost , Song Gao , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Rikalo , Nicholas Piggin , Daniel Henrique Barboza , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Mark Cave-Ayland , Artyom Tarasenko , Max Filippov Subject: [PATCH v2 for-10.0 22/54] target/mips: Set Float3NaNPropRule explicitly Date: Mon, 2 Dec 2024 13:13:15 +0000 Message-Id: <20241202131347.498124-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241202131347.498124-1-peter.maydell@linaro.org> References: <20241202131347.498124-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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 Set the Float3NaNPropRule explicitly for Arm, and remove the ifdef from pickNaNMulAdd(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/mips/fpu_helper.h | 4 ++++ target/mips/msa.c | 3 +++ fpu/softfloat-specialize.c.inc | 8 +------- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/target/mips/fpu_helper.h b/target/mips/fpu_helper.h index be66f2f813a..8ca0ca7ea39 100644 --- a/target/mips/fpu_helper.h +++ b/target/mips/fpu_helper.h @@ -29,6 +29,7 @@ static inline void restore_snan_bit_mode(CPUMIPSState *env) { bool nan2008 = env->active_fpu.fcr31 & (1 << FCR31_NAN2008); FloatInfZeroNaNRule izn_rule; + Float3NaNPropRule nan3_rule; /* * With nan2008, SNaNs are silenced in the usual way. @@ -44,6 +45,9 @@ static inline void restore_snan_bit_mode(CPUMIPSState *env) */ izn_rule = nan2008 ? float_infzeronan_dnan_never : float_infzeronan_dnan_always; set_float_infzeronan_rule(izn_rule, &env->active_fpu.fp_status); + nan3_rule = nan2008 ? float_3nan_prop_s_cab : float_3nan_prop_s_abc; + set_float_3nan_prop_rule(nan3_rule, &env->active_fpu.fp_status); + } static inline void restore_fp_status(CPUMIPSState *env) diff --git a/target/mips/msa.c b/target/mips/msa.c index cc152db27f9..93a9a87d76d 100644 --- a/target/mips/msa.c +++ b/target/mips/msa.c @@ -66,6 +66,9 @@ void msa_reset(CPUMIPSState *env) set_float_2nan_prop_rule(float_2nan_prop_s_ab, &env->active_tc.msa_fp_status); + set_float_3nan_prop_rule(float_3nan_prop_s_cab, + &env->active_tc.msa_fp_status); + /* clear float_status exception flags */ set_float_exception_flags(0, &env->active_tc.msa_fp_status); diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index c4d8d085a98..28db409d22c 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -505,13 +505,7 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls, } if (rule == float_3nan_prop_none) { -#if defined(TARGET_MIPS) - if (snan_bit_is_one(status)) { - rule = float_3nan_prop_s_abc; - } else { - rule = float_3nan_prop_s_cab; - } -#elif defined(TARGET_XTENSA) +#if defined(TARGET_XTENSA) if (status->use_first_nan) { rule = float_3nan_prop_abc; } else {