Revert "runtime: adjust softfloat corner cases to match amd64/arm64"

This reverts commit b9f3accdcf973ca41069e22e6859b9436801aae5.

Reason for revert: we need to do this more carefully, at minimum gated by a module version

(This should follow the WASM FP conversion revert)

Change-Id: Ib98ce7d243348f69c9944db8537397b225c2cc33
Reviewed-on: https://go-review.googlesource.com/c/go/+/711841
Reviewed-by: Keith Randall <khr@golang.org>
TryBot-Bypass: David Chase <drchase@google.com>
Reviewed-by: Keith Randall <khr@google.com>

3 files changed, 25 insertions, 102 deletions

diff --git a/src/runtime/export_test.go b/src/runtime/export_test.go
index f61cac763c..9f2fcacc30 100644
--- a/src/runtime/export_test.go
+++ b/src/runtime/export_test.go
@@ -25,7 +25,6 @@ var F32to64 = f32to64
 var Fcmp64 = fcmp64
 var Fintto64 = fintto64
 var F64toint = f64toint
-var F64touint = f64touint64
 
 var Entersyscall = entersyscall
 var Exitsyscall = exitsyscall
diff --git a/src/runtime/softfloat64.go b/src/runtime/softfloat64.go
index 7b9409f75b..42ef009297 100644
--- a/src/runtime/softfloat64.go
+++ b/src/runtime/softfloat64.go
@@ -26,11 +26,6 @@ const (
 	neg32 uint32 = 1 << (expbits32 + mantbits32)
 )
 
