From patchwork Wed May 16 15:52:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 136039 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1138720lji; Wed, 16 May 2018 09:24:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoCF0aAIPPEeKrszQ0GxjIW9BHxniFTG+sIzOwqHjfUFXsVbmWkaW7vepnKx2pUPTgTX5ad X-Received: by 2002:a37:9804:: with SMTP id a4-v6mr1514774qke.4.1526487843363; Wed, 16 May 2018 09:24:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526487843; cv=none; d=google.com; s=arc-20160816; b=BFQCqT9HG89RUwBjv953Fs/B0gHNvSKzhv5lyVmR//9Sn2yyvE0LKHQxAb0Dghqs0f 7Qcpim0NrlsrpfJpRFvIYcIV3Jtm0PU90rqJ8ott5R7IoOciIGnmO9EjyeqvTl7hOGfT v1HLrp7aUIEQRF+Phi0itAfNM3/hcGzAB/vY2ErE/SfdFHrtJWMqlGWhLShMsFyqD13z nM02cWs/Uj7wVtlNor0c+Ty4F0Aor7pfNoc5IelP9na1A7U2TRhEm6W51w2f/SepbGjE HoUAgk/bFBAxDdJQxxWWpIRa/o26aIjFYWoeuy4eINetbkTv3gms5G5xDhZlryYX/tQe mrIQ== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=h62BzzH4LLhuXxYTEWEspmGWZCobGiYio26vYR2atOs=; b=dk9Y60cpoCKLH9TVw/wT9ytTVq5rRfxglSM5/5qsy5u4a6PiAZTikjluyBvT7onMit C9cWL3xhfprXDy3zuFLos4Bop0fDeF3EAPbRxOtPOZvKnqZBrBNVBpjEGf6Acg9Fo0L6 3kMELV8YFWagIPeE0CJMzv7xvetVF33j5icXLOVTfaVBYu1hmXXBGUOLmwAALFUAqcXE DlI7ufs9VMWFSap8dKAyDg6W5ihkKemAqQEypQRtQibC1kBd+UKbp3JYCyHuRrpSTRjz 74/DRI/+Uu3P1d0oO1tZztbSDoQeam3KiZBKQeQxAVgJC12TWE/LNkAexT4u2r4F1dBw DqjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BQTWQtja; 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 b36-v6si3055533qtb.302.2018.05.16.09.24.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 16 May 2018 09:24:03 -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=BQTWQtja; 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]:53841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIzDe-0003Rn-QX for patch@linaro.org; Wed, 16 May 2018 12:24:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIyju-0004dx-PQ for qemu-devel@nongnu.org; Wed, 16 May 2018 11:53:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIyjr-00057q-Rt for qemu-devel@nongnu.org; Wed, 16 May 2018 11:53:18 -0400 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:34317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIyjr-00057i-MJ for qemu-devel@nongnu.org; Wed, 16 May 2018 11:53:15 -0400 Received: by mail-pl0-x243.google.com with SMTP id ay10-v6so676683plb.1 for ; Wed, 16 May 2018 08:53:15 -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 :mime-version:content-transfer-encoding; bh=h62BzzH4LLhuXxYTEWEspmGWZCobGiYio26vYR2atOs=; b=BQTWQtjaUf5kK2HhyTo/A14UEc5Mlvx7r59SiOiI6cngY0KbUYzS/v2ISb+ObQYF27 0O3pAsD2gO6EdjMhAJvcH13UmNmY8LGJqlMuMm+4+qCJNhz2PpEtg7U1eMxhV6J7tbWR HxYpkbgJlOC8w7LZkF1Ppih1nK9XJfs9pstxo= 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:mime-version:content-transfer-encoding; bh=h62BzzH4LLhuXxYTEWEspmGWZCobGiYio26vYR2atOs=; b=HFDIgPtALb/oRYHeEJIS7pJOXfSH1AgXyddjnmofNJl+206lP2BZgGSz2KuTOmoNr7 72ut4c8SaZWNboTdYn2un7qEmiFgENPMDrp2ntZ/DTYTb2I9vBnqUb23+gX+2SNfYZwf WZynHB1NXqRh42wYcNRfYJzNGwvXpWXF0bynGuOcJ3JGtrXl1CKdJhEFMTSr7VOvEFIP mI2MsziAe9sVZ/KZ+vWZu2NzLRvR2UOPRaQMWnYbifFTDzSMHj797NdIrHayQ8LkRtUz 766gFv11FIgruF7jrAg7tB66vK46tcKTdtBlD+GdWXFUr7oY3qFNz9qJGn2ma6qzIORB +ZSw== X-Gm-Message-State: ALKqPwfzQ1cRCdGd32ZA6zvehtEG7/hVG/s0gYyfOrZvx30C8EnptKPU YdVGQPOTPg6MAyJUHJYuvHKDJdiimGI= X-Received: by 2002:a17:902:3c5:: with SMTP id d63-v6mr1415705pld.163.1526485994311; Wed, 16 May 2018 08:53:14 -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 c3-v6sm4966632pfn.62.2018.05.16.08.53.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 May 2018 08:53:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 08:52:35 -0700 Message-Id: <20180516155243.16937-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180516155243.16937-1-richard.henderson@linaro.org> References: <20180516155243.16937-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::243 Subject: [Qemu-devel] [PULL 20/28] 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 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. Tested-by: Alex Bennée Reviewed-by: Alex Bennée Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- fpu/softfloat-specialize.h | 44 +++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 10 deletions(-) -- 2.17.0 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; } }