Changeset 12162 in project

Timestamp:

10/15/08 01:10:10 (12 years ago)

Author:

felix winkelmann

Message:

tweaks in cscbench.scm

Location:

chicken/branches/cmi

Files:

• TODO (modified) (1 diff)
• benchmarks/cscbench.scm (modified) (3 diffs)

chicken/branches/cmi/TODO

@@ -45 +45 @@
 
 * benchmarks
-** get rid of cscbench, hack together something simpler
-** simplify comparing two builds relative to each other
-** simplify passing extra options
+** add more realistic benchmarks
 
 * tests

chicken/branches/cmi/benchmarks/cscbench.scm

@@ -5 +5 @@
 (require-extension srfi-1 utils posix regex)
 
+(define ignored-files '("cscbench.scm"))
 (define flonum-files '("fft" "maze"))
-
 (define cc "`csc -cc-name`")
 (define chicken "chicken")
@@ -46 +46 @@
         (display-r fs 3 #\0) ) ) ) )
 
+(define (display-size n)
+  (display-r 
+   (string-append (number->string (quotient n 1024)) "k") 
+   10 #\space))
+
 (define (compile-and-run file decls options coptions unsafe)
   (system* "~A ~A -quiet -no-warnings -heap-size 8m -output-file tmpfile.c ~A ~A"
            chicken file decls options)
-  (system* "~a ~a -static -I.. tmpfile.c -o tmpfile ../lib~achicken.a -lm"
-           cc coptions (if unsafe "u" ""))
-  (let ([time (call-with-current-continuation
+  (system* "~a ~a -s -I.. tmpfile.c -o tmpfile ../lib~achicken.a -lm"
+           cc coptions
+           (if unsafe "u" ""))
+  (let ((time (call-with-current-continuation
                (lambda (abort)
                  (set! abort-run (cut abort #f))
-                 (/ (+ (run) (run) (run)) 3) ) ) ] )
+                 (/ (+ (run) (run) (run) (run) (run)) 5) ) ) )
+        (size (file-size "tmpfile")))
     (display #\space)
     (cond (time
             (display-f-4.3 time)
-            time)
+            (values time size))
           (else
             (display "FAILED")
-            9999.9))))
+            (values 9999.9 size)))))
 
 (define (dflush x)
@@ -88 +95 @@
   (dflush "\nCFLAGS:\n")
   (system* "echo `csc -cflags`")
-  (display "\n                     base     unsafe        max\n")
+  (display "\n(Running benchmarks - average over 5 runs, statically linked, stripped)\n")
+  (display "\n                     (runtime)                      (code size)\n")
+  (display "\n                     base     unsafe        max     base     unsafe       max")
+  (display "\n                  -------------------------------------------------------------\n")
   (let ((sum-base 0.0)
         (sum-unsafe 0.0)
-        (sum-max 0.0))
-  (for-each
-   (lambda (file)
-     (let* ([name (pathname-file file)]
-            [options (string-intersperse options " ")] )
-       (display-l name 16 #\space)
-       (flush-output)
-       (set! sum-base (+ sum-base (compile-and-run file "-debug-level 0 -optimize-level 1 -lambda-lift" options "" #f)))
-       (dflush "  ")
-       (set! sum-unsafe (+ sum-unsafe (compile-and-run file "-debug-level 0 -optimize-level 3 -block -disable-interrupts -lambda-lift" options "" #t)))
-       (dflush "  ")
-       (unless (member name flonum-files)
-         (set! sum-max (+ sum-max (compile-and-run file "-benchmark-mode" options "" #t) )))
-       (newline)
-       (flush-output) ) )
-   (lset-difference string=? (sort (glob "*.scm") string<?) '("cscbench.scm")))
-  (display "\nTOTAL            ")
-  (display-f-4.3 sum-base)
-  (display "   ")
-  (display-f-4.3 sum-unsafe)
-  (display "   ")
-  (display-f-4.3 sum-max)
-  (newline)
- 0))
+        (sum-max 0.0)
+        (size-base 0)
+        (size-unsafe 0)
+        (size-max 0))
+    (for-each
+     (lambda (file)
+       (let* ([name (pathname-file file)]
+              [options (string-intersperse options " ")] 
+              (t 0))
+         (display-l name 16 #\space)
+         (flush-output)
+         (set!-values 
+          (t size-base)
+          (compile-and-run
+           file
+           "-debug-level 0 -optimize-level 1 -lambda-lift" 
+           options "" #f))
+         (set! sum-base (+ sum-base t))
+         (dflush "  ")
+         (set!-values
+          (t size-unsafe)
+          (compile-and-run 
+           file
+           "-debug-level 0 -optimize-level 3 -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)))
+         (display-size size-base)
+         (display-size size-unsafe)
+         (display-size size-max)
+         (newline)
+         (flush-output)))
+     (lset-difference string=? (sort (glob "*.scm") string<?) ignored-files))
+    (display "\nTOTAL            ")
+    (display-f-4.3 sum-base)
+    (display "   ")
+    (display-f-4.3 sum-unsafe)
+    (display "   ")
+    (display-f-4.3 sum-max)
+    (newline)
+    0))
 
 (main (command-line-arguments))