0.pre7.8:

[sbcl.git] / src / cold / shared.lisp

diff --git a/src/cold/shared.lisp b/src/cold/shared.lisp
index 75a3b04..d088aa2 100644 (file)
--- a/src/cold/shared.lisp
+++ b/src/cold/shared.lisp
@@ -15,12 +15,26 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-;;; TO DO: Might it be possible to increase the efficiency of CMU CL's garbage
-;;; collection on my large (256Mb) machine by doing larger incremental GC steps
-;;; than the default 2 Mb of CMU CL 2.4.9? A quick test 19990729, setting this
-;;; to 5E6 showed no significant improvement, but it's possible that more
-;;; cleverness might help..
-;#+cmu (setf ext:*bytes-consed-between-gcs* (* 5 (expt 10 6)))
+;;; GC tuning has little effect on the x86 due to the generational
+;;; collector.  For the older stop & copy collector, it assuredly
+;;; does.  GC time is proportional to the amount of non-garbage
+;;; needing collection and copying; when the application involved is
+;;; the SBCL compiler, it doesn't take any longer to collect 20 Mb than
+;;; to collect 2 Mb. -dan, 20000819
+;;;
+;;; Actually, tweaking *BYTES-CONSED-BETWEEN-GCS* to 20Mb instead of
+;;; the default 2 seemed to make SBCL rebuild O(25%) faster on my 256
+;;; Mb K6/3, so I think it does have some effect on X86/GENCGC. I
+;;; haven't looked into why this would be, though. Also, I'm afraid
+;;; that using 20Mb here might be unfriendly to people using more-reasonable
+;;; machines (like old laptops with 48Mb of memory..) so I've
+;;; suppressed this tweak except for Alpha. -- WHN 2001-05-11
+#+(and sbcl alpha) ; SBCL/Alpha uses stop-and-copy, and Alphas have lotso RAM.
+(progn
+  (sb-ext:gc-off)
+  (setf (bytes-consed-between-gcs) (* 20 (expt 10 6)))
+  (sb-ext:gc-on)
+  (sb-ext:gc))
 
 ;;; FIXME: I'm now inclined to make all the bootstrap stuff run in CL-USER
 ;;; instead of SB-COLD. If I do so, I should first take care to
@@ -30,11 +44,6 @@
 (defpackage "SB-COLD" (:use "CL"))
 (in-package "SB-COLD")
 
-;;; prefix for source filename stems when cross-compiling
-(defvar *src-prefix* "src/")
-;;; (We don't bother to specify the source suffix here because ".lisp" is such
-;;; a good default value that we never have to specify it explicitly.)
-
 ;;; prefixes for filename stems when cross-compiling. These are quite arbitrary
 ;;; (although of course they shouldn't collide with anything we don't want to
 ;;; write over). In particular, they can be either relative path names (e.g.
@@ -265,7 +274,7 @@
 
 (defparameter *stems-and-flags* (read-from-file "stems-and-flags.lisp-expr"))
 
-(defmacro for-stems-and-flags ((stem flags) &body body)
+(defmacro do-stems-and-flags ((stem flags) &body body)
   (let ((stem-and-flags (gensym "STEM-AND-FLAGS-")))
     `(dolist (,stem-and-flags *stems-and-flags*)
        (let ((,stem (first ,stem-and-flags))
@@ -274,7 +283,7 @@
 
 ;;; Check for stupid typos in FLAGS list keywords.
 (let ((stems (make-hash-table :test 'equal)))
-  (for-stems-and-flags (stem flags)
+  (do-stems-and-flags (stem flags)
     (if (gethash stem stems)
       (error "duplicate stem ~S in stems-and-flags data" stem)
       (setf (gethash stem stems) t))
@@ -306,7 +315,6 @@
   (load (in-host-compilation-mode
          (lambda ()
            (compile-stem stem
-                         :src-prefix *src-prefix*
                          :obj-prefix *host-obj-prefix*
                          :obj-suffix *host-obj-suffix*
                          :compile-file #'cl:compile-file
@@ -332,7 +340,6 @@
   (funcall *in-target-compilation-mode-fn*
           (lambda ()
             (compile-stem stem
-                          :src-prefix *src-prefix*
                           :obj-prefix *target-obj-prefix*
                           :obj-suffix *target-obj-suffix*
                           :ignore-failure-p ignore-failure-p