-// If F is not NaN and not Inf, then f == (-1)**sign * mantissa * 2**(exp-52)
-// The mantissa and exp are adjusted from their stored representation  so
-// that the mantissa includes the formerly implicit 1, the exponent bias
-// is removed, and denormalized floats to put a 1 in the expected
-// (1<<mantbits64) position.
 func funpack64(f uint64) (sign, mant uint64, exp int, inf, nan bool) {
 	sign = f & (1 << (mantbits64 + expbits64))
 	mant = f & (1<<mantbits64 - 1)
@@ -376,25 +371,24 @@ func fcmp64(f, g uint64) (cmp int32, isnan bool) {
 	return 0, false
 }
 
-// returns saturated-conversion int64 value of f
-// and whether the input was NaN (in which case it
-// may not match the "hardware" conversion).
-func f64toint(f uint64) (val int64, isNan bool) {
+func f64toint(f uint64) (val int64, ok bool) {
 	fs, fm, fe, fi, fn := funpack64(f)
 
 	switch {
-
-	case fn: // NaN
-		return -0x8000_0000_0000_0000, false
+	case fi, fn: // NaN
+		return 0, false
 
 	case fe < -1: // f < 0.5
 		return 0, false
 
-	case fi || fe >= 63: // |f| >= 2^63, including infinity
+	case fe > 63: // f >= 2^63
+		if fs != 0 && fm == 0 { // f == -2^63
+			return -1 << 63, true
+		}
 		if fs != 0 {
-			return -0x8000_0000_0000_0000, true
+			return 0, false
 		}
-		return 0x7fff_ffff_ffff_ffff, true
+		return 0, false
 	}
 
 	for fe > int(mantbits64) {
@@ -406,51 +400,12 @@ func f64toint(f uint64) (val int64, isNan bool) {
 		fm >>= 1
 	}
 	val = int64(fm)
-	if val < 0 {
-		if fs != 0 {
-			return -0x8000_0000_0000_0000, true
-		}
-		return 0x7fff_ffff_ffff_ffff, true
-	}
 	if fs != 0 {
 		val = -val
 	}
 	return val, true
 }
 
-// returns saturated-conversion uint64 value of f
-// and whether the input was NaN (in which case it
-// may not match the "hardware" conversion).
-func f64touint(f uint64) (val uint64, isNan bool) {
-	fs, fm, fe, fi, fn := funpack64(f)
-
-	switch {
-
-	case fn: // NaN
-		return 0xffff_ffff_ffff_ffff, false
-
-	case fs != 0: // all negative, including -Inf, are zero
-		return 0, true
-
-	case fi || fe >= 64: // positive infinity or f >= 2^64
-		return 0xffff_ffff_ffff_ffff, true
-
-	case fe < -1: // f < 0.5
-		return 0, true
-	}
-
-	for fe > int(mantbits64) {
-		fe--
-		fm <<= 1
-	}
-	for fe < int(mantbits64) {
-		fe++
-		fm >>= 1
-	}
-	val = fm
-	return val, true
-}
-
 func fintto64(val int64) (f uint64) {
 	fs := uint64(val) & (1 << 63)
 	mant := uint64(val)
@@ -609,12 +564,6 @@ func fint64to64(x int64) uint64 {
 
 func f32toint32(x uint32) int32 {
 	val, _ := f64toint(f32to64(x))
-	if val >= 0x7fffffff {
-		return 0x7fffffff
-	}
-	if val < -0x80000000 {
-		return -0x80000000
-	}
 	return int32(val)
 }
 
@@ -625,12 +574,6 @@ func f32toint64(x uint32) int64 {
 
 func f64toint32(x uint64) int32 {
 	val, _ := f64toint(x)
-	if val >= 0x7fffffff {
-		return 0x7fffffff
-	}
-	if val < -0x80000000 {
-		return -0x80000000
-	}
 	return int32(val)
 }
 
@@ -640,13 +583,23 @@ func f64toint64(x uint64) int64 {
 }
 
 func f64touint64(x uint64) uint64 {
-	val, _ := f64touint(x)
-	return val
+	var m uint64 = 0x43e0000000000000 // float64 1<<63
+	if fgt64(m, x) {
+		return uint64(f64toint64(x))
+	}
+	y := fadd64(x, -m)
+	z := uint64(f64toint64(y))
+	return z | (1 << 63)
 }
 
 func f32touint64(x uint32) uint64 {
-	val, _ := f64touint(f32to64(x))
-	return val
+	var m uint32 = 0x5f000000 // float32 1<<63
+	if fgt32(m, x) {
+		return uint64(f32toint64(x))
+	}
+	y := fadd32(x, -m)
+	z := uint64(f32toint64(y))
+	return z | (1 << 63)
 }
 
 func fuint64to64(x uint64) uint64 {
diff --git a/src/runtime/softfloat64_test.go b/src/runtime/softfloat64_test.go
index 233d5e01c0..3f53e8bc55 100644
--- a/src/runtime/softfloat64_test.go
+++ b/src/runtime/softfloat64_test.go
@@ -28,15 +28,6 @@ func div(x, y float64) float64 { return x / y }
 func TestFloat64(t *testing.T) {
 	base := []float64{
 		0,
-		1,
-		-9223372036854775808,
-		-9223372036854775808 + 4096,
-		18446744073709551615,
-		18446744073709551615 + 1,
-		18446744073709551615 - 1,
-		9223372036854775808 + 4096,
-		0.5,
-		0.75,
 		math.Copysign(0, -1),
 		-1,
 		1,
@@ -44,8 +35,6 @@ func TestFloat64(t *testing.T) {
 		math.Inf(+1),
 		math.Inf(-1),
 		0.1,
-		0.5,
-		0.75,
 		1.5,
 		1.9999999999999998,     // all 1s mantissa
 		1.3333333333333333,     // 1.010101010101...
@@ -81,7 +70,7 @@ func TestFloat64(t *testing.T) {
 		1e+307,
 		1e+308,
 	}
-	all := make([]float64, 250)
+	all := make([]float64, 200)
 	copy(all, base)
 	for i := len(base); i < len(all); i++ {
 		all[i] = rand.NormFloat64()
@@ -93,7 +82,6 @@ func TestFloat64(t *testing.T) {
 		test(t, "*", mul, fop(Fmul64), all)
 		test(t, "/", div, fop(Fdiv64), all)
 	}
-
 }
 
 // 64 -hw-> 32 -hw-> 64
@@ -116,11 +104,6 @@ func hwint64(f float64) float64 {
 	return float64(int64(f))
 }
 
-// float64 -hw-> uint64 -hw-> float64
-func hwuint64(f float64) float64 {
-	return float64(uint64(f))
-}
-
 // float64 -hw-> int32 -hw-> float64
 func hwint32(f float64) float64 {
 	return float64(int32(f))
@@ -130,23 +113,13 @@ func hwint32(f float64) float64 {
 func toint64sw(f float64) float64 {
 	i, ok := F64toint(math.Float64bits(f))
 	if !ok {
-		// There's no right answer for NaN.
+		// There's no right answer for out of range.
 		// Match the hardware to pass the test.
 		i = int64(f)
 	}
 	return float64(i)
 }
 
-func touint64sw(f float64) float64 {
-	i := F64touint(math.Float64bits(f))
-	if f != f {
-		// There's no right answer for NaN.
-		// Match the hardware to pass the test.
-		i = uint64(f)
-	}
-	return float64(i)
-}
-
 // float64 -hw-> int64 -sw-> float64
 func fromint64sw(f float64) float64 {
 	return math.Float64frombits(Fintto64(int64(f)))
@@ -177,7 +150,6 @@ func test(t *testing.T, op string, hw, sw func(float64, float64) float64, all []
 			testu(t, "to32", trunc32, to32sw, h)
 			testu(t, "to64", trunc32, to64sw, h)
 			testu(t, "toint64", hwint64, toint64sw, h)
-			testu(t, "touint64", hwuint64, touint64sw, h)
 			testu(t, "fromint64", hwint64, fromint64sw, h)
 			testcmp(t, f, h)
 			testcmp(t, h, f)
@@ -191,7 +163,6 @@ func testu(t *testing.T, op string, hw, sw func(float64) float64, v float64) {
 	h := hw(v)
 	s := sw(v)
 	if !same(h, s) {
-		s = sw(v) // debug me
 		err(t, "%s %g = sw %g, hw %g\n", op, v, s, h)
 	}
 }