Changeset 12187 in project

Timestamp:

10/17/08 14:11:50 (12 years ago)

Author:

felix winkelmann

Message:

additional benchmark run, bugfixes, enabled local inlining for programs, new bootstrap tarball

Location:

chicken/branches/cmi

Files:

• NEWS (modified) (1 diff)
• TODO (modified) (1 diff)
• benchmarks/cscbench.scm (modified) (4 diffs)
• bootstrap.tar.gz (modified) (previous)
• chicken.scm (modified) (1 diff)
• defaults.make (modified) (1 diff)
• manual/Declarations (modified) (1 diff)
• manual/Using the compiler (modified) (1 diff)
• setup-api.scm (modified) (4 diffs)
• support.scm (modified) (2 diffs)

chicken/branches/cmi/NEWS

@@ -40 +40 @@
   -optimize-level 3: enables -inline -local (but *not* -unsafe)
   -optimize-level 4: enables -inline -local -unsafe
+- increased default inlining-limit to 20
 - support for cross-module inlining
 - "make <VARIABLES> bench" runs the benchmark suite

chicken/branches/cmi/TODO

@@ -48 +48 @@
 ** -emit-inline-file makes only sense with -inline-global and -local
    what should imply what?
-** test global inlining (using .inline files)
+** test build with -O3 for all .scm files
+   compare binary-sizes and performance
+** make sure hooks are not inlined
 
 * runtime

chicken/branches/cmi/benchmarks/cscbench.scm

@@ -103 +103 @@
   (display "\nRunning benchmarks ...\n\n  (averaging over 5 runs, dropping highest and lowest, binaries are statically linked and stripped)\n")
   (display "\n                     (runtime)                      (code size)\n")
