Fix FP comparisons when SSE isn't available

llvm-svn: 349387

2 files changed, 17 insertions, 14 deletions

diff --git a/libcxx/test/std/numerics/c.math/cmath.pass.cpp b/libcxx/test/std/numerics/c.math/cmath.pass.cpp
index cc535e37439..b02bdbe6447 100644
--- a/libcxx/test/std/numerics/c.math/cmath.pass.cpp
+++ b/libcxx/test/std/numerics/c.math/cmath.pass.cpp
@@ -16,6 +16,7 @@
 
 #include "test_macros.h"
 #include "hexfloat.h"
+#include "truncate_fp.h"
 
 // convertible to int/float/double/etc
 template <class T, int N=0>
@@ -860,7 +861,7 @@ void test_cbrt()
     static_assert((std::is_same<decltype(std::cbrtf(0)), float>::value), "");
     static_assert((std::is_same<decltype(std::cbrtl(0)), long double>::value), "");
     static_assert((std::is_same<decltype(cbrt(Ambiguous())), Ambiguous>::value), "");
-    assert(std::cbrt(1) == 1);
+    assert(truncate_fp(std::cbrt(1)) == 1);
 }
 
 void test_copysign()
diff --git a/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp b/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
index 7433e28e493..df2acbe9e86 100644
--- a/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
+++ b/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp
@@ -15,6 +15,8 @@
 #include <random>
 #include <cassert>
 
+#include "truncate_fp.h"
+
 int main()
 {
     {
@@ -22,35 +24,35 @@ int main()
         typedef float F;
         E r;
         F f = std::generate_canonical<F, 0>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef float F;
         E r;
         F f = std::generate_canonical<F, 1>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef float F;
         E r;
         F f = std::generate_canonical<F, std::numeric_limits<F>::digits - 1>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef float F;
         E r;
         F f = std::generate_canonical<F, std::numeric_limits<F>::digits>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef float F;
         E r;
         F f = std::generate_canonical<F, std::numeric_limits<F>::digits + 1>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
 
     {
@@ -58,43 +60,43 @@ int main()
         typedef double F;
         E r;
         F f = std::generate_canonical<F, 0>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef double F;
         E r;
         F f = std::generate_canonical<F, 1>(r);
-        assert(f == (16807 - E::min()) / (E::max() - E::min() + F(1)));
+        assert(f == truncate_fp((16807 - E::min()) / (E::max() - E::min() + F(1))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef double F;
         E r;
         F f = std::generate_canonical<F, std::numeric_limits<F>::digits - 1>(r);
-        assert(f ==
+        assert(f == truncate_fp(
             (16807 - E::min() +
             (282475249 - E::min()) * (E::max() - E::min() + F(1))) /
-            ((E::max() - E::min() + F(1)) * (E::max() - E::min() + F(1))));
+            ((E::max() - E::min() + F(1)) * (E::max() - E::min() + F(1)))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef double F;
         E r;
         F f = std::generate_canonical<F, std::numeric_limits<F>::digits>(r);
-        assert(f ==
+        assert(f == truncate_fp(
             (16807 - E::min() +
             (282475249 - E::min()) * (E::max() - E::min() + F(1))) /
-            ((E::max() - E::min() + F(1)) * (E::max() - E::min() + F(1))));
+            ((E::max() - E::min() + F(1)) * (E::max() - E::min() + F(1)))));
     }
     {
         typedef std::minstd_rand0 E;
         typedef double F;
         E r;
         F f = std::generate_canonical<F, std::numeric_limits<F>::digits + 1>(r);
-        assert(f ==
+        assert(f == truncate_fp(
             (16807 - E::min() +
             (282475249 - E::min()) * (E::max() - E::min() + F(1))) /
-            ((E::max() - E::min() + F(1)) * (E::max() - E::min() + F(1))));
+            ((E::max() - E::min() + F(1)) * (E::max() - E::min() + F(1)))));
     }
 }