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

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Use different directory when rebuilding lisp with the cross-compiler
by Raymond Toy (＠rtoy) 19 Jul '24

19 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 9a46eb81 by Raymond Toy at 2024-07-18T19:34:36-07:00 Use different directory when rebuilding lisp with the cross-compiler Not sure what's going on, but let's just do the normal build (using the cross-compiled result) using different base directory name. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -75,8 +75,8 @@ linux:cross-build: - bin/create-target.sh xtarget - bin/create-target.sh xcross - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp - - bin/build.sh $bootstrap -R -C "" -o xtarget/lisp/lisp - - bin/make-dist.sh -V `git describe --dirty` -I xdist linux-4 + - bin/build.sh -b xlinux $bootstrap -R -C "" -o xtarget/lisp/lisp + - bin/make-dist.sh -V `git describe --dirty` -I xdist xlinux-4 linux:test: stage: test View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9a46eb816dc87ca1b9f9bbc… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/9a46eb816dc87ca1b9f9bbc… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Actually use the build from linux:build for cross-compiling
by Raymond Toy (＠rtoy) 18 Jul '24

18 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 05421c98 by Raymond Toy at 2024-07-18T06:55:03-07:00 Actually use the build from linux:build for cross-compiling Forgot to change the compiler to dist/bin/lisp instead of the snapshot. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -74,7 +74,7 @@ linux:cross-build: script: - bin/create-target.sh xtarget - bin/create-target.sh xcross - - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp + - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp dist/bin/lisp - bin/build.sh $bootstrap -R -C "" -o xtarget/lisp/lisp - bin/make-dist.sh -V `git describe --dirty` -I xdist linux-4 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/05421c985d37b5f10aa18ba… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/05421c985d37b5f10aa18ba… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] 2 commits: Import lisp::+ascii-limit+ to the C package
by Raymond Toy (＠rtoy) 18 Jul '24

