From patchwork Fri May 11 00:43:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 135462 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp253800lji; Thu, 10 May 2018 17:59:38 -0700 (PDT) X-Google-Smtp-Source: AB8JxZry0b3At64pOufH4R7mDGyKKZ+sMDiULicsvRH4Zg+b6q8o7/Fepz3Tizm2no72fTmz+45f X-Received: by 2002:a37:be86:: with SMTP id o128-v6mr3159096qkf.141.1526000378610; Thu, 10 May 2018 17:59:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526000378; cv=none; d=google.com; s=arc-20160816; b=I/DJDyGs04m2ZlOsZ7tEmBSHVr/mxXxrjAFmVIm9bSvXhPRHagsyB1s/SjjHVBgemV OOHHo0igaX0tS/FcW0OCx2njvi2wKcnj3Sr2+GfsFMQp4rThvfbdgrfvg560BEa++GFY Nxg5zSW04LdoQN6OwF1YCv1/557OPx60xzPOlBz6tsnhcGEQ814QA47M3a6NK2kMBkqt 1iKds0OaBY7VUmpdgCXzzlYFRmGQhTYL5jyE3eFDs/60hIeu7h7wXDGjALjNhffD6YR6 5KtPWGT87duofF0I5P5/p9I9E/MCm+yWNrVFzH2wuX/QPk8G54fR6MekKjf14bNuMjrx lG3A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=MS+jabeFcvUCqsXLya/uB7mpbDAjQtdDouXTp4BblTw=; b=WVp7FrZIjJtZzX2rlqMntdSiNcXFeFjM343KlkG+gY9CGLb4BcDtRkP2HBb6kfXSvm wvWpcjU1WIwpWdStX3vj5CZx3AkMJYmEC38SK5ftDD7F2YoCocnQTA+fucInjrmYTTEH ZB0/g9frgsKFBafezcwv5wDn+c6xFnnauvihlKx+Cd4W+kN2rWtYc1yBh8i+PaUX/75w zvQ35XlO1VcGWUdEcbp9bm8BOcDFJsRvCSRbdz9eIPgORn+ErnOfACT03tFbpVzVfnRn 6ax0cQ4oJumEMVt4YsYLeBidoPVaYdyzspeX+Mbn1RVulgd0SGfctznyWjXv8zVD8J+B JW5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cNa6kqeU; 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 q36-v6si2059589qtf.211.2018.05.10.17.59.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 10 May 2018 17:59:38 -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=cNa6kqeU; 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]:36236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGwPK-00076q-6H for patch@linaro.org; Thu, 10 May 2018 20:59:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGwAS-0007XY-Oo for qemu-devel@nongnu.org; Thu, 10 May 2018 20:44:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGwAR-0004uo-IG for qemu-devel@nongnu.org; Thu, 10 May 2018 20:44:16 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:36262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGwAR-0004ue-9r for qemu-devel@nongnu.org; Thu, 10 May 2018 20:44:15 -0400 Received: by mail-pg0-x244.google.com with SMTP id z70-v6so1681623pgz.3 for ; Thu, 10 May 2018 17:44: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; bh=MS+jabeFcvUCqsXLya/uB7mpbDAjQtdDouXTp4BblTw=; b=cNa6kqeUw781oBrG3DN3GEbNEo386oD2PAYucm8puPLnrFkcyj0F16xUF6eMFK5tzE fjhO+SPbT9iYJtrfKC/IFRga0heFFWW7w9SzHaOZXCzKoJ7zrctpEAKNQ5sX88zY17pT JGlZTx7htcZJ4gqCqTBqg/Kn4NA5oag5EWrEc= 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; bh=MS+jabeFcvUCqsXLya/uB7mpbDAjQtdDouXTp4BblTw=; b=f9b1uUwvzmocOBjj/NTGM1qGG+FYFzizWsmEVNUO5s9GV3VOXTBFfDajQx17E9mXWy en8n2Wd9tWEfwVLxTbO581Cbd8/lzIVfNxXqYY8ib4FVNOaEi4a5e4xni15ieVegCZqe I5HaeX9VMuDA++QMexfe6kjjRRlKX32jHNxeWeIfP+TzGw1WX7kAG3sAWrKiW8jdPa2K 9bF/YHjfvOsg7oc6o8o2aLmPxvxt/0zXDku32tZZcLjWU0oFJqQ79Pw1n/fznyPHS3UV uAkvRARjb/zTMNtGzqgkGAFzRLwoMp65T23FEEDjbgUEXFNNP3DJGZf1T3WK2eqjVNx/ 37cA== X-Gm-Message-State: ALKqPwcKaeROmAPPQteurF8V+HG0DVcywiubqRfu3+oFGcQbkrdOKoMj AEHFnZA6SfhRvtAF7GPNjzJ3TwW1iWI= X-Received: by 2002:a65:6645:: with SMTP id z5-v6mr2746957pgv.43.1525999453950; Thu, 10 May 2018 17:44:13 -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 y24-v6sm4216728pfn.23.2018.05.10.17.44.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 May 2018 17:44:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 10 May 2018 17:43:45 -0700 Message-Id: <20180511004345.26708-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511004345.26708-1-richard.henderson@linaro.org> References: <20180511004345.26708-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH 19/19] fpu/softfloat: Pass FloatClass to pickNaNMulAdd 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, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For each operand, pass a single enumeration instead of a pair of booleans. Signed-off-by: Richard Henderson --- fpu/softfloat-specialize.h | 70 +++++++++++++++----------------------- fpu/softfloat.c | 11 +++--- 2 files changed, 31 insertions(+), 50 deletions(-) -- 2.17.0 diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 83e5bf83b9..637f1ea1be 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -583,15 +583,14 @@ static int pickNaN(FloatClass a_cls, FloatClass b_cls, | information. | Return values : 0 : a; 1 : b; 2 : c; 3 : default-NaN *----------------------------------------------------------------------------*/ -#if defined(TARGET_ARM) -static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, - flag cIsQNaN, flag cIsSNaN, flag infzero, - float_status *status) +static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls, + bool infzero, float_status *status) { +#if defined(TARGET_ARM) /* For ARM, the (inf,zero,qnan) case sets InvalidOp and returns * the default NaN */ - if (infzero && cIsQNaN) { + if (infzero && is_qnan(c_cls)) { float_raise(float_flag_invalid, status); return 3; } @@ -599,25 +598,20 @@ static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, /* This looks different from the ARM ARM pseudocode, because the ARM ARM * puts the operands to a fused mac operation (a*b)+c in the order c,a,b. */ - if (cIsSNaN) { + if (is_snan(c_cls)) { return 2; - } else if (aIsSNaN) { + } else if (is_snan(a_cls)) { return 0; - } else if (bIsSNaN) { + } else if (is_snan(b_cls)) { return 1; - } else if (cIsQNaN) { + } else if (is_qnan(c_cls)) { return 2; - } else if (aIsQNaN) { + } else if (is_qnan(a_cls)) { return 0; } else { return 1; } -} #elif defined(TARGET_MIPS) -static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, - flag cIsQNaN, flag cIsSNaN, flag infzero, - float_status *status) -{ /* For MIPS, the (inf,zero,qnan) case sets InvalidOp and returns * the default NaN */ @@ -628,41 +622,36 @@ static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, if (SNAN_BIT_IS_ONE(status)) { /* Prefer sNaN over qNaN, in the a, b, c order. */ - if (aIsSNaN) { + if (is_snan(a_cls)) { return 0; - } else if (bIsSNaN) { + } else if (is_snan(b_cls)) { return 1; - } else if (cIsSNaN) { + } else if (is_snan(c_cls)) { return 2; - } else if (aIsQNaN) { + } else if (is_qnan(a_cls)) { return 0; - } else if (bIsQNaN) { + } else if (is_qnan(b_cls)) { return 1; } else { return 2; } } else { /* Prefer sNaN over qNaN, in the c, a, b order. */ - if (cIsSNaN) { + if (is_snan(c_cls)) { return 2; - } else if (aIsSNaN) { + } else if (is_snan(a_cls)) { return 0; - } else if (bIsSNaN) { + } else if (is_snan(b_cls)) { return 1; - } else if (cIsQNaN) { + } else if (is_qnan(c_cls)) { return 2; - } else if (aIsQNaN) { + } else if (is_qnan(a_cls)) { return 0; } else { return 1; } } -} #elif defined(TARGET_PPC) -static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, - flag cIsQNaN, flag cIsSNaN, flag infzero, - float_status *status) -{ /* For PPC, the (inf,zero,qnan) case sets InvalidOp, but we prefer * to return an input NaN if we have one (ie c) rather than generating * a default NaN @@ -675,31 +664,26 @@ static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, /* If fRA is a NaN return it; otherwise if fRB is a NaN return it; * otherwise return fRC. Note that muladd on PPC is (fRA * fRC) + frB */ - if (aIsSNaN || aIsQNaN) { + if (is_nan(a_cls)) { return 0; - } else if (cIsSNaN || cIsQNaN) { + } else if (is_nan(c_cls)) { return 2; } else { return 1; } -} #else -/* A default implementation: prefer a to b to c. - * This is unlikely to actually match any real implementation. - */ -static int pickNaNMulAdd(flag aIsQNaN, flag aIsSNaN, flag bIsQNaN, flag bIsSNaN, - flag cIsQNaN, flag cIsSNaN, flag infzero, - float_status *status) -{ - if (aIsSNaN || aIsQNaN) { + /* A default implementation: prefer a to b to c. + * This is unlikely to actually match any real implementation. + */ + if (is_nan(a_cls)) { return 0; - } else if (bIsSNaN || bIsQNaN) { + } else if (is_nan(b_cls)) { return 1; } else { return 2; } -} #endif +} /*---------------------------------------------------------------------------- | Takes two single-precision floating-point values `a' and `b', one of which diff --git a/fpu/softfloat.c b/fpu/softfloat.c index cd56beb277..4e957a5d6f 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -182,17 +182,17 @@ typedef enum __attribute__ ((__packed__)) { } FloatClass; /* Simple helpers for checking if what NaN we have */ -static bool is_nan(FloatClass c) +static inline __attribute__((unused)) bool is_nan(FloatClass c) { return unlikely(c >= float_class_qnan); } -static bool is_snan(FloatClass c) +static inline __attribute__((unused)) bool is_snan(FloatClass c) { return c == float_class_snan; } -static bool is_qnan(FloatClass c) +static inline __attribute__((unused)) bool is_qnan(FloatClass c) { return c == float_class_qnan; } @@ -612,10 +612,7 @@ static FloatParts pick_nan_muladd(FloatParts a, FloatParts b, FloatParts c, if (s->default_nan_mode) { return parts_default_nan(s); } else { - switch (pickNaNMulAdd(is_qnan(a.cls), is_snan(a.cls), - is_qnan(b.cls), is_snan(b.cls), - is_qnan(c.cls), is_snan(c.cls), - inf_zero, s)) { + switch (pickNaNMulAdd(a.cls, b.cls, c.cls, inf_zero, s)) { case 0: break; case 1: