really fix float rounding on 32-bit platforms

[sbcl.git] / tests / float.pure.lisp

diff --git a/tests/float.pure.lisp b/tests/float.pure.lisp
index 0fcf284..60b3a36 100644 (file)
--- a/tests/float.pure.lisp
+++ b/tests/float.pure.lisp
@@ -93,7 +93,7 @@
 (assert (= 0.0d0 (scale-float 1.0d0 (1- most-negative-fixnum))))
 
 (with-test (:name (:scale-float-overflow :bug-372)
-            :fails-on '(or :ppc :darwin)) ;; bug 372
+            :fails-on :darwin) ;; bug 372
   (progn
     (assert (raises-error? (scale-float 1.0 most-positive-fixnum)
                            floating-point-overflow))
@@ -125,7 +125,7 @@
 (funcall (compile nil '(lambda () (tan (tan (round 0))))))
 
 (with-test (:name (:addition-overflow :bug-372)
-            :fails-on '(or :ppc :darwin (and :x86 :netbsd)))
+            :fails-on '(or (and :ppc :openbsd) :darwin (and :x86 :netbsd)))
   (assert (typep (nth-value
                   1
                   (ignore-errors
@@ -245,10 +245,12 @@
                                        (the (eql #c(1.0 2.0))
                                          x))))))))
 
-;; The x86 port used not to reduce the arguments of transcendentals
-;; correctly. On other platforms, we trust libm to DTRT.
-#+x86
-(with-test (:name :range-reduction)
+;; This was previously x86-only, with note:
+;;   The x86 port used not to reduce the arguments of transcendentals
+;;   correctly. On other platforms, we trust libm to DTRT.
+;; but it doesn't cost any real amount to just test them all
+(with-test (:name :range-reduction
+            :fails-on ':x86-64)
   (flet ((almost= (x y)
            (< (abs (- x y)) 1d-5)))
     (macrolet ((foo (op value)
@@ -288,7 +290,8 @@
 ;; The tests are extremely brittle and could be broken by any number of
 ;; back- or front-end optimisations. We should just keep the issue above
 ;; in mind at all times when working with SSE or similar instruction sets.
-#+(or x86 x86-64) ;; No other platforms have SB-VM::TOUCH-OBJECT.
+;;
+;; Run only on x86/x86-64m as no other platforms have SB-VM::TOUCH-OBJECT.
 (macrolet ((with-pinned-floats ((count type &rest names) &body body)
              "Force COUNT float values to be kept live (and hopefully in registers),
               fill a temporary register with noise, and execute BODY."
@@ -313,7 +316,7 @@
                         (locally ,@body))
                     ,@(loop for var in dummy
                             collect `(sb-vm::touch-object ,var)))))))
-  (with-test (:name :clear-sqrtsd)
+  (with-test (:name :clear-sqrtsd :skipped-on '(not (or :x86 :x86-64)))
     (flet ((test-sqrtsd (float)
              (declare (optimize speed (safety 1))
                       (type (double-float (0d0)) float))
@@ -323,7 +326,7 @@
       (declare (notinline test-sqrtsd))
       (assert (zerop (imagpart (test-sqrtsd 4d0))))))
 
-  (with-test (:name :clear-sqrtsd-single)
+  (with-test (:name :clear-sqrtsd-single :skipped-on '(not (or :x86 :x86-64)))
     (flet ((test-sqrtsd-float (float)
              (declare (optimize speed (safety 1))
                       (type (single-float (0f0)) float))
@@ -333,7 +336,7 @@
       (declare (notinline test-sqrtsd-float))
       (assert (zerop (imagpart (test-sqrtsd-float 4f0))))))
 
-  (with-test (:name :clear-cvtss2sd)
+  (with-test (:name :clear-cvtss2sd :skipped-on '(not (or :x86 :x86-64)))
     (flet ((test-cvtss2sd (float)
              (declare (optimize speed (safety 1))
                       (type single-float float))
@@ -343,7 +346,7 @@
       (declare (notinline test-cvtss2sd))
       (assert (zerop (imagpart (test-cvtss2sd 1f0))))))
 
-  (with-test (:name :clear-cvtsd2ss)
+  (with-test (:name :clear-cvtsd2ss :skipped-on '(not (or :x86 :x86-64)))
     (flet ((test-cvtsd2ss (float)
              (declare (optimize speed (safety 1))
                       (type double-float float))
@@ -353,7 +356,7 @@
       (declare (notinline test-cvtsd2ss))
       (assert (zerop (imagpart (test-cvtsd2ss 4d0))))))
 
-  (with-test (:name :clear-cvtsi2sd)
+  (with-test (:name :clear-cvtsi2sd :skipped-on '(not (or :x86 :x86-64)))
     (flet ((test-cvtsi2sd (int)
              (declare (optimize speed (safety 0))
                       (type (unsigned-byte 10) int))
@@ -362,7 +365,7 @@
       (declare (notinline test-cvtsi2sd))
       (assert (zerop (imagpart (test-cvtsi2sd 4))))))
 
-  (with-test (:name :clear-cvtsi2ss)
+  (with-test (:name :clear-cvtsi2ss :skipped-on '(not (or :x86 :x86-64)))
     (flet ((test-cvtsi2ss (int)
              (declare (optimize speed (safety 0))
                       (type (unsigned-byte 10) int))
@@ -370,3 +373,15 @@
                (+ (float int 0e0) x0))))
       (declare (notinline test-cvtsi2ss))
       (assert (zerop (imagpart (test-cvtsi2ss 4)))))))
+
+(with-test (:name :round-to-bignum)
+  (assert (= (round 1073741822.3d0) 1073741822))
+  (assert (= (round 1073741822.5d0) 1073741822))
+  (assert (= (round 1073741822.7d0) 1073741823))
+  (assert (= (round 1073741823.3d0) 1073741823))
+  (assert (= (round 1073741823.5d0) 1073741824))
+  (assert (= (round 1073741823.7d0) 1073741824)))
+
+(with-test (:name :round-single-to-bignum)
+  (assert (= (round 1e14) 100000000376832))
+  (assert (= (round 1e19) 9999999980506447872)))