From patchwork Wed May 16 15:52:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 136022 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1110650lji; Wed, 16 May 2018 09:03:11 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqAXZg8ws5zBo0BgVDcd6M7tyfR0goA++4nEkseUlb/kCyXOicTdq6sRYO74luMmLcviHyr X-Received: by 2002:a37:15ea:: with SMTP id 103-v6mr1425652qkv.349.1526486591725; Wed, 16 May 2018 09:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526486591; cv=none; d=google.com; s=arc-20160816; b=wr22rK+OuNp+QdjZTQE8Di8AvBT5qgLWrNwBsRebXbZHv6WgN4gyNoKwcubpoSrDJz DKSakjh6O+mp/0Q4DrMeTKVBtGJpVcL8e7ljCpJgKEFdyX42oJX2Dmj47B1qPDg4MgwN 318AUel83cJvLnIDQL4cZXP4Dfa7Na9e3N5gwAAZKL+821fZpFqVr8uCfgR3+dwhMccA 7RvOsaIH/20QUC2LJ68SbmIvuyh0IU9BupnHjCcPqKsbhf1X5M8kzq/zYy2bQVFPy34l ZONSuC/r8tmPG/0NxbK0Yv1DQSMcw/tL0RhiH98RClL34EGk5jWk6UnJ09KdA0HMh0/X LEPA== 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=n043IcTuWLeJOrF4bZrWAR222qKx5CvPEizqYpyknu8=; b=gRUgQphxC6cj+HMK3tL1hSjMe7p56Y35hNjXsEqUHH2Kk0GQAF/izAh1PzlCdJKHF1 ekHUo5Fz4PHKOdySuy99v5i1jSjOur+UvxUudV/wsST9+bV/BtierXbxIzDGiVzQOfzW 7JGV7hjFNWvoUo4VU1A2PqFp9TX4WCqiFeppSB1+7jXZHirMLedewj0xS5UDiSYjXzJR SCGQkx9CRfQ5NmYL1T7Mo+e5Yq2tN8SVr7od+I4eTU45YwWOH5NnEjKhzRmvKLYSfqum Pt2XZMvJJw4fUnlPe3gRUj9tQ6vBOAvgFq3RScPpiSZS/gddhOp+R8YvvPAWStoLsJDQ AyTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fsy97QGd; 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 e48-v6si1501584qtc.97.2018.05.16.09.03.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 16 May 2018 09:03:11 -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=fsy97QGd; 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]:53070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIytT-0003Oz-5q for patch@linaro.org; Wed, 16 May 2018 12:03:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIyjc-0004Ka-SM for qemu-devel@nongnu.org; Wed, 16 May 2018 11:53:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIyjb-00052l-CU for qemu-devel@nongnu.org; Wed, 16 May 2018 11:53:00 -0400 Received: from mail-pl0-x22e.google.com ([2607:f8b0:400e:c01::22e]:44324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIyjb-00052X-40 for qemu-devel@nongnu.org; Wed, 16 May 2018 11:52:59 -0400 Received: by mail-pl0-x22e.google.com with SMTP id e6-v6so658999plt.11 for ; Wed, 16 May 2018 08:52:58 -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=n043IcTuWLeJOrF4bZrWAR222qKx5CvPEizqYpyknu8=; b=fsy97QGdzh7OGcyhk6PTc/aDP4j3qrd/BaioQf1VQUtk2CqneM081t2FjJMVrNElB4 PYHRo0V12AzR302LVl1w4xqFC2i2hOnEgt4/kPiHZBfiuNiceFjyzzi0f08nCTO8LEGw 3N3xDhFyljNkhiAiiRX7MKxJKlBfPTYDCDaJ8= 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=n043IcTuWLeJOrF4bZrWAR222qKx5CvPEizqYpyknu8=; b=ckXnMQZOs/nFGoHJOUzXUVcakKiz7atWUtgaltH4tA6B/Pqk4P7PT0VmoYJTPSDxVQ H40Z4k+daCH3bLbR9mJ3Qymk8D63i1Uy60xG4eTNBtTN1YUWkf8OJ4k0dENQh9yNjDCu rna3LUVZOqJkuSST3wVEewToQM1XrWDW6Woq/Y90I/Gdf2D1lWK0zbqMaTXvNWqNl6ss g6/PSPy/puWcg+ocI+nujGAR2Gzd63dk0NfGemn8X38RzhLKpdykU+GC9XFLc6PXQroN U6m4tsvJv5K59TuXavFupq/gPyqZvpPj60fzbb6kVbSTnZV76pTVLhwGlmcNaTjLLzex y4Hw== X-Gm-Message-State: ALKqPwe5xmPKiQDz5PD5XTBlVI5onpwXzBtXv9hUJlLqoX/Ajt7HuaFZ ciZoNIexQAXXmpGX0tYvrXSeCSjBPcE= X-Received: by 2002:a17:902:9a4b:: with SMTP id x11-v6mr1494881plv.176.1526485977677; Wed, 16 May 2018 08:52:57 -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.52.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 May 2018 08:52:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 08:52:23 -0700 Message-Id: <20180516155243.16937-9-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::22e Subject: [Qemu-devel] [PULL 08/28] fpu/softfloat: Replace float_class_msnan with parts_silence_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" With a canonical representation of NaNs, we can silence an SNaN immediately rather than delay until the final format is known. Tested-by: Alex Bennée Reviewed-by: Alex Bennée Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- fpu/softfloat-specialize.h | 23 ++++++++++++++++++++++ fpu/softfloat.c | 40 ++++++++++---------------------------- 2 files changed, 33 insertions(+), 30 deletions(-) -- 2.17.0 diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 0d3d81a52b..571d1df378 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -138,6 +138,29 @@ static FloatParts parts_default_nan(float_status *status) }; } +/*---------------------------------------------------------------------------- +| Returns a quiet NaN from a signalling NaN for the deconstructed +| floating-point parts. +*----------------------------------------------------------------------------*/ + +static FloatParts parts_silence_nan(FloatParts a, float_status *status) +{ +#ifdef NO_SIGNALING_NANS + g_assert_not_reached(); +#elif defined(TARGET_HPPA) + a.frac &= ~(1ULL << (DECOMPOSED_BINARY_POINT - 1)); + a.frac |= 1ULL << (DECOMPOSED_BINARY_POINT - 2); +#else + if (status->snan_bit_is_one) { + return parts_default_nan(status); + } else { + a.frac |= 1ULL << (DECOMPOSED_BINARY_POINT - 1); + } +#endif + a.cls = float_class_qnan; + return a; +} + /*---------------------------------------------------------------------------- | The pattern for a default generated half-precision NaN. *----------------------------------------------------------------------------*/ diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 51780b718f..41253c6749 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -188,7 +188,6 @@ typedef enum __attribute__ ((__packed__)) { float_class_inf, float_class_qnan, /* all NaNs from here */ float_class_snan, - float_class_msnan, /* maybe silenced */ } FloatClass; /* @@ -492,14 +491,7 @@ static FloatParts float16_unpack_canonical(float16 f, float_status *s) static float16 float16_round_pack_canonical(FloatParts p, float_status *s) { - switch (p.cls) { - case float_class_msnan: - p.frac >>= float16_params.frac_shift; - return float16_maybe_silence_nan(float16_pack_raw(p), s); - default: - p = round_canonical(p, s, &float16_params); - return float16_pack_raw(p); - } + return float16_pack_raw(round_canonical(p, s, &float16_params)); } static FloatParts float32_unpack_canonical(float32 f, float_status *s) @@ -509,14 +501,7 @@ static FloatParts float32_unpack_canonical(float32 f, float_status *s) static float32 float32_round_pack_canonical(FloatParts p, float_status *s) { - switch (p.cls) { - case float_class_msnan: - p.frac >>= float32_params.frac_shift; - return float32_maybe_silence_nan(float32_pack_raw(p), s); - default: - p = round_canonical(p, s, &float32_params); - return float32_pack_raw(p); - } + return float32_pack_raw(round_canonical(p, s, &float32_params)); } static FloatParts float64_unpack_canonical(float64 f, float_status *s) @@ -526,14 +511,7 @@ static FloatParts float64_unpack_canonical(float64 f, float_status *s) static float64 float64_round_pack_canonical(FloatParts p, float_status *s) { - switch (p.cls) { - case float_class_msnan: - p.frac >>= float64_params.frac_shift; - return float64_maybe_silence_nan(float64_pack_raw(p), s); - default: - p = round_canonical(p, s, &float64_params); - return float64_pack_raw(p); - } + return float64_pack_raw(round_canonical(p, s, &float64_params)); } /* Simple helpers for checking if what NaN we have */ @@ -555,7 +533,7 @@ static FloatParts return_nan(FloatParts a, float_status *s) switch (a.cls) { case float_class_snan: s->float_exception_flags |= float_flag_invalid; - a.cls = float_class_msnan; + a = parts_silence_nan(a, s); /* fall through */ case float_class_qnan: if (s->default_nan_mode) { @@ -584,7 +562,9 @@ static FloatParts pick_nan(FloatParts a, FloatParts b, float_status *s) (a.frac == b.frac && a.sign < b.sign))) { a = b; } - a.cls = float_class_msnan; + if (is_snan(a.cls)) { + return parts_silence_nan(a, s); + } } return a; } @@ -624,8 +604,10 @@ static FloatParts pick_nan_muladd(FloatParts a, FloatParts b, FloatParts c, default: g_assert_not_reached(); } - a.cls = float_class_msnan; + if (is_snan(a.cls)) { + return parts_silence_nan(a, s); + } return a; } @@ -1334,7 +1316,6 @@ static int64_t round_to_int_and_pack(FloatParts in, int rmode, switch (p.cls) { case float_class_snan: case float_class_qnan: - case float_class_msnan: s->float_exception_flags = orig_flags | float_flag_invalid; return max; case float_class_inf: @@ -1425,7 +1406,6 @@ static uint64_t round_to_uint_and_pack(FloatParts in, int rmode, uint64_t max, switch (p.cls) { case float_class_snan: case float_class_qnan: - case float_class_msnan: s->float_exception_flags = orig_flags | float_flag_invalid; return max; case float_class_inf: