* [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682)
@ 2024-05-07 12:19 Adhemerval Zanella
2024-05-07 12:48 ` Andreas Schwab
2024-05-08 18:25 ` Paul E Murphy
0 siblings, 2 replies; 4+ messages in thread
From: Adhemerval Zanella @ 2024-05-07 12:19 UTC (permalink / raw)
To: libc-alpha; +Cc: Paul E Murphy
The e68b1151f7460d5fa88c3a567c13f66052da79a7 commit changed the
__fesetround_inline_nocheck implementation to use mffscrni
(through __fe_mffscrn) instead of mtfsfi. For generic powerpc
ceil/floor/trunc, the function is supposed to disable the
floating-point inexact exception enablebbit, however mffscrni
does not change any exception enable bits.
This patch fixes by reverting the optimization for the
__fesetround_inline_nocheck.
Checked on powerpc-linux-gnu.
---
sysdeps/powerpc/fpu/fenv_libc.h | 16 +++++-----------
sysdeps/powerpc/fpu/round_to_integer.h | 6 +++---
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/sysdeps/powerpc/fpu/fenv_libc.h b/sysdeps/powerpc/fpu/fenv_libc.h
index f9167056a8..0a06e4486b 100644
--- a/sysdeps/powerpc/fpu/fenv_libc.h
+++ b/sysdeps/powerpc/fpu/fenv_libc.h
@@ -182,19 +182,13 @@ __fesetround_inline (int round)
return 0;
}
-/* Same as __fesetround_inline, however without runtime check to use DFP
- mtfsfi syntax (as relax_fenv_state) or if round value is valid. */
+/* Same as __fesetround_inline, and it also disable the floating-point
+ inexact execption (bit 60 - XE, assuming NI is 0). It does not check
+ if ROUND is a valid value. */
static inline void
-__fesetround_inline_nocheck (const int round)
+__fesetround_inline_disable_inexact (const int round)
{
-#ifdef _ARCH_PWR9
- __fe_mffscrn (round);
-#else
- if (__glibc_likely (GLRO(dl_hwcap2) & PPC_FEATURE2_ARCH_3_00))
- __fe_mffscrn (round);
- else
- asm volatile ("mtfsfi 7,%0" : : "n" (round));
-#endif
+ asm volatile ("mtfsfi 7,%0" : : "n" (round));
}
#define FPSCR_MASK(bit) (1 << (31 - (bit)))
diff --git a/sysdeps/powerpc/fpu/round_to_integer.h b/sysdeps/powerpc/fpu/round_to_integer.h
index b68833640f..6996519c61 100644
--- a/sysdeps/powerpc/fpu/round_to_integer.h
+++ b/sysdeps/powerpc/fpu/round_to_integer.h
@@ -42,14 +42,14 @@ set_fenv_mode (enum round_mode mode)
switch (mode)
{
case CEIL:
- __fesetround_inline_nocheck (FE_UPWARD);
+ __fesetround_inline_disable_inexact (FE_UPWARD);
break;
case FLOOR:
- __fesetround_inline_nocheck (FE_DOWNWARD);
+ __fesetround_inline_disable_inexact (FE_DOWNWARD);
break;
case TRUNC:
case ROUND:
- __fesetround_inline_nocheck (FE_TOWARDZERO);
+ __fesetround_inline_disable_inexact (FE_TOWARDZERO);
break;
case NEARBYINT:
/* Disable FE_INEXACT exception */
--
2.43.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682)
2024-05-07 12:19 [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682) Adhemerval Zanella
@ 2024-05-07 12:48 ` Andreas Schwab
2024-05-07 12:52 ` Adhemerval Zanella Netto
2024-05-08 18:25 ` Paul E Murphy
1 sibling, 1 reply; 4+ messages in thread
From: Andreas Schwab @ 2024-05-07 12:48 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: libc-alpha, Paul E Murphy
On Mai 07 2024, Adhemerval Zanella wrote:
> floating-point inexact exception enablebbit, however mffscrni
enable bit
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682)
2024-05-07 12:48 ` Andreas Schwab
@ 2024-05-07 12:52 ` Adhemerval Zanella Netto
0 siblings, 0 replies; 4+ messages in thread
From: Adhemerval Zanella Netto @ 2024-05-07 12:52 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha, Paul E Murphy
On 07/05/24 09:48, Andreas Schwab wrote:
> On Mai 07 2024, Adhemerval Zanella wrote:
>
>> floating-point inexact exception enablebbit, however mffscrni
> enable bit
>
Ack, I fixed it locally.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682)
2024-05-07 12:19 [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682) Adhemerval Zanella
2024-05-07 12:48 ` Andreas Schwab
@ 2024-05-08 18:25 ` Paul E Murphy
1 sibling, 0 replies; 4+ messages in thread
From: Paul E Murphy @ 2024-05-08 18:25 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha
On 5/7/24 7:19 AM, Adhemerval Zanella wrote:
> The e68b1151f7460d5fa88c3a567c13f66052da79a7 commit changed the
> __fesetround_inline_nocheck implementation to use mffscrni
> (through __fe_mffscrn) instead of mtfsfi. For generic powerpc
> ceil/floor/trunc, the function is supposed to disable the
> floating-point inexact exception enablebbit, however mffscrni
> does not change any exception enable bits.
>
> This patch fixes by reverting the optimization for the
> __fesetround_inline_nocheck.
Thanks. LGTM with trivial typo fixes noted by Andreas.
Reviewed-by: Paul E. Murphy <murphyp@linux.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-08 18:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-07 12:19 [PATCH v3] powerpc: Fix __fesetround_inline_nocheck on POWER9+ (BZ 31682) Adhemerval Zanella
2024-05-07 12:48 ` Andreas Schwab
2024-05-07 12:52 ` Adhemerval Zanella Netto
2024-05-08 18:25 ` Paul E Murphy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).