Skip to content

Commit ae8bfa9

Browse files
vonosmasvonosmas
committed
Reduce libc_errno usage in log and sin smoke tests.
1 parent fadca25 commit ae8bfa9

20 files changed

+80
-56
lines changed

‎libc/test/src/math/smoke/CMakeLists.txt‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ add_fp_unittest(
5555
SRCS
5656
sinf_test.cpp
5757
DEPENDS
58-
libc.src.errno.errno
58+
libc.hdr.errno_macros
5959
libc.src.math.sinf
6060
libc.src.__support.CPP.array
6161
libc.src.__support.FPUtil.fp_bits
@@ -68,7 +68,7 @@ add_fp_unittest(
6868
SRCS
6969
sinf16_test.cpp
7070
DEPENDS
71-
libc.src.errno.errno
71+
libc.hdr.errno_macros
7272
libc.src.math.sinf16
7373
libc.src.__support.FPUtil.cast
7474
)
@@ -80,7 +80,7 @@ add_fp_unittest(
8080
SRCS
8181
sinpif_test.cpp
8282
DEPENDS
83-
libc.src.errno.errno
83+
libc.hdr.errno_macros
8484
libc.src.math.sinpif
8585
libc.src.__support.CPP.array
8686
libc.src.__support.FPUtil.fp_bits
@@ -93,7 +93,7 @@ add_fp_unittest(
9393
SRCS
9494
sinpif16_test.cpp
9595
DEPENDS
96-
libc.src.errno.errno
96+
libc.hdr.errno_macros
9797
libc.src.math.sinpif16
9898
)
9999

@@ -104,7 +104,7 @@ add_fp_unittest(
104104
SRCS
105105
sincosf_test.cpp
106106
DEPENDS
107-
libc.src.errno.errno
107+
libc.hdr.errno_macros
108108
libc.src.math.sincosf
109109
libc.src.__support.CPP.array
110110
libc.src.__support.FPUtil.fp_bits
@@ -4301,7 +4301,7 @@ add_fp_unittest(
43014301
SRCS
43024302
log_test.cpp
43034303
DEPENDS
4304-
libc.src.errno.errno
4304+
libc.hdr.errno_macros
43054305
libc.src.math.log
43064306
libc.src.__support.FPUtil.fp_bits
43074307
)
@@ -4313,7 +4313,7 @@ add_fp_unittest(
43134313
SRCS
43144314
logf_test.cpp
43154315
DEPENDS
4316-
libc.src.errno.errno
4316+
libc.hdr.errno_macros
43174317
libc.src.math.logf
43184318
libc.src.__support.FPUtil.fp_bits
43194319
)
@@ -4325,8 +4325,8 @@ add_fp_unittest(
43254325
SRCS
43264326
logf16_test.cpp
43274327
DEPENDS
4328+
libc.hdr.errno_macros
43284329
libc.hdr.fenv_macros
4329-
libc.src.errno.errno
43304330
libc.src.math.logf16
43314331
libc.src.__support.FPUtil.cast
43324332
)
@@ -4338,7 +4338,7 @@ add_fp_unittest(
43384338
SRCS
43394339
log2_test.cpp
43404340
DEPENDS
4341-
libc.src.errno.errno
4341+
libc.hdr.errno_macros
43424342
libc.src.math.log2
43434343
libc.src.__support.FPUtil.fp_bits
43444344
)
@@ -4350,7 +4350,7 @@ add_fp_unittest(
43504350
SRCS
43514351
log2f_test.cpp
43524352
DEPENDS
4353-
libc.src.errno.errno
4353+
libc.hdr.errno_macros
43544354
libc.src.math.log2f
43554355
libc.src.__support.FPUtil.fp_bits
43564356
)
@@ -4362,8 +4362,8 @@ add_fp_unittest(
43624362
SRCS
43634363
log2f16_test.cpp
43644364
DEPENDS
4365+
libc.hdr.errno_macros
43654366
libc.hdr.fenv_macros
4366-
libc.src.errno.errno
43674367
libc.src.math.log2f16
43684368
libc.src.__support.FPUtil.cast
43694369
)
@@ -4375,7 +4375,7 @@ add_fp_unittest(
43754375
SRCS
43764376
log10_test.cpp
43774377
DEPENDS
4378-
libc.src.errno.errno
4378+
libc.hdr.errno_macros
43794379
libc.src.math.log10
43804380
libc.src.__support.FPUtil.fp_bits
43814381
)
@@ -4387,7 +4387,7 @@ add_fp_unittest(
43874387
SRCS
43884388
log10f_test.cpp
43894389
DEPENDS
4390-
libc.src.errno.errno
4390+
libc.hdr.errno_macros
43914391
libc.src.math.log10f
43924392
libc.src.__support.FPUtil.fp_bits
43934393
)
@@ -4399,8 +4399,8 @@ add_fp_unittest(
43994399
SRCS
44004400
log10f16_test.cpp
44014401
DEPENDS
4402+
libc.hdr.errno_macros
44024403
libc.hdr.fenv_macros
4403-
libc.src.errno.errno
44044404
libc.src.math.log10f16
44054405
libc.src.__support.FPUtil.cast
44064406
)
@@ -4412,7 +4412,7 @@ add_fp_unittest(
44124412
SRCS
44134413
log1p_test.cpp
44144414
DEPENDS
4415-
libc.src.errno.errno
4415+
libc.hdr.errno_macros
44164416
libc.src.math.log1p
44174417
libc.src.__support.FPUtil.fp_bits
44184418
)
@@ -4424,7 +4424,7 @@ add_fp_unittest(
44244424
SRCS
44254425
log1pf_test.cpp
44264426
DEPENDS
4427-
libc.src.errno.errno
4427+
libc.hdr.errno_macros
44284428
libc.src.math.log1pf
44294429
libc.src.__support.FPUtil.fp_bits
44304430
)
@@ -4564,7 +4564,7 @@ add_fp_unittest(
45644564
SRCS
45654565
sinhf_test.cpp
45664566
DEPENDS
4567-
libc.src.errno.errno
4567+
libc.hdr.errno_macros
45684568
libc.src.math.sinhf
45694569
libc.src.__support.CPP.array
45704570
libc.src.__support.FPUtil.fp_bits
@@ -4577,8 +4577,8 @@ add_fp_unittest(
45774577
SRCS
45784578
sinhf16_test.cpp
45794579
DEPENDS
4580+
libc.hdr.errno_macros
45804581
libc.hdr.fenv_macros
4581-
libc.src.errno.errno
45824582
libc.src.math.sinhf16
45834583
libc.src.__support.FPUtil.cast
45844584
)
@@ -5913,6 +5913,7 @@ add_fp_unittest(
59135913
SRCS
59145914
sincos_test.cpp
59155915
DEPENDS
5916+
libc.hdr.errno_macros
59165917
libc.src.math.sincos
59175918
)
59185919

‎libc/test/src/math/smoke/log10_test.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/math_macros.h"
1011
#include "hdr/stdint_proxy.h"
1112
#include "src/__support/FPUtil/FPBits.h"
12-
#include "src/__support/libc_errno.h"
1313
#include "src/math/log10.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
@@ -22,12 +22,18 @@ TEST_F(LlvmLibcLog10Test, SpecialNumbers) {
2222

2323
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::log10(aNaN));
2424
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::log10(inf));
25+
EXPECT_MATH_ERRNO(0);
26+
2527
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log10(neg_inf), FE_INVALID);
28+
EXPECT_MATH_ERRNO(EDOM);
2629
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log10(0.0),
2730
FE_DIVBYZERO);
31+
EXPECT_MATH_ERRNO(ERANGE);
2832
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log10(-0.0),
2933
FE_DIVBYZERO);
34+
EXPECT_MATH_ERRNO(ERANGE);
3035
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log10(-1.0), FE_INVALID);
36+
EXPECT_MATH_ERRNO(EDOM);
3137
EXPECT_FP_EQ_ALL_ROUNDING(zero, LIBC_NAMESPACE::log10(1.0));
3238

