From 3ec9503da9806682dc86186833eb91e0a1f1f876 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Wed, 6 Oct 2010 16:46:22 -0400 Subject: [PATCH] Changed the typed benchmark harness to reflect optimization on by default. --- collects/tests/racket/benchmarks/common/auto.rkt | 12 ++++++------ .../racket/benchmarks/common/typed/wrapper.rkt | 2 +- .../tests/racket/benchmarks/shootout/auto.rkt | 16 ++++++++-------- .../tests/racket/benchmarks/shootout/run.rkt | 6 +++--- .../racket/benchmarks/shootout/typed/wrapper.rkt | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/collects/tests/racket/benchmarks/common/auto.rkt b/collects/tests/racket/benchmarks/common/auto.rkt index 34448fe1ea..fd86c632fd 100755 --- a/collects/tests/racket/benchmarks/common/auto.rkt +++ b/collects/tests/racket/benchmarks/common/auto.rkt @@ -50,7 +50,7 @@ exec racket -qu "$0" ${1+"$@"} (when (directory-exists? "compiled") (delete-directory/files "compiled"))) - (define (mk-typed-scheme bm) + (define (mk-typed-racket-non-optimizing bm) (unless (directory-exists? "typed/compiled") (make-directory "typed/compiled")) (parameterize ([current-namespace (make-base-namespace)] @@ -58,7 +58,7 @@ exec racket -qu "$0" ${1+"$@"} (let ([name (format "~a-non-optimizing.rkt" bm)]) (compile-file (format "typed/~a" name) (build-path "typed/compiled" (path-add-suffix name #".zo")))))) - (define (mk-typed-scheme-optimizing bm) + (define (mk-typed-racket bm) (unless (directory-exists? "typed/compiled") (make-directory "typed/compiled")) (parameterize ([current-namespace (make-base-namespace)] @@ -417,18 +417,18 @@ exec racket -qu "$0" ${1+"$@"} clean-up-zo (append '(nucleic2) mutable-pair-progs)) - (make-impl 'typed-scheme + (make-impl 'typed-racket-non-optimizing void - mk-typed-scheme + mk-typed-racket-non-optimizing (lambda (bm) (system (format "racket -u typed/~a-non-optimizing.rkt" bm))) extract-racket-times clean-up-typed (append mutable-pair-progs '(dynamic2 earley nboyer nucleic2 sboyer scheme2))) - (make-impl 'typed-scheme-optimizing + (make-impl 'typed-racket void - mk-typed-scheme-optimizing + mk-typed-racket (lambda (bm) (system (format "racket -u typed/~a-optimizing.rkt" bm))) extract-racket-times diff --git a/collects/tests/racket/benchmarks/common/typed/wrapper.rkt b/collects/tests/racket/benchmarks/common/typed/wrapper.rkt index 2625db46a1..bceca43608 100644 --- a/collects/tests/racket/benchmarks/common/typed/wrapper.rkt +++ b/collects/tests/racket/benchmarks/common/typed/wrapper.rkt @@ -13,7 +13,7 @@ (caar (regexp-match-positions (if opt? opt-re non-opt-re) name)))] - [option (if opt? (list #'#:optimize) '())] + [option (if opt? '() (list #'#:no-optimize))] [fname (format "~a.rktl" base-name)]) #`(ts:#%module-begin #,@option diff --git a/collects/tests/racket/benchmarks/shootout/auto.rkt b/collects/tests/racket/benchmarks/shootout/auto.rkt index 24a4799261..add3fee3d1 100755 --- a/collects/tests/racket/benchmarks/shootout/auto.rkt +++ b/collects/tests/racket/benchmarks/shootout/auto.rkt @@ -45,7 +45,7 @@ exec racket -qu "$0" ${1+"$@"} (when (directory-exists? "compiled") (delete-directory/files "compiled"))) - (define (mk-typed-scheme bm) + (define (mk-typed-racket-non-optimizing bm) (unless (directory-exists? "typed/compiled") (make-directory "typed/compiled")) (parameterize ([current-namespace (make-base-namespace)] @@ -53,7 +53,7 @@ exec racket -qu "$0" ${1+"$@"} (let ([name (format "~a-non-optimizing.rkt" bm)]) (compile-file (format "typed/~a" name) (build-path "typed/compiled" (path-add-suffix name #".zo")))))) - (define (mk-typed-scheme-optimizing bm) + (define (mk-typed-racket bm) (unless (directory-exists? "typed/compiled") (make-directory "typed/compiled")) (parameterize ([current-namespace (make-base-namespace)] @@ -84,19 +84,19 @@ exec racket -qu "$0" ${1+"$@"} extract-racket-times clean-up-zo '()) - (make-impl 'typed-scheme + (make-impl 'typed-racket-non-optimizing void - mk-typed-scheme + mk-typed-racket-non-optimizing (lambda (bm) - (system (format "racket run.rkt ~a typed-scheme" bm))) + (system (format "racket run.rkt ~a typed-racket-non-optimizing" bm))) extract-racket-times clean-up-typed '()) - (make-impl 'typed-scheme-optimizing + (make-impl 'typed-racket void - mk-typed-scheme-optimizing + mk-typed-racket (lambda (bm) - (system (format "racket run.rkt ~a typed-scheme-optimizing" bm))) + (system (format "racket run.rkt ~a typed-racket" bm))) extract-racket-times clean-up-typed '()) diff --git a/collects/tests/racket/benchmarks/shootout/run.rkt b/collects/tests/racket/benchmarks/shootout/run.rkt index a328ccb8d7..4c52c93538 100644 --- a/collects/tests/racket/benchmarks/shootout/run.rkt +++ b/collects/tests/racket/benchmarks/shootout/run.rkt @@ -138,9 +138,9 @@ (vector-ref (current-command-line-arguments) 1))] [bench (vector-ref (current-command-line-arguments) 0)] [prog (cond - ((string=? version "racket") (format "~a.rkt" bench)) - ((string=? version "typed-scheme") (format "typed/~a-non-optimizing.rkt" bench)) - ((string=? version "typed-scheme-optimizing") (format "typed/~a-optimizing.rkt" bench)) + ((string=? version "racket") (format "~a.rkt" bench)) + ((string=? version "typed-racket-non-optimizing") (format "typed/~a-non-optimizing.rkt" bench)) + ((string=? version "typed-racket") (format "typed/~a-optimizing.rkt" bench)) (else (error 'run "unknown version ~a" version)))]) (let ([m (assoc bench input-map)]) (unless m diff --git a/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt b/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt index 3ced8ad089..28347c36c1 100644 --- a/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt +++ b/collects/tests/racket/benchmarks/shootout/typed/wrapper.rkt @@ -13,7 +13,7 @@ (caar (regexp-match-positions (if opt? opt-re non-opt-re) name)))] - [option (if opt? (list #'#:optimize) '())] + [option (if opt? '() (list #'#:no-optimize))] [fname (format "~a.rktl" base-name)]) #`(ts:#%module-begin #,@option (define OPTIMIZED? #,opt?)