Skip to content

Commit 4ba9ec2

Browse files
vonosmasvonosmas
committed
Reduce libc_errno usage in exp smoke tests.
1 parent c8a0714 commit 4ba9ec2

17 files changed

+55
-92
lines changed

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ add_fp_unittest(
13651365
SRCS
13661366
exp_test.cpp
13671367
DEPENDS
1368-
libc.src.errno.errno
1368+
libc.hdr.errno_macros
13691369
libc.src.math.exp
13701370
libc.src.__support.FPUtil.fp_bits
13711371
)
@@ -1377,7 +1377,7 @@ add_fp_unittest(
13771377
SRCS
13781378
expf_test.cpp
13791379
DEPENDS
1380-
libc.src.errno.errno
1380+
libc.hdr.errno_macros
13811381
libc.src.math.expf
13821382
libc.src.__support.FPUtil.fp_bits
13831383
)
@@ -1391,7 +1391,6 @@ add_fp_unittest(
13911391
DEPENDS
13921392
libc.hdr.errno_macros
13931393
libc.hdr.fenv_macros
1394-
libc.src.errno.errno
13951394
libc.src.math.expf16
13961395
libc.src.__support.FPUtil.cast
13971396
)
@@ -1403,7 +1402,7 @@ add_fp_unittest(
14031402
SRCS
14041403
exp2_test.cpp
14051404
DEPENDS
1406-
libc.src.errno.errno
1405+
libc.hdr.errno_macros
14071406
libc.src.math.exp2
14081407
libc.src.__support.FPUtil.fp_bits
14091408
)
@@ -1415,7 +1414,7 @@ add_fp_unittest(
14151414
SRCS
14161415
exp2f_test.cpp
14171416
DEPENDS
1418-
libc.src.errno.errno
1417+
libc.hdr.errno_macros
14191418
libc.src.math.exp2f
14201419
libc.src.__support.FPUtil.fp_bits
14211420
)
@@ -1427,8 +1426,8 @@ add_fp_unittest(
14271426
SRCS
14281427
exp2f16_test.cpp
14291428
DEPENDS
1429+
libc.hdr.errno_macros
14301430
libc.hdr.fenv_macros
1431-
libc.src.errno.errno
14321431
libc.src.math.exp2f16
14331432
libc.src.__support.FPUtil.cast
14341433
)
@@ -1440,7 +1439,7 @@ add_fp_unittest(
14401439
SRCS
14411440
exp2m1f_test.cpp
14421441
DEPENDS
1443-
libc.src.errno.errno
1442+
libc.hdr.errno_macros
14441443
libc.src.math.exp2m1f
14451444
)
14461445

@@ -1451,8 +1450,8 @@ add_fp_unittest(
14511450
SRCS
14521451
exp2m1f16_test.cpp
14531452
DEPENDS
1453+
libc.hdr.errno_macros
14541454
libc.hdr.fenv_macros
1455-
libc.src.errno.errno
14561455
libc.src.math.exp2m1f16
14571456
libc.src.__support.FPUtil.cast
14581457
)
@@ -1464,7 +1463,7 @@ add_fp_unittest(
14641463
SRCS
14651464
exp10_test.cpp
14661465
DEPENDS
1467-
libc.src.errno.errno
1466+
libc.hdr.errno_macros
14681467
libc.src.math.exp10
14691468
libc.src.__support.FPUtil.fp_bits
14701469
)
@@ -1476,7 +1475,7 @@ add_fp_unittest(
14761475
SRCS
14771476
exp10f_test.cpp
14781477
DEPENDS
1479-
libc.src.errno.errno
1478+
libc.hdr.errno_macros
14801479
libc.src.math.exp10f
14811480
libc.src.__support.FPUtil.fp_bits
14821481
)
@@ -1488,8 +1487,8 @@ add_fp_unittest(
14881487
SRCS
14891488
exp10f16_test.cpp
14901489
DEPENDS
1490+
libc.hdr.errno_macros
14911491
libc.hdr.fenv_macros
1492-
libc.src.errno.errno
14931492
libc.src.math.exp10f16
14941493
libc.src.__support.FPUtil.cast
14951494
)
@@ -1501,8 +1500,8 @@ add_fp_unittest(
15011500
SRCS
15021501
exp10m1f16_test.cpp
15031502
DEPENDS
1503+
libc.hdr.errno_macros
15041504
libc.hdr.fenv_macros
1505-
libc.src.errno.errno
15061505
libc.src.math.exp10m1f16
15071506
libc.src.__support.FPUtil.cast
15081507
)
@@ -1514,7 +1513,7 @@ add_fp_unittest(
15141513
SRCS
15151514
exp10m1f_test.cpp
15161515
DEPENDS
1517-
libc.src.errno.errno
1516+
libc.hdr.errno_macros
15181517
libc.src.math.exp10m1f
15191518
)
15201519

