Expand _01 half<->float limitation to _finite. Simplify.
It's become clear we need to sometimes deal with values <0 or >1.
I'm not yet convinced we care about NaN or +-inf.
We had some fairly clever tricks and optimizations here for NEON
and SSE. I've thrown them out in favor of a single implementation.
If we find the specializations mattered, we can certainly figure out
how to extend them to this new range/domain.
This happens to add a vectorized float -> half for ARMv7, which was
missing from the _01 version. (The SSE strategy was not portable to
platforms that flush denorm floats to zero.)
I've tested the full float range for FloatToHalf on my desktop and a 5x.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2145663003
CQ_INCLUDE_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot;master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot,Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast-Trybot
Committed: https://skia.googlesource.com/skia/+/3296bee70d074bb8094b3229dbe12fa016657e90
Review-Url: https://codereview.chromium.org/2145663003
diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp
index cc5efed..2091652 100644
--- a/tests/Float16Test.cpp
+++ b/tests/Float16Test.cpp
@@ -61,26 +61,26 @@
return x;
}
-DEF_TEST(HalfToFloat_01, r) {
- for (uint16_t h = 0; h < 0x8000; h++) {
+DEF_TEST(HalfToFloat_finite, r) {
+ for (uint32_t h = 0; h <= 0xffff; h++) {
float f = SkHalfToFloat(h);
- if (f >= 0 && f <= 1) {
- float got = SkHalfToFloat_01(h)[0];
+ if (isfinite(f)) {
+ float got = SkHalfToFloat_finite(h)[0];
if (got != f) {
SkDebugf("0x%04x -> 0x%08x (%g), want 0x%08x (%g)\n",
h,
u(got), got,
u(f), f);
}
- REPORTER_ASSERT(r, SkHalfToFloat_01(h)[0] == f);
- REPORTER_ASSERT(r, SkFloatToHalf_01(SkHalfToFloat_01(h)) == h);
+ REPORTER_ASSERT(r, SkHalfToFloat_finite(h)[0] == f);
+ REPORTER_ASSERT(r, SkFloatToHalf_finite(SkHalfToFloat_finite(h)) == h);
}
}
}
-DEF_TEST(FloatToHalf_01, r) {
+DEF_TEST(FloatToHalf_finite, r) {
#if 0
- for (uint32_t bits = 0; bits < 0x80000000; bits++) {
+ for (uint64_t bits = 0; bits <= 0xffffffff; bits++) {
#else
SkRandom rand;
for (int i = 0; i < 1000000; i++) {
@@ -88,14 +88,14 @@
#endif
float f;
memcpy(&f, &bits, 4);
- if (f >= 0 && f <= 1) {
- uint16_t h1 = (uint16_t)SkFloatToHalf_01(Sk4f(f,0,0,0)),
+ if (isfinite(f) && isfinite(SkHalfToFloat(SkFloatToHalf(f)))) {
+ uint16_t h1 = (uint16_t)SkFloatToHalf_finite(Sk4f(f,0,0,0)),
h2 = SkFloatToHalf(f);
bool ok = (h1 == h2 || h1 == h2-1);
REPORTER_ASSERT(r, ok);
if (!ok) {
- SkDebugf("%08x (%d) -> %04x (%d), want %04x (%d)\n",
- bits, bits>>23, h1, h1>>10, h2, h2>>10);
+ SkDebugf("%08x (%g) -> %04x, want %04x (%g)\n",
+ bits, f, h1, h2, SkHalfToFloat(h2));
break;
}
}