test: Separate implementation-defined NaN values

Author: chfast

test/unittests/floating_point_utils_test.cpp

@@ -23,8 +23,19 @@ TEST(floating_point_utils, double_as_uint)
     EXPECT_EQ(FP(-1.0).as_uint(), 0xBFF'0000000000000);
     EXPECT_EQ(FP(std::nextafter(1.0, 0.0)).as_uint(), 0x3FE'FFFFFFFFFFFFF);
     EXPECT_EQ(FP(std::nextafter(-1.0, 0.0)).as_uint(), 0xBFE'FFFFFFFFFFFFF);
+    EXPECT_EQ(FP(FP64::nan(FP64::canon)).as_uint(), 0x7FF'8000000000000);
+    EXPECT_EQ(FP(-FP64::nan(FP64::canon)).as_uint(), 0xFFF'8000000000000);
+}
+
+TEST(floating_point_utils, binary_representation_implementation_defined)
+{
     EXPECT_EQ(FP(FP64::Limits::quiet_NaN()).as_uint(), 0x7FF'8000000000000);
-    EXPECT_EQ(FP(-FP64::Limits::quiet_NaN()).as_uint(), 0xFFF'8000000000000);
+    EXPECT_EQ(FP(FP64::Limits::quiet_NaN()).nan_payload(), 0x8000000000000);
+    EXPECT_EQ(FP(FP64::Limits::signaling_NaN()).nan_payload(), 0x4000000000000);
+
+    EXPECT_EQ(FP(FP32::Limits::quiet_NaN()).as_uint(), 0x7FC00000);
+    EXPECT_EQ(FP(FP32::Limits::quiet_NaN()).nan_payload(), 0x400000);
+    EXPECT_EQ(FP(FP32::Limits::signaling_NaN()).nan_payload(), 0x200000);
 }
 
 TEST(floating_point_utils, float_as_uint)
@@ -43,8 +54,8 @@ TEST(floating_point_utils, float_as_uint)
     EXPECT_EQ(FP(-1.0f).as_uint(), 0xBF800000);
     EXPECT_EQ(FP(std::nextafter(1.0f, 0.0f)).as_uint(), 0x3F7FFFFF);
     EXPECT_EQ(FP(std::nextafter(-1.0f, 0.0f)).as_uint(), 0xBF7FFFFF);
-    EXPECT_EQ(FP(FP32::Limits::quiet_NaN()).as_uint(), 0x7FC00000);
-    EXPECT_EQ(FP(-FP32::Limits::quiet_NaN()).as_uint(), 0xFFC00000);
+    EXPECT_EQ(FP(FP32::nan(FP32::canon)).as_uint(), 0x7FC00000);
+    EXPECT_EQ(FP(-FP32::nan(FP32::canon)).as_uint(), 0xFFC00000);
 }
 
 TEST(floating_point_utils, double_from_uint)
@@ -70,10 +81,11 @@ TEST(floating_point_utils, float_from_uint)
 TEST(floating_point_utils, double_nan_payload)
 {
     constexpr auto inf = FP64::Limits::infinity();
-    constexpr auto qnan = FP64::Limits::quiet_NaN();
+    const auto qnan = FP64::nan(FP64::canon);
 
     EXPECT_EQ(FP(0.0).nan_payload(), 0);
-    EXPECT_EQ(FP(FP64::Limits::signaling_NaN()).nan_payload(), 0x4000000000000);
+    EXPECT_EQ(FP(FP64::nan(1)).nan_payload(), 1);
+    EXPECT_EQ(FP(FP64::nan(FP64::canon + 1)).nan_payload(), FP64::canon + 1);
     EXPECT_EQ(FP(qnan).nan_payload(), FP64::canon);
     EXPECT_EQ(FP(qnan + 1.0).nan_payload(), FP64::canon);
     EXPECT_EQ(FP(inf - inf).nan_payload(), FP64::canon);
@@ -83,10 +95,11 @@ TEST(floating_point_utils, double_nan_payload)
 TEST(floating_point_utils, float_nan_payload)
 {
     constexpr auto inf = FP32::Limits::infinity();
-    constexpr auto qnan = FP32::Limits::quiet_NaN();
+    const auto qnan = FP32::nan(FP32::canon);
 
     EXPECT_EQ(FP(0.0f).nan_payload(), 0);
-    EXPECT_EQ(FP(FP32::Limits::signaling_NaN()).nan_payload(), 0x200000);
+    EXPECT_EQ(FP(FP32::nan(1)).nan_payload(), 1);
+    EXPECT_EQ(FP(FP32::nan(FP32::canon + 1)).nan_payload(), FP32::canon + 1);
     EXPECT_EQ(FP(qnan).nan_payload(), FP32::canon);
     EXPECT_EQ(FP(qnan + 1.0f).nan_payload(), FP32::canon);
     EXPECT_EQ(FP(inf - inf).nan_payload(), FP32::canon);

test/utils/floating_point_utils.hpp

@@ -87,8 +87,8 @@ struct FP
     friend bool operator!=(T a, FP b) noexcept { return FP{a} != b; }
 };
 
-FP(uint64_t)->FP<double>;
 FP(uint32_t)->FP<float>;
+FP(uint64_t)->FP<double>;
 
 using FP32 = FP<float>;
 using FP64 = FP<double>;