git: 2671607f1b5c - main - libc/tests: Enable fpsetround_basic which was never triggered since ported.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Jun 2026 12:36:09 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=2671607f1b5c6e787eb754b0d291a2b5e28e8ac9
commit 2671607f1b5c6e787eb754b0d291a2b5e28e8ac9
Author: K Rin <rin@sandb0x.tw>
AuthorDate: 2025-04-10 04:34:47 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2026-06-10 12:35:03 +0000
libc/tests: Enable fpsetround_basic which was never triggered since ported.
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1656
---
lib/libc/tests/gen/fpclassify_test.c | 13 ++++++-----
lib/libc/tests/gen/fpsetmask_test.c | 42 ++++++++++++++++++++++--------------
lib/libc/tests/gen/fpsetround_test.c | 7 +++---
3 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/lib/libc/tests/gen/fpclassify_test.c b/lib/libc/tests/gen/fpclassify_test.c
index 21dea9e8fee7..ed573b9e2b57 100644
--- a/lib/libc/tests/gen/fpclassify_test.c
+++ b/lib/libc/tests/gen/fpclassify_test.c
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <string.h>
-#ifndef _FLOAT_IEEE754
+#ifndef __i386__
ATF_TC(no_test);
ATF_TC_HEAD(no_test, tc)
@@ -46,7 +46,10 @@ ATF_TC_BODY(no_test,tc)
atf_tc_skip("Test not available on this architecture");
}
-#else /* defined(_FLOAT_IEEE754) */
+#else /* defined(__i386__) */
+
+#undef LDBL_MANT_DIG
+#define LDBL_MANT_DIG DBL_MANT_DIG
ATF_TC(fpclassify_float);
ATF_TC_HEAD(fpclassify_float, tc)
@@ -187,12 +190,12 @@ ATF_TC_BODY(fpclassify_long_double, tc)
ATF_REQUIRE_EQ(f, 0);
}
#endif /* TEST_LONG_DOUBLE */
-#endif /* _FLOAT_IEEE754 */
+#endif /* __i386__ */
ATF_TP_ADD_TCS(tp)
{
-#ifndef _FLOAT_IEEE754
+#ifndef __i386__
ATF_TP_ADD_TC(tp, no_test);
#else
ATF_TP_ADD_TC(tp, fpclassify_float);
@@ -200,7 +203,7 @@ ATF_TP_ADD_TCS(tp)
#ifdef TEST_LONG_DOUBLE
ATF_TP_ADD_TC(tp, fpclassify_long_double);
#endif /* TEST_LONG_DOUBLE */
-#endif /* _FLOAT_IEEE754 */
+#endif /* __i386__ */
return atf_no_error();
}
diff --git a/lib/libc/tests/gen/fpsetmask_test.c b/lib/libc/tests/gen/fpsetmask_test.c
index 1c2d9316e5a7..377e42be1469 100644
--- a/lib/libc/tests/gen/fpsetmask_test.c
+++ b/lib/libc/tests/gen/fpsetmask_test.c
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <string.h>
-#ifndef _FLOAT_IEEE754
+#ifndef __i386__
ATF_TC(no_test);
ATF_TC_HEAD(no_test, tc)
@@ -52,9 +52,16 @@ ATF_TC_BODY(no_test, tc)
atf_tc_skip("Test not available on this architecture.");
}
-#else /* defined(_FLOAT_IEEE754) */
+#else /* defined(__i386__) */
#include <ieeefp.h>
+#ifndef ___STRING
+#define ___STRING(x) #x
+#endif
+#ifndef __arraycount
+#define __arraycount(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
#if __arm__ && !__SOFTFP__
/*
@@ -142,8 +149,8 @@ f_inv(void)
static void
f_ofl(void)
{
-
f_x = f_huge * f_huge;
+ printf("%f %f %Lf", f_x, d_x, ld_x); // avoid compiler optimization
}
static void
@@ -151,6 +158,7 @@ d_ofl(void)
{
d_x = d_huge * d_huge;
+ printf("%f %f %Lf", f_x, d_x, ld_x); // avoid compiler optimization
}
static void
@@ -158,33 +166,34 @@ ld_ofl(void)
{
ld_x = ld_huge * ld_huge;
+ printf("%f %f %Lf", f_x, d_x, ld_x); // avoid compiler optimization
}
/* trip underflow */
static void
f_ufl(void)
{
-
f_x = f_tiny * f_tiny;
+ printf("%f %f %Lf", f_x, d_x, ld_x); // avoid compiler optimization
}
static void
d_ufl(void)
{
-
d_x = d_tiny * d_tiny;
+ printf("%f %f %Lf", f_x, d_x, ld_x); // avoid compiler optimization
}
static void
ld_ufl(void)
{
-
ld_x = ld_tiny * ld_tiny;
+ printf("%f %f %Lf", f_x, d_x, ld_x); // avoid compiler optimization
}
struct ops {
void (*op)(void);
- fp_except mask;
+ fp_except_t mask;
int sicode;
};
@@ -218,12 +227,12 @@ static void
fpsetmask_masked(const struct ops *test_ops)
{
struct sigaction sa;
- fp_except ex1, ex2;
+ fp_except_t ex1, ex2;
const struct ops *t;
/* mask all exceptions, clear history */
fpsetmask(0);
- fpsetsticky(0);
+ fpresetsticky(~0);
/* set up signal handler */
sa.sa_sigaction = sigfpe;
@@ -241,8 +250,8 @@ fpsetmask_masked(const struct ops *test_ops)
ATF_CHECK_EQ(ex1 & t->mask, t->mask);
ATF_CHECK_EQ(signal_caught, 0);
- /* check correct fpsetsticky() behaviour */
- ex2 = fpsetsticky(0);
+ /* check correct fpresetsticky() behaviour */
+ ex2 = fpresetsticky(~0);
ATF_CHECK_EQ(fpgetsticky(), 0);
ATF_CHECK_EQ(ex1, ex2);
}
@@ -260,7 +269,7 @@ fpsetmask_unmasked(const struct ops *test_ops)
/* mask all exceptions, clear history */
fpsetmask(0);
- fpsetsticky(0);
+ fpresetsticky(~0);
/* set up signal handler */
sa.sa_sigaction = sigfpe;
@@ -275,13 +284,16 @@ fpsetmask_unmasked(const struct ops *test_ops)
for (t = test_ops; t->op != NULL; t++) {
fpsetmask(t->mask);
r = sigsetjmp(b, 1);
+ printf("r = %d\n", r);
if (!r) {
(*t->op)();
BARRIER();
+ fpresetsticky(~0);
}
ATF_CHECK_EQ(signal_caught, 1);
ATF_CHECK_EQ(sicode, t->sicode);
signal_caught = 0;
+ sicode = 0;
}
}
@@ -312,8 +324,6 @@ sigfpe(int s, siginfo_t *si, void *c)
if (strcmp(MACHINE, "macppc") == 0) \
atf_tc_expect_fail("PR port-macppc/46319"); \
\
- if (isQEMU()) \
- atf_tc_expect_fail("PR misc/44767"); \
\
m(t##_ops); \
}
@@ -348,12 +358,12 @@ ATF_TC_BODY(fpsetmask_basic, tc)
}
-#endif /* defined(_FLOAT_IEEE754) */
+#endif /* defined(__i386__) */
ATF_TP_ADD_TCS(tp)
{
-#ifndef _FLOAT_IEEE754
+#ifndef __i386__
ATF_TP_ADD_TC(tp, no_test);
#else
ATF_TP_ADD_TC(tp, fpsetmask_basic);
diff --git a/lib/libc/tests/gen/fpsetround_test.c b/lib/libc/tests/gen/fpsetround_test.c
index 0f23e74e57c8..6114cf25e8e3 100644
--- a/lib/libc/tests/gen/fpsetround_test.c
+++ b/lib/libc/tests/gen/fpsetround_test.c
@@ -54,8 +54,9 @@ ATF_TC_HEAD(fpsetround_basic, tc)
"Minimal testing of fpgetround(3) and fpsetround(3)");
}
-#ifdef _FLOAT_IEEE754
+#ifdef __i386__
#include <ieeefp.h>
+#define __arraycount(a) (sizeof(a) / sizeof(*(a)))
static const struct {
const char *n;
@@ -121,7 +122,7 @@ test(int r)
ATF_TC_BODY(fpsetround_basic, tc)
{
-#ifndef _FLOAT_IEEE754
+#ifndef __i386__
atf_tc_skip("Test not applicable on this architecture.");
#else
int r;
@@ -151,7 +152,7 @@ ATF_TC_BODY(fpsetround_basic, tc)
rnd[j].rf, r);
test(r);
}
-#endif /* _FLOAT_IEEE754 */
+#endif /* __i386__ */
}
ATF_TP_ADD_TCS(tp)