- cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl][master] 2 commits: Fix #300: Reduce code duplication in random
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: bb1bc462 by Raymond Toy at 2024-04-07T22:53:45+00:00 Fix #300: Reduce code duplication in random - - - - - 94a2c674 by Raymond Toy at 2024-04-07T22:53:51+00:00 Merge branch 'issue-300-reduce-code-dup-in-random' into 'master' Fix #300: Reduce code duplication in random Closes #300 See merge request cmucl/cmucl!206 - - - - - 2 changed files: - src/bootfiles/21e/boot-2023-08.lisp - src/code/rand-xoroshiro.lisp Changes: ===================================== src/bootfiles/21e/boot-2023-08.lisp ===================================== @@ -2,3 +2,46 @@ ;; *SOFTWARE-VERSION* from the LISP package to the SYSTEM package. (ext:without-package-locks (unintern 'lisp::*software-version* "LISP")) + +#+(or random-mt19937 random-xoroshiro) +(in-package "C") +#+(or random-mt19937 random-xoroshiro) +(deftransform random ((num &optional state) + ((integer 1 #.(expt 2 32)) &optional *)) + _N"use inline (unsigned-byte 32) operations" + (let* ((num-type (continuation-type num)) + (num-high (cond ((numeric-type-p num-type) + (numeric-type-high num-type)) + ((union-type-p num-type) + ;; Find the maximum of the union type. We + ;; know this works because if we're in this + ;; routine, NUM must be a subtype of + ;; (INTEGER 1 2^32), so each member of the + ;; union must be a subtype too. + (reduce #'max (union-type-types num-type) + :key #'numeric-type-high)) + (t + (give-up))))) + ;; Rather than doing (rem (random-chunk) num-high), we do, + ;; essentially, (rem (* num-high (random-chunk)) #x100000000). I + ;; (rtoy) believe this approach doesn't have the bias issue with + ;; doing rem. This method works by treating (random-chunk) as if + ;; it were a 32-bit fraction between 0 and 1, exclusive. Multiply + ;; this by num-high to get a random number between 0 and num-high, + ;; This should have no bias. + (cond ((constant-continuation-p num) + (if (= num-high (expt 2 32)) + '(random-chunk (or state *random-state*)) + '(values (bignum::%multiply + (random-chunk (or state *random-state*)) + num)))) + ((< num-high (expt 2 32)) + '(values (bignum::%multiply (random-chunk (or state *random-state*)) + num))) + ((= num-high (expt 2 32)) + '(if (= num (expt 2 32)) + (random-chunk (or state *random-state*)) + (values (bignum::%multiply (random-chunk (or state *random-state*)) + num)))) + (t + (error (intl:gettext "Shouldn't happen")))))) ===================================== src/code/rand-xoroshiro.lisp ===================================== @@ -490,11 +490,8 @@ (declare (inline %random-single-float %random-double-float)) (cond ((typep arg '(integer 1 #x100000000)) - ;; Do the same thing as the deftransform would do. - (if (= arg (expt 2 32)) - (random-chunk state) - (values (bignum::%multiply (random-chunk state) - arg)))) + ;; Let the compiler deftransform take care of this case. + (random arg state)) ((and (typep arg 'single-float) (> arg 0.0F0)) (%random-single-float arg state)) ((and (typep arg 'double-float) (> arg 0.0D0)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7bec290fda1c29972afe32… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/7bec290fda1c29972afe32… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #297: Print new-assem:assemble with less indentation
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 62631e15 by Raymond Toy at 2024-04-07T22:52:52+00:00 Fix #297: Print new-assem:assemble with less indentation - - - - - 7bec290f by Raymond Toy at 2024-04-07T22:53:01+00:00 Merge branch 'issue-297-pprint-assemble' into 'master' Fix #297: Print new-assem:assemble with less indentation Closes #297 See merge request cmucl/cmucl!203 - - - - - 3 changed files: - src/code/pprint.lisp - src/general-info/release-21f.md - tests/pprint.lisp Changes: ===================================== src/code/pprint.lisp ===================================== @@ -2088,6 +2088,7 @@ When annotations are present, invoke them at the right positions." (c:define-vop pprint-define-vop) (c:sc-case pprint-sc-case) (c:define-assembly-routine pprint-define-assembly) + (new-assem:assemble pprint-multiple-value-bind) (c:deftransform pprint-defun) (c:defoptimizer pprint-defun) (ext:with-float-traps-masked pprint-with-like) ===================================== src/general-info/release-21f.md ===================================== @@ -65,6 +65,7 @@ public domain. * ~~#288~~ Re-enable `deftransform` for random integers. * ~~#290~~ Pprint `with-float-traps-masked` better * ~~#291~~ Pprint `handler-case` neatly. + * ~~#297~~ Pprint `new-assem:assemble` with less indentation. * Other changes: * Improvements to the PCL implementation of CLOS: * Changes to building procedure: ===================================== tests/pprint.lisp ===================================== @@ -121,3 +121,17 @@ (:no-error () (format nil "Nothing bad happened."))) s)))) + +(define-test pprint.assemble + (:tag :issues) + (assert-equal + " +(NEW-ASSEM:ASSEMBLE (C:*CODE-SEGMENT* 'X86::XOROSHIRO-UPDATE) + X86::XOROSHIRO-UPDATE + (PUSH (CONS 'X86::XOROSHIRO-UPDATE X86::XOROSHIRO-UPDATE) + C::*ASSEMBLER-ROUTINES*))" + (with-output-to-string (s) + (pprint '(new-assem:assemble (c::*code-segment* 'vm::xoroshiro-update) + vm::xoroshiro-update + (push (cons 'vm::xoroshiro-update vm::xoroshiro-update) c::*assembler-routines*)) + s)))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3cdf6b8fa3f23952a90f5c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/3cdf6b8fa3f23952a90f5c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-293-restart-on-reader-fp-overflow] 2 commits: Update expected FP underflow message in reader
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch issue-293-restart-on-reader-fp-overflow at cmucl / cmucl Commits: 875638b6 by Raymond Toy at 2024-04-07T11:16:53-07:00 Update expected FP underflow message in reader We changed the message string for FP underflows in the reader so we need to update the test with this new string. - - - - - a7b57151 by Raymond Toy at 2024-04-07T11:22:19-07:00 Merge branch 'issue-275b-signal-float-underflow' into issue-293-restart-on-reader-fp-overflow - - - - - 1 changed file: - tests/float.lisp Changes: ===================================== tests/float.lisp ===================================== @@ -231,7 +231,7 @@ (:tag :issues) (lisp::with-float-traps-enabled (:underflow) ;; The expected string comes from make-float-aux. - (let ((expected "Floating point underflow when reading ~S")) + (let ((expected "Floating point underflow when reading ~S: ~S")) (flet ((test-reader-underflow (string) ;; Test that the we got a reader-error when a number ;; would underflow and that the message says we got an View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d9a8993608611d809179b3… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/d9a8993608611d809179b3… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-275b-signal-float-underflow] Update expected FP underflow message in reader
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch issue-275b-signal-float-underflow at cmucl / cmucl Commits: 875638b6 by Raymond Toy at 2024-04-07T11:16:53-07:00 Update expected FP underflow message in reader We changed the message string for FP underflows in the reader so we need to update the test with this new string. - - - - - 1 changed file: - tests/float.lisp Changes: ===================================== tests/float.lisp ===================================== @@ -231,7 +231,7 @@ (:tag :issues) (lisp::with-float-traps-enabled (:underflow) ;; The expected string comes from make-float-aux. - (let ((expected "Floating point underflow when reading ~S")) + (let ((expected "Floating point underflow when reading ~S: ~S")) (flet ((test-reader-underflow (string) ;; Test that the we got a reader-error when a number ;; would underflow and that the message says we got an View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/875638b6a1a7f7525e82045… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/875638b6a1a7f7525e82045… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-293-restart-on-reader-fp-overflow] 16 commits: Fix #287: Clean up make-float-aux
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch issue-293-restart-on-reader-fp-overflow at cmucl / cmucl Commits: f3e5a7e6 by Raymond Toy at 2024-03-23T12:13:54-07:00 Fix #287: Clean up make-float-aux We don't need to try to round small numbers to least positive float here. When #277 was fixed, this was taken care of. Hence we can remove all the code for that and just throw a reader-error immediately if the result is 0 but the number is not zero. - - - - - 9d01b5ca by Raymond Toy at 2024-03-23T12:38:44-07:00 Oops. Need handler-case to catch errors from large numbers. For large numbers that weren't caught the with the rough check, the conversion of the large ratio to a float signals a `simple-type-error` from `coerce`. We need to catch that and signal a `reader-error`. - - - - - 01857e1c by Raymond Toy at 2024-03-23T14:39:01-07:00 Fix #275: Signal underflow for denormals If the floating-point underflow trap is enabled, signal an underflow error when the number would underflow to a denormal. We still signal a reader-error if the number would not fit in a float. - - - - - 45532060 by Raymond Toy at 2024-03-23T14:56:58-07:00 Add tests for float underflows in the reader - - - - - 23f449e4 by Raymond Toy at 2024-03-26T07:46:47-07:00 Merge branch 'master' into issue-275b-signal-float-underflow - - - - - 488cbe98 by Raymond Toy at 2024-03-26T07:47:46-07:00 Add a comment about continuing with 0 - - - - - bb8eb44c by Raymond Toy at 2024-03-26T08:25:46-07:00 Fix bad merge Actually need to remove `with-float-traps-masked`. Duh! - - - - - ba400bf5 by Raymond Toy at 2024-03-29T07:11:07-07:00 Signal reader-error on underflow instead of FP underflow. The error message makes it clear we have a FP underflow like so: ``` * 1d-308 Reader error on #<Two-Way Stream, Input = #<Synonym Stream to SYSTEM:*STDIN*>, Output = #<Synonym Stream to SYSTEM:*STDOUT*>>: Underflow when reading "1d-308" [Condition of type READER-ERROR] Restarts: 0: [CONTINUE] Return 0.0d0 1: [ABORT ] Return to Top-Level. ``` - - - - - f3d64ced by Raymond Toy at 2024-03-29T07:16:02-07:00 Change message to mention floating point Instead of just saying "Underflow when reading...", say "Floating point underflow when reading..." to make it a bit clearer what happened. - - - - - 4ba5145d by Raymond Toy at 2024-03-29T07:20:32-07:00 Undo some space changes and correct a comment. Undo some tab vs space changes at the end of make-float-aux. The comment about double-float exponent range was in the wrong place so put it in the right place. - - - - - e1a35617 by Raymond Toy at 2024-03-29T07:55:55-07:00 Test FP underflow signals reader-error We now signal a `reader-error` on a FP underflow. Thus, test that we get a reader error. Also test that the message says we got an underflow. This is to verify that we tell the user that it's an underflow and not some other reader error. - - - - - 031b5ce0 by Raymond Toy at 2024-03-29T07:58:47-07:00 Update pot file for updated message string. - - - - - 047a0f08 by Raymond Toy at 2024-03-29T08:00:08-07:00 Add comment on where the expected string comes from. - - - - - ca07a140 by Raymond Toy at 2024-03-29T15:45:54-07:00 Merge branch 'master' into issue-275b-signal-float-underflow - - - - - 2eda1257 by Raymond Toy at 2024-04-07T10:50:22-07:00 Change underflow message to be a bit clearer Update the pot file due to the change in the message string. - - - - - d9a89936 by Raymond Toy at 2024-04-07T11:03:13-07:00 Merge branch 'issue-275b-signal-float-underflow' into issue-293-restart-on-reader-fp-overflow - - - - - 3 changed files: - src/code/reader.lisp - src/i18n/locale/cmucl.pot - tests/float.lisp Changes: ===================================== src/code/reader.lisp ===================================== @@ -1929,8 +1929,8 @@ the end of the stream." ;; 0. (let ((zero (coerce 0 float-format))) (restart-case - (%reader-error stream _"Floating point underflow when reading ~S" - (read-buffer-to-string)) + (%reader-error stream _"Floating point underflow when reading ~S: ~S" + float-format (read-buffer-to-string)) (continue () :report (lambda (stream) (format stream "Return ~A" zero)) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -8736,7 +8736,7 @@ msgid "Underflow" msgstr "" #: src/code/reader.lisp -msgid "Floating point underflow when reading ~S" +msgid "Floating point underflow when reading ~S: ~S" msgstr "" #: src/code/reader.lisp ===================================== tests/float.lisp ===================================== @@ -213,6 +213,39 @@ (assert-error 'reader-error (read-from-string "1.8d308")) (assert-error 'reader-error (read-from-string "1d999999999"))) +(define-test reader.float-underflow + (:tag :issues) + (lisp::with-float-traps-enabled (:underflow) + ;; A denormal + (assert-error 'reader-error + (read-from-string "1e-40")) + (assert-error 'reader-error + (read-from-string (format nil "~A" least-positive-single-float))) + ;; The same for double-floats + (assert-error 'reader-error + (read-from-string "1d-308")) + (assert-error 'reader-error + (read-from-string (format nil "~A" least-positive-double-float))))) + +(define-test reader.float-underflow + (:tag :issues) + (lisp::with-float-traps-enabled (:underflow) + ;; The expected string comes from make-float-aux. + (let ((expected "Floating point underflow when reading ~S")) + (flet ((test-reader-underflow (string) + ;; Test that the we got a reader-error when a number + ;; would underflow and that the message says we got an + ;; underflow. + (let ((condition (nth-value 1 (ignore-errors (read-from-string string))))) + (assert-equal 'reader-error (type-of condition)) + (assert-equal expected (lisp::reader-error-format-control condition))))) + ;; Underflow single-floats + (test-reader-underflow "1e-40") + (test-reader-underflow (format nil "~A" least-positive-single-float)) + ;; Underflow double-floats + (test-reader-underflow "1d-308") + (test-reader-underflow (format nil "~A" least-positive-double-float)))))) + (define-test fp-overflow-restarts.infinity (:tag :issues) ;; Test that the "infinity" restart from reader on floating-point View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/deb940458edf3da1156447… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/deb940458edf3da1156447… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-275b-signal-float-underflow] Change underflow message to be a bit clearer
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch issue-275b-signal-float-underflow at cmucl / cmucl Commits: 2eda1257 by Raymond Toy at 2024-04-07T10:50:22-07:00 Change underflow message to be a bit clearer Update the pot file due to the change in the message string. - - - - - 2 changed files: - src/code/reader.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/reader.lisp ===================================== @@ -1883,8 +1883,8 @@ the end of the stream." ;; 0. (let ((zero (coerce 0 float-format))) (restart-case - (%reader-error stream _"Floating point underflow when reading ~S" - (read-buffer-to-string)) + (%reader-error stream _"Floating point underflow when reading ~S: ~S" + float-format (read-buffer-to-string)) (continue () :report (lambda (stream) (format stream "Return ~A" zero)) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -8736,7 +8736,7 @@ msgid "Underflow" msgstr "" #: src/code/reader.lisp -msgid "Floating point underflow when reading ~S" +msgid "Floating point underflow when reading ~S: ~S" msgstr "" #: src/code/reader.lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2eda1257be4c15c51ce8bc9… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/2eda1257be4c15c51ce8bc9… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-293-restart-on-reader-fp-overflow] Change overflow message to be a bit clearer
by Raymond Toy (＠rtoy) 07 Apr '24

07 Apr '24

Raymond Toy pushed to branch issue-293-restart-on-reader-fp-overflow at cmucl / cmucl Commits: deb94045 by Raymond Toy at 2024-04-07T10:36:12-07:00 Change overflow message to be a bit clearer Update the pot file due to the change in the message string. - - - - - 2 changed files: - src/code/reader.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== src/code/reader.lisp ===================================== @@ -1857,7 +1857,7 @@ the end of the stream." ext:most-positive-double-double-float))))) (restart-case - (%reader-error stream _"~S overflow reading ~S" + (%reader-error stream _"Floating-point overflow reading ~S: ~S" float-format (read-buffer-to-string)) (infinity () :report (lambda (stream) ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -8728,7 +8728,7 @@ msgid "Internal error in floating point reader." msgstr "" #: src/code/reader.lisp -msgid "~S overflow reading ~S" +msgid "Floating-point overflow reading ~S: ~S" msgstr "" #: src/code/reader.lisp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/deb940458edf3da11564476… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/deb940458edf3da11564476… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-296-fix-movd-disassembly
by Raymond Toy (＠rtoy) 06 Apr '24

06 Apr '24

Raymond Toy pushed new branch issue-296-fix-movd-disassembly at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-296-fix-movd-disass… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] Reorder bug list to be numerically ascending.
by Raymond Toy (＠rtoy) 06 Apr '24

06 Apr '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 3cdf6b8f by Raymond Toy at 2024-04-06T08:33:14-07:00 Reorder bug list to be numerically ascending. No other changes. - - - - - 1 changed file: - src/general-info/release-21f.md Changes: ===================================== src/general-info/release-21f.md ===================================== @@ -51,8 +51,8 @@ public domain. * ~~#261~~ Remove `get-system-info` from "bsd-os.lisp" * ~~#268~~ Can't clone ansi-test repo on Mac OS CI box * ~~#265~~ CI for mac os is broken - * ~~#269~~ Add function to get user's home directory * ~~#266~~ Support "~user" in namestrings + * ~~#269~~ Add function to get user's home directory * ~~#271~~ Update ASDF to 3.3.7 * ~~#272~~ Move scavenge code for static vectors to its own function * ~~#274~~ 1d99999999 hangs View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3cdf6b8fa3f23952a90f5cf… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/3cdf6b8fa3f23952a90f5cf… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-300-reduce-code-dup-in-random
by Raymond Toy (＠rtoy) 06 Apr '24

06 Apr '24

Raymond Toy pushed new branch issue-300-reduce-code-dup-in-random at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-300-reduce-code-dup… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0