From nobody Tue Nov 18 06:04:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1607922008; cv=none; d=zohomail.com; s=zohoarc; b=Qq3U3OuWVaorpGtfTfFMFrtm3Jxe6ayJp/aDXW02O3lMvHKSpQke/cMr5ZTfZI8GKIKmL8JEYMTKtLVk0JDOyWI7HyuFucscBAJZqLfFx8KjJTLJ4/NGTADAsnYmYXiOjbGlem4+1oNWNnI6sXv8rhyyCZpfOCrmG0s9B3L/3bQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607922008; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AzsFZGIs0DYV3fN4ZGqyy4iZNhXMgyzK79iPegj2rRs=; b=BfPx3HVm0u84LFUT4YPzCcAzyqsFmIlOG2QY/esOYkgxprXqIlwUBmwY9UScCG9RF7iMVcIxrv36yVK7g/IbRN3dQtYR2cMvGt56Tb8/93gY5ckbzUgWjxuxCS0C/5YyIA+sBAY0v6x+RY1gWKOAJVu9HgMCuzlAKuAgBhWEBDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160792200853958.07844232082061; Sun, 13 Dec 2020 21:00:08 -0800 (PST) Received: from localhost ([::1]:42768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kofxv-0007hN-9Z for importer@patchew.org; Mon, 14 Dec 2020 00:00:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofwR-0005Cb-3v; Sun, 13 Dec 2020 23:58:35 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:41115 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofwP-0004qn-6h; Sun, 13 Dec 2020 23:58:34 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4CvTfr4Kq5z9sVx; Mon, 14 Dec 2020 15:58:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1607921892; bh=DKCYJcfwqcpDrB5bFBgyrgn/tL2ij0jVnE7WbNZkSUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kzu8UI13qBFK/NtXJt/KMnI4BA2wKg3fLcvaA1PtxS5CcwEoHmpLdt1SBFbKbKfjr DrEO0twZSUuCOc09tOOj3scbd0UoLqU+djX3YmWqKuqjp/M8WPe6egEMp526Mb1LE0 Nsp0jCuA/IfnLg6eWcFc89pXD/xpeg7l8tNG1eF0= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 12/30] ppc/translate: Delay NaN checking after comparison Date: Mon, 14 Dec 2020 15:57:49 +1100 Message-Id: <20201214045807.41003-13-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201214045807.41003-1-david@gibson.dropbear.id.au> References: <20201214045807.41003-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: Giuseppe Musacchio , Richard Henderson , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Giuseppe Musacchio Since we always perform a comparison between the two operands avoid checking for NaN unless the result states they're unordered. Suggested-by: Richard Henderson Signed-off-by: Giuseppe Musacchio Reviewed-by: Richard Henderson Message-Id: <20201112230130.65262-4-thatlemon@gmail.com> Signed-off-by: David Gibson --- target/ppc/fpu_helper.c | 80 +++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 34f5bc1f3c..f5a4be595a 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -2475,25 +2475,6 @@ static inline void do_scalar_cmp(CPUPPCState *env, p= pc_vsr_t *xa, ppc_vsr_t *xb, =20 helper_reset_fpstatus(env); =20 - if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || - float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { - vxsnan_flag =3D true; - if (fpscr_ve =3D=3D 0 && ordered) { - vxvc_flag =3D true; - } - } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || - float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { - if (ordered) { - vxvc_flag =3D true; - } - } - if (vxsnan_flag) { - float_invalid_op_vxsnan(env, GETPC()); - } - if (vxvc_flag) { - float_invalid_op_vxvc(env, 0, GETPC()); - } - switch (float64_compare(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) { case float_relation_less: cc =3D CRF_LT; @@ -2506,6 +2487,27 @@ static inline void do_scalar_cmp(CPUPPCState *env, p= pc_vsr_t *xa, ppc_vsr_t *xb, break; case float_relation_unordered: cc =3D CRF_SO; + + if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || + float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { + vxsnan_flag =3D true; + if (fpscr_ve =3D=3D 0 && ordered) { + vxvc_flag =3D true; + } + } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || + float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { + if (ordered) { + vxvc_flag =3D true; + } + } + + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + break; default: g_assert_not_reached(); @@ -2538,25 +2540,6 @@ static inline void do_scalar_cmpq(CPUPPCState *env, = ppc_vsr_t *xa, =20 helper_reset_fpstatus(env); =20 - if (float128_is_signaling_nan(xa->f128, &env->fp_status) || - float128_is_signaling_nan(xb->f128, &env->fp_status)) { - vxsnan_flag =3D true; - if (fpscr_ve =3D=3D 0 && ordered) { - vxvc_flag =3D true; - } - } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || - float128_is_quiet_nan(xb->f128, &env->fp_status)) { - if (ordered) { - vxvc_flag =3D true; - } - } - if (vxsnan_flag) { - float_invalid_op_vxsnan(env, GETPC()); - } - if (vxvc_flag) { - float_invalid_op_vxvc(env, 0, GETPC()); - } - switch (float128_compare(xa->f128, xb->f128, &env->fp_status)) { case float_relation_less: cc =3D CRF_LT; @@ -2569,6 +2552,27 @@ static inline void do_scalar_cmpq(CPUPPCState *env, = ppc_vsr_t *xa, break; case float_relation_unordered: cc =3D CRF_SO; + + if (float128_is_signaling_nan(xa->f128, &env->fp_status) || + float128_is_signaling_nan(xb->f128, &env->fp_status)) { + vxsnan_flag =3D true; + if (fpscr_ve =3D=3D 0 && ordered) { + vxvc_flag =3D true; + } + } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || + float128_is_quiet_nan(xb->f128, &env->fp_status)) { + if (ordered) { + vxvc_flag =3D true; + } + } + + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + break; default: g_assert_not_reached(); --=20 2.29.2