Skip to content

Commit d6987f4

Browse files
krishna2803krishna2803
committed
nit: reorder TotalOrder and TotalOrderMag tests
Signed-off-by: Krishna Pandey <[email protected]>
1 parent 4396ea9 commit d6987f4

File tree

2 files changed

+46
-52
lines changed

2 files changed

+46
-52
lines changed

‎libc/test/src/math/smoke/TotalOrderMagTest.h

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -106,49 +106,46 @@ class TotalOrderMagTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
106106
}
107107

108108
void testNaNPayloads(TotalOrderMagFunc func) {
109-
T qnan_0x42 = FPBits::quiet_nan(Sign::POS, 0x42).get_val();
110-
T neg_qnan_0x42 = FPBits::quiet_nan(Sign::NEG, 0x42).get_val();
111-
T snan_0x42 = FPBits::signaling_nan(Sign::POS, 0x42).get_val();
112-
T neg_snan_0x42 = FPBits::signaling_nan(Sign::NEG, 0x42).get_val();
113-
114-
T qnan_0x15 = FPBits::quiet_nan(Sign::POS, 0x15).get_val();
115-
T neg_qnan_0x15 = FPBits::quiet_nan(Sign::NEG, 0x15).get_val();
116-
T snan_0x15 = FPBits::signaling_nan(Sign::POS, 0x15).get_val();
117-
T neg_snan_0x15 = FPBits::signaling_nan(Sign::NEG, 0x15).get_val();
118109

119110
EXPECT_TRUE(funcWrapper(func, aNaN, aNaN));
120111
EXPECT_TRUE(funcWrapper(func, sNaN, sNaN));
121112

122-
if constexpr (FPBits::FRACTION_LEN - 1 >= 7) {
123-
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_0x42));
124-
EXPECT_FALSE(funcWrapper(func, sNaN, snan_0x42));
125-
EXPECT_FALSE(funcWrapper(func, qnan_0x42, aNaN));
126-
EXPECT_TRUE(funcWrapper(func, snan_0x42, sNaN));
127-
}
113+
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_aNaN));
114+
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_sNaN));
128115

129116
if constexpr (FPBits::FRACTION_LEN - 1 >= 5) {
117+
T qnan_0x15 = FPBits::quiet_nan(Sign::POS, 0x15).get_val();
118+
T neg_qnan_0x15 = FPBits::quiet_nan(Sign::NEG, 0x15).get_val();
119+
T snan_0x15 = FPBits::signaling_nan(Sign::POS, 0x15).get_val();
120+
T neg_snan_0x15 = FPBits::signaling_nan(Sign::NEG, 0x15).get_val();
121+
130122
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_0x15));
131123
EXPECT_FALSE(funcWrapper(func, sNaN, snan_0x15));
132124
EXPECT_FALSE(funcWrapper(func, qnan_0x15, aNaN));
133125
EXPECT_TRUE(funcWrapper(func, snan_0x15, sNaN));
134-
}
135126

136-
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_aNaN));
137-
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_sNaN));
127+
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_qnan_0x15));
128+
EXPECT_FALSE(funcWrapper(func, neg_sNaN, neg_snan_0x15));
129+
EXPECT_FALSE(funcWrapper(func, neg_qnan_0x15, neg_aNaN));
130+
EXPECT_TRUE(funcWrapper(func, neg_snan_0x15, neg_sNaN));
131+
}
138132

139133
if constexpr (FPBits::FRACTION_LEN - 1 >= 7) {
134+
T qnan_0x42 = FPBits::quiet_nan(Sign::POS, 0x42).get_val();
135+
T neg_qnan_0x42 = FPBits::quiet_nan(Sign::NEG, 0x42).get_val();
136+
T snan_0x42 = FPBits::signaling_nan(Sign::POS, 0x42).get_val();
137+
T neg_snan_0x42 = FPBits::signaling_nan(Sign::NEG, 0x42).get_val();
138+
139+
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_0x42));
140+
EXPECT_FALSE(funcWrapper(func, sNaN, snan_0x42));
141+
EXPECT_FALSE(funcWrapper(func, qnan_0x42, aNaN));
142+
EXPECT_TRUE(funcWrapper(func, snan_0x42, sNaN));
143+
140144
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_qnan_0x42));
141145
EXPECT_FALSE(funcWrapper(func, neg_sNaN, neg_snan_0x42));
142146
EXPECT_FALSE(funcWrapper(func, neg_qnan_0x42, neg_aNaN));
143147
EXPECT_TRUE(funcWrapper(func, neg_snan_0x42, neg_sNaN));
144148
}
145-
146-
if constexpr (FPBits::FRACTION_LEN - 1 >= 5) {
147-
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_qnan_0x15));
148-
EXPECT_FALSE(funcWrapper(func, neg_sNaN, neg_snan_0x15));
149-
EXPECT_FALSE(funcWrapper(func, neg_qnan_0x15, neg_aNaN));
150-
EXPECT_TRUE(funcWrapper(func, neg_snan_0x15, neg_sNaN));
151-
}
152149
}
153150
};
154151

