From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb2c.google.com (mail-yb1-xb2c.google.com [IPv6:2607:f8b0:4864:20::b2c]) by sourceware.org (Postfix) with ESMTPS id D97653846013 for ; Wed, 3 Apr 2024 20:04:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D97653846013 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D97653846013 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b2c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712174686; cv=none; b=kEgkW+6BJ8Ba5VQSNI1hbxExp+behFQKJ0RftkrtcCYf2rJWvAPqDJFsIKws4B2svPLFsjCaKMgMMhqdI6lWP6YRxlCGVOpWN439yv1IxrSnQVuy/khoxr4YVbWE5KFigubB4pbu/MCYWp8JljPoCkAzcq3FSGfSmHZfI6zFhHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712174686; c=relaxed/simple; bh=/F3/Ty9/tk9bbVQ5ngNx1g3LZfC0yh8yDcq9mRPiwP8=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=TVN5+szHH9mB/ABDdAWdg3jeAKpbPqdKBLJDPV8Cd2odlpCpV+SeejMDAe+YsTrhUG2at8vj9II6s8/hdQyDiKBXWBsEiVPFKKl3dMAXJmg5TUSqQFpuORoQpdugsGYTy1qpJZenVSy/Fx4jboF8hTo/z4Ygm71TlqZzam9BdUw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb2c.google.com with SMTP id 3f1490d57ef6-dcc84ae94c1so323520276.1 for ; Wed, 03 Apr 2024 13:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712174683; x=1712779483; darn=sourceware.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=BpTEg4lgCgL0qM8UUA3kMZIBuuoWKckd+I+AQmNXBk0=; b=mV/lSnAbWA2xoFLtGD3NI+8rpwtuU52/fdkws5P1WwTnCiaZnP6PSb+DrrAuyEtxfk R/iaDcNUQzDCfNVH+bGSlCXIAGCez6SiBXpSt0M1Og+44e5HAGsilwVjc+CmmIn5Q5f7 Qd/+/TqUo5JBicun7Qlscm20ViihBvao5NmympP0xPNlv0GpI9dcL2uJtr737A6z+dv6 ZYAPH3c6QcamWA0omIFkK3HNunF/hncuC3+lrRmrBuOvgr0UgOhjLKHo49urn09FeuOu CfChTRm/pgbOSpfaJ/nRksrnYYnaXqPIbdtoBPlrAUZgJAsS4aPmdJoCVmTdxazdwGhB KNTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174683; x=1712779483; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BpTEg4lgCgL0qM8UUA3kMZIBuuoWKckd+I+AQmNXBk0=; b=RJtkswNRNACJwJzXazyT2ynFnoNJirxJXjOdKIW2W701EwSc0v1CRPKOxvE5/F5bta BpE4r7KsTVTN6SA2Quu+UkMv7dHvgO+Z3et4p4i2cOudIsfAg38z5xN3M5nZvtGin28d oGb2BNs3zyRqW/LzDwgF8L/RjDBN9/FrBK07tg/lxC7yhu+UFZyusBamscg6LIJlrN6s xegpZSAxXm7sVnUwn/NcpfZZmZlphyMesiuqnKu+ZvDJc7FSR1ugHUrNfvtFcmIJexsO +F8nD58zIfIa+S7XOrzfj4fIbPL01uERDRfkxiLibWJU359tthfqwvGxe8CSnZorEZcR 7/nw== X-Gm-Message-State: AOJu0YwuZU+3uZhqpprNMD6+6Mc9Bgzsdz9yib6HK80tcNka670qj+SQ jZu920GpmR7hHHVFLuvu7Cx7tHwlCkAnui9DGwFwewc75rND9GtYBOUd3tZ4et0YhJ8A68g5JfQ +uKrsfhllfGpxoBh+vb4/GSc1VnhUVk3T X-Google-Smtp-Source: AGHT+IHwXUOuvEPAbJ1Xv8YBSaL3gSEu7sJITWn3gc4iY5Wo2kUPYu33ouGXrQvfo8yTh0GSmxyYd7Rcz0hJL6wSffU= X-Received: by 2002:a25:9241:0:b0:dcc:273e:1613 with SMTP id e1-20020a259241000000b00dcc273e1613mr480758ybo.40.1712174682992; Wed, 03 Apr 2024 13:04:42 -0700 (PDT) MIME-Version: 1.0 References: <20240403193919.1533786-1-adhemerval.zanella@linaro.org> <20240403193919.1533786-4-adhemerval.zanella@linaro.org> In-Reply-To: <20240403193919.1533786-4-adhemerval.zanella@linaro.org> From: "H.J. Lu" Date: Wed, 3 Apr 2024 13:04:06 -0700 Message-ID: Subject: Re: [PATCH 3/3] math: math: x86 trunc traps when FE_INEXACT is enabled (BZ 31603) To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Joseph Myers Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3019.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Apr 3, 2024 at 12:39=E2=80=AFPM Adhemerval Zanella wrote: > > The implementations of trunc functions using x87 floating point (i386 and > x86_64 long double only) traps when FE_INEXACT is enabled. Although > this is a GNU extension outside the scope of the C standard, other > architectures that also support traps do not show this behavior. > > The fix moves the implementation to a common one that holds any > exceptions with a 'fnclex' (libc_feholdexcept_setround_387). > > Checked on x86_64-linux-gnu and i686-linux-gnu. > --- > math/Makefile | 2 + > math/test-trunc-except-2.c | 67 +++++++++++++++++++ > sysdeps/i386/fpu/{s_trunc.S =3D> s_trunc.c} | 24 ++----- > sysdeps/i386/fpu/{s_truncf.S =3D> s_truncf.c} | 24 ++----- > sysdeps/i386/fpu/s_truncl.S | 40 ----------- > .../fpu/s_truncl.S =3D> x86/fpu/s_truncl.c} | 23 ++----- > 6 files changed, 87 insertions(+), 93 deletions(-) > create mode 100644 math/test-trunc-except-2.c > rename sysdeps/i386/fpu/{s_trunc.S =3D> s_trunc.c} (69%) > rename sysdeps/i386/fpu/{s_truncf.S =3D> s_truncf.c} (68%) > delete mode 100644 sysdeps/i386/fpu/s_truncl.S > rename sysdeps/{x86_64/fpu/s_truncl.S =3D> x86/fpu/s_truncl.c} (70%) > > diff --git a/math/Makefile b/math/Makefile > index 121fe2881a..a9fef9e2db 100644 > --- a/math/Makefile > +++ b/math/Makefile > @@ -539,6 +539,7 @@ tests =3D \ > test-tgmath-int \ > test-tgmath-ret \ > test-tgmath2 \ > + test-trunc-except-2 \ > tst-CMPLX \ > tst-CMPLX2 \ > tst-definitions \ > @@ -993,6 +994,7 @@ CFLAGS-test-nan-const.c +=3D -fno-builtin > > CFLAGS-test-ceil-except-2.c +=3D -fno-builtin > CFLAGS-test-floor-except-2.c +=3D -fno-builtin > +CFLAGS-test-trunc-except-2.c +=3D -fno-builtin > > include ../Rules > > diff --git a/math/test-trunc-except-2.c b/math/test-trunc-except-2.c > new file mode 100644 > index 0000000000..8933c6ab41 > --- /dev/null > +++ b/math/test-trunc-except-2.c > @@ -0,0 +1,67 @@ > +/* Test trunc functions do not disable exception traps. > + Copyright (C) 2024 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 > + . */ > + > +#include > +#include > +#include > + > +#ifndef FE_INEXACT > +# define FE_INEXACT 0 > +#endif > + > +#define TEST_FUNC(NAME, FLOAT, SUFFIX) \ > +static int \ > +NAME (void) \ > +{ \ > + int result =3D 0; = \ > + volatile FLOAT a, b __attribute__ ((unused)); = \ > + a =3D 1.5; = \ > + /* trunc must work when traps on "inexact" are enabled. */ \ > + b =3D trunc ## SUFFIX (a); = \ > + /* And it must have left those traps enabled. */ \ > + if (fegetexcept () =3D=3D FE_INEXACT) = \ > + puts ("PASS: " #FLOAT); \ > + else \ > + { \ > + puts ("FAIL: " #FLOAT); \ > + result =3D 1; = \ > + } \ > + return result; \ > +} > + > +TEST_FUNC (float_test, float, f) > +TEST_FUNC (double_test, double, ) > +TEST_FUNC (ldouble_test, long double, l) > + > +static int > +do_test (void) > +{ > + if (feenableexcept (FE_INEXACT) =3D=3D -1) > + { > + puts ("enabling FE_INEXACT traps failed, cannot test"); > + return 77; > + } > + int result =3D float_test (); > + feenableexcept (FE_INEXACT); > + result |=3D double_test (); > + feenableexcept (FE_INEXACT); > + result |=3D ldouble_test (); > + return result; > +} > + > +#include > diff --git a/sysdeps/i386/fpu/s_trunc.S b/sysdeps/i386/fpu/s_trunc.c > similarity index 69% > rename from sysdeps/i386/fpu/s_trunc.S > rename to sysdeps/i386/fpu/s_trunc.c > index 40e45c9f9c..ac16f4967c 100644 > --- a/sysdeps/i386/fpu/s_trunc.S > +++ b/sysdeps/i386/fpu/s_trunc.c > @@ -1,5 +1,5 @@ > -/* Truncate double value. > - Copyright (C) 1997-2024 Free Software Foundation, Inc. > +/* Round to integer, toward zero. i386 version. > + Copyright (C) 2024 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 > @@ -16,22 +16,10 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > #include > > -ENTRY(__trunc) > - fldl 4(%esp) > - subl $32, %esp > - cfi_adjust_cfa_offset (32) > - fnstenv 4(%esp) > - movl $0xc00, %edx > - orl 4(%esp), %edx > - movl %edx, (%esp) > - fldcw (%esp) > - frndint > - fldenv 4(%esp) > - addl $32, %esp > - cfi_adjust_cfa_offset (-32) > - ret > -END(__trunc) > +#define FUNC __trunc > +#define TYPE double > +#define FE_OPTION FE_TOWARDZERO > +#include "s_nearestint_387_template.c" > libm_alias_double (__trunc, trunc) > diff --git a/sysdeps/i386/fpu/s_truncf.S b/sysdeps/i386/fpu/s_truncf.c > similarity index 68% > rename from sysdeps/i386/fpu/s_truncf.S > rename to sysdeps/i386/fpu/s_truncf.c > index 0b26e09d61..240d3507ef 100644 > --- a/sysdeps/i386/fpu/s_truncf.S > +++ b/sysdeps/i386/fpu/s_truncf.c > @@ -1,5 +1,5 @@ > -/* Truncate float value. > - Copyright (C) 1997-2024 Free Software Foundation, Inc. > +/* Round to integer, toward zero. i386 version. > + Copyright (C) 2024 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 > @@ -16,22 +16,10 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > #include > > -ENTRY(__truncf) > - flds 4(%esp) > - subl $32, %esp > - cfi_adjust_cfa_offset (32) > - fnstenv 4(%esp) > - movl $0xc00, %edx > - orl 4(%esp), %edx > - movl %edx, (%esp) > - fldcw (%esp) > - frndint > - fldenv 4(%esp) > - addl $32, %esp > - cfi_adjust_cfa_offset (-32) > - ret > -END(__truncf) > +#define FUNC __truncf > +#define TYPE float > +#define FE_OPTION FE_TOWARDZERO > +#include "s_nearestint_387_template.c" > libm_alias_float (__trunc, trunc) > diff --git a/sysdeps/i386/fpu/s_truncl.S b/sysdeps/i386/fpu/s_truncl.S > deleted file mode 100644 > index dfd0ca4a57..0000000000 > --- a/sysdeps/i386/fpu/s_truncl.S > +++ /dev/null > @@ -1,40 +0,0 @@ > -/* Truncate long double value. > - Copyright (C) 1997-2024 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 > - . */ > - > -#include > -#include > - > -ENTRY(__truncl) > - fldt 4(%esp) > - subl $32, %esp > - cfi_adjust_cfa_offset (32) > - fnstenv 4(%esp) > - movl $0xc00, %edx > - orl 4(%esp), %edx > - movl %edx, (%esp) > - fldcw (%esp) > - frndint > - fnstsw > - andl $0x1, %eax > - orl %eax, 8(%esp) > - fldenv 4(%esp) > - addl $32, %esp > - cfi_adjust_cfa_offset (-32) > - ret > -END(__truncl) > -libm_alias_ldouble (__trunc, trunc) > diff --git a/sysdeps/x86_64/fpu/s_truncl.S b/sysdeps/x86/fpu/s_truncl.c > similarity index 70% > rename from sysdeps/x86_64/fpu/s_truncl.S > rename to sysdeps/x86/fpu/s_truncl.c > index e3d64a84e8..e2bac7fa38 100644 > --- a/sysdeps/x86_64/fpu/s_truncl.S > +++ b/sysdeps/x86/fpu/s_truncl.c > @@ -1,5 +1,5 @@ > -/* Truncate long double value. > - Copyright (C) 1997-2024 Free Software Foundation, Inc. > +/* Round to integer, toward zero. x86 version. > + Copyright (C) 2024 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 > @@ -17,20 +17,9 @@ > . */ > > #include > -#include > > -ENTRY(__truncl) > - fldt 8(%rsp) > - fnstenv -28(%rsp) > - movl $0xc00, %edx > - orl -28(%rsp), %edx > - movl %edx, -32(%rsp) > - fldcw -32(%rsp) > - frndint > - fnstsw > - andl $0x1, %eax > - orl %eax, -24(%rsp) > - fldenv -28(%rsp) > - ret > -END(__truncl) > +#define FUNC __truncl > +#define TYPE long double > +#define FE_OPTION FE_TOWARDZERO > +#include "s_nearestint_387_template.c" > libm_alias_ldouble (__trunc, trunc) > -- > 2.34.1 > LGTM. Reviewed-by: H.J. Lu Thanks. --=20 H.J.