3339
double x = 1.0;

‎libc/test/src/math/smoke/log10f16_test.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/fenv_macros.h"
1011
#include "src/__support/FPUtil/cast.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/math/log10f16.h"
1313
#include "test/UnitTest/FPMatcher.h"
1414
#include "test/UnitTest/Test.h"
1515

1616
using LlvmLibcLog10f16Test = LIBC_NAMESPACE::testing::FPTest<float16>;
1717

1818
TEST_F(LlvmLibcLog10f16Test, SpecialNumbers) {
19-
libc_errno = 0;
20-
2119
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::log10f16(aNaN));
2220
EXPECT_MATH_ERRNO(0);
2321

‎libc/test/src/math/smoke/log10f_test.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/math_macros.h"
1011
#include "hdr/stdint_proxy.h"
1112
#include "src/__support/FPUtil/FPBits.h"
@@ -21,12 +22,19 @@ TEST_F(LlvmLibcLog10fTest, SpecialNumbers) {
2122

2223
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::log10f(aNaN));
2324
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::log10f(inf));
25+
EXPECT_MATH_ERRNO(0);
26+
2427
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log10f(neg_inf), FE_INVALID);
28+
EXPECT_MATH_ERRNO(EDOM);
2529
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log10f(0.0f),
2630
FE_DIVBYZERO);
31+
EXPECT_MATH_ERRNO(ERANGE);
2732
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log10f(-0.0f),
2833
FE_DIVBYZERO);
34+
EXPECT_MATH_ERRNO(ERANGE);
2935
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log10f(-1.0f), FE_INVALID);
36+
EXPECT_MATH_ERRNO(EDOM);
37+
3038
EXPECT_FP_EQ_ALL_ROUNDING(zero, LIBC_NAMESPACE::log10f(1.0f));
3139

