From patchwork Mon Dec 2 13:12:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 846602 Delivered-To: patch@linaro.org Received: by 2002:a5d:4cd0:0:b0:385:e875:8a9e with SMTP id c16csp1197716wrt; Mon, 2 Dec 2024 05:17:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUCTg832Ic8PtZCIeWHTSwCB4YjuDqMYfwM+hHRVwIHetj2VMmpvCIJVcUNpUdB2qeyJ7z5aQ==@linaro.org X-Google-Smtp-Source: AGHT+IH5zspqCQtThgKoNqJzVeJplMzsR729wB6Q9JqDYiV6dpJFIp7/aAxXa4E0tnwviaRoTjDl X-Received: by 2002:a05:620a:454c:b0:7b6:6701:7a4c with SMTP id af79cd13be357-7b67c4aa7fcmr3136681785a.62.1733145453725; Mon, 02 Dec 2024 05:17:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1733145453; cv=none; d=google.com; s=arc-20240605; b=eCfWggXl4RqJoHfhLwMc7zcW+6yys9OABpPtfROBt247IXR6SlHTPRMwo9HOi0uqLY X5XPF9H5NBMMt/WRAcMCUgU9QPJyL65mxCrBMgyr8PyIibLS3MkCV2mxAJJbGXuCiznm H7bAxAjnNK49PcDawMxpMscBb28Xda18fMHHfIKL85LKY5iGcz+1NqODQ3jYqgPD4fSn 152wxbWLHo02brQsk9xu1agZ/CdrRmXqe7LJiugQeP7DbJ8cFNdfXjiJtD2ayNs1OywO aWFYusWKYpcrhfWu6EiSlsuRIIYW7+xyBOdGfNBEvFcLUnpjttR28wiiV4bkMWFRQ94t /aiA== 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=X86TKVmBDvN75raroOS5cqB5k378L/9aSAueAeunYPY=; fh=QgE9QYJDVj//6C0QJWGeEM+qaFVaxwMel1ZWqkEy6K0=; b=KXqAtLTokypEKhNblOBIUlJpOzmyCi51LSajBoaG0aC8ygHPaNGpxhOicEOu0IUOzl HfiUqwK+HRzR8qags07K25YyP0kkYOOPQhthJhRI82EbqO/ErweY6POE+5Q+pf7d0s7n +7UUr85eMazNUtNRy3qieawOcQIvRozNwjLZORvGtKMEhkwy1AZTw91ws3chyNrbXtXB 8TGupy8TpcdgmD/9Xq+qZ9ZZ51Vl9LSgkTtNf6U79u6pBpxHRRsAi18TZ8RJY8Rgr2zN tPobmT9uI7nVbZzqXzmdtrO0mKi2z0GhdQHnoZdaB1wJYdC1KY1tshkJKZOOqule0X7z WDaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xSTlkBXm; 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-4af593a2338si3755107137.544.2024.12.02.05.17.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Dec 2024 05:17:33 -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=xSTlkBXm; 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 1tI6IC-00045T-Qx; Mon, 02 Dec 2024 08:16:49 -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 1tI6Fv-0001nn-Ja for qemu-devel@nongnu.org; Mon, 02 Dec 2024 08:14:32 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tI6FT-00038X-P7 for qemu-devel@nongnu.org; Mon, 02 Dec 2024 08:14:04 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-385e1fcb0e1so1178672f8f.2 for ; Mon, 02 Dec 2024 05:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733145237; x=1733750037; 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=X86TKVmBDvN75raroOS5cqB5k378L/9aSAueAeunYPY=; b=xSTlkBXm0qr+JsuVwvnOKeMTwIvKiGUoF4Y98fLU/Am7p5w/vXO9XQpwj7D5KoEUOW yRs1TE3/rf0UHbCuh9gUg2XaAbm9l8VOTnL6wRYlmM4HqjzbOYeM8pumpfQduqNt2CVo EjmcaZGzO9golB5tBlhP16xQcfef2DFKPejDzOOhr1rKmQMvGrQUU+ng64n1ZU36oo2v QjR9XVoXKpG5XgfRilUdlkevRh1RQmoI62k3s1RKrJkdaMCgURukjK1qigNakLCVpneg l65LyXzI9LDYjEd+llFSsE2InqFpUI19lJ10P4ZBFFkQ9YhA3J2ID9DCgLBubuNNr5gQ TXdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733145237; x=1733750037; 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=X86TKVmBDvN75raroOS5cqB5k378L/9aSAueAeunYPY=; b=FRuFAwU6Vna698l3lNu9bjsXRga6l/zw9DfpFL4+s9BRB6y4H+js9rXE3zhO9qztQV dSPLgGAeSKw4ikKpSJI1pmOU/FuBdxHUor6ZPbR1MqS5TnqVCoGdi1VQzaWtFkfXdCCE 5tSTABpUvO+j8apIZXnwf3wkVCpr2caAKZGNOJmRV5GYQnpFPzkIap74Tgk2j/8nxX4c 4KE2/NRnxSI6LAnen3U2DwNOKi6FVXHVYzWNYDoU5cK5bRsiFsjDO/cpHnVwb3ed322t uWOx4ZGQsDUz9Hvm6SYZOlAjnF5nBQ00QsSaGiVQzRga4BrTbZDCKJjx6uiaxylsjFgE l6uQ== X-Gm-Message-State: AOJu0YxwZFmPedMJa86lTCe8XU3D7PUk1IwVlmJENVjAk+I6tFO0DP1M gHZnDwtjDvxZvszl0wJCC6bsuCKtyXx9HnsyxA8TKp/TIxuxsQlAYpAjRCWOJvRgTMElomxXkPK T X-Gm-Gg: ASbGnctkwdYNaBs+aZL/NJkoZjgZKuLz5yjlp8Awa/eh/O0g/7CVySDnWf3QG+l4CYr Yzmu/qmcvY/RTkzTbzFVahQTULZhjFd2IOI3kXCXni7BHxmPv/Pndr6aE0iWDwGu+1e+P15a5aK HeJ/DIDkXg5XAwBfB5e1Q1b2ytjWv5aeYmF1bAbKqyLlWJ/K2T7JImoSFjeaxe0p3+E2nyfcu9K bcmIILfZ8WzEIXnTgU5fzIhtaC15ArmIxzutGwhvA4E6mubvkrlVhY= X-Received: by 2002:a5d:47af:0:b0:385:ef39:6cd5 with SMTP id ffacd0b85a97d-385ef396e98mr4114344f8f.1.1733145236576; Mon, 02 Dec 2024 05:13:56 -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.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 05:13:56 -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 05/54] target/arm: Set FloatInfZeroNaNRule explicitly Date: Mon, 2 Dec 2024 13:12:58 +0000 Message-Id: <20241202131347.498124-6-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::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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 FloatInfZeroNaNRule explicitly for the Arm target, so we can remove the ifdef from pickNaNMulAdd(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/cpu.c | 3 +++ fpu/softfloat-specialize.c.inc | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 6938161b954..ead39793985 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -173,11 +173,14 @@ void arm_register_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, * * tininess-before-rounding * * 2-input NaN propagation prefers SNaN over QNaN, and then * operand A over operand B (see FPProcessNaNs() pseudocode) + * * 0 * Inf + NaN returns the default NaN if the input NaN is quiet, + * and the input NaN if it is signalling */ static void arm_set_default_fp_behaviours(float_status *s) { set_float_detect_tininess(float_tininess_before_rounding, s); set_float_2nan_prop_rule(float_2nan_prop_s_ab, s); + set_float_infzeronan_rule(float_infzeronan_dnan_if_qnan, s); } static void cp_reg_reset(gpointer key, gpointer value, gpointer opaque) diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index f5b422e07b5..b3ffa54f368 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -489,13 +489,7 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls, /* * Temporarily fall back to ifdef ladder */ -#if defined(TARGET_ARM) - /* - * For ARM, the (inf,zero,qnan) case returns the default NaN, - * but (inf,zero,snan) returns the input NaN. - */ - rule = float_infzeronan_dnan_if_qnan; -#elif defined(TARGET_MIPS) +#if defined(TARGET_MIPS) if (snan_bit_is_one(status)) { /* * For MIPS systems that conform to IEEE754-1985, the (inf,zero,nan)