From 736a3843051ee5bfa0d704b81729fc31fa4e2182 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 13 Aug 2006 12:21:02 +0000 Subject: [PATCH] fix larceny driver svn: r4057 --- collects/tests/mzscheme/benchmarks/common/auto.ss | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/collects/tests/mzscheme/benchmarks/common/auto.ss b/collects/tests/mzscheme/benchmarks/common/auto.ss index 4240846d83..e09c8d4bc6 100644 --- a/collects/tests/mzscheme/benchmarks/common/auto.ss +++ b/collects/tests/mzscheme/benchmarks/common/auto.ss @@ -25,7 +25,8 @@ exec mzscheme -qu "$0" ${1+"$@"} (define (mk-larceny bm) (parameterize ([current-input-port (open-input-string (format "(compile-file \"~a.sch\")\n" - bm))]) + bm))] + [current-output-port (open-output-bytes)]) (system "larceny"))) (define (mk-mzc bm) @@ -65,6 +66,12 @@ exec mzscheme -qu "$0" ${1+"$@"} (let ([m (regexp-match #rx#"cpu time: ([0-9]+) real time: ([0-9]+) gc time: ([0-9]+)" str)]) (map bytes->number (cdr m)))) + (define (extract-larceny-times bm str) + (let ([m (regexp-match #rx#"Elapsed time...: ([0-9]+) ms.*Elapsed GC time: ([0-9]+) ms" str)]) + (list (bytes->number (cadr m)) + #f + (bytes->number (caddr m))))) + (define (extract-chicken-times bm str) (let ([m (regexp-match #rx#"([0-9.]+) seconds.*[^0-9.]([0-9.]+) seconds" str)]) (list (* 1000 (string->number (format "#e~a" (cadr m)))) @@ -125,7 +132,7 @@ exec mzscheme -qu "$0" ${1+"$@"} run-gambit-exe extract-gambit-times '(nucleic2)) - (make-impl 'larcency + (make-impl 'larceny mk-larceny run-larceny extract-larceny-times