18 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 4bb23b29 by Raymond Toy at 2024-07-18T06:29:53-07:00 Import lisp::+ascii-limit+ to the C package Revert the previous changes, leaving `+ascii-limit+` in the `lisp` package. But then import it into the `C` package. For this to work, the compiler using for cross-compiling has to have this change already. - - - - - 8ada0f1e by Raymond Toy at 2024-07-18T06:35:36-07:00 Update CI to use the linux:build as the cross-compiling lisp. - - - - - 6 changed files: - .gitlab-ci.yml - src/code/char.lisp - src/code/exports.lisp - src/code/unicode.lisp - src/compiler/srctran.lisp - src/i18n/locale/cmucl.pot Changes: ===================================== .gitlab-ci.yml ===================================== @@ -63,7 +63,13 @@ linux:cross-build: - linux-3/*.log - linux-4/*.log needs: - - job: linux:install + + # Normally need the linux:install stage to get the compiler to + # use. But for #337, we need the normal build from linux:build to + # do the cross-compile. Once the snapshot is made, we can use + # linux:install instead. + - job: linux:build + #- job: linux:install artifacts: true script: - bin/create-target.sh xtarget ===================================== src/code/char.lisp ===================================== @@ -59,6 +59,11 @@ (deftype codepoint () `(integer 0 (,codepoint-limit))) +(defconstant +ascii-limit+ + 127 + "A character code strictly larger than this is handled using Unicode + rules.") + ;; Table of mappings for upper case and lower case letters. See ;; src/lisp/case-mapping.c. (alien:def-alien-variable "case_mapping" @@ -255,7 +260,7 @@ (let ((m (char-code (the base-char char)))) (or (<= (char-code #\space ) m (char-code #\~)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (>= (unicode-category m) +unicode-category-graphic+)))))) @@ -267,7 +272,7 @@ (or (<= (char-code #\A) m (char-code #\Z)) (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (<= +unicode-category-letter+ (unicode-category m) (+ +unicode-category-letter+ #x0F)))))) @@ -279,7 +284,7 @@ (let ((m (char-code char))) (or (<= (char-code #\A) m (char-code #\Z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (not (zerop (ldb +lower-case-entry+ (case-mapping-entry m)))))))) @@ -290,7 +295,7 @@ (let ((m (char-code char))) (or (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (not (zerop (ldb +upper-case-entry+ (case-mapping-entry m)))))))) (defun both-case-p (char) @@ -302,7 +307,7 @@ (or (<= (char-code #\A) m (char-code #\Z)) (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (not (zerop (case-mapping-entry m))))))) @@ -336,7 +341,7 @@ (<= (char-code #\A) m (char-code #\Z)) (<= (char-code #\a) m (char-code #\z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m +ascii-limit+) (<= +unicode-category-letter+ (unicode-category m) (+ +unicode-category-letter+ #x0F)))))) @@ -409,7 +414,7 @@ (cond ((<= (char-code #\A) ch (char-code #\Z)) (logxor ch #x20)) #+(and unicode (not unicode-bootstrap)) - ((> ch c::+ascii-limit+) + ((> ch +ascii-limit+) (case-mapping-lower-case ch)) (t ch)))) ===================================== src/code/exports.lisp ===================================== @@ -1067,7 +1067,8 @@ "CHAR-TITLECASE" "TITLE-CASE-P" "GLYPH" "SGLYPH" "STRING-TO-NFC" - "CODEPOINT-LIMIT" "CODEPOINT") + "CODEPOINT-LIMIT" "CODEPOINT" + "+ASCII-LIMIT+") ;; Unicode (:export "STRING-TO-NFC" "STRING-TO-NFD" "STRING-TO-NFKC" "STRING-TO-NFKD" @@ -1858,7 +1859,8 @@ "%SP-STRING-COMPARE" "%SVSET" "%TYPEP" "SHORT-FLOAT-P" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" - "STRING>*" "STRING>=*") + "STRING>*" "STRING>=*" + "+ASCII-LIMIT+") (:import-from "SYSTEM" "FOREIGN-SYMBOL-ADDRESS" "FOREIGN-SYMBOL-CODE-ADDRESS" "FOREIGN-SYMBOL-DATA-ADDRESS") (:import-from "EXTENSIONS" ===================================== src/code/unicode.lisp ===================================== @@ -495,7 +495,7 @@ (cond ((<= (char-code #\a) m (char-code #\z)) (code-char (logxor m #x20))) #+(and unicode (not unicode-bootstrap)) - ((> m c::+ascii-limit+) + ((> m lisp::+ascii-limit+) (code-char (lisp::unicode-title m))) (t char)))) @@ -506,7 +506,7 @@ (let ((m (char-code char))) (or (<= (char-code #\A) m (char-code #\Z)) #+(and unicode (not unicode-bootstrap)) - (and (> m c::+ascii-limit+) + (and (> m lisp::+ascii-limit+) (= (unicode-category m) +unicode-category-title+))))) (defun string-capitalize-unicode (string &key (start 0) end (casing :simple)) ===================================== src/compiler/srctran.lisp ===================================== @@ -21,11 +21,6 @@ (in-package "C") (intl:textdomain "cmucl") -(defconstant +ascii-limit+ - 127 - "A character code strictly larger than this is handled using Unicode - rules.") - ;;; Source transform for Not, Null -- Internal ;;; ;;; Convert into an IF so that IF optimizations will eliminate redundant @@ -1814,8 +1809,7 @@ (round-it pos))))))) (defun round-derive-type-quot (number-type divisor-type) - (let* ((rem-type (rem-result-type number-type divisor-type)) - (number-interval (numeric-type->interval number-type)) + (let* ((number-interval (numeric-type->interval number-type)) (divisor-interval (numeric-type->interval divisor-type))) (let ((quot (round-quotient-bound (interval-div number-interval @@ -1824,9 +1818,7 @@ ,(or (interval-high quot) '*)))))) (defun round-derive-type-rem (number-type divisor-type) - (let* ((rem-type (rem-result-type number-type divisor-type)) - (number-interval (numeric-type->interval number-type)) - (divisor-interval (numeric-type->interval divisor-type))) + (let* ((rem-type (rem-result-type number-type divisor-type))) (multiple-value-bind (class format) (ecase rem-type (integer @@ -1840,13 +1832,6 @@ (values 'float nil)) (real (values nil nil))) - #+nil - (when (member rem-type '(float single-float double-float - #+long-float long-float - #+double-double double-double-float)) - (setf rem (interval-func #'(lambda (x) - (coerce x rem-type)) - rem))) (make-numeric-type :class class :format format :low nil ===================================== src/i18n/locale/cmucl.pot ===================================== @@ -5443,6 +5443,12 @@ msgstr "" msgid "The upper exclusive bound on the value of a Unicode codepoint" msgstr "" +#: src/code/char.lisp +msgid "" +"A character code strictly larger than this is handled using Unicode\n" +" rules." +msgstr "" + #: src/code/char.lisp msgid "" "Number of bits used for the index of the second stage table of the\n" @@ -19149,12 +19155,6 @@ msgstr "" msgid "FOREIGN-SYMBOL-ADDRESS flavor ~S is not :CODE or :DATA" msgstr "" -#: src/compiler/srctran.lisp -msgid "" -"A character code strictly larger than this is handled using Unicode\n" -" rules." -msgstr "" - #: src/compiler/srctran.lisp msgid "Function doesn't have fixed argument count." msgstr "" View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/92732c62ca7118fa87c172… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/92732c62ca7118fa87c172… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-336-3-standard-ignorable
by Raymond Toy (＠rtoy) 18 Jul '24

18 Jul '24

Raymond Toy pushed new branch issue-336-3-standard-ignorable at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-336-3-standard-igno… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-336-2-fix-compiler-notes
by Raymond Toy (＠rtoy) 17 Jul '24

17 Jul '24

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

1 0

[Git][cmucl/cmucl][master] 2 commits: Address #336: Fix compiler warnings in srctran.lisp
by Raymond Toy (＠rtoy) 17 Jul '24

17 Jul '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: a85f2a01 by Raymond Toy at 2024-07-17T16:44:16+00:00 Address #336: Fix compiler warnings in srctran.lisp - - - - - ba2176ab by Raymond Toy at 2024-07-17T16:44:27+00:00 Merge branch 'issue-336-1-fix-compiler-notes' into 'master' Address #336: Fix compiler warnings in srctran.lisp See merge request cmucl/cmucl!233 - - - - - 2 changed files: - src/compiler/srctran.lisp - src/compiler/x86/float-sse2.lisp Changes: ===================================== src/compiler/srctran.lisp ===================================== @@ -1809,8 +1809,7 @@ (round-it pos))))))) (defun round-derive-type-quot (number-type divisor-type) - (let* ((rem-type (rem-result-type number-type divisor-type)) - (number-interval (numeric-type->interval number-type)) + (let* ((number-interval (numeric-type->interval number-type)) (divisor-interval (numeric-type->interval divisor-type))) (let ((quot (round-quotient-bound (interval-div number-interval @@ -1819,9 +1818,7 @@ ,(or (interval-high quot) '*)))))) (defun round-derive-type-rem (number-type divisor-type) - (let* ((rem-type (rem-result-type number-type divisor-type)) - (number-interval (numeric-type->interval number-type)) - (divisor-interval (numeric-type->interval divisor-type))) + (let* ((rem-type (rem-result-type number-type divisor-type))) (multiple-value-bind (class format) (ecase rem-type (integer @@ -1835,13 +1832,6 @@ (values 'float nil)) (real (values nil nil))) - #+nil - (when (member rem-type '(float single-float double-float - #+long-float long-float - #+double-double double-double-float)) - (setf rem (interval-func #'(lambda (x) - (coerce x rem-type)) - rem))) (make-numeric-type :class class :format format :low nil ===================================== src/compiler/x86/float-sse2.lisp ===================================== @@ -773,10 +773,11 @@ (inst ,opinst x (,ea y))) (,stack-sc (inst ,opinst x (,ea-stack y))))) - ((and ,commutative (location= y r)) - ;; y = r and the operation is commutative, so just - ;; do the operation with r and x. - (inst ,opinst y x)) + ,@(when commutative + `(((location= y r) + ;; y = r and the operation is commutative, so just + ;; do the operation with r and x. + (inst ,opinst y x)))) ((not (location= r y)) ;; x, y, and r are three different regs. So just ;; move r to x and do the operation on r. @@ -1994,8 +1995,9 @@ `(cond ((location= x r) (inst ,opinst x y)) - ((and ,commutative (location= y r)) - (inst ,opinst y x)) + ,@(when commutative + `(((location= y r) + (inst ,opinst y x)))) ((not (location= r y)) (inst ,movinst r x) (inst ,opinst r y)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5c8483f87814f4d2423fcc… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/5c8483f87814f4d2423fcc… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Need to save the cross-compiled lisp
by Raymond Toy (＠rtoy) 15 Jul '24

15 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: 92732c62 by Raymond Toy at 2024-07-15T16:12:06-07:00 Need to save the cross-compiled lisp Add xdist directory to artifacts so that the cross-compiled build can be used for testing. Without this, the cross-test fails because it can't find the lisp to use. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -56,6 +56,12 @@ linux:cross-build: stage: build tags: - linux + artifacts: + paths: + - xdist/ + - linux-2/*.log + - linux-3/*.log + - linux-4/*.log needs: - job: linux:install artifacts: true View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/92732c62ca7118fa87c172c… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/92732c62ca7118fa87c172c… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][issue-337-cross-compile-linux-x86-fails] Add CI to do cross-compile and run unit-tests
by Raymond Toy (＠rtoy) 15 Jul '24

15 Jul '24

Raymond Toy pushed to branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl Commits: d76be25f by Raymond Toy at 2024-07-15T14:40:25-07:00 Add CI to do cross-compile and run unit-tests Do a cross-compile and then a native build to test the cross-compiler. Then use that result (in `xdist/bin/lisp`) to run the unit tests. These should work. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -52,6 +52,20 @@ linux:build: # describe return something that make-dist.sh doesn't like. - bin/make-dist.sh -V `git describe --dirty` -I dist linux-4 +linux:cross-build: + stage: build + tags: + - linux + needs: + - job: linux:install + artifacts: true + script: + - bin/create-target.sh xtarget + - bin/create-target.sh xcross + - bin/cross-build-world.sh -crl xtarget xcross src/tools/cross-scripts/cross-x86-x86.lisp snapshot/bin/lisp + - bin/build.sh $bootstrap -R -C "" -o xtarget/lisp/lisp + - bin/make-dist.sh -V `git describe --dirty` -I xdist linux-4 + linux:test: stage: test tags: @@ -67,6 +81,21 @@ linux:test: script: - bin/run-unit-tests.sh -l dist/bin/lisp 2>&1 | tee test.log +linux:cross-test: + stage: test + tags: + - linux + artifacts: + paths: + - ansi-test/test.out + - cross-test.log + needs: + # Needs artifacts from build (dist/) + - job: linux:cross-build + artifacts: true + script: + - bin/run-unit-tests.sh -l xdist/bin/lisp 2>&1 | tee cross-test.log + linux:ansi-test: stage: ansi-test tags: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d76be25f99317f2fd9df7aa… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/d76be25f99317f2fd9df7aa… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl] Pushed new branch issue-337-cross-compile-linux-x86-fails
by Raymond Toy (＠rtoy) 15 Jul '24

15 Jul '24

Raymond Toy pushed new branch issue-337-cross-compile-linux-x86-fails at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/issue-337-cross-compile-l… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0

[Git][cmucl/cmucl][master] 2 commits: Fix #333: LOAD :IF-DOES-NOT-EXIST is a generalized boolean
by Raymond Toy (＠rtoy) 14 Jul '24

14 Jul '24

Raymond Toy pushed to branch master at cmucl / cmucl Commits: decda1f5 by Raymond Toy at 2024-07-14T12:34:05+00:00 Fix #333: LOAD :IF-DOES-NOT-EXIST is a generalized boolean - - - - - 5c8483f8 by Raymond Toy at 2024-07-14T12:34:13+00:00 Merge branch 'issue-333-load-if-does-not-exist' into 'master' Fix #333: LOAD :IF-DOES-NOT-EXIST is a generalized boolean Closes #333 See merge request cmucl/cmucl!231 - - - - - 3 changed files: - src/code/load.lisp - src/compiler/fndb.lisp - tests/issues.lisp Changes: ===================================== src/code/load.lisp ===================================== @@ -565,7 +565,8 @@ (fasload filename) (sloload filename)) (let ((pn (merge-pathnames (pathname filename) - *default-pathname-defaults* nil))) + *default-pathname-defaults* nil)) + (if-does-not-exist (if if-does-not-exist :error nil))) (if (wild-pathname-p pn) (dolist (file (directory pn) t) (internal-load pn file if-does-not-exist contents ===================================== src/compiler/fndb.lisp ===================================== @@ -1119,7 +1119,7 @@ (defknown load ((or filename stream) - &key (:verbose t) (:print t) (:if-does-not-exist (member :error nil)) + &key (:verbose t) (:print t) (:if-does-not-exist t) (:if-source-newer (member :load-source :load-object :query :compile)) (:contents (or null (member :source :binary))) (:external-format t)) ===================================== tests/issues.lisp ===================================== @@ -1105,3 +1105,16 @@ (not (zerop n)))) (dolist (x '(0 1 1000)) (assert-equal (expected x) (fun x) x)))) + +(define-test issue.333.if-does-not-exist + (:tag :issues) + ;; "unknown.lisp" should be a file that doesn't exist. Verify that + ;; if :IF-DOES-NOT-EXIST is non-NIL we signal an error from LOAD. + ;; The first case is the old default value of :ERROR. + (assert-error 'file-error + (load "unknown.lisp" :if-does-not-exist :error)) + ;; :IF-DOES-NOT-EXIST is a generalized BOOLEAN, so non-NIL will + ;; signal an error too. + (assert-error 'file-error + (load "unknown.lisp" :if-does-not-exist t)) + (assert-false (load "unknown.lisp" :if-does-not-exist nil))) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/bf1475ce65e21ef3dd6fc1… -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/bf1475ce65e21ef3dd6fc1… You're receiving this email because of your account on gitlab.common-lisp.net.

1 0