From patchwork Sat May 8 01:47:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 432567 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp862142jao; Fri, 7 May 2021 19:30:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdUOUyxUeeDFadTJA0jFEKj8b/js8qSBtJV+F8539WaeI1VLon7AYC+Irhr5jcKq/bRuxS X-Received: by 2002:a92:6f11:: with SMTP id k17mr12186673ilc.200.1620441010419; Fri, 07 May 2021 19:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620441010; cv=none; d=google.com; s=arc-20160816; b=n3VKk+Pb0PZxpmrtj+1WExVjU0bXLwuJN6QpWR/Fb8U3JY/nURcfw4UltJFFPz/ixl 4dgkxeV4U7blv++olg11Zk3+pyVTjpS/+iBGCxxAXD4vOOnI0UIKOAwf0MOZqLAY2dv/ hNYfSSEP8lctpmNfnMkp0miWbLilnDDpEUdakd0kSa6D9qzrEAuGeWvBtwTj509X2xGx 4en6I9X+8dM04YIjwGAdIB1yY0nXiLE0jkpdREY+TI4TzX+KmXKmvDD492NUsrZZ9mJ+ oI8FTtN2CH0JGsK1WTBpdTgiFuMudwD0ECPkH19fuFv1zTuc1uUlajg83eOop6s2P/4w oc8A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1Od39KgKMdYhwkyR5c/sGxfaCPXmuk0Ca5kCuFG8rqg=; b=GFpmS7GYXdWd4kcFW/Zka4c9g2SFM0gS3PiUtAc/zusDJCdiG0bVfik7SY349la3Xt Fn0PVT4kWxYrzK3JJG6D53VCDpNr6l8LtKAyzJ3zKB8XVm73RZ3vbA9a/7y2RGMchpeA kZfjCCllTNABS2PYByDGTRxwe6HUn/00QJIfBYfzl47IeEz/ssAVVPPsAxzmZMn+YqYJ hpRrC925y7+6e9MMmPvxustfIrCn+68zr3GPZ6OvT86IclgVcjCbvjZrHfdTujJBUmTS bJfXa/YyvK+T78Ofy1iVrEAP0vm+NyjZkUGicNmTEX16l7on/cpjmOQl8zvK0vH1ekYD x8ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IF7kVHgR; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s24si8533652ioc.50.2021.05.07.19.30.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 May 2021 19:30:10 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=IF7kVHgR; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfCjJ-0000DV-MJ for patch@linaro.org; Fri, 07 May 2021 22:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfC82-0002vM-N0 for qemu-devel@nongnu.org; Fri, 07 May 2021 21:51:38 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:46767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfC80-0005Rp-Ep for qemu-devel@nongnu.org; Fri, 07 May 2021 21:51:38 -0400 Received: by mail-pg1-x52f.google.com with SMTP id m124so8603148pgm.13 for ; Fri, 07 May 2021 18:51:36 -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=1Od39KgKMdYhwkyR5c/sGxfaCPXmuk0Ca5kCuFG8rqg=; b=IF7kVHgRdpduJYwf3ykC3rP1wJOb9RxNKG7me5v76JPWL3/rZrKtwg5S9e+7mrrcgx Zaiocmb6pnHrk3mcgttwIrDk4El8Jcm397Wl37Ie3ipU3RXcKeD7NDRUwuYMeS0bO0lB dflQQ3ZoFRmgg/tpxw+L2pje3eAgMyVmdOwB4M0KUYSVkYXvVQbyxjrVMTOWWxJvT9Vo B4jy/nxcsWg87CCg/p/wYkODgiORHRMEE2Nw6KA82PdsxHo8gfE4W9euU0Qj02lAKyWT YW5b2dsHZ36H5ISROCL0b5fdtDmkR1GsMDTY0e3vBFFiCwzo+WXjKrGi9NpynpZutOqM p5kQ== 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=1Od39KgKMdYhwkyR5c/sGxfaCPXmuk0Ca5kCuFG8rqg=; b=Y7l2Pj/SfTf59RAuMbvoljeQOrsQEd0vgqEnunZAu/p+KaTRsxhX+dCi2IOzlOyDZ2 1wF283506/Zj+UKqz+Vfgejt/jolpAQbmertGnbka+dCwcRzj4czqA89+LCVt7bnQL8v 2sK1xKkbHhZ5P+72q8BopS3AkcYSVQC1qpHjTEb57JPfc66jRAtj5mm8JTlRdtPNjYJH jD4Oj4Kvlo3RGhEYaRYRrPPq1aeqdIHhDOA/sfRsguffMPYP1hJ9W82ERnYZW56NPp6h QpsxdcT3QgzXaI7u8xszd8InoyK7lL65UERubAsOwZBBh4gughkJ9mSuHLbDixxMVOe7 8kww== X-Gm-Message-State: AOAM532MC1f3jjuXKt8lF2TcM5Gr5frBza86fegntJI/0tdw3WudP83G ypEGheS0jWw849oWp8+l/dyVYF5XymzoJA== X-Received: by 2002:a62:8fd2:0:b029:28e:8c64:52a4 with SMTP id n201-20020a628fd20000b029028e8c6452a4mr13447910pfd.3.1620438695142; Fri, 07 May 2021 18:51:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id 204sm5861396pfw.158.2021.05.07.18.51.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 18:51:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 48/72] softfloat: Move int_to_float to softfloat-parts.c.inc Date: Fri, 7 May 2021 18:47:38 -0700 Message-Id: <20210508014802.892561-49-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210508014802.892561-1-richard.henderson@linaro.org> References: <20210508014802.892561-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename to parts$N_sint_to_float. Reimplement int{32,64}_to_float128 with FloatParts128. Signed-off-by: Richard Henderson --- fpu/softfloat.c | 136 +++++++++++--------------------------- fpu/softfloat-parts.c.inc | 32 +++++++++ 2 files changed, 70 insertions(+), 98 deletions(-) -- 2.25.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 235ddda7a0..d843ea67c4 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -848,6 +848,14 @@ static uint64_t parts128_float_to_uint(FloatParts128 *p, FloatRoundMode rmode, #define parts_float_to_uint(P, R, Z, M, S) \ PARTS_GENERIC_64_128(float_to_uint, P)(P, R, Z, M, S) +static void parts64_sint_to_float(FloatParts64 *p, int64_t a, + int scale, float_status *s); +static void parts128_sint_to_float(FloatParts128 *p, int64_t a, + int scale, float_status *s); + +#define parts_sint_to_float(P, I, Z, S) \ + PARTS_GENERIC_64_128(sint_to_float, P)(P, I, Z, S) + /* * Helper functions for softfloat-parts.c.inc, per-size operations. */ @@ -2939,42 +2947,15 @@ uint64_t bfloat16_to_uint64_round_to_zero(bfloat16 a, float_status *s) } /* - * Integer to float conversions - * - * Returns the result of converting the two's complement integer `a' - * to the floating-point format. The conversion is performed according - * to the IEC/IEEE Standard for Binary Floating-Point Arithmetic. + * Signed integer to floating-point conversions */ -static FloatParts64 int_to_float(int64_t a, int scale, float_status *status) -{ - FloatParts64 r = { .sign = false }; - - if (a == 0) { - r.cls = float_class_zero; - } else { - uint64_t f = a; - int shift; - - r.cls = float_class_normal; - if (a < 0) { - f = -f; - r.sign = true; - } - shift = clz64(f); - scale = MIN(MAX(scale, -0x10000), 0x10000); - - r.exp = DECOMPOSED_BINARY_POINT - shift + scale; - r.frac = f << shift; - } - - return r; -} - float16 int64_to_float16_scalbn(int64_t a, int scale, float_status *status) { - FloatParts64 pa = int_to_float(a, scale, status); - return float16_round_pack_canonical(&pa, status); + FloatParts64 p; + + parts_sint_to_float(&p, a, scale, status); + return float16_round_pack_canonical(&p, status); } float16 int32_to_float16_scalbn(int32_t a, int scale, float_status *status) @@ -3009,8 +2990,10 @@ float16 int8_to_float16(int8_t a, float_status *status) float32 int64_to_float32_scalbn(int64_t a, int scale, float_status *status) { - FloatParts64 pa = int_to_float(a, scale, status); - return float32_round_pack_canonical(&pa, status); + FloatParts64 p; + + parts64_sint_to_float(&p, a, scale, status); + return float32_round_pack_canonical(&p, status); } float32 int32_to_float32_scalbn(int32_t a, int scale, float_status *status) @@ -3040,8 +3023,10 @@ float32 int16_to_float32(int16_t a, float_status *status) float64 int64_to_float64_scalbn(int64_t a, int scale, float_status *status) { - FloatParts64 pa = int_to_float(a, scale, status); - return float64_round_pack_canonical(&pa, status); + FloatParts64 p; + + parts_sint_to_float(&p, a, scale, status); + return float64_round_pack_canonical(&p, status); } float64 int32_to_float64_scalbn(int32_t a, int scale, float_status *status) @@ -3069,15 +3054,12 @@ float64 int16_to_float64(int16_t a, float_status *status) return int64_to_float64_scalbn(a, 0, status); } -/* - * Returns the result of converting the two's complement integer `a' - * to the bfloat16 format. - */ - bfloat16 int64_to_bfloat16_scalbn(int64_t a, int scale, float_status *status) { - FloatParts64 pa = int_to_float(a, scale, status); - return bfloat16_round_pack_canonical(&pa, status); + FloatParts64 p; + + parts_sint_to_float(&p, a, scale, status); + return bfloat16_round_pack_canonical(&p, status); } bfloat16 int32_to_bfloat16_scalbn(int32_t a, int scale, float_status *status) @@ -3105,6 +3087,19 @@ bfloat16 int16_to_bfloat16(int16_t a, float_status *status) return int64_to_bfloat16_scalbn(a, 0, status); } +float128 int64_to_float128(int64_t a, float_status *status) +{ + FloatParts128 p; + + parts_sint_to_float(&p, a, 0, status); + return float128_round_pack_canonical(&p, status); +} + +float128 int32_to_float128(int32_t a, float_status *status) +{ + return int64_to_float128(a, status); +} + /* * Unsigned Integer to float conversions * @@ -4955,28 +4950,6 @@ floatx80 int32_to_floatx80(int32_t a, float_status *status) } -/*---------------------------------------------------------------------------- -| Returns the result of converting the 32-bit two's complement integer `a' to -| the quadruple-precision floating-point format. The conversion is performed -| according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic. -*----------------------------------------------------------------------------*/ - -float128 int32_to_float128(int32_t a, float_status *status) -{ - bool zSign; - uint32_t absA; - int8_t shiftCount; - uint64_t zSig0; - - if ( a == 0 ) return packFloat128( 0, 0, 0, 0 ); - zSign = ( a < 0 ); - absA = zSign ? - a : a; - shiftCount = clz32(absA) + 17; - zSig0 = absA; - return packFloat128( zSign, 0x402E - shiftCount, zSig0<cls = float_class_zero; + return; + } + + p->cls = float_class_normal; + if (a < 0) { + f = -f; + p->sign = true; + } + shift = clz64(f); + scale = MIN(MAX(scale, -0x10000), 0x10000); + + p->exp = DECOMPOSED_BINARY_POINT - shift + scale; + p->frac_hi = f << shift; +}