3240
float x = 1.0f;

‎libc/test/src/math/smoke/log1p_test.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/math_macros.h"
1011
#include "src/__support/FPUtil/FPBits.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/math/log1p.h"
1313
#include "test/UnitTest/FPMatcher.h"
1414
#include "test/UnitTest/Test.h"
@@ -21,12 +21,16 @@ TEST_F(LlvmLibcLog1pTest, SpecialNumbers) {
2121

2222
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::log1p(aNaN));
2323
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::log1p(inf));
24+
EXPECT_MATH_ERRNO(0);
2425
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log1p(neg_inf), FE_INVALID);
26+
EXPECT_MATH_ERRNO(EDOM);
2527
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log1p(-2.0), FE_INVALID);
28+
EXPECT_MATH_ERRNO(EDOM);
2629
EXPECT_FP_EQ(zero, LIBC_NAMESPACE::log1p(0.0));
2730
EXPECT_FP_EQ(neg_zero, LIBC_NAMESPACE::log1p(-0.0));
2831
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log1p(-1.0),
2932
FE_DIVBYZERO);
33+
EXPECT_MATH_ERRNO(ERANGE);
3034

3135
EXPECT_FP_EQ(0x1.62c829bf8fd9dp9,
3236
LIBC_NAMESPACE::log1p(0x1.9b536cac3a09dp1023));

‎libc/test/src/math/smoke/log1pf_test.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/math_macros.h"
1011
#include "hdr/stdint_proxy.h"
1112
#include "src/__support/FPUtil/FPBits.h"
12-
#include "src/__support/libc_errno.h"
1313
#include "src/math/log1pf.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
@@ -22,11 +22,14 @@ TEST_F(LlvmLibcLog1pfTest, SpecialNumbers) {
2222

2323
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::log1pf(aNaN));
2424
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::log1pf(inf));
25+
EXPECT_MATH_ERRNO(0);
2526
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log1pf(neg_inf), FE_INVALID);
27+
EXPECT_MATH_ERRNO(EDOM);
2628
EXPECT_FP_EQ(zero, LIBC_NAMESPACE::log1pf(0.0f));
2729
EXPECT_FP_EQ(neg_zero, LIBC_NAMESPACE::log1pf(-0.0f));
2830
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log1pf(-1.0f),
2931
FE_DIVBYZERO);
32+
EXPECT_MATH_ERRNO(ERANGE);
3033
}
3134

