From gitlab at common-lisp.net Wed Sep 2 05:21:26 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Wed, 02 Sep 2020 05:21:26 +0000 Subject: [Git][cmucl/cmucl] Pushed new branch rtoy-issue-87-add-cl-bench Message-ID: <5f4f2bd62f9f7_8733fb1c06ae8501072e@common-lisp.net.mail> Raymond Toy pushed new branch rtoy-issue-87-add-cl-bench at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/rtoy-issue-87-add-cl-bench You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 18:03:55 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 18:03:55 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] Store the results in our directory instead of /var/tmp Message-ID: <5f52818b3abae_216a1d3f8aba1046988326a@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: f15977bd by Raymond Toy at 2020-09-04T11:03:27-07:00 Store the results in our directory instead of /var/tmp Adjust where the reports are stored when running the benchmarks and where the reports are read from. Instead of /var/tmp, use cl-bench/results. This will make it easier to find these files in CI. - - - - - 2 changed files: - benchmarks/cl-bench/report.lisp - benchmarks/cl-bench/support.lisp Changes: ===================================== benchmarks/cl-bench/report.lisp ===================================== @@ -14,18 +14,28 @@ (in-package :cl-user) +(defvar *benchmark-file-directory* + (merge-pathnames (make-pathname :directory '(:relative "results")) + (make-pathname :directory (pathname-directory *load-truename*))) + "Directory where the benchmark report file is stored") + (defconstant +implementation+ (concatenate 'string (lisp-implementation-type) " " (lisp-implementation-version))) (defun bench-analysis () - (let (data implementations benchmarks) - (dolist (f (directory "/var/tmp/CL-benchmark*.*")) + (let ((benchmark-path (concatenate 'string + (namestring *benchmark-file-directory*) + "CL-benchmark*.*")) + data implementations benchmarks) + (dolist (f (directory benchmark-path)) + (format t "*** f = ~A~%" f) (ignore-errors (with-open-file (f f :direction :input) (let ((*read-eval* nil)) (push (read f) data))))) + (format t "*** data = ~A~%" data) (setq implementations (delete +implementation+ (mapcar #'car data) :test #'string=)) (setq benchmarks (reverse (mapcar #'first (cdr (first data))))) (format t "~25a~10 at a" "Benchmark" "Reference") ===================================== benchmarks/cl-bench/support.lisp ===================================== @@ -21,6 +21,10 @@ (defvar *benchmarks* '()) (defvar *benchmark-results* '()) +(defvar *benchmark-file-directory* + (merge-pathnames (make-pathname :directory '(:relative "results")) + (make-pathname :directory (pathname-directory *load-truename*))) + "Directory where the benchmark report file is stored") (defvar +implementation+ (concatenate 'string @@ -117,11 +121,14 @@ (defun benchmark-report-file () + (ensure-directories-exist *benchmark-file-directory*) (multiple-value-bind (second minute hour date month year) (get-decoded-time) (declare (ignore second)) + ;; Should we use pathnames directly instead of creating a string + ;; naming the file? (format nil "~aCL-benchmark-~d~2,'0d~2,'0dT~2,'0d~2,'0d" - #+win32 "" #-win32 "/var/tmp/" + *benchmark-file-directory* year month date hour minute))) ;; grr, CLISP doesn't implement ~<..~:> View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f15977bd7d814fd5ea30cf0884e57cb7eea2d520 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/f15977bd7d814fd5ea30cf0884e57cb7eea2d520 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 19:06:47 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 19:06:47 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] 3 commits: Ignore files created from running the benchmarks Message-ID: <5f529047b7c3b_216a1d3f8aba1056388344a@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: 682553a2 by Raymond Toy at 2020-09-04T12:02:03-07:00 Ignore files created from running the benchmarks - - - - - ab2992c3 by Raymond Toy at 2020-09-04T12:04:40-07:00 Make run-cmucl.sh executable - - - - - a68d0c37 by Raymond Toy at 2020-09-04T12:06:37-07:00 Run benchmarks Run the benchmarks using the snapshot and then with the newly built version. Generate a report too. The benchmark results are added to the artifacts. - - - - - 3 changed files: - .gitlab-ci.yml - + benchmarks/cl-bench/files/.gitignore - benchmarks/cl-bench/run-cmucl.sh Changes: ===================================== .gitlab-ci.yml ===================================== @@ -7,6 +7,7 @@ linux-runner: artifacts: paths: - ansi-test/test.out + - benchmarks/cl-bench/results tags: - linux before_script: @@ -22,7 +23,11 @@ linux-runner: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - - grep 'No unexpected \(successes\|failures\)' test.out + - grep 'No unexpected \(successes\|failures\)' test.out + - cd ../benchmarks/cl-bench + - CMUCL=../../snapshot/bin/lisp run-cmucl.sh + - CMUCL=../../dist/bin/lisp run-cmucl.sh + - ../../snapshot/bin/lisp -load report osx-runner: artifacts: ===================================== benchmarks/cl-bench/files/.gitignore ===================================== @@ -0,0 +1,13 @@ +/arrays.olisp +/bignum.olisp +/boehm-gc.olisp +/clos-janderson.olisp +/clos.olisp +/crc40.olisp +/deflate.olisp +/gabriel.olisp +/hash.olisp +/math.olisp +/misc.olisp +/ratios.olisp +/richards.olisp ===================================== benchmarks/cl-bench/run-cmucl.sh ===================================== View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f15977bd7d814fd5ea30cf0884e57cb7eea2d520...a68d0c37caab0e58c5c0a54d0d6420d085ae2185 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/f15977bd7d814fd5ea30cf0884e57cb7eea2d520...a68d0c37caab0e58c5c0a54d0d6420d085ae2185 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 19:18:10 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 19:18:10 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] Add some debug Message-ID: <5f5292f2572a7_216a1d3f8aba10446883815@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: 0dea3bcf by Raymond Toy at 2020-09-04T12:17:52-07:00 Add some debug Figure out why run-cmucl.sh doesn't exist, preventing us from running the benchmarks. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -25,6 +25,8 @@ linux-runner: - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected \(successes\|failures\)' test.out - cd ../benchmarks/cl-bench + - echo $PWD + - ls - CMUCL=../../snapshot/bin/lisp run-cmucl.sh - CMUCL=../../dist/bin/lisp run-cmucl.sh - ../../snapshot/bin/lisp -load report View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0dea3bcfd2bdc218d3fbee6af5ab630b93acb018 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/0dea3bcfd2bdc218d3fbee6af5ab630b93acb018 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 21:10:32 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 21:10:32 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] Add dir prefix to run run-cmucl.sh Message-ID: <5f52ad48580eb_216a1d3f8ac45ab2c884280@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: a7b237ae by Raymond Toy at 2020-09-04T14:10:18-07:00 Add dir prefix to run run-cmucl.sh Use ./run-cmucl.sh instead of run-cmucl.sh since . is probably not in $PATH. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -27,8 +27,8 @@ linux-runner: - cd ../benchmarks/cl-bench - echo $PWD - ls - - CMUCL=../../snapshot/bin/lisp run-cmucl.sh - - CMUCL=../../dist/bin/lisp run-cmucl.sh + - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh + - CMUCL=../../dist/bin/lisp ./run-cmucl.sh - ../../snapshot/bin/lisp -load report osx-runner: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a7b237ae755f8e825b75355568cb6c553b4f18f3 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/a7b237ae755f8e825b75355568cb6c553b4f18f3 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 21:29:06 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 21:29:06 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] Set output file for FPRINT benchmark. Message-ID: <5f52b1a2585be_216a1d3f8aba105200846b0@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: bc890d42 by Raymond Toy at 2020-09-04T14:28:55-07:00 Set output file for FPRINT benchmark. The FPRINT benchmark needs a file and it was set to "/tmp/fprint.tst", which doesn't exist on gitlab CI. Just use "./tmp/fprint.tst". Let CI recipes create the "tmp" directory so the scripts don't need to. - - - - - 2 changed files: - .gitlab-ci.yml - benchmarks/cl-bench/files/gabriel.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -27,6 +27,7 @@ linux-runner: - cd ../benchmarks/cl-bench - echo $PWD - ls + - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh - ../../snapshot/bin/lisp -load report ===================================== benchmarks/cl-bench/files/gabriel.lisp ===================================== @@ -1018,7 +1018,9 @@ ;;; FPRINT -- Benchmark to print to a file. -(defparameter +fread-temporary-pathname+ "/tmp/fprint.tst") +(defparameter +fread-temporary-pathname+ + "./tmp/fprint.tst" + "Temporary file used for benchmarking fread") (defvar *fprint-test-atoms* '(abcdef12 cdefgh23 efghij34 ghijkl45 ijklmn56 klmnop67 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bc890d42e09aed670c319539ff1f22924accb34d -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/bc890d42e09aed670c319539ff1f22924accb34d You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 21:40:31 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 21:40:31 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] 2 commits: Remove debugging print Message-ID: <5f52b44fb47b3_216a1d3f8aba104cd8848c6@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: 5551b146 by Raymond Toy at 2020-09-04T14:39:07-07:00 Remove debugging print - - - - - 42e0a041 by Raymond Toy at 2020-09-04T14:40:19-07:00 Run benchmarks on OSX * Remove some debugging script lines * Copy the linux script to run on osx - - - - - 2 changed files: - .gitlab-ci.yml - benchmarks/cl-bench/report.lisp Changes: ===================================== .gitlab-ci.yml ===================================== @@ -25,8 +25,6 @@ linux-runner: - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected \(successes\|failures\)' test.out - cd ../benchmarks/cl-bench - - echo $PWD - - ls - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh @@ -51,3 +49,8 @@ osx-runner: - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected \(successes\|failures\)' test.out + - cd ../benchmarks/cl-bench + - mkdir tmp + - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh + - CMUCL=../../dist/bin/lisp ./run-cmucl.sh + - ../../snapshot/bin/lisp -load report ===================================== benchmarks/cl-bench/report.lisp ===================================== @@ -30,7 +30,6 @@ "CL-benchmark*.*")) data implementations benchmarks) (dolist (f (directory benchmark-path)) - (format t "*** f = ~A~%" f) (ignore-errors (with-open-file (f f :direction :input) (let ((*read-eval* nil)) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/bc890d42e09aed670c319539ff1f22924accb34d...42e0a04132ee3cdc545550db3ef89e0be561cc0b -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/bc890d42e09aed670c319539ff1f22924accb34d...42e0a04132ee3cdc545550db3ef89e0be561cc0b You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Fri Sep 4 22:08:03 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Fri, 04 Sep 2020 22:08:03 +0000 Subject: [Git][cmucl/cmucl][rtoy-issue-87-add-cl-bench] Add benchmark path to artifacts Message-ID: <5f52bac34e74_216a1d3f8ab9aeadfc850e7@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-issue-87-add-cl-bench at cmucl / cmucl Commits: ea0601c0 by Raymond Toy at 2020-09-04T15:05:41-07:00 Add benchmark path to artifacts Forgot to copy the artifacts path from linux to mac so that we save the benchmark results. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -34,6 +34,7 @@ osx-runner: artifacts: paths: - ansi-test/test.out + - benchmarks/cl-bench/results tags: - osx before_script: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ea0601c06181f3929bdec8d87476761b2d62a769 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ea0601c06181f3929bdec8d87476761b2d62a769 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 02:38:43 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 02:38:43 +0000 Subject: [Git][cmucl/cmucl][master] 2 commits: Add CL-bench Message-ID: <5f52fa336af4_216a1d3f8aba104698872a5@common-lisp.net.mail> Raymond Toy pushed to branch master at cmucl / cmucl Commits: 6ae9025c by Raymond Toy at 2020-09-05T02:38:38+00:00 Add CL-bench >From Eric Marsden at http://emarsden.chez.com/downloads/cl-bench.tar.gz. Checked in as is. - - - - - 09c8327a by Raymond Toy at 2020-09-05T02:38:39+00:00 Merge branch 'rtoy-issue-87-add-cl-bench' into 'master' Fix #87: Add cl-bench to CI Closes #87 See merge request cmucl/cmucl!55 - - - - - 17 changed files: - .gitlab-ci.yml - + benchmarks/cl-bench/Makefile - + benchmarks/cl-bench/NEWS - + benchmarks/cl-bench/README - + benchmarks/cl-bench/TODO - + benchmarks/cl-bench/defpackage.lisp - + benchmarks/cl-bench/do-compilation-script.lisp - + benchmarks/cl-bench/do-execute-script.lisp - + benchmarks/cl-bench/do-interpret-script.lisp - + benchmarks/cl-bench/files/.gitignore - + benchmarks/cl-bench/files/arrays.lisp - + benchmarks/cl-bench/files/bignum.lisp - + benchmarks/cl-bench/files/boehm-gc.lisp - + benchmarks/cl-bench/files/cl-ppcre/api.lisp - + benchmarks/cl-bench/files/cl-ppcre/cl-ppcre-test.system - + benchmarks/cl-bench/files/cl-ppcre/cl-ppcre.system - + benchmarks/cl-bench/files/cl-ppcre/closures.lisp The diff was not included because it is too large. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/69064be1625fc725cbc5025fa1517d893cbaaa8a...09c8327acd74339e938f3fcb15da61e44df6d7d1 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/69064be1625fc725cbc5025fa1517d893cbaaa8a...09c8327acd74339e938f3fcb15da61e44df6d7d1 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 17:27:15 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 17:27:15 +0000 Subject: [Git][cmucl/cmucl] Pushed new branch rtoy-refactor-ci-config Message-ID: <5f53ca738c8e2_216a1d3f8aba105c8c89637@common-lisp.net.mail> Raymond Toy pushed new branch rtoy-refactor-ci-config at cmucl / cmucl -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/tree/rtoy-refactor-ci-config You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 17:33:05 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 17:33:05 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Set up artifacts between install and build Message-ID: <5f53cbd124046_216a1d3f8aba105dcc902b5@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: e6dc62db by Raymond Toy at 2020-09-05T10:32:55-07:00 Set up artifacts between install and build In the build stage, keep the ansi-test and snapshot directories around because we need that for running the tests. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,11 +9,17 @@ stages: - test - benchmark +cache: + linux:install: stage: install tags: - linux + artifacts: + paths: + - ansi-test/ + - snapshot/ script: - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) @@ -26,6 +32,9 @@ linux:build: stage: build tags: - linux + needs: + - job: linux:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 @@ -61,6 +70,10 @@ osx:install: stage: install tags: - osx + artifacts: + paths: + - ansi-test/ + - snapshot/ script: - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) @@ -72,6 +85,9 @@ osx:build: stage: install tags: - osx + needs: + - job: osx:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist darwin-4 View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e6dc62dba11e1b09cd37b22a442c62a0bd458f5e -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e6dc62dba11e1b09cd37b22a442c62a0bd458f5e You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 17:38:25 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 17:38:25 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Fix typo in osx:build Message-ID: <5f53cd1164c92_216a1d3f8aba10582c904a6@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: c56210cd by Raymond Toy at 2020-09-05T10:38:16-07:00 Fix typo in osx:build Stage was "install", but should have benn "build". - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -82,7 +82,7 @@ osx:install: - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) osx:build: - stage: install + stage: build tags: - osx needs: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c56210cd8302c93572252828866c408d22960999 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c56210cd8302c93572252828866c408d22960999 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 17:52:53 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 17:52:53 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Save the dist directory Message-ID: <5f53d075f2a35_216a1d3f8ab9aeafb49086@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: 86e84ae7 by Raymond Toy at 2020-09-05T10:52:45-07:00 Save the dist directory Needed for the test stage. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -32,13 +32,15 @@ linux:build: stage: build tags: - linux + artifacts: + paths: + - dist/ needs: - job: linux:install artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 - - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log linux:test: stage: test @@ -48,6 +50,7 @@ linux:test: paths: - ansi-test/test.out script: + - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected \(successes\|failures\)' test.out @@ -85,6 +88,9 @@ osx:build: stage: build tags: - osx + artifacts: + paths: + - dist/ needs: - job: osx:install artifacts: true View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/86e84ae78910d110b475d2ce62238d1248cfdeaa -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/86e84ae78910d110b475d2ce62238d1248cfdeaa You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 18:06:42 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 18:06:42 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Set up dependencies some more Message-ID: <5f53d3b266b64_216a1d3f8aba104aa8910a9@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: 08bbf9f9 by Raymond Toy at 2020-09-05T11:06:32-07:00 Set up dependencies some more - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -49,6 +49,9 @@ linux:test: artifacts: paths: - ansi-test/test.out + needs: + - job: linux:build + artifacts: true script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -62,6 +65,9 @@ linux:benchmark: artifacts: paths: - benchmarks/cl-bench/results + needs: + - job: linux:build + artifacts: true script: - cd ../benchmarks/cl-bench - mkdir tmp @@ -105,6 +111,9 @@ osx:test: artifacts: paths: - ansi-test/test.out + needs: + - job: osx:build + artifacts: true script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -118,6 +127,9 @@ osx:benchmark: artifacts: paths: - benchmarks/cl-bench/results + needs: + - job: osx:build + artifacts: true script: - cd ../benchmarks/cl-bench - mkdir tmp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/08bbf9f9b933cae2365c3f8733cf882ce468a97f -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/08bbf9f9b933cae2365c3f8733cf882ce468a97f You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 18:24:30 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 18:24:30 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Update test and benchmark dependencies Message-ID: <5f53d7de37700_216a1d3f8aba105a5c916a9@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: b2e80b1f by Raymond Toy at 2020-09-05T11:24:19-07:00 Update test and benchmark dependencies Test stage needs the artifacts from the install and build stage because it needs the ansi-test directory and the dist directory Benchmark needs the same but because it needs the snapshot directory and the dist directory so benchmarks can be run using the snapshot and the latest build. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -50,8 +50,10 @@ linux:test: paths: - ansi-test/test.out needs: - - job: linux:build + # Needs artifacts from install (ansi-test/) and build (dist/) + - job: linux:install artifacts: true + - job: linux:build script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -66,8 +68,10 @@ linux:benchmark: paths: - benchmarks/cl-bench/results needs: - - job: linux:build + # Needs artifacts from install (snapshot/) and build (dist/) + - job: linux:install artifacts: true + - job: linux:build script: - cd ../benchmarks/cl-bench - mkdir tmp @@ -112,8 +116,10 @@ osx:test: paths: - ansi-test/test.out needs: - - job: osx:build + # Needs artifacts from install (ansi-test/) and build (dist/) + - job: osx:install artifacts: true + - job: osx:build script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -128,8 +134,10 @@ osx:benchmark: paths: - benchmarks/cl-bench/results needs: - - job: osx:build + # Needs artifacts from install (snapshot/) and build (dist/) + - job: osx:install artifacts: true + - job: osx:build script: - cd ../benchmarks/cl-bench - mkdir tmp View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b2e80b1f89749dbafada6f3524bbcc715d2db8b2 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/b2e80b1f89749dbafada6f3524bbcc715d2db8b2 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 18:41:21 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 18:41:21 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Fix benchmark stage Message-ID: <5f53dbd1d9a96_216a1d3f8ac45aabe892065@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: 95678947 by Raymond Toy at 2020-09-05T11:41:11-07:00 Fix benchmark stage We were cd'ing to the wrong directory (because we start at the root of the build). The stage for osx:benchmark was incorrectly set to test instead of benchmark. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -73,7 +73,7 @@ linux:benchmark: artifacts: true - job: linux:build script: - - cd ../benchmarks/cl-bench + - cd benchmarks/cl-bench - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh @@ -127,7 +127,7 @@ osx:test: - grep 'No unexpected \(successes\|failures\)' test.out osx:benchmark: - stage: test + stage: benchmark tags: - osx artifacts: @@ -139,7 +139,7 @@ osx:benchmark: artifacts: true - job: osx:build script: - - cd ../benchmarks/cl-bench + - cd benchmarks/cl-bench - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/956789478fdd540508f0b1ef9af809f74541acb7 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/956789478fdd540508f0b1ef9af809f74541acb7 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 19:52:47 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 19:52:47 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Add test.log to artifacts Message-ID: <5f53ec8ff4017_216a1d3f8ac45aaf589244c@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: ae2b154c by Raymond Toy at 2020-09-05T12:52:36-07:00 Add test.log to artifacts Save the test.log from running our testsuite to the artifacts - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -49,6 +49,7 @@ linux:test: artifacts: paths: - ansi-test/test.out + - test.log needs: # Needs artifacts from install (ansi-test/) and build (dist/) - job: linux:install @@ -115,6 +116,7 @@ osx:test: artifacts: paths: - ansi-test/test.out + - test.log needs: # Needs artifacts from install (ansi-test/) and build (dist/) - job: osx:install View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ae2b154cdeac9b09541e69251b4da6dcd95f4583 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/ae2b154cdeac9b09541e69251b4da6dcd95f4583 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 20:17:05 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 20:17:05 +0000 Subject: [Git][cmucl/cmucl][rtoy-refactor-ci-config] Clone ansi-test in the test stage instead of install. Message-ID: <5f53f2412a2ff_216a1d3f8aba10414892943@common-lisp.net.mail> Raymond Toy pushed to branch rtoy-refactor-ci-config at cmucl / cmucl Commits: c544cad2 by Raymond Toy at 2020-09-05T13:15:54-07:00 Clone ansi-test in the test stage instead of install. Then the install stage doesn't need to save the ansi-test directory, which isn't used until the test stage anyway. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -18,11 +18,8 @@ linux:install: - linux artifacts: paths: - - ansi-test/ - snapshot/ script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) - wget -nv $download_url/cmucl-$version-linux.tar.bz2 - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2 - mkdir snapshot @@ -51,10 +48,12 @@ linux:test: - ansi-test/test.out - test.log needs: - # Needs artifacts from install (ansi-test/) and build (dist/) - - job: linux:install - artifacts: true + # Needs artifacts from build (dist/) - job: linux:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test @@ -86,11 +85,8 @@ osx:install: - osx artifacts: paths: - - ansi-test/ - snapshot/ script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) - curl -s -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) @@ -118,10 +114,12 @@ osx:test: - ansi-test/test.out - test.log needs: - # Needs artifacts from install (ansi-test/) and build (dist/) - - job: osx:install - artifacts: true + # Needs artifacts from build (dist/) - job: osx:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c544cad209608ae87196c0099c62a4f3030023ca -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/c544cad209608ae87196c0099c62a4f3030023ca You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gitlab at common-lisp.net Sat Sep 5 20:38:04 2020 From: gitlab at common-lisp.net (Raymond Toy) Date: Sat, 05 Sep 2020 20:38:04 +0000 Subject: [Git][cmucl/cmucl][master] 2 commits: Refactor CI into stages Message-ID: <5f53f72c19c55_216a1d3f8aba1047889356@common-lisp.net.mail> Raymond Toy pushed to branch master at cmucl / cmucl Commits: 616b30dc by Raymond Toy at 2020-09-05T20:37:58+00:00 Refactor CI into stages Refactor CI into 4 stages: install, build, test, benchmark - - - - - 932884a4 by Raymond Toy at 2020-09-05T20:37:58+00:00 Merge branch 'rtoy-refactor-ci-config' into 'master' Refactor CI in to multiple stages See merge request cmucl/cmucl!56 - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -3,54 +3,143 @@ variables: version: "2020-04-x86" bootstrap: "" -linux-runner: - artifacts: - paths: - - ansi-test/test.out - - benchmarks/cl-bench/results +stages: + - install + - build + - test + - benchmark + +cache: + + +linux:install: + stage: install tags: - linux - before_script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + artifacts: + paths: + - snapshot/ + script: - wget -nv $download_url/cmucl-$version-linux.tar.bz2 - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2) + +linux:build: + stage: build + tags: + - linux + artifacts: + paths: + - dist/ + needs: + - job: linux:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist linux-4 + +linux:test: + stage: test + tags: + - linux + artifacts: + paths: + - ansi-test/test.out + - test.log + needs: + # Needs artifacts from build (dist/) + - job: linux:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected \(successes\|failures\)' test.out - - cd ../benchmarks/cl-bench + +linux:benchmark: + stage: benchmark + tags: + - linux + artifacts: + paths: + - benchmarks/cl-bench/results + needs: + # Needs artifacts from install (snapshot/) and build (dist/) + - job: linux:install + artifacts: true + - job: linux:build + script: + - cd benchmarks/cl-bench - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh - ../../snapshot/bin/lisp -load report -osx-runner: - artifacts: - paths: - - ansi-test/test.out - - benchmarks/cl-bench/results +osx:install: + stage: install tags: - osx - before_script: - - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git - - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + artifacts: + paths: + - snapshot/ + script: - curl -s -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2 - mkdir snapshot - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2) + +osx:build: + stage: build + tags: + - osx + artifacts: + paths: + - dist/ + needs: + - job: osx:install + artifacts: true script: - bin/build.sh $bootstrap -R -C "" -o snapshot/bin/lisp - bin/make-dist.sh -I dist darwin-4 + +osx:test: + stage: test + tags: + - osx + artifacts: + paths: + - ansi-test/test.out + - test.log + needs: + # Needs artifacts from build (dist/) + - job: osx:build + artifacts: true + before_script: + - git clone https://gitlab.common-lisp.net/ansi-test/ansi-test.git + - (cd ansi-test; git checkout rtoy-cmucl-expected-failures) + script: - bin/run-tests.sh -l dist/bin/lisp 2>&1 | tee test.log - cd ansi-test - make LISP="../dist/bin/lisp -batch -noinit -nositeinit" - grep 'No unexpected \(successes\|failures\)' test.out - - cd ../benchmarks/cl-bench + +osx:benchmark: + stage: benchmark + tags: + - osx + artifacts: + paths: + - benchmarks/cl-bench/results + needs: + # Needs artifacts from install (snapshot/) and build (dist/) + - job: osx:install + artifacts: true + - job: osx:build + script: + - cd benchmarks/cl-bench - mkdir tmp - CMUCL=../../snapshot/bin/lisp ./run-cmucl.sh - CMUCL=../../dist/bin/lisp ./run-cmucl.sh View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/09c8327acd74339e938f3fcb15da61e44df6d7d1...932884a4b406572614a9830bf864738a0c3a5700 -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/compare/09c8327acd74339e938f3fcb15da61e44df6d7d1...932884a4b406572614a9830bf864738a0c3a5700 You're receiving this email because of your account on gitlab.common-lisp.net. -------------- next part -------------- An HTML attachment was scrubbed... URL: