From patchwork Wed Apr 3 19:39:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 87993 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2DB563844778 for ; Wed, 3 Apr 2024 19:40:21 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id DD13B384601E for ; Wed, 3 Apr 2024 19:39:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD13B384601E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DD13B384601E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::432 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712173178; cv=none; b=LP5RhbCOCr3/6BJL2bKy9h48qUiP72BFDWFDiolMZ0zzt4BY+OsG9GuMx7YWabsaZaVyz2Oya6g54j/YYXyTlTx47kkiNtI7Qm7/9upRVx5wnhgcO4vvXhVugrIUMY8c7+hrAW8xqG/hO0mlPjD2Sr2B5x07nwKwtckR/A8vkrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712173178; c=relaxed/simple; bh=6p8RvLhjUjEoRhN4eJmks4AJaHToKjDqIYIy/sMXR6E=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=aIHeyMi3G/Q35HpZaqmxxAh+52SUvgI3AGWv+SvvoVZN8ca/NYXz08PeSqsFUgdl5cRdu8JLHl3pwkKqwn5MuK7XSGfa0A5V4HU1+tVUUYvXF6U3H3abgaBJhJPjIrU6QKKrB0zHjlT/eC9shJH6WrolfrPb4q1SFSDsxXTZuq0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6e6bee809b8so165787b3a.1 for ; Wed, 03 Apr 2024 12:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712173170; x=1712777970; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gd6VxzVUZG62Y1LDv2+Z/kictRny9lnWrJupIPkvFFQ=; b=sediwBpvH/UQX54brMxa9tHLW4zBmP95L5bOHsULEip3E0bFQLleoD7GCSkwe1/dX0 AfPQ+agQ8IBIZhyh1xs0zq2qzxGf4KCrMC+rYas3++hOPzeKsxjPbOJtFvaw1F7mb/LZ msIUwe7YOTc/YUzGiqA/bRgLl/o/Qo9L3oJnnjcBk8pCii3zylaOSlDIvv5Gsx8Q0AQ9 5yBlklqidRO5JHJPO/b6XzbyCukzF8LHCU7aM4HFH/fj3B/r6bUflkyOTPpDEtOnyYZH l/8lUKzv0HOSkjrEUAdysWLoQPp+64CeUpy4uOf2T60D4OyTLN23DrE6Cyi9/Ih5LuOn KQgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173170; x=1712777970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gd6VxzVUZG62Y1LDv2+Z/kictRny9lnWrJupIPkvFFQ=; b=sXPKm0+PjLs52swvV5TxoLY+a8LfFdJflSfr4wk13ynZvQsnDXwLTdlhoTkFXAuR8W FvduXBb6PoIDnfWJAChskn0WCLN5iJ/7TjqUb6RcNrTVpeW60kuWFTi0KP3fmGB0FWG4 08rKDJZuyn5jFu62ZxIyhVHApJg4rxTwGUWZFqodLTO4eK/Lqv3dKo7+4kscbf6RoW5/ OC4k3/y5TUUEBdx9DAPtgBlztQXGrwzL6alGzrTHb2gp17RF0CNdDxRvplogmpTJ8Vk5 vbKKCDPR+KgduzR7WiKQA3sDTRnPx0+N3Jr5abFYiS0JLm7ZrAXKhz3ZPErTCUcY2HlM aj6w== X-Gm-Message-State: AOJu0YzK5u2hIiJFWYshxMYaXA/Q+Zh5D0mAsn03taWMpp1Q5wpuzuI/ g4bl3aUXmv7lMr8ESEYXamXFthwiyIAutV6ahPDLP3d6U/zbFVBnheLvqQ/i+fpVSQaRVXGJGK0 w X-Google-Smtp-Source: AGHT+IGrwxzFjiag5nCVPshR/CSaFXlQEDpmiW1Yxw9Jhz3ktXviQQ/6cXWEZU1uemjqCUbC/XJKUQ== X-Received: by 2002:a05:6a20:258a:b0:1a5:6c73:74b8 with SMTP id k10-20020a056a20258a00b001a56c7374b8mr690585pzd.39.1712173170171; Wed, 03 Apr 2024 12:39:30 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:b18e:82b0:6301:7f28:5bcc]) by smtp.gmail.com with ESMTPSA id fd30-20020a056a002e9e00b006eaf43b5982sm8913535pfb.108.2024.04.03.12.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:39:29 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: "H . J . Lu" , Joseph Myers Subject: [PATCH 3/3] math: math: x86 trunc traps when FE_INEXACT is enabled (BZ 31603) Date: Wed, 3 Apr 2024 16:39:19 -0300 Message-Id: <20240403193919.1533786-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240403193919.1533786-1-adhemerval.zanella@linaro.org> References: <20240403193919.1533786-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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. Reviewed-by: H.J. Lu --- math/Makefile | 2 + math/test-trunc-except-2.c | 67 +++++++++++++++++++ sysdeps/i386/fpu/{s_trunc.S => s_trunc.c} | 24 ++----- sysdeps/i386/fpu/{s_truncf.S => s_truncf.c} | 24 ++----- sysdeps/i386/fpu/s_truncl.S | 40 ----------- .../fpu/s_truncl.S => 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 => s_trunc.c} (69%) rename sysdeps/i386/fpu/{s_truncf.S => s_truncf.c} (68%) delete mode 100644 sysdeps/i386/fpu/s_truncl.S rename sysdeps/{x86_64/fpu/s_truncl.S => 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 = \ 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 += -fno-builtin CFLAGS-test-ceil-except-2.c += -fno-builtin CFLAGS-test-floor-except-2.c += -fno-builtin +CFLAGS-test-trunc-except-2.c += -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 = 0; \ + volatile FLOAT a, b __attribute__ ((unused)); \ + a = 1.5; \ + /* trunc must work when traps on "inexact" are enabled. */ \ + b = trunc ## SUFFIX (a); \ + /* And it must have left those traps enabled. */ \ + if (fegetexcept () == FE_INEXACT) \ + puts ("PASS: " #FLOAT); \ + else \ + { \ + puts ("FAIL: " #FLOAT); \ + result = 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) == -1) + { + puts ("enabling FE_INEXACT traps failed, cannot test"); + return 77; + } + int result = float_test (); + feenableexcept (FE_INEXACT); + result |= double_test (); + feenableexcept (FE_INEXACT); + result |= 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)