@@ -4265,7 +4264,7 @@ add_fp_unittest(
42654264
SRCS
42664265
expm1_test.cpp
42674266
DEPENDS
4268-
libc.src.errno.errno
4267+
libc.hdr.errno_macros
42694268
libc.src.math.expm1
42704269
libc.src.__support.FPUtil.fp_bits
42714270
)
@@ -4277,7 +4276,7 @@ add_fp_unittest(
42774276
SRCS
42784277
expm1f_test.cpp
42794278
DEPENDS
4280-
libc.src.errno.errno
4279+
libc.hdr.errno_macros
42814280
libc.src.math.expm1f
42824281
libc.src.__support.FPUtil.fp_bits
42834282
)
@@ -4291,7 +4290,6 @@ add_fp_unittest(
42914290
DEPENDS
42924291
libc.hdr.errno_macros
42934292
libc.hdr.fenv_macros
4294-
libc.src.errno.errno
42954293
libc.src.math.expm1f16
42964294
libc.src.__support.FPUtil.cast
42974295
)

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

Lines changed: 8 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/exp10.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
@@ -21,12 +21,19 @@ TEST_F(LlvmLibcExp10Test, SpecialNumbers) {
2121
EXPECT_MATH_ERRNO(0);
2222

2323
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::exp10(aNaN));
24+
EXPECT_MATH_ERRNO(0);
2425
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::exp10(inf));
26+
EXPECT_MATH_ERRNO(0);
2527
EXPECT_FP_EQ_ALL_ROUNDING(zero, LIBC_NAMESPACE::exp10(neg_inf));
28+
EXPECT_MATH_ERRNO(0);
29+
2630
EXPECT_FP_EQ_WITH_EXCEPTION(zero, LIBC_NAMESPACE::exp10(-0x1.0p20),
2731
FE_UNDERFLOW);
32+
EXPECT_MATH_ERRNO(ERANGE);
2833
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::exp10(0x1.0p20),
2934
FE_OVERFLOW);
35+
EXPECT_MATH_ERRNO(ERANGE);
36+
3037
EXPECT_FP_EQ_ALL_ROUNDING(1.0, LIBC_NAMESPACE::exp10(0.0));
3138
EXPECT_FP_EQ_ALL_ROUNDING(1.0, LIBC_NAMESPACE::exp10(-0.0));
3239

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

Lines changed: 1 addition & 7 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/exp10f16.h"
1313
#include "test/UnitTest/FPMatcher.h"
1414
#include "test/UnitTest/Test.h"
1515

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

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

@@ -40,8 +38,6 @@ TEST_F(LlvmLibcExp10f16Test, SpecialNumbers) {
4038
}
4139

4240
TEST_F(LlvmLibcExp10f16Test, Overflow) {
43-
libc_errno = 0;
44-
4541
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::exp10f16(max_normal),
4642
FE_OVERFLOW);
4743
EXPECT_MATH_ERRNO(ERANGE);
@@ -53,8 +49,6 @@ TEST_F(LlvmLibcExp10f16Test, Overflow) {
5349
}
5450

