From patchwork Fri Nov 3 12:24:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 740661 Delivered-To: patch@linaro.org Received: by 2002:a5d:538f:0:b0:32d:baff:b0ca with SMTP id d15csp1335268wrv; Fri, 3 Nov 2023 05:25:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmH/17Clg0K4Sx2vPWrh/77uG+CKwh7XFkhF0fdDTwEiYejFHdlFLFILKsMETWL70a4oTT X-Received: by 2002:a05:6214:1316:b0:65b:259f:d6a9 with SMTP id pn22-20020a056214131600b0065b259fd6a9mr23072856qvb.7.1699014315886; Fri, 03 Nov 2023 05:25:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1699014315; cv=pass; d=google.com; s=arc-20160816; b=Ows74JPP4WghymZ3+7pzb5xc4fDm9TndaLw+PdaUoGt//k99/4Fs9g3LZZR9S/gcPR IHqSF2Expkbz2ihIKWW8aV/lnXQuhFWMGuvz4JkwdmH4cIaseVF79NiIq/4cKttHmfFE Tmi4FBZgkWd/PwKpwTIkR8vyHOJ34XlquMh47m+TYQ7rw7R8/vRMkB2ENAWfu/GPNQb+ iMaKNDwAkQR2C/3B+GcYCm337zl1/Y0tSiW46TKyJk9ze93Yon3FdWvh2zHWo7AANcev 1PatkauuFgw2XqDszh14HhbOCogN37vavXe5t1X7t0bLLA6/z0qSnFvizFm6tLLWyTvy foFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=eftPKld3emM/oawcIawQye0ZqEe6js4ZoXRzoUmLenU=; fh=01HD8dtuIqmy9rV/eMJuvD8dAGq4TXBqBjIxWaMzNQI=; b=rhAHA2/P9TnIFkd5FrZ6130DccoKc7sQnd41ScA1jjPtS0oWW6L37K6URd/j4o9wVm qoOG+eLTFCc2b9zOuK/rxS9pgY+VgNkV7GwiR3tN87rDOdauw5wBk4qndyoQTEKsrvnB 9FUVNgxbQeSwmvzPw5lYAVbmFILvzKBetaP8YTzvSOoyL5VovYV2b75U59sjDwQSOjey 0S8YPvx8G1TB2tQjivfW8UaDWLUSxWcpX5E4leBm4cdlp7010JBs+95AsiYnC6JTjv96 4fgMcrGRwGFU7CHWLGxbnRtOx7caNb10L6nKVq89Mo78AjziW3Ujl5T6Jk8nI8wDqXAa IcZw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ORXHbVE6; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a8-20020ad441c8000000b0066cf62213d8si1393346qvq.58.2023.11.03.05.25.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 05:25:15 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ORXHbVE6; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces+patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces+patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 92C533858425 for ; Fri, 3 Nov 2023 12:25:09 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) by sourceware.org (Postfix) with ESMTPS id 463003858C50 for ; Fri, 3 Nov 2023 12:24:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 463003858C50 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 463003858C50 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::72a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699014276; cv=none; b=vH3NR8UpDlxeQg22ppZIpCq/4Rm9IvXlKaYrpGRQl3vkZM/HTE0Dfn3YMjCKcEuev1+1gi6bxcTItDCGpsvMrrC42mCHUZU2JmgmFAjkRF4OSgYEh+qOBo/9hbVewiH7G0L8wsdbsKlivbtdjTWZ9Y+eGCjwVwf2rYhdNh9v4k4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699014276; c=relaxed/simple; bh=hfDMehSrfWPelTn8gQqgqYIK4BflGb+l5n5qAH2yda0=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=naukFRltddPJijozKymU/ZKW5ZyAnHuLZoCdo56dv48ctDNqD+rB6gO6UX5gh4YrDf+UuEzpoc5DVCHYtei/qpaX/KI3hT7MwkMOWtH04NM2xf6MiFhXjKiAgESQV8x38tj68xHZ7H4HGzvFlqyWjJQ7yjI5hiF3AnHqwvqxd5o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-778940531dbso118879285a.0 for ; Fri, 03 Nov 2023 05:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699014268; x=1699619068; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=eftPKld3emM/oawcIawQye0ZqEe6js4ZoXRzoUmLenU=; b=ORXHbVE6XkJWoTw3FmXtG9RI0m2nYvR8S0P26VuPKLU528iv3iDalArTafbiQcDFFn KSoSGntpSYd52/57GWlXun+pJC6taGtyKfXbPh62+EBcnET9zmdu1xohSQKWqFg5pRZh o1f6thF0LWnGx68FB6asvyRD8F05ctf6PMhmcFgTjXjDlQBnSNm2Qd60ZklKRV6yMQ3e pd7GnMdFOS2L19GfUq4hjnbrIaE9E3/nzVLS0of8bSenHuVMMCXZbdPQdg2Ydbo3eUnm F59CifE3BbSQM8Kp4IPTR5hsc3oF6njyZRWLl+PvJE/wSh+sBbU+nPXaOYkR5WwopJUZ fxQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699014268; x=1699619068; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eftPKld3emM/oawcIawQye0ZqEe6js4ZoXRzoUmLenU=; b=D3EV2ahIERqr64zTMcl/EIrudNgJp39h7iCRwOJhn8Rp+jHNFT1qJlmpQCZR2+y5JZ 1FzBwV6CVATO4rLRUlcy2ObGrhqJjbOHM1ksoD4czRNg4bCYXcAdLFtYT3WRVDpVwmEd OUA9gq0Z7YEwRjbebJNLw0NbmNx0SfoK/yXfEv3b/EsgF4uPbLyc9NhUilTMPh1XSvva N/rQ2mB9tZZbGuFS+wRFizlVgy4LiCqVytBt6XKHX9sORaOMtUqywgWRurHKjjSJDetM h6MXFsfpeeQ0ay8/Qg654lR693HilvbeZirQNiOvDAgCy7f0DEc5VT/xaJgSDj7knSmZ PALw== X-Gm-Message-State: AOJu0YwDQUtcggCzAV7my+Si1E3lCJjI+xD7omTydGP7KmZSYG4WeJ0I 7LIegJakw3a95nnSzIbFtrn4ktnhmpKgNvsIlLOqQg== X-Received: by 2002:a05:620a:4109:b0:775:9bc3:c492 with SMTP id j9-20020a05620a410900b007759bc3c492mr24203796qko.7.1699014267793; Fri, 03 Nov 2023 05:24:27 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:a715:dd81:f992:f726:338a]) by smtp.gmail.com with ESMTPSA id e15-20020a05620a12cf00b0076eee688a95sm693833qkl.0.2023.11.03.05.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 05:24:27 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Bruno Haible Subject: [PATCH 3/7] x86: Do not raises floating-point exception traps on fesetexceptflag (BZ 30990) Date: Fri, 3 Nov 2023 09:24:12 -0300 Message-Id: <20231103122416.2724355-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231103122416.2724355-1-adhemerval.zanella@linaro.org> References: <20231103122416.2724355-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 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, T_SCC_BODY_TEXT_LINE 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+patch=linaro.org@sourceware.org From: Bruno Haible According to ISO C23 (7.6.4.4), fesetexcept is supposed to set floating-point exception flags without raising a trap (unlike feraiseexcept, which is supposed to raise a trap if feenableexcept was called with the appropriate argument). The flags can be set in the 387 unit or in the SSE unit. When we need to clear a flag, we need to do so in both units, due to the way fetestexcept is implemented. When we need to set a flag, it is sufficient to do it in the SSE unit, because that is guaranteed to not trap. However, on i386 CPUs that have only a 387 unit, set the flags in the 387, as long as this cannot trap. Co-authored-by: Adhemerval Zanella --- math/test-fexcept-traps.c | 22 ++++++++++- sysdeps/i386/fpu/fsetexcptflg.c | 63 ++++++++++++++++++++----------- sysdeps/x86_64/fpu/fsetexcptflg.c | 24 +++++++----- 3 files changed, 77 insertions(+), 32 deletions(-) diff --git a/math/test-fexcept-traps.c b/math/test-fexcept-traps.c index 9b8f583ae6..13aff229c3 100644 --- a/math/test-fexcept-traps.c +++ b/math/test-fexcept-traps.c @@ -19,6 +19,7 @@ #include #include #include +#include static int do_test (void) @@ -66,7 +67,26 @@ do_test (void) /* The test is that this does not cause exception traps. For architectures where setting the exception might result in traps the function should return a nonzero value. */ - ret = fesetexceptflag (&saved, FE_ALL_EXCEPT); + { + int exc_before = fegetexcept (); + ret = fesetexceptflag (&saved, FE_ALL_EXCEPT); + int exc_after = fegetexcept (); + if (exc_before != exc_after) + { + puts ("fesetexceptflag (FE_ALL_EXCEPT) changed the exceptions mask"); + return 1; + } + } + + /* Execute some floating-point operations, since on some CPUs exceptions + triggers a trap only at the next floating-point instruction. */ + volatile double a = 1.0; + volatile double b = a + a; + math_force_eval (b); + volatile long double al = 1.0L; + volatile long double bl = al + al; + math_force_eval (bl); + if (ret != 0 && !EXCEPTION_SET_FORCES_TRAP) { puts ("fesetexceptflag failed"); diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c index e724b7d6fd..480165cff9 100644 --- a/sysdeps/i386/fpu/fsetexcptflg.c +++ b/sysdeps/i386/fpu/fsetexcptflg.c @@ -17,42 +17,63 @@ . */ #include -#include -#include #include -#include int __fesetexceptflag (const fexcept_t *flagp, int excepts) { - fenv_t temp; + /* The flags can be set in the 387 unit or in the SSE unit. When we need to + clear a flag, we need to do so in both units, due to the way fetestexcept + is implemented. + When we need to set a flag, it is sufficient to do it in the SSE unit, + because that is guaranteed to not trap. However, on i386 CPUs that have + only a 387 unit, set the flags in the 387, as long as this cannot trap. */ - /* Get the current environment. We have to do this since we cannot - separately set the status word. */ - __asm__ ("fnstenv %0" : "=m" (*&temp)); + fenv_t temp; - temp.__status_word &= ~(excepts & FE_ALL_EXCEPT); - temp.__status_word |= *flagp & excepts & FE_ALL_EXCEPT; + excepts &= FE_ALL_EXCEPT; - /* Store the new status word (along with the rest of the environment. - Possibly new exceptions are set but they won't get executed unless - the next floating-point instruction. */ - __asm__ ("fldenv %0" : : "m" (*&temp)); + /* Get the current x87 FPU environment. We have to do this since we + cannot separately set the status word. + Note: fnstenv masks all floating-point exceptions until the fldenv + or fldcw below. */ + __asm__ ("fnstenv %0" : "=m" (*&temp)); - /* If the CPU supports SSE, we set the MXCSR as well. */ if (CPU_FEATURE_USABLE (SSE)) { - unsigned int xnew_exc; + unsigned int mxcsr; + + /* Clear relevant flags. */ + temp.__status_word &= ~(excepts & ~ *flagp); - /* Get the current MXCSR. */ - __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + /* Store the new status word (along with the rest of the environment). */ + __asm__ ("fldenv %0" : : "m" (*&temp)); - /* Set the relevant bits. */ - xnew_exc &= ~(excepts & FE_ALL_EXCEPT); - xnew_exc |= *flagp & excepts & FE_ALL_EXCEPT; + /* And now similarly for SSE. */ + __asm__ ("stmxcsr %0" : "=m" (*&mxcsr)); + + /* Clear or set relevant flags. */ + mxcsr ^= (mxcsr ^ *flagp) & excepts; /* Put the new data in effect. */ - __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + __asm__ ("ldmxcsr %0" : : "m" (*&mxcsr)); + } + else + { + /* Clear or set relevant flags. */ + temp.__status_word ^= (temp.__status_word ^ *flagp) & excepts; + + if ((~temp.__control_word) & temp.__status_word & excepts) + { + /* Setting the exception flags may trigger a trap (at the next + floating-point instruction, but that does not matter). + ISO C 23 ยง 7.6.4.5 does not allow it. */ + __asm__ volatile ("fldcw %0" : : "m" (*&temp.__control_word)); + return -1; + } + + /* Store the new status word (along with the rest of the environment). */ + __asm__ ("fldenv %0" : : "m" (*&temp)); } /* Success. */ diff --git a/sysdeps/x86_64/fpu/fsetexcptflg.c b/sysdeps/x86_64/fpu/fsetexcptflg.c index a3ac1dea01..2ce2b509f2 100644 --- a/sysdeps/x86_64/fpu/fsetexcptflg.c +++ b/sysdeps/x86_64/fpu/fsetexcptflg.c @@ -22,30 +22,34 @@ int fesetexceptflag (const fexcept_t *flagp, int excepts) { + /* The flags can be set in the 387 unit or in the SSE unit. + When we need to clear a flag, we need to do so in both units, + due to the way fetestexcept() is implemented. + When we need to set a flag, it is sufficient to do it in the SSE unit, + because that is guaranteed to not trap. */ + fenv_t temp; unsigned int mxcsr; - /* XXX: Do we really need to set both the exception in both units? - Shouldn't it be enough to set only the SSE unit? */ + excepts &= FE_ALL_EXCEPT; /* Get the current x87 FPU environment. We have to do this since we cannot separately set the status word. */ __asm__ ("fnstenv %0" : "=m" (*&temp)); - temp.__status_word &= ~(excepts & FE_ALL_EXCEPT); - temp.__status_word |= *flagp & excepts & FE_ALL_EXCEPT; + /* Clear relevant flags. */ + temp.__status_word &= ~(excepts & ~ *flagp); - /* Store the new status word (along with the rest of the environment. - Possibly new exceptions are set but they won't get executed unless - the next floating-point instruction. */ + /* Store the new status word (along with the rest of the environment). */ __asm__ ("fldenv %0" : : "m" (*&temp)); - /* And now the same for SSE. */ + /* And now similarly for SSE. */ __asm__ ("stmxcsr %0" : "=m" (*&mxcsr)); - mxcsr &= ~(excepts & FE_ALL_EXCEPT); - mxcsr |= *flagp & excepts & FE_ALL_EXCEPT; + /* Clear or set relevant flags. */ + mxcsr ^= (mxcsr ^ *flagp) & excepts; + /* Put the new data in effect. */ __asm__ ("ldmxcsr %0" : : "m" (*&mxcsr)); /* Success. */