Fix bugs in ROUND evaluation tests
Fix bugs in tests cases for +-infinity
PiperOrigin-RevId: 315229899
diff --git a/eval/f32-roundu.cc b/eval/f32-roundu.cc
index 3f6c92f..8e5af78 100644
--- a/eval/f32-roundu.cc
+++ b/eval/f32-roundu.cc
@@ -159,7 +159,7 @@
TEST(ROUNDU__SSE_ADDSUB, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__sse_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -171,7 +171,7 @@
TEST(ROUNDU__SSE_ADDSUB, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__sse_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -425,7 +425,7 @@
TEST(ROUNDU__SSE2_CVT, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__sse2_cvt(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -437,7 +437,7 @@
TEST(ROUNDU__SSE2_CVT, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__sse2_cvt(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -691,7 +691,7 @@
TEST(ROUNDU__SSE41, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__sse41(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -703,7 +703,7 @@
TEST(ROUNDU__SSE41, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__sse41(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -957,7 +957,7 @@
TEST(ROUNDU__NEON_ADDSUB, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__neon_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -969,7 +969,7 @@
TEST(ROUNDU__NEON_ADDSUB, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__neon_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -1223,7 +1223,7 @@
TEST(ROUNDU__NEON_CVT, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__neon_cvt(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -1235,7 +1235,7 @@
TEST(ROUNDU__NEON_CVT, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__neon_cvt(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -1489,7 +1489,7 @@
TEST(ROUNDU__NEONV8, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__neonv8(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -1501,7 +1501,7 @@
TEST(ROUNDU__NEONV8, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__neonv8(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -1755,7 +1755,7 @@
TEST(ROUNDU__PSIMD_ADDSUB, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__psimd_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -1767,7 +1767,7 @@
TEST(ROUNDU__PSIMD_ADDSUB, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__psimd_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -2020,7 +2020,7 @@
TEST(ROUNDU__SCALAR_ADDSUB, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__scalar_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -2032,7 +2032,7 @@
TEST(ROUNDU__SCALAR_ADDSUB, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__scalar_addsub(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -2284,7 +2284,7 @@
TEST(ROUNDU__SCALAR_CVT, positive_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0x7F800000));
+ std::fill(inputs.begin(), inputs.end(), +std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__scalar_cvt(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))
@@ -2296,7 +2296,7 @@
TEST(ROUNDU__SCALAR_CVT, negative_infinity) {
std::vector<float, AlignedAllocator<float, 64>> inputs(kBlockSize);
std::vector<float, AlignedAllocator<float, 64>> outputs(kBlockSize);
- std::fill(inputs.begin(), inputs.end(), UINT32_C(0xFF800000));
+ std::fill(inputs.begin(), inputs.end(), -std::numeric_limits<float>::infinity());
xnn_math_f32_roundu__scalar_cvt(kBlockSize * sizeof(float), inputs.data(), outputs.data());
const uint32_t reference_output = fp32_to_bits(std::ceil(inputs[0]));
ASSERT_EQ(reference_output, fp32_to_bits(outputs[0]))