From patchwork Sat May 8 01:47:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 432520 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp841600jao; Fri, 7 May 2021 18:51:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjOJN9qVZkogAXd8BefekAj/uaJ7hl5HYpOIy9ShVx5Q2cIFI3ZKpSkJobxCKSo0gG7sEW X-Received: by 2002:a92:d80f:: with SMTP id y15mr11619721ilm.305.1620438691638; Fri, 07 May 2021 18:51:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620438691; cv=none; d=google.com; s=arc-20160816; b=MaS3ezw7bXj447hHrawaLUTERM0oFdrbxTPIwzFPyB5ghEVyxKrM9k2McJS9AUMEkb p9is8ftKZVUYopUi0DDOCUly0g1sBzv9T5C1oV/CnnRhHErTOqAGICw9pkDSs7VtIDvi W/tHmLnOkxdM1fvoGTSX7mLvUY5VZqftJ51BL6Wnol4QVr0i7Kbptx3SZpw9a/FYnT50 u8vqHUVLJlK/tGrwvKrGBzolS00iEVJMEwklzhyX+a/n9WPJc92Ch8PvYbKqMeBCf4g4 V1qR/RedrqQ8wiACtW9vtzCy3pOpiSAeF832Gsl1HE1Erg2PjjFnLl2iVDdZA1P92uG1 jBkQ== 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=J2jECUv0KB/VRaKbNWjXBjsVAbH6ZqCf4a3f43XZat8=; b=tnE2U6FnnwSSTwelrmoEnmkK1rtZWuoXfI7XUEWHcBx6+SoJef1y2bQ0t9hh7DXiS+ WLM0rxPXUNsIoW2yjrgBGhIcnNCEibUJkUu2Q8VP1CiFKHUnFBo6glbQkFF/hHYgDRoA mcBzQjAr8PjBLjCFxJ20G/5lup/Cb27DgL3qi3kGBZaGp8FIL3AscfUSFPzhOmvJCbbX +oSN1B2gzaKj6mviTPDpdg95S38yO+U7i7SCv/mZ3/LDbzHj4FLxigOGTA+8U7DQWOpy kV3oTE85+2zb2zME3ZxcfAvoNjaj71PLecUQO9jRmdrBi6yjggmmva9h2hdgEBgUCE8C iH8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gshKE4ND; 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 y13si5107833ilu.37.2021.05.07.18.51.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 May 2021 18:51:31 -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=gshKE4ND; 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]:52142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfC7v-0001fJ-42 for patch@linaro.org; Fri, 07 May 2021 21:51:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfC4l-0004A5-Ff for qemu-devel@nongnu.org; Fri, 07 May 2021 21:48:15 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:47063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfC4h-0003YO-Lw for qemu-devel@nongnu.org; Fri, 07 May 2021 21:48:15 -0400 Received: by mail-pf1-x42b.google.com with SMTP id q2so9076801pfh.13 for ; Fri, 07 May 2021 18:48:11 -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=J2jECUv0KB/VRaKbNWjXBjsVAbH6ZqCf4a3f43XZat8=; b=gshKE4ND++11vkoO3VO4AgFOqNGFofzNHQ+eBPT5aS0Tly5wzIwj/xtgl218eHWG3w iCPH2HlwiE6pf2TRAmxJEZB6V01CkGtcbHrbACRt3dAyLVDPYkkIrcomLox08xtvgKZ9 UNJ8k97EzzGJvCpR2LEk2fK7QTix/PB/mWTXkrGwOG8FV4BPXSGKNwOuMrgJwqeucEO7 C10n33fv6kdrkt6UsvedUXGv1iREIOL8EeVSBrjbpWFF0ivoXCvY2aZtqCqhaUbn4GTc Z4m5hz17LEmaGg5QDRBYQt6W4xPJV8C1/aix2PAOxV5UCOA3d8m4MJ0gP6u1ZerJ2sD7 9TiA== 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=J2jECUv0KB/VRaKbNWjXBjsVAbH6ZqCf4a3f43XZat8=; b=pbu0/+miB81BzzOGdTEQmSBJCBDZTEoR5dHIxx3sW8Phcz2Zk7Hfki6FzuKQLBNlV3 ipnn7TWqAx9eJIOXlUSYjkSz9aqK38CloXUuCBHYPdoSgEnnOWIvSmi8lycHQOg6Vp75 yKynBjewhB3OlskHseoOIBC5rOW9mUnJLNVf2494AzocwGUl/B9baCr3bJ9KEaaL9Jab 1UTdXRbccMsxgs9tRdBZ6/cnNjmCZiDBGy3qMY1uzjUUN4TiXZfwdy4OuH4uKp3FSNIN 2W9CQdy/MkXK8tbDDnJ6S1wtf4SyqeLxjPXEerRLzSaxe1QK+jIi6UksDsnwI5Zo0hpz VDjQ== X-Gm-Message-State: AOAM532Lm3Gi1qV+yFiWBedQ6Akm3ryZ9s8p33hxy/uvWM403fMvmSJ9 5PWEG7T2QpOW+PNmxYxmufwVfN4L+tPioA== X-Received: by 2002:a63:4c26:: with SMTP id z38mr13542949pga.415.1620438490406; Fri, 07 May 2021 18:48:10 -0700 (PDT) Received: from localhost.localdomain ([71.212.144.24]) by smtp.gmail.com with ESMTPSA id t4sm5819681pfq.165.2021.05.07.18.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 18:48:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 10/72] softfloat: Add float_cmask and constants Date: Fri, 7 May 2021 18:47:00 -0700 Message-Id: <20210508014802.892561-11-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::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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" Testing more than one class at a time is better done with masks. This reduces the static branch count. Reviewed-by: Alex Bennée Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- fpu/softfloat.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index ee4b5073b6..64edb23793 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -469,6 +469,20 @@ typedef enum __attribute__ ((__packed__)) { float_class_snan, } FloatClass; +#define float_cmask(bit) (1u << (bit)) + +enum { + float_cmask_zero = float_cmask(float_class_zero), + float_cmask_normal = float_cmask(float_class_normal), + float_cmask_inf = float_cmask(float_class_inf), + float_cmask_qnan = float_cmask(float_class_qnan), + float_cmask_snan = float_cmask(float_class_snan), + + float_cmask_infzero = float_cmask_zero | float_cmask_inf, + float_cmask_anynan = float_cmask_qnan | float_cmask_snan, +}; + + /* Simple helpers for checking if, or what kind of, NaN we have */ static inline __attribute__((unused)) bool is_nan(FloatClass c) { @@ -1338,26 +1352,28 @@ bfloat16 QEMU_FLATTEN bfloat16_mul(bfloat16 a, bfloat16 b, float_status *status) static FloatParts muladd_floats(FloatParts a, FloatParts b, FloatParts c, int flags, float_status *s) { - bool inf_zero = ((1 << a.cls) | (1 << b.cls)) == - ((1 << float_class_inf) | (1 << float_class_zero)); - bool p_sign; + bool inf_zero, p_sign; bool sign_flip = flags & float_muladd_negate_result; FloatClass p_class; uint64_t hi, lo; int p_exp; + int ab_mask, abc_mask; + + ab_mask = float_cmask(a.cls) | float_cmask(b.cls); + abc_mask = float_cmask(c.cls) | ab_mask; + inf_zero = ab_mask == float_cmask_infzero; /* It is implementation-defined whether the cases of (0,inf,qnan) * and (inf,0,qnan) raise InvalidOperation or not (and what QNaN * they return if they do), so we have to hand this information * off to the target-specific pick-a-NaN routine. */ - if (is_nan(a.cls) || is_nan(b.cls) || is_nan(c.cls)) { + if (unlikely(abc_mask & float_cmask_anynan)) { return pick_nan_muladd(a, b, c, inf_zero, s); } if (inf_zero) { float_raise(float_flag_invalid, s); - s->float_exception_flags |= float_flag_invalid; return parts_default_nan(s); } @@ -1371,9 +1387,9 @@ static FloatParts muladd_floats(FloatParts a, FloatParts b, FloatParts c, p_sign ^= 1; } - if (a.cls == float_class_inf || b.cls == float_class_inf) { + if (ab_mask & float_cmask_inf) { p_class = float_class_inf; - } else if (a.cls == float_class_zero || b.cls == float_class_zero) { + } else if (ab_mask & float_cmask_zero) { p_class = float_class_zero; } else { p_class = float_class_normal;