common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Decrease parallel-exec total wall-clock time

Browse source 
Move the slowest compiler.pure test out (it was at least 6 sec)
and start the slowest tests first via a manually curated list.
This commit is contained in:
Douglas Katzman 2020-06-30 13:09:15 -04:00
parent 1dbad9cb90
commit 68c38676c3
3 changed files with 82 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tests/bug-1072739.pure.lisp Normal file
View file

@ -0,0 +1,51 @@
;; win32 is very specific about the order in which catch blocks
;; must be allocated on the stack
;;
;; This test is extremely slow, so it deserves its own file.
(with-test (:name (compile :bug-1072739) :slow t)
(checked-compile-and-assert (:optimize :safe)
`(lambda ()
(STRING=
(LET ((% 23))
(WITH-OUTPUT-TO-STRING (G13908)
(PRINC
(LET ()
(DECLARE (OPTIMIZE (SB-EXT:INHIBIT-WARNINGS 3)))
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13909) (PRINC %A%B% G13909) G13909)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13914)
(PRINC %A%B% G13914)
(PRINC "" G13914)
G13914)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13913)
(PRINC %A%B G13913)
(PRINC "%" G13913)
G13913)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13912)
(PRINC %A% G13912)
(PRINC "b%" G13912)
G13912)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13911)
(PRINC %A G13911)
(PRINC "%b%" G13911)
G13911)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13910)
(PRINC % G13910)
(PRINC "a%b%" G13910)
G13910)
(UNBOUND-VARIABLE NIL
(ERROR "Interpolation error in \"%a%b%\"
"))))))))))))))
G13908)))
"23a%b%"))
(() t)))

53
tests/compiler.pure.lisp
View file

@ -4945,59 +4945,6 @@
(logand (lognand a -6) (* b -502823994)))
((-1491588365 -3745511761) 1084329992)))
;; win32 is very specific about the order in which catch blocks
;; must be allocated on the stack
;;
;; This test is on the critical path. When started as the very first test,
;; it finishes as the last.
(with-test (:name (compile :bug-1072739) :slow t)
(checked-compile-and-assert (:optimize :safe)
`(lambda ()
(STRING=
(LET ((% 23))
(WITH-OUTPUT-TO-STRING (G13908)
(PRINC
(LET ()
(DECLARE (OPTIMIZE (SB-EXT:INHIBIT-WARNINGS 3)))
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13909) (PRINC %A%B% G13909) G13909)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13914)
(PRINC %A%B% G13914)
(PRINC "" G13914)
G13914)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13913)
(PRINC %A%B G13913)
(PRINC "%" G13913)
G13913)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13912)
(PRINC %A% G13912)
(PRINC "b%" G13912)
G13912)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13911)
(PRINC %A G13911)
(PRINC "%b%" G13911)
G13911)
(UNBOUND-VARIABLE NIL
(HANDLER-CASE
(WITH-OUTPUT-TO-STRING (G13910)
(PRINC % G13910)
(PRINC "a%b%" G13910)
G13910)
(UNBOUND-VARIABLE NIL
(ERROR "Interpolation error in \"%a%b%\"
"))))))))))))))
G13908)))
"23a%b%"))
(() t)))
(with-test (:name (compile equal equalp :transforms))
(let* ((s "foo")
(bit-vector #*11001100)

39
tests/parallel-exec.sh
View file

@ -15,20 +15,41 @@ TEST_DIRECTORY=$junkdir SBCL_HOME=../obj/sbcl-home exec ../src/runtime/sbcl \
(import '(sb-alien:alien-funcall sb-alien:extern-alien
sb-alien:int sb-alien:c-string sb-alien:unsigned))
(setq *summarize-test-times* t)
;;; Ordered approximately in descending order by running time
(defvar *slow-tests* '("threads.impure"
"seq.impure"
"threads.pure"
"compiler.pure"
"timer.impure"
"bug-1180102.impure"
"gethash-concurrency.impure"
"arith.pure"))
(defun choose-order (tests)
(sort tests
(lambda (a b)
(let ((posn-a (or (position a *slow-tests* :test #'string=)
most-positive-fixnum))
(posn-b (or (position b *slow-tests* :test #'string=)
most-positive-fixnum)))
(cond ((< posn-a posn-b) t)
((> posn-a posn-b) nil)
(t (string< a b)))))))
(defun parallel-execute-tests (max-jobs)
(format t "Using ~D processes~%" max-jobs)
;; Interleave the order in which all tests are launched rather than
;; starting them in the batches that filtering places them in.
(let ((files (sort (mapcar #'pathname-name
(let ((files (choose-order
(mapcar #'pathname-name
(append (pure-load-files)
(pure-cload-files)
(impure-load-files)
(impure-cload-files)
(sh-files)))
#'string<))
(sh-files)))))
(subprocess-count 0)
(subprocess-list nil)
(aggregate-vop-usage (make-hash-table))
;; Start timing only after all the DIRECTORY calls are done (above)
(start-time (get-internal-real-time))
(missing-usage)
(losing))
(labels ((wait ()
@ -39,15 +60,16 @@ TEST_DIRECTORY=$junkdir SBCL_HOME=../obj/sbcl-home exec ../src/runtime/sbcl \
(decf subprocess-count)
(let ((process (assoc pid subprocess-list)))
(setq subprocess-list (delete process subprocess-list))
(let* ((code (ash status -8))
(filename (cdr process)))
(let ((code (ash status -8))
(filename (cadr process))
(et (- (get-internal-real-time) (caddr process))))
(unless (sum-vop-usage (format nil "$logdir/~a.vop-usage" filename) t)
(when (or (search ".pure" filename) (search ".impure" filename))
(push filename missing-usage)))
(cond ((eq code 104)
(format t "~A: success~%" filename))
(format t "~A: success (~d msec)~%" filename et))
(t
(format t "~A: status ~D~%" filename code)
(format t "~A: status ~D (~d msec)~%" filename code et)
(push filename losing)))))))
(sum-vop-usage (input deletep)
(with-open-file (f input :if-does-not-exist nil)
@ -98,7 +120,7 @@ TEST_DIRECTORY=$junkdir SBCL_HOME=../obj/sbcl-home exec ../src/runtime/sbcl \
(exit :code (if (unexpected-failures) 1 104)))))
(format t "~A: pid ~d~%" file pid)
(incf subprocess-count)
(push (cons pid file) subprocess-list)))
(push (list pid file (get-internal-real-time)) subprocess-list)))
(loop (if (plusp subprocess-count) (wait) (return)))
(dolist (result '("vop-usage.txt" "vop-usage-combined.txt"))
@ -113,6 +135,7 @@ TEST_DIRECTORY=$junkdir SBCL_HOME=../obj/sbcl-home exec ../src/runtime/sbcl \
(format output "~7d ~s~%" (car cell) (cdr cell)))))
(sum-vop-usage "../output/warm-vop-usage.txt" nil))
(format t "~&Total realtime: ~d msec~%" (- (get-internal-real-time) start-time))
(when missing-usage
(format t "~&Missing vop-usage:~{ ~a~}~%" missing-usage))