-  (display "\n                     base     unsafe        max     base     unsafe       max")
-  (display "\n                  -------------------------------------------------------------\n")
+  (display "\n                     base       fast     unsafe        max      base      fast    unsafe       max")
+  (display "\n                  ----------------------------------------------------------------------------------\n")
   (let ((sum-base 0.0)
+        (sum-fast 0.0)
         (sum-unsafe 0.0)
         (sum-max 0.0)
         (size-base 0)
+        (size-fast 0)
         (size-unsafe 0)
         (size-max 0))
@@ -122 +124 @@
           (compile-and-run
            file
-           "-debug-level 0 -optimize-level 1 -lambda-lift" 
+           "-debug-level 0 -optimize-level 1" 
            options "" #f))
          (set! sum-base (+ sum-base t))
+         (dflush "  ")
+         (set!-values 
+          (t size-fast)
+          (compile-and-run
+           file
+           "-debug-level 0 -optimize-level 3 -lambda-lift" 
+           options "" #f))
+         (set! sum-fast (+ sum-fast t))
          (dflush "  ")
          (set!-values
@@ -130 +140 @@
           (compile-and-run 
            file
-           "-debug-level 0 -optimize-level 3 -block -disable-interrupts -lambda-lift" 
+           "-debug-level 0 -optimize-level 4 -block -disable-interrupts -lambda-lift" 
            options "" #t))
          (set! sum-unsafe (+ sum-unsafe t))
          (dflush "  ")
-         (unless (member name flonum-files)
-           (set!-values
-            (t size-max)
-            (compile-and-run file "-benchmark-mode" options "" #t) )
-           (set! sum-max (+ sum-max t)))
+         (cond ((member name flonum-files)
+                (display "         "))
+               (else
+                (set!-values
+                 (t size-max)
+                 (compile-and-run file "-benchmark-mode" options "" #t) )
+                (set! sum-max (+ sum-max t))))
          (display-size size-base)
+         (display-size size-fast)
          (display-size size-unsafe)
          (display-size size-max)
@@ -148 +161 @@
     (display-f-4.3 sum-base)
     (display "   ")
+    (display-f-4.3 sum-fast)
+    (display "   ")
     (display-f-4.3 sum-unsafe)
     (display "   ")

chicken/branches/cmi/chicken.scm

@@ -118 +118 @@
                    [(0) #f]
                    [(1)
-                    (set! options (cons* 'optimize-leaf-routines options)) ]
+                    (set! options (cons 'optimize-leaf-routines options)) ]
                    [(2)
-                    (set! options
-                      (cons 'optimize-leaf-routines options) ) ] 
+                    (set! options (cons 'optimize-leaf-routines options)) ] 
                    [(3)
                     (set! options

chicken/branches/cmi/defaults.make

@@ -318 +318 @@
 endif
 CHICKEN_LIBRARY_OPTIONS = $(CHICKEN_OPTIONS) -explicit-use
-CHICKEN_PROGRAM_OPTIONS = $(CHICKEN_OPTIONS) -no-lambda-info
+CHICKEN_PROGRAM_OPTIONS = $(CHICKEN_OPTIONS) -no-lambda-info -inline -local
 CHICKEN_COMPILER_OPTIONS = $(CHICKEN_PROGRAM_OPTIONS) -extend private-namespace.scm
 CHICKEN_UNSAFE_OPTIONS = -unsafe -no-lambda-info

chicken/branches/cmi/manual/Declarations

@@ -163 +163 @@
  [declaration specifier] (inline-limit THRESHOLD)
 
-Sets the maximum size of procedures which may potentially be inlined. The default threshold is {{10}}.
+Sets the maximum size of procedures which may potentially be inlined. The default threshold is {{20}}.
 
 

chicken/branches/cmi/manual/Using the compiler

@@ -124 +124 @@
 ; -inline-global : Enable cross-module inlining.
 
-; -inline-limit THRESHOLD : Sets the maximum size of a potentially inlinable procedure. The default threshold is {{10}}.
+; -inline-limit THRESHOLD : Sets the maximum size of a potentially inlinable procedure. The default threshold is {{20}}.
 
 ; -keyword-style STYLE : Enables alternative keyword syntax, where {{STYLE}} may be either {{prefix}} (as in Common Lisp), {{suffix}} (as in DSSSL) or {{none}}. Any other value is ignored. The default is {{suffix}}.

chicken/branches/cmi/setup-api.scm

@@ -126 +126 @@
 
 (define *major-version* (##sys#fudge 41))
-(define *default-eggdir* (conc "eggs/" *major-version*))
 
 (define *sudo* #f)
@@ -136 +135 @@
 (define *windows-shell* (or (eq? *windows* 'mingw32)
                             (eq? *windows* 'msvc)))
-(define *debug* #f)
 
 (register-feature! 'chicken-setup)
@@ -169 +167 @@
 (define *ranlib-command* "ranlib")
 (define *csc-options* '())
-(define *dont-ask* #f)
 (define *base-directory* (current-directory))
 
@@ -189 +186 @@
 ; be converted to a number, then it is kept as a string.
 
-(define (version-string->numbers string)
+#;(define (version-string->numbers string)
   (map (lambda (x) (or (string->number x) (->string x))) 
        (string-split string ".")))

chicken/branches/cmi/support.scm

@@ -67 +67 @@
   default-optimization-iterations chop-separator chop-extension follow-without-loop
   generate-code make-variable-list make-argument-list generate-foreign-stubs foreign-type-declaration
-  foreign-argument-conversion foreign-result-conversion final-foreign-type debugging block-globals
+  foreign-argument-conversion foreign-result-conversion final-foreign-type debugging
   constant-declarations process-lambda-documentation big-fixnum? sort-symbols
   export-dump-hook intrinsic? node->sexpr emit-global-inline-file inline-max-size
@@ -807 +807 @@
     (when (and (not val) (not exp))
       (debugging 'o "hiding nonexported module bindings" sym)
-      (set! block-globals (cons sym block-globals)) ) ) )
-
+      (hide-variable sym))))