From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,BODY_8BITS, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id E5CEF1F487 for ; Fri, 27 Mar 2020 19:34:04 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 831B5385E007; Fri, 27 Mar 2020 19:34:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 831B5385E007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1585337643; bh=Aw7U6WZA9es//3BEHJkejC/i45NCt8qrAkEP3g8ohEk=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ORiNtn57+vkARoTVqCFOv7T/h02bNafkVBIz/Q9EKVt2zQVTezd7F3eCmxP0BnikE wg1MdRLHosyABwLYeEtV7hoXGeMWDRz05zLs5ugVS2pzXnvEBJF01dWbjtSwmnyoWA mAQvnJN6jA9Xrlt5AafJQAOPy7VzWO0a+d8k0oMo= Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by sourceware.org (Postfix) with ESMTPS id C6227385E006 for ; Fri, 27 Mar 2020 19:33:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C6227385E006 Received: by mail-qv1-xf41.google.com with SMTP id ef12so3458338qvb.11 for ; Fri, 27 Mar 2020 12:33:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Aw7U6WZA9es//3BEHJkejC/i45NCt8qrAkEP3g8ohEk=; b=nW0Fe8lgMdxtxRIzGTPxQTKFXq+LeQE4zYEqeYYHY0B2t9b8wxi94qyv4EXSze0Kr5 8BE/+FhD+i/qUDAbAx6X1n8XWpIgCvt23kSLI3N0QzbUthh4Grf/RfxxigNQWf86JDZN BTh+6YTmjQ6i3ajxIGRV1Xa/zdZ0yfSGZzNDUiPRLWIRvCc3F4BGxT9MrW/mpeT+dg70 IBP7j3WtOLhJnVjWirT6jOo24RADnSCLY1x9jMmrYcUwwFFsIvWBbemPnqvQRdR5Vn9+ hs3gbGI3PlkpT5uJ1GJwlWLrspOB0hffPmcK/fFflDIQTtlfZFN2IUMGkurOXx77PyiO PHjQ== X-Gm-Message-State: ANhLgQ17pj7lOZq+RTcQ65DZ9Vw0LYFONYz5EbyxHUc+ECsi46KTwpAG lLku6pxfgwktTQRNOLR6EVFk4OklKAc= X-Google-Smtp-Source: ADFU+vucZD+Cm36tRuCxbMmsN1NXTp/kFpDcsQR4PoHeFurObahKVz8dEMdeEPhzPF4vC9nhwNkGNg== X-Received: by 2002:a05:6214:20c:: with SMTP id i12mr904745qvt.48.1585337638853; Fri, 27 Mar 2020 12:33:58 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id p38sm4756705qtf.50.2020.03.27.12.33.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 27 Mar 2020 12:33:58 -0700 (PDT) Subject: Re: [PATCH v2 1/3] math: Remove fenvinline.h To: Paul E Murphy , libc-alpha@sourceware.org References: <20200309183234.11891-1-adhemerval.zanella@linaro.org> <196ea31e-f170-7f3c-6169-4c0ab95e0209@linux.ibm.com> Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <1dcebd66-bf8b-8471-5c1b-e93aa8fc48dd@linaro.org> Date: Fri, 27 Mar 2020 16:33:55 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Adhemerval Zanella via Libc-alpha Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On 10/03/2020 13:51, Adhemerval Zanella wrote: > > > On 09/03/2020 17:19, Paul E Murphy wrote: >> >> >> On 3/9/20 1:32 PM, Adhemerval Zanella wrote: >>> Changes from previous version: >>> >>>    - Mention on commit message x86 also exports a similar optimization, >>>      but on a different header. >>> >>> -- >>> >>> Similar to string2.h (18b10de7ce) and string3.h (09a596cc2c) this >>> patch removes the fenvinline.h on all architectures.  Currently >>> only powerpc implements some optimizations.  This kind of optimization >>> is better implemented by the compiler (which handles the architecture >>> ISA transparently). >>> >>> Also, for the specific optimized powerpc implementation the code is >>> becoming convoluted and these micro-optimization are hardly wildly >>> used, even more being a possible hotspot in realword cases >>> (non-default rounding are used only on specific cases and exception >>> handling are done most likely only on errors path).  Only x86 >>> implements similar optimization (on fenv.h) also indicates that >>> these should no be on libc. >>> >>> The math/test-fenv already covers all math/test-fenvinline tests, >>> so it is safe to remove it. >>> >>> Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. >>> --- >>>   bits/fenvinline.h                 |   8 - >>>   math/Makefile                     |   4 +- >>>   math/fenv.h                       |   4 - >>>   math/test-fenvinline.c            | 354 ------------------------------ >>>   sysdeps/powerpc/bits/fenvinline.h | 108 --------- >>>   5 files changed, 2 insertions(+), 476 deletions(-) >>>   delete mode 100644 bits/fenvinline.h >>>   delete mode 100644 math/test-fenvinline.c >>>   delete mode 100644 sysdeps/powerpc/bits/fenvinline.h > > Indeed, I misread the failures on powerpc64le-linux-gnu. Below it is > an updated patch with the fegetround optimization moved to an internal > header. Ping. > > -- > > diff --git a/bits/fenvinline.h b/bits/fenvinline.h > deleted file mode 100644 > index 42f77b5618..0000000000 > --- a/bits/fenvinline.h > +++ /dev/null > @@ -1,8 +0,0 @@ > -/* This file provides inline versions of floating-pint environment > - handling functions. If there were any. */ > - > -#ifndef __NO_MATH_INLINES > - > -/* Here is where the code would go. */ > - > -#endif > diff --git a/math/Makefile b/math/Makefile > index 84a8b94c74..f916594a51 100644 > --- a/math/Makefile > +++ b/math/Makefile > @@ -24,7 +24,7 @@ include ../Makeconfig > # Installed header files. > headers := math.h bits/mathcalls.h bits/mathinline.h \ > fpu_control.h complex.h bits/cmathcalls.h fenv.h \ > - bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h \ > + bits/fenv.h bits/mathdef.h tgmath.h \ > bits/math-vector.h finclude/math-vector-fortran.h \ > bits/libm-simd-decl-stubs.h bits/iscanonical.h \ > bits/flt-eval-method.h bits/fp-fast.h bits/fp-logb.h \ > @@ -233,7 +233,7 @@ tests = test-matherr-3 test-fenv basic-test \ > test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \ > test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \ > test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \ > - test-fenv-tls test-fenv-preserve test-fenv-return test-fenvinline \ > + test-fenv-tls test-fenv-preserve test-fenv-return \ > test-nearbyint-except test-fenv-clear \ > test-nearbyint-except-2 test-signgam-uchar test-signgam-uchar-init \ > test-signgam-uint test-signgam-uint-init test-signgam-ullong \ > diff --git a/math/fenv.h b/math/fenv.h > index 6cad1d3575..e6b9578d6c 100644 > --- a/math/fenv.h > +++ b/math/fenv.h > @@ -140,10 +140,6 @@ extern int fegetmode (femode_t *__modep) __THROW; > extern int fesetmode (const femode_t *__modep) __THROW; > #endif > > -/* Include optimization. */ > -#ifdef __OPTIMIZE__ > -# include > -#endif > > /* NaN support. */ > > diff --git a/math/test-fenvinline.c b/math/test-fenvinline.c > deleted file mode 100644 > index 0e5d361fff..0000000000 > --- a/math/test-fenvinline.c > +++ /dev/null > @@ -1,354 +0,0 @@ > -/* Test for fenv inline implementations. > - Copyright (C) 2015-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#ifndef _GNU_SOURCE > -# define _GNU_SOURCE > -#endif > - > -/* To make sure the fenv inline function are used. */ > -#undef __NO_MATH_INLINES > - > -#include > -#include > -#include > - > -/* > - Since not all architectures might define all exceptions, we define > - a private set and map accordingly. > -*/ > -#define NO_EXC 0 > -#define INEXACT_EXC 0x1 > -#define DIVBYZERO_EXC 0x2 > -#define UNDERFLOW_EXC 0x04 > -#define OVERFLOW_EXC 0x08 > -#define INVALID_EXC 0x10 > -#define ALL_EXC \ > - (INEXACT_EXC | DIVBYZERO_EXC | UNDERFLOW_EXC | OVERFLOW_EXC \ > - | INVALID_EXC) > -static int count_errors; > - > -#if FE_ALL_EXCEPT > -static void > -test_single_exception_fp_int (int exception, > - int exc_flag, > - int fe_flag, > - const char *flag_name) > -{ > - if (exception & exc_flag) > - { > - if (fetestexcept (fe_flag)) > - printf (" Pass: Exception \"%s\" is set\n", flag_name); > - else > - { > - printf (" Fail: Exception \"%s\" is not set\n", flag_name); > - ++count_errors; > - } > - } > - else > - { > - if (fetestexcept (fe_flag)) > - { > - printf (" Fail: Exception \"%s\" is set\n", flag_name); > - ++count_errors; > - } > - else > - printf (" Pass: Exception \"%s\" is not set\n", flag_name); > - } > -} > -/* Test whether a given exception was raised. */ > -static void > -test_single_exception_fp_double (int exception, > - int exc_flag, > - double fe_flag, > - const char *flag_name) > -{ > - if (exception & exc_flag) > - { > - if (fetestexcept (fe_flag)) > - printf (" Pass: Exception \"%s\" is set\n", flag_name); > - else > - { > - printf (" Fail: Exception \"%s\" is not set\n", flag_name); > - ++count_errors; > - } > - } > - else > - { > - if (fetestexcept (fe_flag)) > - { > - printf (" Fail: Exception \"%s\" is set\n", flag_name); > - ++count_errors; > - } > - else > - printf (" Pass: Exception \"%s\" is not set\n", flag_name); > - } > -} > -#endif > - > -static void > -test_exceptions (const char *test_name, int exception) > -{ > - printf ("Test: %s\n", test_name); > -#ifdef FE_DIVBYZERO > - test_single_exception_fp_double (exception, DIVBYZERO_EXC, FE_DIVBYZERO, > - "DIVBYZERO"); > -#endif > -#ifdef FE_INVALID > - test_single_exception_fp_double (exception, INVALID_EXC, FE_INVALID, > - "INVALID"); > -#endif > -#ifdef FE_INEXACT > - test_single_exception_fp_double (exception, INEXACT_EXC, FE_INEXACT, > - "INEXACT"); > -#endif > -#ifdef FE_UNDERFLOW > - test_single_exception_fp_double (exception, UNDERFLOW_EXC, FE_UNDERFLOW, > - "UNDERFLOW"); > -#endif > -#ifdef FE_OVERFLOW > - test_single_exception_fp_double (exception, OVERFLOW_EXC, FE_OVERFLOW, > - "OVERFLOW"); > -#endif > -} > - > -static void > -test_exceptionflag (void) > -{ > - printf ("Test: fegetexceptionflag (FE_ALL_EXCEPT)\n"); > -#if FE_ALL_EXCEPT > - fexcept_t excepts; > - > - feclearexcept (FE_ALL_EXCEPT); > - > - feraiseexcept (FE_INVALID); > - fegetexceptflag (&excepts, FE_ALL_EXCEPT); > - > - feclearexcept (FE_ALL_EXCEPT); > - feraiseexcept (FE_OVERFLOW | FE_INEXACT); > - > - fesetexceptflag (&excepts, FE_ALL_EXCEPT); > - > - test_single_exception_fp_int (INVALID_EXC, INVALID_EXC, FE_INVALID, > - "INVALID (int)"); > - test_single_exception_fp_int (INVALID_EXC, OVERFLOW_EXC, FE_OVERFLOW, > - "OVERFLOW (int)"); > - test_single_exception_fp_int (INVALID_EXC, INEXACT_EXC, FE_INEXACT, > - "INEXACT (int)"); > - > - /* Same test, but using double as argument */ > - feclearexcept (FE_ALL_EXCEPT); > - > - feraiseexcept (FE_INVALID); > - fegetexceptflag (&excepts, (double)FE_ALL_EXCEPT); > - > - feclearexcept (FE_ALL_EXCEPT); > - feraiseexcept (FE_OVERFLOW | FE_INEXACT); > - > - fesetexceptflag (&excepts, (double)FE_ALL_EXCEPT); > - > - test_single_exception_fp_double (INVALID_EXC, INVALID_EXC, FE_INVALID, > - "INVALID (double)"); > - test_single_exception_fp_double (INVALID_EXC, OVERFLOW_EXC, FE_OVERFLOW, > - "OVERFLOW (double)"); > - test_single_exception_fp_double (INVALID_EXC, INEXACT_EXC, FE_INEXACT, > - "INEXACT (double)"); > -#endif > -} > - > -static void > -test_fesetround (void) > -{ > -#if defined FE_TONEAREST && defined FE_TOWARDZERO > - int res1; > - int res2; > - > - printf ("Tests for fesetround\n"); > - > - /* The fesetround should not itself cause the test to fail, however it > - should either succeed for both 'int' and 'double' argument, or fail > - for both. */ > - res1 = fesetround ((int) FE_TOWARDZERO); > - res2 = fesetround ((double) FE_TOWARDZERO); > - if (res1 != res2) > - { > - printf ("fesetround (FE_TOWARDZERO) failed: %d, %d\n", res1, res2); > - ++count_errors; > - } > - > - res1 = fesetround ((int) FE_TONEAREST); > - res2 = fesetround ((double) FE_TONEAREST); > - if (res1 != res2) > - { > - printf ("fesetround (FE_TONEAREST) failed: %d, %d\n", res1, res2); > - ++count_errors; > - } > -#endif > -} > - > -#if FE_ALL_EXCEPT > -/* Tests for feenableexcept/fedisableexcept. */ > -static void > -feenable_test (const char *flag_name, fexcept_t fe_exc) > -{ > - int fe_exci = fe_exc; > - double fe_excd = fe_exc; > - int excepts; > - > - /* First disable all exceptions. */ > - if (fedisableexcept (FE_ALL_EXCEPT) == -1) > - { > - printf ("Test: fedisableexcept (FE_ALL_EXCEPT) failed\n"); > - ++count_errors; > - /* If this fails, the other tests don't make sense. */ > - return; > - } > - > - /* Test for inline macros using integer argument. */ > - excepts = feenableexcept (fe_exci); > - if (!EXCEPTION_ENABLE_SUPPORTED (fe_exci) && excepts == -1) > - { > - printf ("Test: not testing feenableexcept, it isn't implemented.\n"); > - return; > - } > - if (excepts == -1) > - { > - printf ("Test: feenableexcept (%s) failed\n", flag_name); > - ++count_errors; > - return; > - } > - if (excepts != 0) > - { > - printf ("Test: feenableexcept (%s) failed, return should be 0, is %x\n", > - flag_name, excepts); > - ++count_errors; > - } > - > - /* And now disable the exception again. */ > - excepts = fedisableexcept (fe_exc); > - if (excepts == -1) > - { > - printf ("Test: fedisableexcept (%s) failed\n", flag_name); > - ++count_errors; > - return; > - } > - if (excepts != fe_exc) > - { > - printf ("Test: fedisableexcept (%s) failed, return should be 0x%x, is 0x%x\n", > - flag_name, (unsigned int)fe_exc, excepts); > - ++count_errors; > - } > - > - /* Test for inline macros using double argument. */ > - excepts = feenableexcept (fe_excd); > - if (!EXCEPTION_ENABLE_SUPPORTED (fe_excd) && excepts == -1) > - { > - printf ("Test: not testing feenableexcept, it isn't implemented.\n"); > - return; > - } > - if (excepts == -1) > - { > - printf ("Test: feenableexcept (%s) failed\n", flag_name); > - ++count_errors; > - return; > - } > - if (excepts != 0) > - { > - printf ("Test: feenableexcept (%s) failed, return should be 0, is %x\n", > - flag_name, excepts); > - ++count_errors; > - } > - > - /* And now disable the exception again. */ > - excepts = fedisableexcept (fe_exc); > - if (excepts == -1) > - { > - printf ("Test: fedisableexcept (%s) failed\n", flag_name); > - ++count_errors; > - return; > - } > - if (excepts != fe_exc) > - { > - printf ("Test: fedisableexcept (%s) failed, return should be 0x%x, is 0x%x\n", > - flag_name, (unsigned int)fe_exc, excepts); > - ++count_errors; > - } > -} > -#endif > - > -static void > -test_feenabledisable (void) > -{ > - printf ("Tests for feenableexcepts/fedisableexcept\n"); > - > - /* We might have some exceptions still set. */ > - feclearexcept (FE_ALL_EXCEPT); > - > -#ifdef FE_DIVBYZERO > - feenable_test ("FE_DIVBYZERO", FE_DIVBYZERO); > -#endif > -#ifdef FE_INVALID > - feenable_test ("FE_INVALID", FE_INVALID); > -#endif > -#ifdef FE_INEXACT > - feenable_test ("FE_INEXACT", FE_INEXACT); > -#endif > -#ifdef FE_UNDERFLOW > - feenable_test ("FE_UNDERFLOW", FE_UNDERFLOW); > -#endif > -#ifdef FE_OVERFLOW > - feenable_test ("FE_OVERFLOW", FE_OVERFLOW); > -#endif > - fesetenv (FE_DFL_ENV); > -} > - > -static int > -do_test (void) > -{ > - /* clear all exceptions and test if all are cleared */ > - feclearexcept (FE_ALL_EXCEPT); > - test_exceptions ("feclearexcept (FE_ALL_EXCEPT) clears all exceptions", > - NO_EXC); > - > - /* raise all exceptions and test if all are raised */ > - feraiseexcept (FE_ALL_EXCEPT); > - if (EXCEPTION_TESTS (float)) > - test_exceptions ("feraiseexcept (FE_ALL_EXCEPT) raises all exceptions", > - ALL_EXC); > - > - /* Same test, but using double as argument */ > - feclearexcept ((double)FE_ALL_EXCEPT); > - test_exceptions ("feclearexcept ((double)FE_ALL_EXCEPT) clears all exceptions", > - NO_EXC); > - > - feraiseexcept ((double)FE_ALL_EXCEPT); > - if (EXCEPTION_TESTS (float)) > - test_exceptions ("feraiseexcept ((double)FE_ALL_EXCEPT) raises all exceptions", > - ALL_EXC); > - > - if (EXCEPTION_TESTS (float)) > - test_exceptionflag (); > - > - test_fesetround (); > - > - test_feenabledisable (); > - > - return count_errors; > -} > - > -#define TEST_FUNCTION do_test () > -#include "../test-skeleton.c" > diff --git a/sysdeps/powerpc/bits/fenvinline.h b/sysdeps/powerpc/bits/fenvinline.h > deleted file mode 100644 > index f2d095a72f..0000000000 > --- a/sysdeps/powerpc/bits/fenvinline.h > +++ /dev/null > @@ -1,108 +0,0 @@ > -/* Inline floating-point environment handling functions for powerpc. > - Copyright (C) 1995-2020 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#if defined __GNUC__ && !defined _SOFT_FLOAT && !defined __NO_FPRS__ > - > -/* Inline definitions for fegetround. */ > -# define __fegetround_ISA300() \ > - (__extension__ ({ \ > - union { double __d; unsigned long long __ll; } __u; \ > - __asm__ __volatile__ ( \ > - ".machine push; .machine \"power9\"; mffsl %0; .machine pop" \ > - : "=f" (__u.__d)); \ > - __u.__ll & 0x0000000000000003LL; \ > - })) > - > -# define __fegetround_ISA2() \ > - (__extension__ ({ \ > - int __fegetround_result; \ > - __asm__ __volatile__ ("mcrfs 7,7 ; mfcr %0" \ > - : "=r"(__fegetround_result) : : "cr7"); \ > - __fegetround_result & 3; \ > - })) > - > -# ifdef _ARCH_PWR9 > -# define __fegetround() __fegetround_ISA300() > -# elif defined __BUILTIN_CPU_SUPPORTS__ > -# define __fegetround() \ > - (__glibc_likely (__builtin_cpu_supports ("arch_3_00")) \ > - ? __fegetround_ISA300() \ > - : __fegetround_ISA2() \ > - ) > -# else > -# define __fegetround() __fegetround_ISA2() > -# endif > - > -# define fegetround() __fegetround () > - > -# ifndef __NO_MATH_INLINES > - > -/* Builtins to mtfsb0 and mtfsb1 was introduced on GCC 9. */ > -# if !__GNUC_PREREQ(9, 0) > -/* The weird 'i#*X' constraints on the following suppress a gcc > - warning when __excepts is not a constant. Otherwise, they mean the > - same as just plain 'i'. This warning only happens in old GCC > - versions (gcc 3 or less). Otherwise plain 'i' works fine. */ > -# define __MTFSB0(__b) __asm__ __volatile__ ("mtfsb0 %0" : : "i#*X" (__b)) > -# define __MTFSB1(__b) __asm__ __volatile__ ("mtfsb1 %0" : : "i#*X" (__b)) > -# else > -# define __MTFSB0(__b) __builtin_mtfsb0 (__b) > -# define __MTFSB1(__b) __builtin_mtfsb1 (__b) > -# endif > - > -# if __GNUC_PREREQ(3, 4) > - > -#include > - > -/* Inline definition for feraiseexcept. */ > -# define feraiseexcept(__excepts) \ > - (__extension__ ({ \ > - int __e = __excepts; \ > - int __ret = 0; \ > - if (__builtin_constant_p (__e) \ > - && __builtin_popcount (__e) == 1 \ > - && __e != FE_INVALID) \ > - { \ > - __MTFSB1 ((__builtin_clz (__e))); \ > - } \ > - else \ > - __ret = feraiseexcept (__e); \ > - __ret; \ > - })) > - > -/* Inline definition for feclearexcept. */ > -# define feclearexcept(__excepts) \ > - (__extension__ ({ \ > - int __e = __excepts; \ > - int __ret = 0; \ > - if (__builtin_constant_p (__e) \ > - && __builtin_popcount (__e) == 1 \ > - && __e != FE_INVALID) \ > - { \ > - __MTFSB0 ((__builtin_clz (__e))); \ > - } \ > - else \ > - __ret = feclearexcept (__e); \ > - __ret; \ > - })) > - > -# endif /* __GNUC_PREREQ(3, 4). */ > - > -# endif /* !__NO_MATH_INLINES. */ > - > -#endif /* __GNUC__ && !_SOFT_FLOAT && !__NO_FPRS__ */ > diff --git a/sysdeps/powerpc/fpu/fegetround.c b/sysdeps/powerpc/fpu/fegetround.c > index 00b4462624..9d7762f08b 100644 > --- a/sysdeps/powerpc/fpu/fegetround.c > +++ b/sysdeps/powerpc/fpu/fegetround.c > @@ -21,10 +21,8 @@ > int > (__fegetround) (void) > { > - return __fegetround(); > + return __fegetround_inline (); > } > -#undef fegetround > -#undef __fegetround > libm_hidden_def (__fegetround) > weak_alias (__fegetround, fegetround) > libm_hidden_weak (fegetround) > diff --git a/sysdeps/powerpc/fpu/fenv_libc.h b/sysdeps/powerpc/fpu/fenv_libc.h > index e888c6621c..09dbd3e2df 100644 > --- a/sysdeps/powerpc/fpu/fenv_libc.h > +++ b/sysdeps/powerpc/fpu/fenv_libc.h > @@ -68,6 +68,14 @@ extern const fenv_t *__fe_mask_env (void) attribute_hidden; > __fr; \ > }) > > +#define __fe_mffsl() \ > + ({register fenv_union_t __fr; \ > + __asm__ __volatile__ ( \ > + ".machine push; .machine \"power9\"; mffsl %0; .machine pop" \ > + : "=f" (__fr.fenv)); \ > + __fr.l & 0x3; \ > + }) > + > #define __fe_mffscrn(rn) \ > ({register fenv_union_t __fr; \ > if (__builtin_constant_p (rn)) \ > @@ -144,6 +152,20 @@ typedef union > unsigned long long l; > } fenv_union_t; > > +static inline int > +__fegetround_inline (void) > +{ > +#ifdef _ARCH_PWR9 > + return __fe_mffsl (); > +#else > + if (__glibc_likely (GLRO(dl_hwcap2) & PPC_FEATURE2_ARCH_3_00)) > + return __fe_mffsl (); > + > + fenv_union_t fe; > + fe.fenv = fegetenv_register (); > + return fe.l & 0x3; > +#endif > +} > > static inline int > __fesetround_inline (int round) > diff --git a/sysdeps/powerpc/fpu/fraiseexcpt.c b/sysdeps/powerpc/fpu/fraiseexcpt.c > index daa13de500..1bcd31ae14 100644 > --- a/sysdeps/powerpc/fpu/fraiseexcpt.c > +++ b/sysdeps/powerpc/fpu/fraiseexcpt.c > @@ -18,7 +18,6 @@ > > #include > > -#undef feraiseexcept > int > __feraiseexcept (int excepts) > { > diff --git a/sysdeps/powerpc/nofpu/fraiseexcpt.c b/sysdeps/powerpc/nofpu/fraiseexcpt.c > index 2193a604e2..e60ed68048 100644 > --- a/sysdeps/powerpc/nofpu/fraiseexcpt.c > +++ b/sysdeps/powerpc/nofpu/fraiseexcpt.c > @@ -21,7 +21,6 @@ > #include "soft-supp.h" > #include > > -#undef feraiseexcept > int > __feraiseexcept (int x) > { >