From patchwork Sat May 12 00:43:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135605 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1574582lji; Fri, 11 May 2018 17:59:01 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr7ixwrUwxV766Owu7zILVkgKUmEK/YsO2kHbYsEGRH9tnDleYmjFmZY/aVYSOKAmc0MlJL X-Received: by 2002:a37:aa4b:: with SMTP id t72-v6mr246625qke.215.1526086741390; Fri, 11 May 2018 17:59:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526086741; cv=none; d=google.com; s=arc-20160816; b=gUXScK3FZy1zbeVSkRiyBwp4vVECPALjBwIvWjeAlMvnqKUp5yO7iZv5pCJED1+O5D tFct9bn7CJYssT7TJpZOKMsOrqZ9pL2RbeUb0T79QfJPv7ZohZ+XdoyE/RxEq+MMQRWn 2FAeP/D/8Si1xL7kuuU1VNzlZeEUaR/UjWs4VQLdXa5eSw7Y/mJTJo9+oCyzBp0jCilw KjzTvNJiH7E862xDuTsGbb7T5ZC5k5UgJCdfQtET0z61dicNdF7zsVadJ7Zr4zmajghh fXBAt+k6h7Dmv8Mj7aPm+rTMcvNA5i9FH/PJMP5GeWUtbAYRFf9GjyQZYC8ZZpE5jxlI s3kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=QEmIRJzREeuGE85Fh+AuGexvV4Am9SrrRS3mM2qJ3bs=; b=fbZkftOAisqMsdfgR1GGxOWkWq/8wvEEohDt/NIt8rWCsM6FmyPAmEkWO8tGmcgnbA ZJbnIeTkR6sUA9R8u1vouMlrhxqpwdVqWTeRlHuTBRHXEFwSaCJlsLDPPWti/7s7gDuz XOntVquDqzpzsg5BvD9jS+fd0b+SL8pT9o6fDRT+TIUPaj4LvbNNgOqUAiHsvcEnGRnV q5zgiTP3TYLUbI90KatHEnpfaWwbKW7rHt7hn5ka7QgBAUXjIy+ETG+gImAXkZstKlGK LCjrb9qpA6Urn0xam7hq/AMXxj0k2FgMQNiZkXtqTmtXOoV58GgzGt/KneSsGvfoy9kh 8rEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VHRzfCW6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w15-v6si1245489qtb.55.2018.05.11.17.59.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 11 May 2018 17:59:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VHRzfCW6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHIsG-0007bz-SF for patch@linaro.org; Fri, 11 May 2018 20:59:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fHIdW-00051b-VK for qemu-devel@nongnu.org; Fri, 11 May 2018 20:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fHIdV-000301-U3 for qemu-devel@nongnu.org; Fri, 11 May 2018 20:43:47 -0400 Received: from mail-pl0-x242.google.com ([2607:f8b0:400e:c01::242]:40344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fHIdV-0002zv-Oi for qemu-devel@nongnu.org; Fri, 11 May 2018 20:43:45 -0400 Received: by mail-pl0-x242.google.com with SMTP id t12-v6so4146189plo.7 for ; Fri, 11 May 2018 17:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QEmIRJzREeuGE85Fh+AuGexvV4Am9SrrRS3mM2qJ3bs=; b=VHRzfCW6PulcIjsEietbsZ4fpAahMyRR0IplcmeR/PRXqq700sAp4Vc7XZYBx5TIUx duAnJyiHvRhY8YNsNwPxJQDDSIR75+zC8EGciT9fjwPZfjIdrAg7OidSADZJEDnVlwci Og81n/zYxQjc1Ot/YysiD4LpxsFJhjqa7EW1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QEmIRJzREeuGE85Fh+AuGexvV4Am9SrrRS3mM2qJ3bs=; b=sUoG9g5t1tnirk4Wpx3gjTQpJSu4GHegR10ICOP/nG17cwP7PRd3kJLwpZY4TCG/lb 61YmDbuAv+6MW2+ZOlesl0PPgpztDtumBvquISH87sBaSiX04Z41SPUIZtoiFdEPk09B nmeh7ImRBIx9N+5dhIalE5sIxaXsS3l4zfxh0N6GbEXFYBpaUBW7+pbOwWEoSDKe6bsJ +C9RwNRTuV5bLC6TUjepgu+97xvZeEst29OWe0tgrwlkaynyI3B2XHC93io1es70nkz9 blNViPlx5o40Lf1fB9uvjU0rcsqpSOTF2dFtqZfVKtfGcsRBVjty8AD+YVWhHEdd7dKp NTkA== X-Gm-Message-State: ALKqPwfRU8W0Fx2n5FvYsZyBEmMtqEBz3Xt77dEIrRp21AtH+axrTss3 giAED35vdaXQHVvgoHr3m9DuVM4vyO8= X-Received: by 2002:a17:902:aa98:: with SMTP id d24-v6mr270348plr.185.1526085824381; Fri, 11 May 2018 17:43:44 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-2-170.tukw.qwest.net. [97.113.2.170]) by smtp.gmail.com with ESMTPSA id k84-v6sm10756406pfh.93.2018.05.11.17.43.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 17:43:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 11 May 2018 17:43:06 -0700 Message-Id: <20180512004311.9299-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180512004311.9299-1-richard.henderson@linaro.org> References: <20180512004311.9299-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::242 Subject: [Qemu-devel] [PATCH v2 22/27] fpu/softfloat: Use float*_silence_nan in propagateFloat*NaN X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have already checked the arguments for SNaN; we don't need to do it again. Signed-off-by: Richard Henderson --- fpu/softfloat-specialize.h | 44 +++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 10 deletions(-) -- 2.17.0 Reviewed-by: Peter Maydell diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 995a0132c6..4fa068a5dc 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -498,7 +498,7 @@ static float32 commonNaNToFloat32(commonNaNT a, float_status *status) | The routine is passed various bits of information about the | two NaNs and should return 0 to select NaN a and 1 for NaN b. | Note that signalling NaNs are always squashed to quiet NaNs -| by the caller, by calling floatXX_maybe_silence_nan() before +| by the caller, by calling floatXX_silence_nan() before | returning them. | | aIsLargerSignificand is only valid if both a and b are NaNs @@ -536,7 +536,7 @@ static int pickNaN(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, { /* According to MIPS specifications, if one of the two operands is * a sNaN, a new qNaN has to be generated. This is done in - * floatXX_maybe_silence_nan(). For qNaN inputs the specifications + * floatXX_silence_nan(). For qNaN inputs the specifications * says: "When possible, this QNaN result is one of the operand QNaN * values." In practice it seems that most implementations choose * the first operand if both operands are qNaN. In short this gives @@ -788,9 +788,15 @@ static float32 propagateFloat32NaN(float32 a, float32 b, float_status *status) if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return float32_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return float32_silence_nan(b, status); + } + return b; } else { - return float32_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return float32_silence_nan(a, status); + } + return a; } } @@ -950,9 +956,15 @@ static float64 propagateFloat64NaN(float64 a, float64 b, float_status *status) if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return float64_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return float64_silence_nan(b, status); + } + return b; } else { - return float64_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return float64_silence_nan(a, status); + } + return a; } } @@ -1121,9 +1133,15 @@ floatx80 propagateFloatx80NaN(floatx80 a, floatx80 b, float_status *status) if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return floatx80_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return floatx80_silence_nan(b, status); + } + return b; } else { - return floatx80_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return floatx80_silence_nan(a, status); + } + return a; } } @@ -1270,8 +1288,14 @@ static float128 propagateFloat128NaN(float128 a, float128 b, if (pickNaN(aIsQuietNaN, aIsSignalingNaN, bIsQuietNaN, bIsSignalingNaN, aIsLargerSignificand)) { - return float128_maybe_silence_nan(b, status); + if (bIsSignalingNaN) { + return float128_silence_nan(b, status); + } + return b; } else { - return float128_maybe_silence_nan(a, status); + if (aIsSignalingNaN) { + return float128_silence_nan(a, status); + } + return a; } }