diff options
Diffstat (limited to 'absl/time/duration_test.cc')
| -rw-r--r-- | absl/time/duration_test.cc | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/absl/time/duration_test.cc b/absl/time/duration_test.cc index b7209e1c..4d85a2c4 100644 --- a/absl/time/duration_test.cc +++ b/absl/time/duration_test.cc @@ -17,7 +17,6 @@ #endif #include <chrono> // NOLINT(build/c++11) -#include <cfloat> #include <cmath> #include <cstdint> #include <ctime> @@ -1321,7 +1320,7 @@ TEST(Duration, SmallConversions) { EXPECT_EQ(absl::ZeroDuration(), absl::Seconds(0)); // TODO(bww): Is the next one OK? - EXPECT_EQ(absl::ZeroDuration(), absl::Seconds(std::nextafter(0.125e-9, 0))); + EXPECT_EQ(absl::ZeroDuration(), absl::Seconds(0.124999999e-9)); EXPECT_EQ(absl::Nanoseconds(1) / 4, absl::Seconds(0.125e-9)); EXPECT_EQ(absl::Nanoseconds(1) / 4, absl::Seconds(0.250e-9)); EXPECT_EQ(absl::Nanoseconds(1) / 2, absl::Seconds(0.375e-9)); @@ -1331,7 +1330,7 @@ TEST(Duration, SmallConversions) { EXPECT_EQ(absl::Nanoseconds(1), absl::Seconds(0.875e-9)); EXPECT_EQ(absl::Nanoseconds(1), absl::Seconds(1.000e-9)); - EXPECT_EQ(absl::ZeroDuration(), absl::Seconds(std::nextafter(-0.125e-9, 0))); + EXPECT_EQ(absl::ZeroDuration(), absl::Seconds(-0.124999999e-9)); EXPECT_EQ(-absl::Nanoseconds(1) / 4, absl::Seconds(-0.125e-9)); EXPECT_EQ(-absl::Nanoseconds(1) / 4, absl::Seconds(-0.250e-9)); EXPECT_EQ(-absl::Nanoseconds(1) / 2, absl::Seconds(-0.375e-9)); @@ -1370,13 +1369,10 @@ TEST(Duration, SmallConversions) { EXPECT_THAT(ToTimeval(absl::Nanoseconds(2000)), TimevalMatcher(tv)); } -void VerifyApproxSameAsMul(double time_as_seconds, int* const misses) { +void VerifySameAsMul(double time_as_seconds, int* const misses) { auto direct_seconds = absl::Seconds(time_as_seconds); auto mul_by_one_second = time_as_seconds * absl::Seconds(1); - // These are expected to differ by up to one tick due to fused multiply/add - // contraction. - if (absl::AbsDuration(direct_seconds - mul_by_one_second) > - absl::time_internal::MakeDuration(0, 1u)) { + if (direct_seconds != mul_by_one_second) { if (*misses > 10) return; ASSERT_LE(++(*misses), 10) << "Too many errors, not reporting more."; EXPECT_EQ(direct_seconds, mul_by_one_second) @@ -1388,17 +1384,8 @@ void VerifyApproxSameAsMul(double time_as_seconds, int* const misses) { // For a variety of interesting durations, we find the exact point // where one double converts to that duration, and the very next double // converts to the next duration. For both of those points, verify that -// Seconds(point) returns a duration near point * Seconds(1.0). (They may -// not be exactly equal due to fused multiply/add contraction.) +// Seconds(point) returns the same duration as point * Seconds(1.0) TEST(Duration, ToDoubleSecondsCheckEdgeCases) { -#if (defined(__i386__) || defined(_M_IX86)) && FLT_EVAL_METHOD != 0 - // We're using an x87-compatible FPU, and intermediate operations can be - // performed with 80-bit floats. This means the edge cases are different than - // what we expect here, so just skip this test. - GTEST_SKIP() - << "Skipping the test because we detected x87 floating-point semantics"; -#endif - constexpr uint32_t kTicksPerSecond = absl::time_internal::kTicksPerSecond; constexpr auto duration_tick = absl::time_internal::MakeDuration(0, 1u); int misses = 0; @@ -1436,8 +1423,8 @@ TEST(Duration, ToDoubleSecondsCheckEdgeCases) { } // Now low_edge is the highest double that converts to Duration d, // and high_edge is the lowest double that converts to Duration after_d. - VerifyApproxSameAsMul(low_edge, &misses); - VerifyApproxSameAsMul(high_edge, &misses); + VerifySameAsMul(low_edge, &misses); + VerifySameAsMul(high_edge, &misses); } } } @@ -1457,8 +1444,8 @@ TEST(Duration, ToDoubleSecondsCheckRandom) { int misses = 0; for (int i = 0; i < 1000000; ++i) { double d = std::exp(uniform(gen)); - VerifyApproxSameAsMul(d, &misses); - VerifyApproxSameAsMul(-d, &misses); + VerifySameAsMul(d, &misses); + VerifySameAsMul(-d, &misses); } } |