‎libc/test/src/math/smoke/TotalOrderTest.h

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -104,49 +104,46 @@ class TotalOrderTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
104104
}
105105

106106
void testNaNPayloads(TotalOrderFunc func) {
107-
T qnan_0x42 = FPBits::quiet_nan(Sign::POS, 0x42).get_val();
108-
T neg_qnan_0x42 = FPBits::quiet_nan(Sign::NEG, 0x42).get_val();
109-
T snan_0x42 = FPBits::signaling_nan(Sign::POS, 0x42).get_val();
110-
T neg_snan_0x42 = FPBits::signaling_nan(Sign::NEG, 0x42).get_val();
111-
112-
T qnan_0x15 = FPBits::quiet_nan(Sign::POS, 0x15).get_val();
113-
T neg_qnan_0x15 = FPBits::quiet_nan(Sign::NEG, 0x15).get_val();
114-
T snan_0x15 = FPBits::signaling_nan(Sign::POS, 0x15).get_val();
115-
T neg_snan_0x15 = FPBits::signaling_nan(Sign::NEG, 0x15).get_val();
116107

117108
EXPECT_TRUE(funcWrapper(func, aNaN, aNaN));
118109
EXPECT_TRUE(funcWrapper(func, sNaN, sNaN));
119110

120-
if constexpr (FPBits::FRACTION_LEN - 1 >= 7) {
121-
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_0x42));
122-
EXPECT_FALSE(funcWrapper(func, sNaN, snan_0x42));
123-
EXPECT_FALSE(funcWrapper(func, qnan_0x42, aNaN));
124-
EXPECT_TRUE(funcWrapper(func, snan_0x42, sNaN));
125-
}
111+
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_aNaN));
112+
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_sNaN));
126113

127114
if constexpr (FPBits::FRACTION_LEN - 1 >= 5) {
115+
T qnan_0x15 = FPBits::quiet_nan(Sign::POS, 0x15).get_val();
116+
T neg_qnan_0x15 = FPBits::quiet_nan(Sign::NEG, 0x15).get_val();
117+
T snan_0x15 = FPBits::signaling_nan(Sign::POS, 0x15).get_val();
118+
T neg_snan_0x15 = FPBits::signaling_nan(Sign::NEG, 0x15).get_val();
119+
128120
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_0x15));
129121
EXPECT_FALSE(funcWrapper(func, sNaN, snan_0x15));
130122
EXPECT_FALSE(funcWrapper(func, qnan_0x15, aNaN));
131123
EXPECT_TRUE(funcWrapper(func, snan_0x15, sNaN));
132-
}
133-
134-
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_aNaN));
135-
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_sNaN));
136124

137-
if constexpr (FPBits::FRACTION_LEN - 1 >= 7) {
138-
EXPECT_FALSE(funcWrapper(func, neg_aNaN, neg_qnan_0x42));
139-
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_snan_0x42));
140-
EXPECT_TRUE(funcWrapper(func, neg_qnan_0x42, neg_aNaN));
141-
EXPECT_FALSE(funcWrapper(func, neg_snan_0x42, neg_sNaN));
142-
}
143-
144-
if constexpr (FPBits::FRACTION_LEN - 1 >= 5) {
145125
EXPECT_FALSE(funcWrapper(func, neg_aNaN, neg_qnan_0x15));
146126
EXPECT_TRUE(funcWrapper(func, neg_sNaN, neg_snan_0x15));
147127
EXPECT_TRUE(funcWrapper(func, neg_qnan_0x15, neg_aNaN));
148128
EXPECT_FALSE(funcWrapper(func, neg_snan_0x15, neg_sNaN));
149129
}
130+
131+
if constexpr (FPBits::FRACTION_LEN - 1 >= 7) {
132+
T qnan_0x42 = FPBits::quiet_nan(Sign::POS, 0x42).get_val();
133+
T neg_qnan_0x42 = FPBits::quiet_nan(Sign::NEG, 0x42).get_val();
134+
T snan_0x42 = FPBits::signaling_nan(Sign::POS, 0x42).get_val();
135+
T neg_snan_0x42 = FPBits::signaling_nan(Sign::NEG, 0x42).get_val();
136+
137+
EXPECT_TRUE(funcWrapper(func, aNaN, qnan_0x42));
138+
EXPECT_FALSE(funcWrapper(func, sNaN, snan_0x42));
139+
EXPECT_FALSE(funcWrapper(func, qnan_0x42, aNaN));
140+
EXPECT_TRUE(funcWrapper(func, snan_0x42, sNaN));
141+
142+
EXPECT_TRUE(funcWrapper(func, neg_aNaN, neg_qnan_0x42));
143+
EXPECT_FALSE(funcWrapper(func, neg_sNaN, neg_snan_0x42));
144+
EXPECT_FALSE(funcWrapper(func, neg_qnan_0x42, neg_aNaN));
145+
EXPECT_TRUE(funcWrapper(func, neg_snan_0x42, neg_sNaN));
146+
}
150147
}
151148
};
152149

0 commit comments

Comments
 (0)