5551
TEST_F(LlvmLibcExp10f16Test, Underflow) {
56-
libc_errno = 0;
57-
5852
EXPECT_FP_EQ_WITH_EXCEPTION(zero, LIBC_NAMESPACE::exp10f16(neg_max_normal),
5953
FE_UNDERFLOW | FE_INEXACT);
6054
EXPECT_MATH_ERRNO(ERANGE);

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,17 @@
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/exp10f.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
1616

1717
using LlvmLibcExp10fTest = LIBC_NAMESPACE::testing::FPTest<float>;
1818

1919
TEST_F(LlvmLibcExp10fTest, SpecialNumbers) {
20-
libc_errno = 0;
21-
2220
EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::exp10f(sNaN), FE_INVALID);
2321
EXPECT_MATH_ERRNO(0);
2422

@@ -43,7 +41,6 @@ TEST_F(LlvmLibcExp10fTest, SpecialNumbers) {
4341
}
4442

4543
TEST_F(LlvmLibcExp10fTest, Overflow) {
46-
libc_errno = 0;
4744
EXPECT_FP_EQ_WITH_EXCEPTION(
4845
inf, LIBC_NAMESPACE::exp10f(FPBits(0x7f7fffffU).get_val()), FE_OVERFLOW);
4946
EXPECT_MATH_ERRNO(ERANGE);

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

Lines changed: 1 addition & 7 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/exp10m1f16.h"
1313
#include "test/UnitTest/FPMatcher.h"
1414
#include "test/UnitTest/Test.h"
1515

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

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

@@ -40,8 +38,6 @@ TEST_F(LlvmLibcExp10m1f16Test, SpecialNumbers) {
4038
}
4139

4240
TEST_F(LlvmLibcExp10m1f16Test, Overflow) {
43-
libc_errno = 0;
44-
4541
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::exp10m1f16(max_normal),
4642
FE_OVERFLOW | FE_INEXACT);
4743
EXPECT_MATH_ERRNO(ERANGE);
@@ -67,8 +63,6 @@ TEST_F(LlvmLibcExp10m1f16Test, Overflow) {
6763
}
6864

6965
TEST_F(LlvmLibcExp10m1f16Test, ResultNearNegOne) {
70-
libc_errno = 0;
71-
7266
EXPECT_FP_EQ_WITH_EXCEPTION(LIBC_NAMESPACE::fputil::cast<float16>(-1.0),
7367
LIBC_NAMESPACE::exp10m1f16(neg_max_normal),
7468
FE_INEXACT);

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

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

9-
#include "src/__support/libc_errno.h"
9+
#include "hdr/errno_macros.h"
1010
#include "src/math/exp10m1f.h"
1111
#include "test/UnitTest/FPMatcher.h"
1212
#include "test/UnitTest/Test.h"
1313

1414
using LlvmLibcExp10m1fTest = LIBC_NAMESPACE::testing::FPTest<float>;
1515

1616
TEST_F(LlvmLibcExp10m1fTest, SpecialNumbers) {
17-
libc_errno = 0;
18-
1917
EXPECT_FP_EQ_WITH_EXCEPTION(aNaN, LIBC_NAMESPACE::exp10m1f(sNaN), FE_INVALID);
2018
EXPECT_MATH_ERRNO(0);
2119

@@ -34,8 +32,6 @@ TEST_F(LlvmLibcExp10m1fTest, SpecialNumbers) {
3432
}
3533

3634
TEST_F(LlvmLibcExp10m1fTest, Overflow) {
37-
libc_errno = 0;
38-
3935
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::exp10m1f(0x1.fffffep+127f),
4036
FE_OVERFLOW);
4137
EXPECT_MATH_ERRNO(ERANGE);
@@ -50,8 +46,6 @@ TEST_F(LlvmLibcExp10m1fTest, Overflow) {
5046
}
5147

5248
TEST_F(LlvmLibcExp10m1fTest, Underflow) {
53-
libc_errno = 0;
54-
5549
EXPECT_FP_EQ_WITH_EXCEPTION(-1.0f, LIBC_NAMESPACE::exp10m1f(-max_normal),
5650
FE_UNDERFLOW);
5751
EXPECT_MATH_ERRNO(ERANGE);

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

Lines changed: 8 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/exp2.h"
1414
#include "test/UnitTest/FPMatcher.h"
1515
#include "test/UnitTest/Test.h"
@@ -21,11 +21,18 @@ TEST_F(LlvmLibcExp2Test, SpecialNumbers) {
2121
EXPECT_MATH_ERRNO(0);
2222

2323
EXPECT_FP_EQ(aNaN, LIBC_NAMESPACE::exp2(aNaN));
24+
EXPECT_MATH_ERRNO(0);
2425
EXPECT_FP_EQ(inf, LIBC_NAMESPACE::exp2(inf));
26+
EXPECT_MATH_ERRNO(0);
2527
EXPECT_FP_EQ_ALL_ROUNDING(zero, LIBC_NAMESPACE::exp2(neg_inf));
28+
EXPECT_MATH_ERRNO(0);
29+
2630
EXPECT_FP_EQ_WITH_EXCEPTION(zero, LIBC_NAMESPACE::exp2(-0x1.0p20),
2731
FE_UNDERFLOW);
32+
EXPECT_MATH_ERRNO(ERANGE);
2833
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::exp2(0x1.0p20), FE_OVERFLOW);
34+
EXPECT_MATH_ERRNO(ERANGE);
35+
2936
EXPECT_FP_EQ_ALL_ROUNDING(1.0, LIBC_NAMESPACE::exp2(0.0));
3037
EXPECT_FP_EQ_ALL_ROUNDING(1.0, LIBC_NAMESPACE::exp2(-0.0));
3138
EXPECT_FP_EQ_ALL_ROUNDING(2.0, LIBC_NAMESPACE::exp2(1.0));

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

Lines changed: 1 addition & 7 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/exp2f16.h"
1313
#include "test/UnitTest/FPMatcher.h"
1414
#include "test/UnitTest/Test.h"
1515

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

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

@@ -40,8 +38,6 @@ TEST_F(LlvmLibcExp2f16Test, SpecialNumbers) {
4038
}
4139

4240
TEST_F(LlvmLibcExp2f16Test, Overflow) {
43-
libc_errno = 0;
44-
4541
EXPECT_FP_EQ_WITH_EXCEPTION(inf, LIBC_NAMESPACE::exp2f16(max_normal),
4642
FE_OVERFLOW);
4743
EXPECT_MATH_ERRNO(ERANGE);
@@ -53,8 +49,6 @@ TEST_F(LlvmLibcExp2f16Test, Overflow) {
5349
}
5450

5551
TEST_F(LlvmLibcExp2f16Test, Underflow) {
56-
libc_errno = 0;
57-
5852
EXPECT_FP_EQ_WITH_EXCEPTION(zero, LIBC_NAMESPACE::exp2f16(neg_max_normal),
5953
FE_UNDERFLOW | FE_INEXACT);
6054
EXPECT_MATH_ERRNO(ERANGE);

0 commit comments

Comments
 (0)