3235
#ifdef LIBC_TEST_FTZ_DAZ

‎libc/test/src/math/smoke/log2_test.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/math_macros.h"
1011
#include "hdr/stdint_proxy.h"
1112
#include "src/__support/FPUtil/FPBits.h"
12-
#include "src/__support/libc_errno.h"
1313
#include "src/math/log2.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
@@ -22,11 +22,16 @@ TEST_F(LlvmLibcLog2Test, SpecialNumbers) {
2222

2323
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::log2(aNaN));
2424
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::log2(inf));
25+
EXPECT_MATH_ERRNO(0);
2526
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log2(neg_inf), FE_INVALID);
27+
EXPECT_MATH_ERRNO(EDOM);
2628
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log2(0.0), FE_DIVBYZERO);
29+
EXPECT_MATH_ERRNO(ERANGE);
2730
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log2(-0.0),
2831
FE_DIVBYZERO);
32+
EXPECT_MATH_ERRNO(ERANGE);
2933
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log2(-1.0), FE_INVALID);
34+
EXPECT_MATH_ERRNO(EDOM);
3035
EXPECT_FP_EQ_ALL_ROUNDING(zero, LIBC_NAMESPACE::log2(1.0));
3136
}
3237

‎libc/test/src/math/smoke/log2f16_test.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/fenv_macros.h"
1011
#include "src/__support/FPUtil/cast.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/math/log2f16.h"
1313
#include "test/UnitTest/FPMatcher.h"
1414
#include "test/UnitTest/Test.h"
1515

1616
using LlvmLibcLog2f16Test = LIBC_NAMESPACE::testing::FPTest<float16>;
1717

1818
TEST_F(LlvmLibcLog2f16Test, SpecialNumbers) {
19-
libc_errno = 0;
20-
2119
EXPECT_FP_EQ_ALL_ROUNDING(aNaN, LIBC_NAMESPACE::log2f16(aNaN));
2220
EXPECT_MATH_ERRNO(0);
2321

‎libc/test/src/math/smoke/log2f_test.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/math_macros.h"
1011
#include "hdr/stdint_proxy.h"
1112
#include "src/__support/FPUtil/FPBits.h"
12-
#include "src/__support/libc_errno.h"
1313
#include "src/math/log2f.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
@@ -22,12 +22,17 @@ TEST_F(LlvmLibcLog2fTest, SpecialNumbers) {
2222

2323
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::log2f(aNaN));
2424
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::log2f(inf));
25+
EXPECT_MATH_ERRNO(0);
2526
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log2f(neg_inf), FE_INVALID);
27+
EXPECT_MATH_ERRNO(EDOM);
2628
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log2f(0.0f),
2729
FE_DIVBYZERO);
30+
EXPECT_MATH_ERRNO(ERANGE);
2831
EXPECT_FP_EQ_WITH_EXCEPTION(neg_inf, LIBC_NAMESPACE::log2f(-0.0f),
2932
FE_DIVBYZERO);
33+
EXPECT_MATH_ERRNO(ERANGE);
3034
EXPECT_FP_IS_NAN_WITH_EXCEPTION(LIBC_NAMESPACE::log2f(-1.0f), FE_INVALID);
35+
EXPECT_MATH_ERRNO(EDOM);
3136
EXPECT_FP_EQ_ALL_ROUNDING(zero, LIBC_NAMESPACE::log2f(1.0f));
3237
}
3338
#ifdef LIBC_TEST_FTZ_DAZ

0 commit comments

Comments
 (0)