From patchwork Tue Jan 9 12:22:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 123929 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3975551qgn; Tue, 9 Jan 2018 04:43:52 -0800 (PST) X-Google-Smtp-Source: ACJfBos8XlBe0qhMscOWjL1NuolAK+wm9oBL5cRSWUA0r3wCau/cqILR4zKjEdxNdEByCe8xcxOf X-Received: by 10.13.216.214 with SMTP id a205mr13229394ywe.247.1515501832187; Tue, 09 Jan 2018 04:43:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515501832; cv=none; d=google.com; s=arc-20160816; b=ra256mk4gVy8uknzZjGmnyO0vHNuCfYpVesmPf100xWOumdLaLlW01V8Pi2ns8pgj8 8Eoz+dddltLjJhAA4VXoR+q94vPTgiFzdL2aqoa5ZlMA/FmYvF3IpEeXKNUYKZMqXH7p cSaajxBF559ZyVlCs2Ty6qVYP1Fo9Ka06q8JSCbMsf16ln8/kYw0vee9e0150uzI9/2f tpZJkZQBKQDW2PzqjmL7HftzQqzGQcYgWMGE7615MvrtOnNp+Rkb8Z/akIj3rQKiXixM cPCGqyRWiLKls+Q7plSQztEEdtSrdVRCny4eDLwMQmdBpsGQqj49W7XlC9qM1XZn+Vo2 caXw== 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=gZUuItoMCkv+JpgUBtuyfqdsiVU3EEiyMFXhGaZpH1Q=; b=lJgj+YZQaF6wjMHg7pDZ3YezLhqo7m/0eNr3nIB3nIxNGmNCSzG5HuNVNcHOx3jLkc 7BrnOEWeea0pKXsVhGY/NpFgc/5t3bzpu6Bw5JAJj4DblCHpqF4konFH3cPgklRt/z/T LFC7bgSQZUuqRaDRQUOfMqj//DMXQaPu47+g5/EByTqXgPpzqMT7qRc7wHZdx0RtrMjJ M62XJUQb5esI6NIa55FVp0Wd3RUeDm9mE3zVFZWsmjyCf8ewZQZT0dXGGga2Ed8jYsBt RC5pY2FZrIkT38M4VVN9dqxtkwlyrK1zXGkWosZC94lvGHe5cVFFPxB2hiSqBwN8C+vP MZeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ksV13FY2; 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 v2si2999314ybk.645.2018.01.09.04.43.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 09 Jan 2018 04:43:52 -0800 (PST) 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=ksV13FY2; 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]:50125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYtFv-0006p9-Ld for patch@linaro.org; Tue, 09 Jan 2018 07:43:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYt15-0002af-TE for qemu-devel@nongnu.org; Tue, 09 Jan 2018 07:28:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYt11-0002AS-Q8 for qemu-devel@nongnu.org; Tue, 09 Jan 2018 07:28:31 -0500 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYt11-00029k-Gg for qemu-devel@nongnu.org; Tue, 09 Jan 2018 07:28:27 -0500 Received: by mail-wr0-x244.google.com with SMTP id b76so13921202wrd.3 for ; Tue, 09 Jan 2018 04:28:27 -0800 (PST) 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=gZUuItoMCkv+JpgUBtuyfqdsiVU3EEiyMFXhGaZpH1Q=; b=ksV13FY2AZwbWWJWL4N+43vtRcRjVrmkUDhVnt1dzqmg2wokNW8Rdl++Li27xKY+TQ R8iodj0rzMy+sZUo2aHb/v37NJOz9ky8o1n5u0k3IRF6RvPGTDHEzLYGB1NbxByCgN17 u9tufjJF3Lxxf70wiElq7JYZOTpcdghE4fKls= 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=gZUuItoMCkv+JpgUBtuyfqdsiVU3EEiyMFXhGaZpH1Q=; b=UlkysYx+ohbfXBo3nEwVi7G/Y0S0DHXQ/QfHhBShVnOi2RElrQfhSJFCFL3dB/YBEN I82yD+PhnvkzKcEWQIEoWlOWWo1Qyicj25KKyTuAAG08166BgpWxfoRWP+4Nzw0XpKHK mJG92JgSz4UOloTGU5Rx7C+hgiUg9+6K2CcUAD48vrDVRnWZ46BU+NcjfTyiS1ZC+Y+N pfS1MhohMH5bmJ9R3UDffjyJclFTpGGp2KgwvQ+O5OOa4kukjigsV3gljsO5l5/2FoH9 J/RIMvKgp9SigNMqOKbrfcKXvvEj9zdvHqS3E4uexombIg2e1sQoXFH42DbAMxrwCXX7 RrPg== X-Gm-Message-State: AKGB3mLskenDFb12l9rm2+5hdUyI6at/TUd2grc0ehKENsiRoQLXoY+c TSDJEm5CQmBpZe3BKFNvPFnmOA== X-Received: by 10.223.160.139 with SMTP id m11mr13092185wrm.119.1515500906249; Tue, 09 Jan 2018 04:28:26 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u10sm3386560wrg.6.2018.01.09.04.28.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 04:28:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 413673E2B52; Tue, 9 Jan 2018 12:22:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: richard.henderson@linaro.org, peter.maydell@linaro.org, laurent@vivier.eu, bharata@linux.vnet.ibm.com, andrew@andrewdutcher.com Date: Tue, 9 Jan 2018 12:22:47 +0000 Message-Id: <20180109122252.17670-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180109122252.17670-1-alex.bennee@linaro.org> References: <20180109122252.17670-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH v2 15/20] fpu/softfloat: re-factor round_to_int 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can now add float16_round_to_int and use the common round_decomposed and canonicalize functions to have a single implementation for float16/32/64 round_to_int functions. Signed-off-by: Alex Bennée Signed-off-by: Richard Henderson --- fpu/softfloat.c | 304 ++++++++++++++++++++---------------------------- include/fpu/softfloat.h | 1 + 2 files changed, 130 insertions(+), 175 deletions(-) -- 2.15.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 84386f354b..edc35300d1 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1183,6 +1183,135 @@ float64 float64_div(float64 a, float64 b, float_status *status) return float64_round_pack_canonical(pr, status); } +/* + * Rounds the floating-point value `a' to an integer, and returns the + * result as a floating-point value. The operation is performed + * according to the IEC/IEEE Standard for Binary Floating-Point + * Arithmetic. + */ + +static decomposed_parts round_decomposed(decomposed_parts a, int rounding_mode, + float_status *s) +{ + + switch (a.cls) { + case float_class_snan: + a.cls = s->default_nan_mode ? float_class_dnan : float_class_msnan; + s->float_exception_flags |= float_flag_invalid; + break; + case float_class_zero: + case float_class_inf: + case float_class_qnan: + /* already "integral" */ + break; + case float_class_normal: + if (a.exp >= DECOMPOSED_BINARY_POINT) { + /* already integral */ + break; + } + if (a.exp < 0) { + bool one; + /* all fractional */ + s->float_exception_flags |= float_flag_inexact; + switch (rounding_mode) { + case float_round_nearest_even: + one = a.exp == -1 && a.frac > DECOMPOSED_IMPLICIT_BIT; + break; + case float_round_ties_away: + one = a.exp == -1 && a.frac >= DECOMPOSED_IMPLICIT_BIT; + break; + case float_round_to_zero: + one = false; + break; + case float_round_up: + one = !a.sign; + break; + case float_round_down: + one = a.sign; + break; + default: + g_assert_not_reached(); + } + + if (one) { + a.frac = DECOMPOSED_IMPLICIT_BIT; + a.exp = 0; + } else { + a.cls = float_class_zero; + } + } else { + uint64_t frac_lsb, frac_lsbm1, round_mask, roundeven_mask, inc; + + frac_lsb = DECOMPOSED_IMPLICIT_BIT >> a.exp; + frac_lsbm1 = frac_lsb >> 1; + roundeven_mask = (frac_lsb - 1) | frac_lsb; + round_mask = roundeven_mask >> 1; + + switch (rounding_mode) { + case float_round_nearest_even: + inc = ((a.frac & roundeven_mask) != frac_lsbm1 ? frac_lsbm1 : 0); + break; + case float_round_ties_away: + inc = frac_lsbm1; + break; + case float_round_to_zero: + inc = 0; + break; + case float_round_up: + inc = a.sign ? 0 : round_mask; + break; + case float_round_down: + inc = a.sign ? round_mask : 0; + break; + default: + g_assert_not_reached(); + } + + if (a.frac & round_mask) { + s->float_exception_flags |= float_flag_inexact; + a.frac += inc; + a.frac &= ~round_mask; + if (a.frac & DECOMPOSED_OVERFLOW_BIT) { + a.frac >>= 1; + a.exp++; + } + } + } + break; + default: + g_assert_not_reached(); + } + return a; +} + +float16 float16_round_to_int(float16 a, float_status *s) +{ + decomposed_parts pa = float16_unpack_canonical(a, s); + decomposed_parts pr = round_decomposed(pa, s->float_rounding_mode, s); + return float16_round_pack_canonical(pr, s); +} + +float32 float32_round_to_int(float32 a, float_status *s) +{ + decomposed_parts pa = float32_unpack_canonical(a, s); + decomposed_parts pr = round_decomposed(pa, s->float_rounding_mode, s); + return float32_round_pack_canonical(pr, s); +} + +float64 float64_round_to_int(float64 a, float_status *s) +{ + decomposed_parts pa = float64_unpack_canonical(a, s); + decomposed_parts pr = round_decomposed(pa, s->float_rounding_mode, s); + return float64_round_pack_canonical(pr, s); +} + +float64 float64_trunc_to_int(float64 a, float_status *s) +{ + decomposed_parts pa = float64_unpack_canonical(a, s); + decomposed_parts pr = round_decomposed(pa, float_round_to_zero, s); + return float64_round_pack_canonical(pr, s); +} + /*---------------------------------------------------------------------------- | Takes a 64-bit fixed-point value `absZ' with binary point between bits 6 | and 7, and returns the properly rounded 32-bit integer corresponding to the @@ -2913,88 +3042,6 @@ float128 float32_to_float128(float32 a, float_status *status) } -/*---------------------------------------------------------------------------- -| Rounds the single-precision floating-point value `a' to an integer, and -| returns the result as a single-precision floating-point value. The -| operation is performed according to the IEC/IEEE Standard for Binary -| Floating-Point Arithmetic. -*----------------------------------------------------------------------------*/ - -float32 float32_round_to_int(float32 a, float_status *status) -{ - flag aSign; - int aExp; - uint32_t lastBitMask, roundBitsMask; - uint32_t z; - a = float32_squash_input_denormal(a, status); - - aExp = extractFloat32Exp( a ); - if ( 0x96 <= aExp ) { - if ( ( aExp == 0xFF ) && extractFloat32Frac( a ) ) { - return propagateFloat32NaN(a, a, status); - } - return a; - } - if ( aExp <= 0x7E ) { - if ( (uint32_t) ( float32_val(a)<<1 ) == 0 ) return a; - status->float_exception_flags |= float_flag_inexact; - aSign = extractFloat32Sign( a ); - switch (status->float_rounding_mode) { - case float_round_nearest_even: - if ( ( aExp == 0x7E ) && extractFloat32Frac( a ) ) { - return packFloat32( aSign, 0x7F, 0 ); - } - break; - case float_round_ties_away: - if (aExp == 0x7E) { - return packFloat32(aSign, 0x7F, 0); - } - break; - case float_round_down: - return make_float32(aSign ? 0xBF800000 : 0); - case float_round_up: - return make_float32(aSign ? 0x80000000 : 0x3F800000); - } - return packFloat32( aSign, 0, 0 ); - } - lastBitMask = 1; - lastBitMask <<= 0x96 - aExp; - roundBitsMask = lastBitMask - 1; - z = float32_val(a); - switch (status->float_rounding_mode) { - case float_round_nearest_even: - z += lastBitMask>>1; - if ((z & roundBitsMask) == 0) { - z &= ~lastBitMask; - } - break; - case float_round_ties_away: - z += lastBitMask >> 1; - break; - case float_round_to_zero: - break; - case float_round_up: - if (!extractFloat32Sign(make_float32(z))) { - z += roundBitsMask; - } - break; - case float_round_down: - if (extractFloat32Sign(make_float32(z))) { - z += roundBitsMask; - } - break; - default: - abort(); - } - z &= ~ roundBitsMask; - if (z != float32_val(a)) { - status->float_exception_flags |= float_flag_inexact; - } - return make_float32(z); - -} - - /*---------------------------------------------------------------------------- @@ -4140,99 +4187,6 @@ float128 float64_to_float128(float64 a, float_status *status) } -/*---------------------------------------------------------------------------- -| Rounds the double-precision floating-point value `a' to an integer, and -| returns the result as a double-precision floating-point value. The -| operation is performed according to the IEC/IEEE Standard for Binary -| Floating-Point Arithmetic. -*----------------------------------------------------------------------------*/ - -float64 float64_round_to_int(float64 a, float_status *status) -{ - flag aSign; - int aExp; - uint64_t lastBitMask, roundBitsMask; - uint64_t z; - a = float64_squash_input_denormal(a, status); - - aExp = extractFloat64Exp( a ); - if ( 0x433 <= aExp ) { - if ( ( aExp == 0x7FF ) && extractFloat64Frac( a ) ) { - return propagateFloat64NaN(a, a, status); - } - return a; - } - if ( aExp < 0x3FF ) { - if ( (uint64_t) ( float64_val(a)<<1 ) == 0 ) return a; - status->float_exception_flags |= float_flag_inexact; - aSign = extractFloat64Sign( a ); - switch (status->float_rounding_mode) { - case float_round_nearest_even: - if ( ( aExp == 0x3FE ) && extractFloat64Frac( a ) ) { - return packFloat64( aSign, 0x3FF, 0 ); - } - break; - case float_round_ties_away: - if (aExp == 0x3FE) { - return packFloat64(aSign, 0x3ff, 0); - } - break; - case float_round_down: - return make_float64(aSign ? LIT64( 0xBFF0000000000000 ) : 0); - case float_round_up: - return make_float64( - aSign ? LIT64( 0x8000000000000000 ) : LIT64( 0x3FF0000000000000 )); - } - return packFloat64( aSign, 0, 0 ); - } - lastBitMask = 1; - lastBitMask <<= 0x433 - aExp; - roundBitsMask = lastBitMask - 1; - z = float64_val(a); - switch (status->float_rounding_mode) { - case float_round_nearest_even: - z += lastBitMask >> 1; - if ((z & roundBitsMask) == 0) { - z &= ~lastBitMask; - } - break; - case float_round_ties_away: - z += lastBitMask >> 1; - break; - case float_round_to_zero: - break; - case float_round_up: - if (!extractFloat64Sign(make_float64(z))) { - z += roundBitsMask; - } - break; - case float_round_down: - if (extractFloat64Sign(make_float64(z))) { - z += roundBitsMask; - } - break; - default: - abort(); - } - z &= ~ roundBitsMask; - if (z != float64_val(a)) { - status->float_exception_flags |= float_flag_inexact; - } - return make_float64(z); - -} - -float64 float64_trunc_to_int(float64 a, float_status *status) -{ - int oldmode; - float64 res; - oldmode = status->float_rounding_mode; - status->float_rounding_mode = float_round_to_zero; - res = float64_round_to_int(a, status); - status->float_rounding_mode = oldmode; - return res; -} - /*---------------------------------------------------------------------------- | Returns the remainder of the double-precision floating-point value `a' diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index c92147abec..6427762a9a 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -319,6 +319,7 @@ float64 float16_to_float64(float16 a, flag ieee, float_status *status); | Software half-precision operations. *----------------------------------------------------------------------------*/ +float16 float16_round_to_int(float16, float_status *status); float16 float16_add(float16, float16, float_status *status); float16 float16_sub(float16, float16, float_status *status); float16 float16_mul(float16, float16, float_status *status);